Index: tmp/org.txm.core/.classpath
===================================================================
--- tmp/org.txm.core/.classpath	(revision 240)
+++ tmp/org.txm.core/.classpath	(revision 241)
@@ -43,7 +43,6 @@
 	<classpathentry exported="true" kind="lib" path="bin/" sourcepath="src/java"/>
 	<classpathentry excluding="org/txm/importer/graal/xsl/" kind="src" path="src/groovy"/>
 	<classpathentry kind="src" path="res"/>
-	<classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jodconverter-core-3.1-beta.jar"/>
Index: tmp/org.txm.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.core/META-INF/MANIFEST.MF	(revision 240)
+++ tmp/org.txm.core/META-INF/MANIFEST.MF	(revision 241)
@@ -5,6 +5,7 @@
 Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.txm.toolbox.Activator
 Require-Bundle: org.eclipse.core.runtime,
+ org.txm.statsengine.r.core;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.osgi.util;bundle-version="3.2.0",
  org.eclipse.core.net,
  org.eclipse.osgi,
@@ -12,7 +13,6 @@
  org.eclipse.persistence.jpa;bundle-version="2.6.0",
  javax.persistence;bundle-version="2.1.0",
  org.eclipse.persistence.jpa.jpql;bundle-version="2.6.0",
- org.txm.r;bundle-version="1.0.0";visibility:=reexport,
  org.txm.utils;bundle-version="1.0.0";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: EDU.oswego.cs.dl.util.concurrent,
@@ -117,42 +117,6 @@
  junit.framework,
  junit.runner,
  junit.textui,
- net.sf.saxon,
- net.sf.saxon.dom,
- net.sf.saxon.event,
- net.sf.saxon.evpull,
- net.sf.saxon.expr,
- net.sf.saxon.expr.flwor,
- net.sf.saxon.expr.instruct,
- net.sf.saxon.expr.number,
- net.sf.saxon.expr.parser,
- net.sf.saxon.expr.sort,
- net.sf.saxon.functions,
- net.sf.saxon.functions.regex,
- net.sf.saxon.java,
- net.sf.saxon.lib,
- net.sf.saxon.om,
- net.sf.saxon.pattern,
- net.sf.saxon.pull,
- net.sf.saxon.query,
- net.sf.saxon.s9api,
- net.sf.saxon.serialize,
- net.sf.saxon.serialize.charcode,
- net.sf.saxon.serialize.codenorm,
- net.sf.saxon.style,
- net.sf.saxon.sxpath,
- net.sf.saxon.trace,
- net.sf.saxon.trans,
- net.sf.saxon.tree,
- net.sf.saxon.tree.iter,
- net.sf.saxon.tree.linked,
- net.sf.saxon.tree.tiny,
- net.sf.saxon.tree.util,
- net.sf.saxon.tree.wrapper,
- net.sf.saxon.type,
- net.sf.saxon.value,
- net.sf.saxon.xpath,
- net.sf.saxon.xqj,
  org.apache.log4j,
  org.apache.log4j.chainsaw,
  org.apache.log4j.config,
Index: tmp/org.txm.core/src/groovy/org/txm/scripts/TxmToHSQL.groovy
===================================================================
--- tmp/org.txm.core/src/groovy/org/txm/scripts/TxmToHSQL.groovy	(revision 240)
+++ tmp/org.txm.core/src/groovy/org/txm/scripts/TxmToHSQL.groovy	(revision 241)
@@ -27,10 +27,10 @@
 //
 package org.txm.scripts;
 
-import org.txm.searchengine.cqp.corpus.Corpus;
-import org.txm.searchengine.cqp.corpus.Lexicon;
-import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.searchengine.cqp.corpus.CorpusManager;
+import org.txm.searchengine.cqp.corpus.Corpus
+import org.txm.searchengine.cqp.corpus.CorpusManager
+import org.txm.searchengine.cqp.corpus.Lexicon
+import org.txm.searchengine.cqp.corpus.Property
 // TODO: Auto-generated Javadoc
 
 /**
Index: tmp/org.txm.core/src/java/org/txm/Messages.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/Messages.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/Messages.java	(revision 241)
@@ -1,543 +0,0 @@
-package org.txm;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.core.messages.TXMCoreMessages;
-
-/**
- * The keys of all messages in the Toolbox
- * 
- * @author mdecorde
- *
- */
-public class Messages extends NLS {
-	
-	// The Constant BUNDLE_NAME. 
-	private static final String BUNDLE_NAME = "org.txm.messages"; //$NON-NLS-1$
-	public static String FAILED;
-	public static String DONE;			
-	public static String AbsoluteFrequency_1;
-	public static String AbstractCqiClient_2;
-	public static String ArrayIndex_0;
-	public static String ArrayIndex_1;
-	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 CAH_0;
-	public static String CA_0;
-	public static String CA_16;
-	public static String CA_2;
-	public static String CA_4;
-	public static String CHAR_VECTOR_ADDED_TO_WORKSPACE;
-	public static String CONNECTED_TO_STATS_MODULE;
-	public static String CONNECTING_CQI_CLIENT;
-	public static String CONNECTION_OK;
-	public static String CQI_CLIENT_CONNECTED;
-	public static String CREATING_PART;
-	public static String CREATING_SUBCORPUS;
-	public static String CatalogManager_0;
-	public static String CatalogManager_1;
-	public static String Catalog_0;
-	public static String CompositeComparator_0;
-	public static String Concordance_0;
-	public static String Concordance_1;
-	public static String Concordance_12;
-	public static String Concordance_13;
-	public static String Concordance_14;
-	public static String Concordance_15;
-	public static String Concordance_16;
-	public static String Concordance_17;
-	public static String Concordance_18;
-	public static String Concordance_19;
-	public static String Concordance_2;
-	public static String Concordance_3;
-	public static String Concordance_4;
-	public static String Concordance_5;
-	public static String Concordance_6;
-	public static String Concordance_7;
-	public static String Concordance_8;
-	public static String Contrasts_0;
-	public static String Convert5To6_1;
-	public static String Convert5To6_10;
-	public static String Convert5To6_11;
-	public static String Convert5To6_12;
-	public static String Convert5To6_15;
-	public static String Convert5To6_19;
-	public static String Convert5To6_30;
-	public static String Convert5To6_46;
-	public static String Convert5To6_6;
-	public static String Convert5To6_7;
-	public static String Convert5To6_8;
-	public static String Convert5To6_9;
-	public static String Cooccurrence_0;
-	public static String Cooccurrence_1;
-	public static String Cooccurrence_10;
-	public static String Cooccurrence_102;
-	public static String Cooccurrence_103;
-	public static String Cooccurrence_105;
-	public static String Cooccurrence_106;
-	public static String Cooccurrence_107;
-	public static String Cooccurrence_11;
-	public static String Cooccurrence_12;
-	public static String Cooccurrence_13;
-	public static String Cooccurrence_14;
-	public static String Cooccurrence_15;
-	public static String Cooccurrence_16;
-	public static String Cooccurrence_2;
-	public static String Cooccurrence_22;
-	public static String Cooccurrence_23;
-	public static String Cooccurrence_3;
-	public static String Cooccurrence_4;
-	public static String Cooccurrence_5;
-	public static String Cooccurrence_6;
-	public static String Cooccurrence_7;
-	public static String Cooccurrence_8;
-	public static String Cooccurrence_9;
-	public static String CorpusManager_0;
-	public static String CorpusManager_1;
-	public static String Corpus_12;
-	public static String Corpus_13;
-	public static String Corpus_14;
-	public static String Corpus_15;
-	public static String Corpus_19;
-	public static String Corpus_2;
-	public static String Corpus_3;
-	public static String Corpus_4;
-	public static String Corpus_5;
-	public static String Corpus_6;
-	public static String Corpus_7;
-	public static String Corpus_8;
-	public static String CqiClient_0;
-	public static String CqiClient_1;
-	public static String CqiClient_3;
-	public static String CqiClient_32;
-	public static String CqiClient_33;
-	public static String CqiClient_34;
-	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 DOUBLE_VECTOR_ADDED_TO_WORKSPACE;
-	public static String DROP_PARTITION;
-	public static String DROP_QUERYRESULT;
-	public static String DROP_SUBCORPUS;
-	public static String Diagnostic_0;
-	public static String Diagnostic_1;
-	public static String Diagnostic_10;
-	public static String Diagnostic_11;
-	public static String Diagnostic_12;
-	public static String Diagnostic_13;
-	public static String Diagnostic_14;
-	public static String Diagnostic_15;
-	public static String Diagnostic_16;
-	public static String Diagnostic_17;
-	public static String Diagnostic_18;
-	public static String Diagnostic_19;
-	public static String Diagnostic_2;
-	public static String Diagnostic_20;
-	public static String Diagnostic_22;
-	public static String Diagnostic_23;
-	public static String Diagnostic_26;
-	public static String Diagnostic_3;
-	public static String Diagnostic_4;
-	public static String Diagnostic_40;
-	public static String Diagnostic_41;
-	public static String Diagnostic_43;
-	public static String Diagnostic_49;
-	public static String Diagnostic_5;
-	public static String Diagnostic_6;
-	public static String Diagnostic_7;
-	public static String Diagnostic_8;
-	public static String Diagnostic_9;
-	public static String END_SUBCORPUS_LEXICON;
-	public static String END_SUBCORPUS_SIZE;
-	public static String ERROR_EXTRACT_ITEM;
-	public static String EVALUATED_EXPRESSION;
-	public static String ExecTimer_0;
-	public static String ExecTimer_1;
-	public static String ExecTimer_2;
-	public static String ExecTimer_3;
-	public static String FAILED_INIT_CONNECTION_R;
-	public static String FactoMineRCA_2;
-	public static String FactoMineRCA_3;
-	public static String FactoMineRCA_4;
-	public static String FactoMineRCA_5;
-	public static String Factor_0;
-	public static String FileCopy_0;
-	public static String FileCopy_2;
-	public static String FileCopy_4;
-	public static String FilterManager_0;
-	public static String FilterManager_1;
-	public static String Filter_7;
-	public static String Focus_1;
-	public static String GroovyImportScriptRunner_0;
-	public static String GroovyImportScriptRunner_1;
-	public static String GroovyImportScriptRunner_3;
-	public static String INT_VECTOR_ADDED_TO_WORKSPACE;
-	public static String InternalView_3;
-	public static String InternalView_6;
-	public static String InternalView_7;
-	public static String LEXICON;
-	public static String LEXICON_ADDED;
-	public static String LIBBRARY_NOT_LOADED;
-	public static String LS_0;
-	public static String LS_1;
-	public static String LexicalTableImpl_0;
-	public static String LexicalTableImpl_1;
-	public static String LexicalTableImpl_10;
-	public static String LexicalTableImpl_12;
-	public static String LexicalTableImpl_13;
-	public static String LexicalTableImpl_3;
-	public static String LexicalTableImpl_5;
-	public static String LexicalTableImpl_8;
-	public static String LexicalTableImpl_9;
-	public static String LexicographicKeywordComparator_0;
-	public static String LexicographicLeftContextComparator_0;
-	public static String LexicographicRightContextComparator_0;
-	public static String Lexicon_0;
-	public static String Lexicon_3;
-	public static String Localizer_0;
-	public static String Localizer_1;
-	public static String Log_3;
-	public static String Log_5;
-	public static String Log_8;
-	public static String MATRIX_ADDED_TO_WORKSPACE;
-	public static String MainCorpus_0;
-	public static String MainCorpus_1;
-	public static String MainCorpus_2;
-	public static String MatrixImpl_0;
-	public static String MatrixImpl_1;
-	public static String MatrixImpl_10;
-	public static String MatrixImpl_11;
-	public static String MatrixImpl_13;
-	public static String MatrixImpl_14;
-	public static String MatrixImpl_19;
-	public static String MatrixImpl_2;
-	public static String MatrixImpl_20;
-	public static String MatrixImpl_21;
-	public static String MatrixImpl_22;
-	public static String MatrixImpl_23;
-	public static String MatrixImpl_28;
-	public static String MatrixImpl_29;
-	public static String MatrixImpl_4;
-	public static String MatrixImpl_5;
-	public static String MatrixImpl_6;
-	public static String MatrixImpl_67;
-	public static String MatrixImpl_7;
-	public static String MatrixImpl_73;
-	public static String MatrixImpl_79;
-	public static String MatrixImpl_88;
-	public static String MemCqiClient_0;
-	public static String MemCqiClient_1;
-	public static String MemCqiClient_10;
-	public static String MemCqiClient_11;
-	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 MessageBox_0;
-	public static String MessageBox_1;
-	public static String MessageBox_2;
-	public static String NEW_PARTION;
-	public static String NOT_FOUND_IN_R;
-	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 NullComparator_0;
-	public static String PACKAGE_LOADED;
-	public static String PARTITION_CREATED;
-	public static String PART_CREATED;
-	public static String Page_3;
-	public static String Pair_0;
-	public static String Pair_1;
-	public static String PartitionFocus_1;
-	public static String PartitionFocus_2;
-	public static String PartitionFocus_3;
-	public static String PartitionFocus_4;
-	public static String Partition_1;
-	public static String Partition_18;
-	public static String Partition_2;
-	public static String Partition_21;
-	public static String Partition_4;
-	public static String Partition_9;
-	public static String PatchCwbRegistry_0;
-	public static String PatchCwbRegistry_1;
-	public static String PatchCwbRegistry_13;
-	public static String PatchCwbRegistry_16;
-	public static String PatchCwbRegistry_2;
-	public static String PatchCwbRegistry_23;
-	public static String PatchCwbRegistry_27;
-	public static String PatchCwbRegistry_28;
-	public static String PatchCwbRegistry_29;
-	public static String PatchCwbRegistry_3;
-	public static String PatchCwbRegistry_34;
-	public static String PatchCwbRegistry_35;
-	public static String PatchCwbRegistry_4;
-	public static String PatchCwbRegistry_5;
-	public static String Project_0;
-	public static String Project_1;
-	public static String Project_10;
-	public static String Project_11;
-	public static String Project_12;
-	public static String Project_13;
-	public static String Project_14;
-	public static String Project_15;
-	public static String Project_16;
-	public static String Project_17;
-	public static String Project_18;
-	public static String Project_2;
-	public static String Project_25;
-	public static String Project_26;
-	public static String Project_27;
-	public static String Project_28;
-	public static String Project_3;
-	public static String Project_31;
-	public static String Project_4;
-	public static String Project_5;
-	public static String Project_6;
-	public static String Project_7;
-	public static String Project_8;
-	public static String Project_9;
-	public static String PropertiesReferenceComparator_0;
-	public static String QUERY;
-	public static String QUERYING_PARTITION;
-	public static String QuantitativeDataStructureImpl_0;
-	public static String QuantitativeDataStructureImpl_1;
-	public static String QuantitativeDataStructureImpl_2;
-	public static String QueryIndex_2;
-	public static String QueryIndex_3;
-	public static String QueryResult_0;
-	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_INTEGER_FROM_CQI_SERVER;
-	public static String READING_INT_ARRAY_FROM_CQI_SERVER;
-	public static String READING_STRING_ARRAY_FROM_CQI_SERVER;
-	public static String READING_STRING_FROM_CQI_SERVER;
-	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_HEADER_FROM_CQI_SERVER;
-	public static String READ_INTEGER_FROM_CQI_SERVER;
-	public static String READ_INT_ARRAY_FROM_CQI_SERVER;
-	public static String READ_STRING_ARRAY_FROM_CQI_SERVER;
-	public static String READ_STRING_FROM_CQI_SERVER;
-	public static String REQUESTED_OBJECT;
-	public static String RETURNING_CACHED_LEXICON;
-	public static String RETURN_FROM_QUERY;
-	public static String RException_0;
-	public static String RException_1;
-	public static String RException_2;
-	public static String RSERVE_ACTIVATED;
-	public static String RSERVE_PATH_NOT_SET_ERROR;
-	public static String RSERVE_PATH_SET_ERROR;
-	public static String RWorkspace_0;
-	public static String RWorkspace_1;
-	public static String RWorkspace_10;
-	public static String RWorkspace_11;
-	public static String RWorkspace_2;
-	public static String RWorkspace_21;
-	public static String RWorkspace_3;
-	public static String RWorkspace_4;
-	public static String RWorkspace_5;
-	public static String RWorkspace_6;
-	public static String RWorkspace_7;
-	public static String RWorkspace_8;
-	public static String R_EXPR;
-	public static String R_READ_CONSOLE;
-	public static String R_SAVE_HISTORY;
-	public static String R_SHOW_MESSAGE;
-	public static String R_WRITE_CONSOLE;
-	public static String ReferencePattern_3;
-	public static String Referencer_1;
-	public static String Referencer_2;
-	public static String RelativeFrequency_3;
-	public static String Progression_1;
-	public static String Progression_10;
-	public static String Progression_11;
-	public static String Progression_12;
-	public static String Progression_13;
-	public static String Progression_14;
-	public static String Progression_2;
-	public static String Progression_3;
-	public static String Progression_9;
-	public static String SERVER_STARTED;
-	public static String SERVER_STOPED;
-	public static String STARTING_SERVER;
-	public static String STOPING_SERVER;
-	public static String SUBCORPUS_CREATED;
-	public static String SUBCORPUS_LEXICON;
-	public static String SUBCORPUS_SIZE;
-	public static String Selection_0;
-	public static String Selection_1;
-	public static String Selection_2;
-	public static String Selection_26;
-	public static String Selection_3;
-	public static String Selection_4;
-	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 Sh_4;
-	public static String SpecificitesResult_0;
-	public static String SpecificitesResult_1;
-	public static String SpecificitesResult_10;
-	public static String SpecificitesResult_2;
-	public static String SpecificitesResult_3;
-	public static String SpecificitesResult_4;
-	public static String SpecificitesResult_5;
-	public static String SpecificitesResult_6;
-	public static String SpecificitesResult_7;
-	public static String SpecificitesResult_8;
-	public static String Specificites_0;
-	public static String Specificites_1;
-	public static String Specificites_2;
-	public static String StartRserve_0;
-	public static String StartRserve_2;
-	public static String StartRserve_21;
-	public static String StartRserve_22;
-	public static String StartRserve_28;
-	public static String StartRserve_29;
-	public static String StartRserve_3;
-	public static String StartRserve_4;
-	public static String StartRserve_6;
-	public static String StreamGobbler_0;
-	public static String StreamGobbler_1;
-	public static String StreamGobbler_2;
-	public static String StreamGobbler_3;
-	public static String StructuralUnitProperty_0;
-	public static String Subcorpus_1;
-	public static String Subcorpus_2;
-	public static String Subcorpus_3;
-	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 TSCmd_30;
-	public static String TSCmd_31;
-	public static String TSCorpusManager_0;
-	public static String TSCorpusManager_1;
-	public static String TSCorpus_0;
-	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 TigerXmlIndexing_2;
-	public static String TigerXmlIndexing_3;
-	public static String TigerXmlIndexing_6;
-	public static String TigerXmlIndexing_7;
-	public static String Toolbox_0;
-	public static String Toolbox_1;
-	public static String Toolbox_10;
-	public static String Toolbox_11;
-	public static String Toolbox_12;
-	public static String Toolbox_14;
-	public static String Toolbox_15;
-	public static String Toolbox_16;
-	public static String Toolbox_17;
-	public static String Toolbox_18;
-	public static String Toolbox_2;
-	public static String Toolbox_21;
-	public static String Toolbox_22;
-	public static String Toolbox_23;
-	public static String Toolbox_24;
-	public static String Toolbox_25;
-	public static String Toolbox_26;
-	public static String Toolbox_27;
-	public static String Toolbox_28;
-	public static String Toolbox_29;
-	public static String Toolbox_3;
-	public static String Toolbox_30;
-	public static String Toolbox_31;
-	public static String Toolbox_33;
-	public static String Toolbox_34;
-	public static String Toolbox_35;
-	public static String Toolbox_37;
-	public static String Toolbox_38;
-	public static String Toolbox_39;
-	public static String Toolbox_4;
-	public static String Toolbox_40;
-	public static String Toolbox_43;
-	public static String Toolbox_45;
-	public static String Toolbox_47;
-	public static String Toolbox_5;
-	public static String Toolbox_7;
-	public static String Toolbox_8;
-	public static String Toolbox_9;
-	public static String Toolbox_connected_to_corpus_sever;
-	public static String Toolbox_wait_failed;
-	public static String Toolbox_workspace_init;
-	public static String Toolbox_workspace_init_failed;
-	public static String Toolbox_wrong_port;
-	public static String TxmObject_0;
-	public static String TxmObject_1;
-	public static String TxmObject_2;
-	public static String TxmRenderer_1;
-	public static String TxmRenderer_5;
-	public static String TxmRenderer_6;
-	public static String TxmRenderer_7;
-	public static String VARIABLE_REMOVED;
-	public static String ValidateXml_0;
-	public static String ValidateXml_1;
-	public static String ValidateXml_2;
-	public static String ValidateXml_3;
-	public static String VectorizeArray_0;
-	public static String VectorizeArray_1;
-	public static String VectorizeArray_10;
-	public static String VectorizeArray_11;
-	public static String VectorizeArray_3;
-	public static String VectorizeArray_4;
-	public static String VectorizeArray_5;
-	public static String VectorizeArray_7;
-	public static String VectorizeArray_8;
-	public static String VectorizeArray_9;
-	public static String Index_0;
-	public static String Index_1;
-	public static String Index_7;
-	public static String WORKSPACE_PURGED;
-	public static String Workspace_0;
-	public static String Workspace_1;
-	public static String Workspace_10;
-	public static String Workspace_2;
-	public static String Workspace_26;
-	public static String Workspace_27;
-	public static String Workspace_28;
-	public static String Workspace_29;
-	public static String Workspace_3;
-	public static String Workspace_30;
-	public static String Workspace_31;
-	public static String Workspace_4;
-	public static String Workspace_5;
-	public static String Workspace_6;
-	public static String Workspace_7;
-	public static String Workspace_8;
-
-	static {
-		// initialize resource bundle
-		TXMCoreMessages.initializeMessages(BUNDLE_NAME, Messages.class);
-		//NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
-				
Index: tmp/org.txm.core/src/java/org/txm/messages_fr.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/messages_fr.properties	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/messages_fr.properties	(revision 241)
@@ -1,517 +0,0 @@
-﻿FAILED=Échec.
-DONE=Terminé.
-AbsoluteFrequency_1=Fréquence absolue
-AbstractCqiClient_2=Pas d'erreur à notifier.
-ArrayIndex_0=** Le tableau d'index ne peut pas être nul ou vide.
-ArrayIndex_1=** Un index commençant à 0 ne peut pas être inférieur à 0 ou supérieur au nombre d'éléments indexés.
-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.
-CAH_0=Erreur durant l'export du résultat CAH : 
-CA_0=** La table lexicale n'a pas été trouvée dans l'espace de travail R.
-CA_16=** Impossible de charger la librairie 'ca'
-CA_2=** Erreur lors du calcul de l'analyse factorielle des correspondances : 
-CA_4=** Impossible d'extraire les valeurs propres 
-CHAR_VECTOR_ADDED_TO_WORKSPACE=Le vecteur "{1}" ({0,number,integer} valeurs "character") a été transmis au Moteur Statistique.
-CONNECTED_TO_STATS_MODULE= connecté.
-CONNECTING_CQI_CLIENT=Connexion au moteur de recherche avec les paramètres suivants : {0}:{1}@{2}{3}...
-CONNECTION_OK=Connexion au Moteur Statistique établie.
-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.
-Catalog_0=** Fichier de catalogue introuvable
-CompositeComparator_0=Composé : 
-Concordance_0=\ 
-Concordance_1=** Echec de récupération de la propriété 'text_id' des lignes 
-Concordance_12=** Echec de l'exportation de la concordance : 
-Concordance_13=Référence
-Concordance_14=ContexteGauche
-Concordance_15=Pivot
-Concordance_16=ContexteDroit
-Concordance_17=Référence
-Concordance_18=
-Concordance_19=Contexte
-Concordance_2=indéfini
-Concordance_3=\ résultats obtenus en\ 
-Concordance_4=Echec de la suppression du QueryResult de CQP: 
-Concordance_5=
-Concordance_6=Récupération 
-Concordance_7=\ résultats
-Concordance_8=Echec de la récupération des limites de texte : 
-Contrasts_0=Calcul: 
-Convert5To6_1=''{0}'' est introuvable.
-Convert5To6_10=le dossier 'registry' est manquant
-Convert5To6_11=le dossier 'html' est manquant
-Convert5To6_12=traitement en cours...
-Convert5To6_15=Reorganisation des fichiers de 
-Convert5To6_19=Lecture des informatins sur le corpus depuis le fichier import.xml : 
-Convert5To6_30=Remplissage du fichier 'import.xml' avec : 
-Convert5To6_46=traitement du fichier : 
-Convert5To6_6=Vérification du format...
-Convert5To6_7=le dossier 'txm' est manquant
-Convert5To6_8=le dossier 'html' est manquant
-Convert5To6_9=le dossier 'data' est manquant
-Cooccurrence_0=Coocurrence : 
-Cooccurrence_1=** Echec de la recherche de 'n' ou 'o' : 
-Cooccurrence_10=\ propriétés : 
-Cooccurrence_102=** Erreur : argument négatif dans la fonction 'factln'
-Cooccurrence_103=** Erreur : argument négatif dans la fonction 'rbicoln'
-Cooccurrence_105=Occ\tFréq\tCoFréq\tIndice\tDistMoy\tMode
-Cooccurrence_106=\n
-Cooccurrence_107=** Erreur : 
-Cooccurrence_11=Occ
-Cooccurrence_12=Fréq
-Cooccurrence_13=CoFréq
-Cooccurrence_14=Indice
-Cooccurrence_15=DistMoy
-Cooccurrence_16=Mode
-Cooccurrence_2=Cooc : 
-Cooccurrence_22=Erreur: ref_forms.length ! ref_freqs.length
-Cooccurrence_23=Erreur: pas de cooccurrents
-Cooccurrence_3=\ (
-Cooccurrence_4=\ F : 
-Cooccurrence_5=** Impossible de calculer des cooccurrences avec cette concordance
-Cooccurrence_6=Occ\tFréq\tCoFréq\tIndice\tDistMoy\tMode
-Cooccurrence_7=\ Occ :
-Cooccurrence_8=\ Indice:
-Cooccurrence_9=\ DistMoy:
-CorpusManager_0=** Le client CQi n'est pas initilialisé
-CorpusManager_1=** Erreur : Cette exception ne devrait pas se lever
-Corpus_12=** Echec de la restauration du sous-corpus
-Corpus_13=Corpus: getLocale: CQP est pas prêt à répondre : 
-Corpus_14=Attention: le corpus ne peut pas être chargé 
-Corpus_15= informations from workspace (selfElement  null)
-Corpus_19=** Echec de la restauration de la partition
-Corpus_2=Corpus : 
-Corpus_3=, Encodage : 
-Corpus_4=, Langue : 
-Corpus_5= Pas de valeur donnée
-Corpus_6=** Corpus : la référence au texte 
-Corpus_7=\ est manquante
-Corpus_8=\ dans
-CqiClient_0=Récupération de la dernière erreur CQP
-CqiClient_1=Lecture de CQI CTRL LAST GENERAL ERROR
-CqiClient_3=** Echec de la lecture de la dernière erreur CQP
-CqiClient_32=Moteur de recherche lancé...
-CqiClient_33=** La connexion au moteur de recherche a échoué.
-CqiClient_34=Moteur de recherche lancé.
-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 : 
-DOUBLE_VECTOR_ADDED_TO_WORKSPACE=Le vecteur "{1}" ({0,number,integer} valeurs numériques "doubles") a été transmis au Moteur Statistique.
-DROP_PARTITION=Suppression de la partition {0}
-DROP_QUERYRESULT=Suppression du résultat de requête {0}
-DROP_SUBCORPUS=Suppression du sous-corpus {0}
-Diagnostic_0=<h3>Propriétés des structures\n
-Diagnostic_1=** Echec d'accès au corpus
-Diagnostic_10=Nom de la partition : 
-Diagnostic_11=\ structures
-Diagnostic_12=Nombre de parties :
-Diagnostic_13=Taille de la partition : 
-Diagnostic_14=Propriétés des unités lexicales (max {0} valeurs)
-Diagnostic_15=Numéro de la partie : 
-Diagnostic_16=Nombre d'unités de structure 
-Diagnostic_17=Nom des parties : 
-Diagnostic_18=Taille des parties : 
-Diagnostic_19=Propriétés des parties : 
-Diagnostic_2=** Erreur
-Diagnostic_20=Requêtes de parties : 
-Diagnostic_22=Propriétés des structures (max {0} valeurs)
-Diagnostic_23=\ valeurs)
-Diagnostic_26=Pas de propriété
-Diagnostic_3=Description du corpus 
-Diagnostic_4=\ propriétés
-Diagnostic_40=* Statistiques Générales\n
-Diagnostic_41=- T
-Diagnostic_43=- Propriétés de mot 
-Diagnostic_49=- S
-Diagnostic_5=Statistiques Générales
-Diagnostic_6=** Echec d'accès au corpus
-Diagnostic_7=Nombre de mots 
-Diagnostic_8=\ lexique
-Diagnostic_9=Nombre de propriétés de mot 
-END_SUBCORPUS_LEXICON=Lexique du sous-corpus {0} calculé en {1} ms
-END_SUBCORPUS_SIZE=Taille du sous-corpus {0} ({1}) calculée en {2} ms
-ERROR_EXTRACT_ITEM=** Erreur lors de l'extraction de la liste d'items : 	
-EVALUATED_EXPRESSION=L''expression ''{0}'' a été évaluée.
-ExecTimer_0=\ msec
-ExecTimer_1=\ sec
-ExecTimer_2=\ min et 
-ExecTimer_3=h, 
-FAILED_INIT_CONNECTION_R=** Echec de connexion au serveur statistique.
-FactoMineRCA_2=** Echec d'accès à la colonne des contributions : 
-FactoMineRCA_3=** Echec d'accès à la colonne des cos\u00B2 : 
-FactoMineRCA_4=** Echec d'accès à la ligne des contributions : 
-FactoMineRCA_5=** Echec d'accès à la ligne des cos\u00B2 : 
-Factor_0=** Non implémenté
-FileCopy_0=** Copie de fichiers : échec d'accès à la source : 
-FileCopy_2=** Copie de fichiers : droits d'accès insuffisants à la source : 
-FileCopy_4=** Copie de fichiers : échec de création du dossier : 
-FilterManager_0=** Erreur du gestionnaire de filtre : initialisation 
-FilterManager_1=\ n'existe pas.
-Filter_7=** Erreur de lecture
-Focus_1=** Le focus est vide ou nul.
-GroovyImportScriptRunner_0=Initialisation de GroovyImportScriptRunner
-GroovyImportScriptRunner_1=> début de l'exécution de 
-GroovyImportScriptRunner_3=> fin de l'exécution
-INT_VECTOR_ADDED_TO_WORKSPACE=Le vecteur "{1}" ({0,number,integer} valeurs numériques "entières") a été transmis au Moteur Statistique.
-InternalView_3=\ \ Information des structures :
-InternalView_6=InternalView: erreur lors de la récupération des valeurs des propriétés de structure
-InternalView_7=\ \ No d'informations sur les structures
-LEXICON=Lexique
-LEXICON_ADDED=Le lexique "{1}" ({0,number,integer} entrées) a été transmis au Moteur Statistique.
-LIBBRARY_NOT_LOADED=LA librairie {0} n''a pu être chargée : {1}
-LS_0=Erreur : 
-LS_1=\ n'est pas un dossier
-LexicalTableImpl_0=
-LexicalTableImpl_1=Construction de la table lexicale avec : 
-LexicalTableImpl_10=colonnes
-LexicalTableImpl_12=Erreur: les marges
-LexicalTableImpl_13=\ sont plus grandes que la taille des parties
-LexicalTableImpl_3=\ <sans partition> /
-LexicalTableImpl_5=pas assez de colonnes : minimum 2 (ici : 
-LexicalTableImpl_8=ligne
-LexicalTableImpl_9= n'a pas 
-LexicographicKeywordComparator_0=Pivot
-LexicographicLeftContextComparator_0=Contexte gauche
-LexicographicRightContextComparator_0=Contexte droit
-Lexicon_0=Le tableau des formes et des fréquences doivent avoir la même longueur.
-Lexicon_3=Lexique :
-Localizer_0=[Traduction manquante] 
-Localizer_1=messages
-Log_3=Copie des messages dans 
-Log_5=Ecriture des messages dans
-Log_8=\nstack:\n
-MATRIX_ADDED_TO_WORKSPACE=La matrice "{2}" ({0,number,integer} lignes et {1,number,integer} colonnes) a été transmise au Moteur Statistique.
-MainCorpus_0=\ n'est pas un identifiant de corpus CQP valide. Il doit être en majuscule.
-MainCorpus_1=\ dans
-MainCorpus_2=Suppression du dossier de corpus binaire : 
-MatrixImpl_0=Une variable ("
-MatrixImpl_1=") n'existe pas dans l'espace de travail R.
-MatrixImpl_10=Index de ligne (
-MatrixImpl_11=) trop grand (max 
-MatrixImpl_13=Index de colonne (
-MatrixImpl_14=) trop grand (max 
-MatrixImpl_19=L'objet R a une valeur nulle.
-MatrixImpl_2=dim(
-MatrixImpl_20=Type inconnu : 
-MatrixImpl_21=mode
-MatrixImpl_22=Index de ligne (
-MatrixImpl_23=) trop grand (max 
-MatrixImpl_28=Index de colonne (
-MatrixImpl_29=) trop grand (max 
-MatrixImpl_4=Les noms de lignes d'une matrice de contingence ne peuvent pas être nuls.
-MatrixImpl_5=La dimension du vecteur des noms de lignes doit être égale au nombre de lignes de la matrice.
-MatrixImpl_6=Les noms de colonnes d'une matrice de contingence ne peuvent pas être nuls.
-MatrixImpl_67=Matrice: impossible d'obtenir le nombre de lignes: 
-MatrixImpl_7=La dimension du vecteur des noms de colonnes doit être égale au nombre de colonnes de la matrice (
-MatrixImpl_73=MatrixImpl: Erreur: la taille des colonnes diffère de l'originale
-MatrixImpl_79=Impossible d'obtenir les noms de lignes
-MatrixImpl_88=Impossible de supprimer toutes les lignes
-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 
-MessageBox_0=Erreur
-MessageBox_1=Attention
-MessageBox_2=Information
-NEW_PARTION=Création d''une nouvelle partition du corpus {0} : {1}
-NOT_FOUND_IN_R=) n'a pas été trouvé dans l'espace de travail R.
-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: 
-NullComparator_0=Aucun
-PACKAGE_LOADED=Bibliothèque {0} chargée.
-PARTITION_CREATED=Partition {0} créée en {1} ms
-PART_CREATED=Partie {0} créée en {1} ms
-Page_3=** URL mal formée, fichier 
-Pair_0=\ devrait valoir faux
-Pair_1=\ devrait valoir vrai
-PartitionFocus_1=Le focus ne doit pas être vide ou nul.
-PartitionFocus_2=Le focus est vide ou nul
-PartitionFocus_3=Le focus de la partie {0} n''appartient pas à la partition {1}.
-PartitionFocus_4=** Nom de partition inconnu.
-Partition_1=\ dans
-Partition_18=Erreur lors de la récupération de la dernière erreur CQP : 
-Partition_2=\ dans
-Partition_21=Attention : la partition n'a pu être sauvegardée
-Partition_4=\ requête : 
-Partition_9=** Echec de la création de la partie :
-PatchCwbRegistry_0=Mise à jour du registre du corpus "{0}"
-PatchCwbRegistry_1='
-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_12=Chargement du corpus {0}...
-Project_13=Ajout des textes : 
-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_16=Le nom de corpus a été changé de {0} à {1} 
-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_25=Erreur : le dossier 'registry' n'existe pas
-Project_26=** Erreur : le dossier d'entrée n'est pas conforme au format de corpus binaire de TXM :  
-Project_27=Erreur lors de la reécriture du fichier 'registry' : 
-Project_28=TXM a besoin des dossiers suivants : 
-Project_3=Attention : deux corpus partagent le même identifiant (@name) dans leur fichier de configuration : {0}
-Project_31= et le fichier
-Project_4=Suppression des doublons de la liste des corpus:
-Project_5=Analyse du dossier...
-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_9= base
-PropertiesReferenceComparator_0=Références
-QUERY=Requête sur {0} : {1} <- {2}
-QUERYING_PARTITION=Requête sur la partition {0}
-QuantitativeDataStructureImpl_0=Aucun objet de nom "
-QuantitativeDataStructureImpl_1=" dans l'espace de travail
-QuantitativeDataStructureImpl_2=** Impossible de supprimer un objet qui n'existe pas.
-QueryIndex_2=Attention : requête dupliquée : 
-QueryIndex_3=Attention: échec de la requête:
-QueryResult_0=\ n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
-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_HEADER_FROM_CQI_SERVER=Entête reçue 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}
-REQUESTED_OBJECT=L'objet demandé (
-RETURNING_CACHED_LEXICON=Recyclage du lexique {0}
-RETURN_FROM_QUERY={0} occurrences trouvées en {1} ms
-RException_0=** Erreur R : "
-RException_1="
-RException_2=\n lors de l'évaluation de :
-RSERVE_ACTIVATED=Moteur Statistique lancé 
-RSERVE_PATH_NOT_SET_ERROR=** Le chemin du programme du serveur statistique n'a pas été renseigné et sa recherche a échoué
-RSERVE_PATH_SET_ERROR=** Le chemin du programme du serveur statistique a été renseigné mais sa recherche a échoué
-RWorkspace_0=** Echec de connexion à l'espace de travail R 
-RWorkspace_1=** Erreur d'évaluation : 
-RWorkspace_10=Démarrage de R avec le chemin d'accès: 
-RWorkspace_11=Dernier 'safeeval'
-RWorkspace_2=tentative de connexion à R : 
-RWorkspace_21=Commande complète : 
-RWorkspace_3=Sauvegarde du graphique dans le fichier 
-RWorkspace_4=
-RWorkspace_5=
-RWorkspace_6=** Echec de l'initialisation du transfert : 
-RWorkspace_7=La matrice est vide
-RWorkspace_8=Impossible de démarrer RServe : 
-R_EXPR=Expression transmise au Moteur Statistique pour évaluation : {0}.
-R_READ_CONSOLE=Le Moteur Statistique attend une réponse de la console ({0}, {1}).
-R_SAVE_HISTORY=Le Moteur Statistique a sauvegardé un historique ({0}).
-R_SHOW_MESSAGE=Le Moteur Statistique a affiché ce message : {0}.
-R_WRITE_CONSOLE=Le Moteur Statistique a afiché ce message dans la console: {0}.
-ReferencePattern_3=Référence
-Referencer_1=Références
-Referencer_2=Références : l'export a échoué :  
-RelativeFrequency_3=Fréquence Relative %
-Progression_1=Erreur la taille du sous-corpus est 0
-Progression_10= dans
-Progression_11= (densité)
-Progression_12=structure : 
-Progression_13=, propriété : 
-Progression_14=, valeur 
-Progression_2=Attention, le corpus est discontinu
-Progression_3=Erreur la taille du sous-corpus est 0
-Progression_9=Progression de
-SERVER_STARTED=Moteur de recherche lancé 
-SERVER_STOPED=Moteur de recherche arrêté
-STARTING_SERVER=Lancement du moteur de recherche : {0}
-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_0=\ nombre de mots : 
-Selection_1=\ nombre de textes : 
-Selection_2=\ valeur : 
-Selection_26=Echec de la récupération des valeurs de structures de
-Selection_3=Propriété : 
-Selection_4=nombre de mots : 
-Selection_5=Métadonnées de textes : 
-Selection_6=Erreur : le corpus
-Selection_7=n'a pas de 'Base'
-Selection_8=Erreur : pas de structures trouvées pour la métadonnée d'identifiant : 
-Selection_9=Erreur lors de la récupération des metadonnées du corpus
-Sh_4=Le processus a terminé avec le code d'erreur : 
-SpecificitesResult_0=** Pas de tableau d'index de spécificité
-SpecificitesResult_1=** Le tableau d'index des spécificités ne correspond pas à une matrice
-SpecificitesResult_10=** Référence à une colonne inexistante.
-SpecificitesResult_2=** La table lexicale ne peut être nulle.
-SpecificitesResult_3=** Le nombre lignes prévu (
-SpecificitesResult_4=) et trouvé (
-SpecificitesResult_5=) ne correspondent pas
-SpecificitesResult_6=** Référence à une ligne inexistante
-SpecificitesResult_7=** Le nombre de colonnes données et le nombre de colonnes trouvées sont différents (
-SpecificitesResult_8=Unité
-Specificites_0=** Il faut au moins 2 parties pour calculer des spécificités
-Specificites_1=** Echec d'accès aux spécificités : 
-Specificites_2=\ spécificités calculées
-StartRserve_0=Démarrage de R avec la ligne de commande: 
-StartRserve_2=Chemin d'accès à R non fourni, tentative de résolution...
-StartRserve_21=** Echec du lancement de Rserve avec la commande : 
-StartRserve_22=Moteur statistique lancé
-StartRserve_28=** Echec du lancement de REG pour localiser le programme R
-StartRserve_29=\ Vous avez besoin du logiciel 'R' et de configurer ses chemins via la fenêtre de préférences 'Outils/Préférences'
-StartRserve_3=Rserve déja démarré sur le port 
-StartRserve_4=Essai du chemin de R : 'R'
-StartRserve_6=Essai du chemin de R : 
-StreamGobbler_0=Initialisation de l'enregistreur de journal
-StreamGobbler_1=démarrage de l'enregistreur de journal
-StreamGobbler_2=Arrêt de l'enregistreur de journal
-StreamGobbler_3=Interruption de l'enregistreur de journal
-StructuralUnitProperty_0=** Echec de lecture des valeurs de la propriété de structure 
-Subcorpus_1=\ dans
-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
-TSCorpusManager_0=Erreur dans le dossier registre :
-TSCorpusManager_1=Erreur dans le dossier de configuration : 
-TSCorpus_0=Erreur : le corpus n'a pas les droits de lecture
-TSResult_0=Nombre de match
-TSResult_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
-TigerXmlIndexing_2=Erreur : n'existe pas
-TigerXmlIndexing_3=Erreur : n'a pas les droits de lecture
-TigerXmlIndexing_6=IO :
-TigerXmlIndexing_7=SAX : 
-Toolbox_0=** Le fichier 
-Toolbox_1=** Plateforme : les paramètres SERVER_PATH_TO_EXECUTABLE, SERVER_PATH_TO_REGISTRY et SERVER_PATH_TO_INIT_FILE doivent être renseignés dans le fichier '.properties' donné à la plateforme 
-Toolbox_10=** Pas d'espace de travail trouvé, création d'un nouvel espace de travail dans le dossier 
-Toolbox_11=Mis à jour avec : 
-Toolbox_12=Chargement de l'espace de travail à partir du fichier 
-Toolbox_14=** Echec de lecture de l'espace de travail à partir du fichier 
-Toolbox_15=** Erreur :
-Toolbox_16=\ n'existe pas.
-Toolbox_17=Fin du test d'attente de CQP
-Toolbox_18=** Echec du test d'attente de CQP : 
-Toolbox_2=** Erreur : valeur nulle pour la clé 
-Toolbox_21=\ R :
-Toolbox_22=\ Espace de travail : 
-Toolbox_23=Démarrage du moteur de statistiques par l'utilisateur : 
-Toolbox_24=\ distant : 
-Toolbox_25=\ port : 
-Toolbox_26=** Echec de connexion au moteur de recherche avec les paramètres suivants : 
-Toolbox_27=\ et  
-Toolbox_28=Erreur lors du démarage du mode mémoire de CQP
-Toolbox_29=** Échec de la connexion au moteur de recherche : 
-Toolbox_3=vrai
-Toolbox_30=- mauvais login/mot de passe/nom de machine/port :
-Toolbox_31=Echec de la commande 'taskkill /IM cqpserver.exe /F': 
-Toolbox_33=- ou le moteur de recherche n'a pas été lancé avec la ligne de commande : 
-Toolbox_34=Echec de la commande 'tskill cqpserver.exe': 
-Toolbox_35=** La connexion au moteur statistique a échoué
-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_43=Echec de la commande 'taskkill /IM Rserve.exe /F': 
-Toolbox_45=Echec de la commande 'tskill Rserve.exe': 
-Toolbox_47=Echec de la commande 'killall -9 Rserve-bin.so': 
-Toolbox_5= debug: 
-Toolbox_7=Le chemin vers le programme R est null
-Toolbox_8=Clés non définies :
-Toolbox_9=Paramètres de la plateforme :
-Toolbox_connected_to_corpus_sever=connecté.
-Toolbox_wait_failed=** Echec de l'attente du processus interrompu
-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_0=** Echec de l'accès à l'objet parent
-TxmObject_1=TxmObject : delete : l'objet parent est nul
-TxmObject_2=Erreur de la sauvegarde de l'attribut
-TxmRenderer_1=TxmRenderer: erreur: pas de corpus trouvé
-TxmRenderer_5=ligne : 
-TxmRenderer_6=prop
-TxmRenderer_7=mdc :
-VARIABLE_REMOVED=La variable R "{0}" a été supprimée.
-ValidateXml_0=Validation XML : 
-ValidateXml_1=est un dossier
-ValidateXml_2=n'existe pas
-ValidateXml_3=n'a pas les bon droits de lecture
-VectorizeArray_0=** Rien à faire avec une matrice vide
-VectorizeArray_1=** Les tableaux internes doivent avoir une dimension supérieure à 0
-VectorizeArray_10=** Un tableau interne ne peut pas être nul
-VectorizeArray_11=** Les tableaux internes n'ont pas tous la même dimension.
-VectorizeArray_3=** Les tableaux internes n'ont pas tous la même dimension.
-VectorizeArray_4=** Rien à faire avec une matrice vide
-VectorizeArray_5=** Les tableaux internes doivent avoir une dimension supérieure à 0
-VectorizeArray_7=* Les tableaux internes n'ont pas tous la même dimension.
-VectorizeArray_8=** Rien à faire avec une matrice vide
-VectorizeArray_9=** Les tableaux internes doivent avoir une dimension supérieure à 0
-Index_0=** Erreur lors du calcul du lexique : \n
-Index_1=console : 
-Index_7=** Echec de l'exportation du Lexique : 
-WORKSPACE_PURGED=Moteur Statistique nettoyé.
-Workspace_0=, index 
-Workspace_1=\t\t\tÉdition : 
-Workspace_10=corpus :
-Workspace_2=** Echec du chargement de l'espace de travail :
-Workspace_26=\t\t\t\tPage : 
-Workspace_27=\ identifiant de mot 
-Workspace_28=\t\tScript : 
-Workspace_29=, type :  
-Workspace_3=Projet : 
-Workspace_30=\tCorpus : 
-Workspace_31=\t\tTexte : 
-Workspace_4=\tBase : 
-Workspace_5=\t\tTexte : 
-Workspace_6=** Echec de la création du fichier d'espace de travail : 
-Workspace_7=\ pages
-Workspace_8=Le fichier XML d'espace de travail est mal formé. Un nouveau doit être regénéré...
Index: tmp/org.txm.core/src/java/org/txm/messages.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/messages.properties	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/messages.properties	(revision 241)
@@ -1,517 +0,0 @@
-FAILED=Failed.
-DONE=Done.
-AbsoluteFrequency_1=Absolute Frequency
-AbstractCqiClient_2=No error.
-ArrayIndex_0=** The index array can not be null or empty.
-ArrayIndex_1=** A zero-based index cannot be < 0 or > to the number of indexed elements.
-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: 
-BuildCwbEncodeArgs_0=The file ''{0}'' cannot be found.
-CAH_0=Error while exporting CAH result : 
-CA_0=** The lexical table was not found in the R workspace.
-CA_16=** Cannot load the 'ca' library
-CA_2=** Error while computing correspondance analysis: 
-CA_4=Unable to extract singular values 
-CHAR_VECTOR_ADDED_TO_WORKSPACE=Vector "{1}" ({0,number,integer} "character") has been transmited to the Statistics Engine.
-CONNECTED_TO_STATS_MODULE= connected.
-CONNECTING_CQI_CLIENT=Connecting to the Search Engine with the following parameters: {0}:{1}@{2}{3}
-CONNECTION_OK=Connected to the Statistics Engine.
-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.
-Catalog_0=** Catalog File Not found 
-CompositeComparator_0=Composite: 
-Concordance_0=\ 
-Concordance_1=** Failed to retrieve text_id property from lines
-Concordance_12=** Failed to export Concordance: 
-Concordance_13=Reference
-Concordance_14=LeftContext
-Concordance_15=Keyword
-Concordance_16=RightContext
-Concordance_17=Reference
-Concordance_18=
-Concordance_19=Context
-Concordance_2=undefined
-Concordance_3=\ results retrieved in 
-Concordance_4=Failed to remove QueryResult from CQP: 
-Concordance_5=
-Concordance_6=Retrieving 
-Concordance_7=\ results
-Concordance_8=Failed to get texts limits: 
-Contrasts_0=Computing: 
-Convert5To6_1= is missing
-Convert5To6_10='registry' file is missing: 
-Convert5To6_11='html' directory is missing: 
-Convert5To6_12=processing...
-Convert5To6_15=reorganizing files of 
-Convert5To6_19=Read corpus infos from old import.xml file: 
-Convert5To6_30=Fill import.xml with: 
-Convert5To6_46=processing text: 
-Convert5To6_6=checking binary format...
-Convert5To6_7='txm' directory is missing: 
-Convert5To6_8='html' directory is missing: 
-Convert5To6_9='data' directory is missing: 
-Cooccurrence_0=Coocurrence: 
-Cooccurrence_1=** Error: can't find 'n' or 'o': 
-Cooccurrence_10=\ properties: 
-Cooccurrence_102=** Error: negative argument in 'factln' function
-Cooccurrence_103=** Error: negative argument in 'rbicoln' function
-Cooccurrence_105=Occ\tFreq\tCoFreq\tScore\tMeanDist\tMode
-Cooccurrence_106=\n
-Cooccurrence_107=** Error: 
-Cooccurrence_11=Occ
-Cooccurrence_12=Freq
-Cooccurrence_13=CoFreq
-Cooccurrence_14=Score
-Cooccurrence_15=MeanDist
-Cooccurrence_16=Mode
-Cooccurrence_2=Cooc: 
-Cooccurrence_22=Error: ref_forms.length ! ref_freqs.length
-Cooccurrence_23=Error: no cooccurrents
-Cooccurrence_3=\ (
-Cooccurrence_4=\ F: 
-Cooccurrence_5=** Impossible to compute cooccurrences with this concordance 
-Cooccurrence_6=Occ\tFreq\tCoFreq\tScore\tMeanDist\tMode
-Cooccurrence_7=\ Occ:
-Cooccurrence_8=\ Score:
-Cooccurrence_9=\ MeanDist:
-CorpusManager_0=** CQi Client not initialized
-CorpusManager_1=** Error: This exception should not be thrown
-Corpus_12=** Failed to restore subcorpus 
-Corpus_13=Corpus:getLocale: CQP is not ready to answer: 
-Corpus_14=Warning: can't load corpus 
-Corpus_15= informations from workspace (selfElement  null)
-Corpus_19=** Failed to restore partition 
-Corpus_2=Corpus: 
-Corpus_3=, Encoding : 
-Corpus_4=, Language : 
-Corpus_5=No values given
-Corpus_6=** Corpus: the reference to text 
-Corpus_7=\ is broken
-Corpus_8=\ in 								
-CqiClient_0=Get Last CQP error
-CqiClient_1=Read CQI CTRL LAST GENERAL ERROR
-CqiClient_3=** Failed to get last CQP error
-CqiClient_32=Search Engine launched...
-CqiClient_33=** failed to connect to Search Engine.
-CqiClient_34=Running SearchEngine in memory mode.
-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 : 
-DOUBLE_VECTOR_ADDED_TO_WORKSPACE=Vector "{1}" ({0,number,integer} "doubles") transmitted to the Statistics Engine.
-DROP_PARTITION=Deleting partition {0}
-DROP_QUERYRESULT=Deleting query results {0}
-DROP_SUBCORPUS=Deleting subcorpus {0}
-Diagnostic_0=* Structural Units properties\n
-Diagnostic_1=** Failed to access corpus 
-Diagnostic_10=Partition name: 
-Diagnostic_11=\ structures
-Diagnostic_12=Number of parts: 
-Diagnostic_13=Partition size: 
-Diagnostic_14=Lexical Units properties (max {0} values)
-Diagnostic_15=Part number: 
-Diagnostic_16=Number of structural units 
-Diagnostic_17=Part names: 
-Diagnostic_18=Part sizes: 
-Diagnostic_19=Part properties: 
-Diagnostic_2=** Error
-Diagnostic_20=Parts queries: 
-Diagnostic_22=Structural Units properties (max {0} values)
-Diagnostic_23=\ values)
-Diagnostic_26=No property
-Diagnostic_3=Description of 
-Diagnostic_4=\ properties
-Diagnostic_40=* General Statistics\n
-Diagnostic_41=- T 
-Diagnostic_43=- Word properties 
-Diagnostic_49=- S 
-Diagnostic_5=General Statistics
-Diagnostic_6=** Failed to access corpus 
-Diagnostic_7=Number of words 
-Diagnostic_8=\ lexicon
-Diagnostic_9=Number of word properties 
-END_SUBCORPUS_LEXICON=Lexicon of subcorpus {0} computed in {1} ms
-END_SUBCORPUS_SIZE=size of subcorpus {0} ({1}) computed in {2} ms
-ERROR_EXTRACT_ITEM=** Error extracting list item: 
-EVALUATED_EXPRESSION=Expression "{0}" evaluated.
-ExecTimer_0= msec
-ExecTimer_1= sec
-ExecTimer_2= min and 
-ExecTimer_3=h, 
-FAILED_INIT_CONNECTION_R=** Failed to connect to Statistics Engine.
-FactoMineRCA_2=** Fail to get contrib column: 
-FactoMineRCA_3=** Fail to get cos\u00B2 column: 
-FactoMineRCA_4=** Fail to get contrib row: 
-FactoMineRCA_5=** Fail to get cos\u00B2 row: 
-Factor_0=** Not implemented
-FileCopy_0=** File copy: failed to find source: 
-FileCopy_2=** File copy: access right restriction to source: 
-FileCopy_4=** File copy: failed to create directory: 
-FilterManager_0=** Filter manager error : initialization 
-FilterManager_1=\ does not exist.
-Filter_7=** Read error
-Focus_1=** The focus is empty or null.
-GroovyImportScriptRunner_0=Initialization of GroovyImportScriptRunner
-GroovyImportScriptRunner_1=> beginning execution of 
-GroovyImportScriptRunner_3=> end of execution 
-INT_VECTOR_ADDED_TO_WORKSPACE=Vector "{1}" ({0,number,integer} "int") transmitted to Statistics Engine.
-InternalView_3=\ \ Structure informations: 
-InternalView_6=InternalView: failed to retrieve struct properties values: 
-InternalView_7=\ \ No structure informations
-LEXICON=Lexicon 
-LEXICON_ADDED=Lexicon "{1}" ({0,number,integer} entries) transmitted to Statistics Engine.
-LIBBRARY_NOT_LOADED=Failed to load the {0} library: {1}
-LS_0=Error: 
-LS_1= is not a Directory!
-LexicalTableImpl_0=
-LexicalTableImpl_1=Building lexical table with: 
-LexicalTableImpl_10= columns
-LexicalTableImpl_12=Error: margin 
-LexicalTableImpl_13= is higher than the partition size
-LexicalTableImpl_3=\ <no partition> /
-LexicalTableImpl_5=not enough columns: minimum 2 (here: 
-LexicalTableImpl_8=line
-LexicalTableImpl_9= does not have 
-LexicographicKeywordComparator_0=Keyword
-LexicographicLeftContextComparator_0=Left context
-LexicographicRightContextComparator_0=Right context
-Lexicon_0=Forms and frequencies tables must be of the same length.
-Lexicon_3=Lexicon : 
-Localizer_0=[Missing translation] 
-Localizer_1=messages
-Log_3=Copying logs in 
-Log_5=Start loging in 
-Log_8=\nstack:\n
-MATRIX_ADDED_TO_WORKSPACE=Matrix "{2}" ({0,number,integer} rows and {1,number,integer} columns) transmitted to Statistics Engine.
-MainCorpus_0=\ is not a valid CQP ID for a corpus. It must be in uppercase characters.
-MainCorpus_1=\ in 
-MainCorpus_2=Delete binary directory: 
-MatrixImpl_0=A variable ("
-MatrixImpl_1=") does not exist in the R workspace.
-MatrixImpl_10=Row index (
-MatrixImpl_11=) too big (max 
-MatrixImpl_13=Col index (
-MatrixImpl_14=) too big (max 
-MatrixImpl_19=R object evaluated to null.
-MatrixImpl_2=dim(
-MatrixImpl_20=Unknown type: 
-MatrixImpl_21=mode
-MatrixImpl_22=Row index (
-MatrixImpl_23=) too big (max 
-MatrixImpl_28=Column index (
-MatrixImpl_29=) too big (max 
-MatrixImpl_4=Row names of a contingency table cannot be null.
-MatrixImpl_5=Row names vector length must be equal to the number of rows of the matrix.
-MatrixImpl_6=Column names of a contingency table cannot be null
-MatrixImpl_67=Matrix: failed to get nrow: 
-MatrixImpl_7=Col names vector length must be equals to the number of columns of the matrix (
-MatrixImpl_73=MatrixImpl: Error: column size differs: original
-MatrixImpl_79=Failed to get row names
-MatrixImpl_88=Cannot delete all lines
-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 
-MessageBox_0=Error
-MessageBox_1=Warning
-MessageBox_2=Information
-NEW_PARTION=Creating new partion of corpus {0}: {1}
-NOT_FOUND_IN_R=) was not found in the R workspace.
-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: 
-NullComparator_0=None
-PACKAGE_LOADED=Library {0} loaded.
-PARTITION_CREATED=Partition {0} created in {1} ms
-PART_CREATED=Part {0} created in {1} ms
-Page_3=** Malformed URL, file 
-Pair_0=\ should be false
-Pair_1=\ should be true
-PartitionFocus_1=The focus cannot be null or empty.
-PartitionFocus_2=Focus is empty or null
-PartitionFocus_3=The {0} part focus doesn''t belong to partition {1}.
-PartitionFocus_4=** Unknown partition name.
-Partition_1=\ in 
-Partition_18=Failed to get last CQP error: 
-Partition_2=\ in 
-Partition_21=Warning: the partition could not be saved in workspace: 
-Partition_4=\ query: 
-Partition_9=** Failed to create part: 
-PatchCwbRegistry_0="{0}" corpus registry update
-PatchCwbRegistry_1=' corpus
-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_12=Loading {0} corpus...  
-Project_13=Adding texts: 
-Project_14=Error: no version in import.xml file
-Project_15=Error: the corpus version is too old to be loaded.
-Project_16=Corpus name has been changed from {0} to {1} 
-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_25=Error: registry directory does not exist ! 
-Project_26=** Error: ''{0}'' corpus directory is not conformant to TXM corpus binary format: corpus skipped." 
-Project_27=Error while patching registry file: 
-Project_28=TXM needs folders: 
-Project_3=Project: load: malformed base node: duplicated 
-Project_31= and file 
-Project_4=Remove duplicate corpus from corpus list: 
-Project_5=Analysing directory...
-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_9= base
-PropertiesReferenceComparator_0=References
-QUERY=Query on {0} : {1} <- {2}
-QUERYING_PARTITION=Querying partition {0}
-QuantitativeDataStructureImpl_0=No object with name "
-QuantitativeDataStructureImpl_1=" in the workspace
-QuantitativeDataStructureImpl_2=** Cannot delete a non-existing object.
-QueryIndex_2=Warning : duplicate query entry : 
-QueryIndex_3=Warning: query failed: 
-QueryResult_0=\ is not a valid CQP Id for a subcorpus. It must be an uppercase characters followed by lowercase characters.
-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_HEADER_FROM_CQI_SERVER=Read header 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}
-REQUESTED_OBJECT=The object requested (
-RETURNING_CACHED_LEXICON=Recycling the lexicon {0}
-RETURN_FROM_QUERY={0} matches found in {1} ms
-RException_0=** R error: "
-RException_1="
-RException_2=\nwhile evaluating: 
-RSERVE_ACTIVATED=Statistics Engine running 
-RSERVE_PATH_NOT_SET_ERROR=** The Statistics Engine program path is not set and we could not find it
-RSERVE_PATH_SET_ERROR=** The Statistics Engine program path is set but we couldn't find it
-RWorkspace_0=** Failed to connect to the R Workspace 
-RWorkspace_1=** Evaluation Error: 
-RWorkspace_10=Starting R using path: 
-RWorkspace_11=Last safeeval: 
-RWorkspace_2=try : connect to R at 
-RWorkspace_21=Full command: 
-RWorkspace_3=Saving graphic in file 
-RWorkspace_4=
-RWorkspace_5=
-RWorkspace_6=** Failed to initialize file transfert: 
-RWorkspace_7=Matrix is empty
-RWorkspace_8=Failed to start RServe : 
-R_EXPR=Expression sent to the Statistics Engine for evaluation: {0}.
-R_READ_CONSOLE=The Statistics Engine waits for something to read from the console ({0}, {1}).
-R_SAVE_HISTORY=The Statistics Engine has saved an history ({0}).
-R_SHOW_MESSAGE=The Statistics Engine displayed this message: {0}.
-R_WRITE_CONSOLE=The Statistics Engine displayed this message in the console: {0}.
-ReferencePattern_3=Reference
-Referencer_1=Referencer
-Referencer_2=Referencer export failed: 
-RelativeFrequency_3=Relative Frenquency %
-Progression_1=Error: subcorpus with size 0
-Progression_10=in
-Progression_11=(density)
-Progression_12=structure: 
-Progression_13=, property: 
-Progression_14=, value: 
-Progression_2=Warning: discontinued subcorpus
-Progression_3=Error: subcorpus with size 0
-Progression_9=Progression of
-SERVER_STARTED=Search Engine started 
-SERVER_STOPED=Search Engine stopped
-STARTING_SERVER=Starting Search Engine : {0}
-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_0=\ number of words : 
-Selection_1=\ number of texts : 
-Selection_2=\ value : 
-Selection_26=Failed to get sup values of 
-Selection_3=Property : 
-Selection_4=number of words : 
-Selection_5=Text metadata: 
-Selection_6=Selection error: the corpus 
-Selection_7= has no base
-Selection_8=Can't find structural unit for metadata with id: 
-Selection_9=Error while getting metadatas from Base.importMetadatas: 
-Sh_4=Process exited abnormally with code 
-SpecificitesResult_0=** No specificity index array.
-SpecificitesResult_1=** The specificity index array does not properly represent a matrix.
-SpecificitesResult_10=** Reference to a non existing column.
-SpecificitesResult_2=** The lexical table cannot be null.
-SpecificitesResult_3=** Number of rows wanted (
-SpecificitesResult_4=) and found (
-SpecificitesResult_5=) mismatch.
-SpecificitesResult_6=** Reference to non existing row.
-SpecificitesResult_7=** number of columns given and found mismatch (
-SpecificitesResult_8=Unit
-Specificites_0=** Cannot compute specificites with less than 2 parts in the corpus.
-Specificites_1=** Failed to get the specificites: 
-Specificites_2=\ specificity index computed
-StartRserve_0=Starting R with command line: 
-StartRserve_2=No R path given, trying to find it...
-StartRserve_21=** Failed to start Rserve with command: 
-StartRserve_22=Statistical Engine launched
-StartRserve_28=** Failed to run REG to find the location of R program: 
-StartRserve_29=\ You need the 'R' software and you need to configure in the 'Tools/Preferences' window the correct path to it.
-StartRserve_3=Rserve already running on port 
-StartRserve_4=try R path : 'R'
-StartRserve_6=try R path : 
-StreamGobbler_0=Initializing log recorder
-StreamGobbler_1=Starting log recorder
-StreamGobbler_2=Stopping log recorder
-StreamGobbler_3=Interrupting log recorder
-StructuralUnitProperty_0=** Failed to access structural property values 
-Subcorpus_1=\ in 
-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
-TSCmd_30=Query was: 
-TSCmd_31= matches found.
-TSCorpusManager_0=Error reg dir: 
-TSCorpusManager_1=Error configdir dir: 
-TSCorpus_0=Couldn't read corpus: 
-TSResult_0=Number of match 
-TSResult_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 
-TigerXmlIndexing_2=ERROR: !exists
-TigerXmlIndexing_3=ERROR: !read
-TigerXmlIndexing_6=IO: 
-TigerXmlIndexing_7=SAX: 
-Toolbox_0=** File
-Toolbox_1=** Platform : the parameters SERVER_PATH_TO_EXECUTABLE, SERVER_PATH_TO_REGISTRY et SERVER_PATH_TO_INIT_FILE must be specified in a given '.properties' file.
-Toolbox_10=** No worlspace found. Creating a new one.
-Toolbox_11=Updating with : 
-Toolbox_12=Loading workspace from file : 
-Toolbox_14=** Error loadgin workspace from file : 
-Toolbox_15=** Error : 
-Toolbox_16=\ does not exists
-Toolbox_17=End of CQP wait test
-Toolbox_18=** Error while waiting for CQP
-Toolbox_2=** Error: null value for key 
-Toolbox_21=\ R: 
-Toolbox_22=\ Workspace: 
-Toolbox_23=Start StatEngine: user: 
-Toolbox_24=\ remote:
-Toolbox_25=\ port: 
-Toolbox_26=** Error : while connection to search engine, with the following parameters : 
-Toolbox_27=\ and 
-Toolbox_28=Failed to start MemCqiClient: 
-Toolbox_29=** Error while connecting to search engine.
-Toolbox_3=true
-Toolbox_30=- wrong login or password or port : 
-Toolbox_31=Failed to exec 'taskkill /IM cqpserver.exe /F': 
-Toolbox_33=- or the engine was not started with the command line : 
-Toolbox_34=Failed to exec 'tskill cqpserver.exe': 
-Toolbox_35=** Error while connecting to the stat engine.
-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_43=Failed to exec 'taskkill /IM Rserve.exe /F': 
-Toolbox_45=Failed to exec 'tskill Rserve.exe': 
-Toolbox_47=Failed to exec 'killall -9 Rserve-bin.so': 
-Toolbox_5= debug: 
-Toolbox_7=The path to R program is null
-Toolbox_8=Undefined keys : 
-Toolbox_9=Platform parameters: 
-Toolbox_connected_to_corpus_sever=connected
-Toolbox_wait_failed=** Failed to wait for the interrupted process
-Toolbox_workspace_init=Reloading subcorpora and partitions...
-Toolbox_workspace_init_failed=** Error during workspace initialisation :
-Toolbox_wrong_port=** Error : the connexion to the server failed : wrong port format
-TxmObject_0=** Failed to get parent object
-TxmObject_1=TxmObject: delete: parent object is null
-TxmObject_2=Failed to save attribute 
-TxmRenderer_1=TxmRenderer: error: no corpus found for result 
-TxmRenderer_5=line: 
-TxmRenderer_6= prop 
-TxmRenderer_7=  mdc: 
-VARIABLE_REMOVED=R Variable "{0}" deleted.
-ValidateXml_0=XmlValidation: 
-ValidateXml_1= is a directory
-ValidateXml_2= does not exists
-ValidateXml_3= is not read-able
-VectorizeArray_0=** Nothing to do with an empty matrix
-VectorizeArray_1=** Inner arrays must be of dimension > 0.
-VectorizeArray_10=** An inner array cannot be null.
-VectorizeArray_11=** All the inner array do not have the same length.
-VectorizeArray_3=** All the inner array do not have the same length.
-VectorizeArray_4=** Nothing to do with an empty matrix
-VectorizeArray_5=** Inner arrays must be of dimension > 0.
-VectorizeArray_7=** All the inner array do not have the same length.
-VectorizeArray_8=** Nothing to do with an empty matrix
-VectorizeArray_9=** Inner arrays must be of dimension > 0.
-Index_0=** Error while computing lexicon:\n 
-Index_1=Console : 
-Index_7=** Failed to export Lexicon : 
-WORKSPACE_PURGED=Statistics Engine cleaned up.
-Workspace_0=, index 
-Workspace_1=\t\t\tEdition: 
-Workspace_10=corpus: 
-Workspace_2=** Failed to load workspace: 
-Workspace_26=\t\t\t\tPage: 
-Workspace_27=\ wordid 
-Workspace_28=\t\tScript: 
-Workspace_29=, type:  
-Workspace_3=Project: 
-Workspace_30=\tCorpora: 
-Workspace_31=\t\tText: 
-Workspace_4=\tBase: 
-Workspace_5=\t\tText: 
-Workspace_6=** Failed to create empty workspace file: 
-Workspace_7=\ pages
-Workspace_8=Workspace XML file is mal formed. We need to recreate one...
Index: tmp/org.txm.core/src/java/org/txm/RserveWatcher.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/RserveWatcher.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/RserveWatcher.java	(revision 241)
@@ -1,84 +0,0 @@
-// Copyright © 2010-2013 ENS de Lyon.
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$ 
-//
-package org.txm;
-
-import org.txm.stat.engine.r.RWorkspace;
-import org.txm.stat.engine.r.RWorkspaceException;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class RserveWatcher.
- */
-public class RserveWatcher extends Watcher{
-
-	
-	/**
-	 * Instantiates a new rserve watcher.
-	 */
-	public RserveWatcher()
-	{
-		this.processname = "RSERVE"; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.txm.Watcher#check()
-	 */
-	@Override
-	protected boolean check() {
-		RWorkspace rw;
-		try {
-			rw = RWorkspace.getRWorkspaceInstance();
-		} catch (RWorkspaceException e1) {
-			System.out.println("Rserve watcher encounter an error: "+e1); //$NON-NLS-1$
-			return false;
-		}
-		
-		if (rw == null)
-		{
-			return false;
-		}
-		else
-		{
-			try {
-				rw.eval("print(\"test\")"); //$NON-NLS-1$
-			} catch (Exception e) {
-				System.out.println("Rserve watcher encounter an error: "+e); //$NON-NLS-1$
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.txm.Watcher#restart()
-	 */
-	@Override
-	protected boolean restart() {
-		return Toolbox.restartStatEngine(true);
-	}
-}
Index: tmp/org.txm.core/src/java/org/txm/Watcher.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/Watcher.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/Watcher.java	(revision 241)
@@ -41,7 +41,7 @@
 	boolean process = true;
 	
 	/** The processname. */
-	String processname="noname"; //$NON-NLS-1$
+	protected String processname="noname"; //$NON-NLS-1$
 	
 	/** The restartcount. */
 	int restartcount = 0;
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 0)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties	(revision 241)
@@ -0,0 +1,8 @@
+
+COMPUTE_DONE_NO_RESULT = Ни одного результата
+
+PROPERTY_1 = Свойство
+
+QUERY_1 = Запрос:
+
+SORT_DONE = Сортировка завершена.

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

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 240)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 241)
@@ -9,9 +9,450 @@
  * @author sjacquot
  *
  */
-public class TXMCoreMessages {
+public class TXMCoreMessages extends NLS {
 
+	private static final String BUNDLE_NAME = "org.txm.core.messages.messages"; //$NON-NLS-1$
 	
+	
+	public static String PROPERTY_1;
+
+	public static String FMIN_1;
+	public static String FMIN_2;
+	public static String FMAX_1;
+	public static String FMAX_2;
+	public static String VMAX_1;
+	public static String QUERY_1;
+	public static String T;
+	public static String V;
+	public static String COMPUTE_DONE_NO_RESULT;
+
+	
+	
+	public static String FAILED;
+	public static String DONE;			
+	public static String AbsoluteFrequency_1;
+	public static String AbstractCqiClient_2;
+	public static String ArrayIndex_0;
+	public static String ArrayIndex_1;
+	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 CHAR_VECTOR_ADDED_TO_WORKSPACE;
+	public static String CONNECTED_TO_STATS_MODULE;
+	public static String CONNECTING_CQI_CLIENT;
+	public static String CONNECTION_OK;
+	public static String CQI_CLIENT_CONNECTED;
+	public static String CREATING_PART;
+	public static String CREATING_SUBCORPUS;
+	public static String CatalogManager_0;
+	public static String CatalogManager_1;
+	public static String Catalog_0;
+	public static String CompositeComparator_0;
+	public static String Concordance_0;
+	public static String Concordance_1;
+	public static String Concordance_12;
+	public static String Concordance_13;
+	public static String Concordance_14;
+	public static String Concordance_15;
+	public static String Concordance_16;
+	public static String Concordance_17;
+	public static String Concordance_18;
+	public static String Concordance_19;
+	public static String Concordance_2;
+	public static String Concordance_3;
+	public static String Concordance_4;
+	public static String Concordance_5;
+	public static String Concordance_6;
+	public static String Concordance_7;
+	public static String Concordance_8;
+	public static String Contrasts_0;
+	public static String Convert5To6_1;
+	public static String Convert5To6_10;
+	public static String Convert5To6_11;
+	public static String Convert5To6_12;
+	public static String Convert5To6_15;
+	public static String Convert5To6_19;
+	public static String Convert5To6_30;
+	public static String Convert5To6_46;
+	public static String Convert5To6_6;
+	public static String Convert5To6_7;
+	public static String Convert5To6_8;
+	public static String Convert5To6_9;
+	public static String CorpusManager_0;
+	public static String CorpusManager_1;
+	public static String Corpus_12;
+	public static String Corpus_13;
+	public static String Corpus_14;
+	public static String Corpus_15;
+	public static String Corpus_19;
+	public static String Corpus_2;
+	public static String Corpus_3;
+	public static String Corpus_4;
+	public static String Corpus_5;
+	public static String Corpus_6;
+	public static String Corpus_7;
+	public static String Corpus_8;
+	public static String CqiClient_0;
+	public static String CqiClient_1;
+	public static String CqiClient_3;
+	public static String CqiClient_32;
+	public static String CqiClient_33;
+	public static String CqiClient_34;
+	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 DOUBLE_VECTOR_ADDED_TO_WORKSPACE;
+	public static String DROP_PARTITION;
+	public static String DROP_QUERYRESULT;
+	public static String DROP_SUBCORPUS;
+	public static String Diagnostic_0;
+	public static String Diagnostic_1;
+	public static String Diagnostic_10;
+	public static String Diagnostic_11;
+	public static String Diagnostic_12;
+	public static String Diagnostic_13;
+	public static String Diagnostic_14;
+	public static String Diagnostic_15;
+	public static String Diagnostic_16;
+	public static String Diagnostic_17;
+	public static String Diagnostic_18;
+	public static String Diagnostic_19;
+	public static String Diagnostic_2;
+	public static String Diagnostic_20;
+	public static String Diagnostic_22;
+	public static String Diagnostic_23;
+	public static String Diagnostic_26;
+	public static String Diagnostic_3;
+	public static String Diagnostic_4;
+	public static String Diagnostic_40;
+	public static String Diagnostic_41;
+	public static String Diagnostic_43;
+	public static String Diagnostic_49;
+	public static String Diagnostic_5;
+	public static String Diagnostic_6;
+	public static String Diagnostic_7;
+	public static String Diagnostic_8;
+	public static String Diagnostic_9;
+	public static String END_SUBCORPUS_LEXICON;
+	public static String END_SUBCORPUS_SIZE;
+	public static String ERROR_EXTRACT_ITEM;
+	public static String EVALUATED_EXPRESSION;
+	public static String ExecTimer_0;
+	public static String ExecTimer_1;
+	public static String ExecTimer_2;
+	public static String ExecTimer_3;
+	public static String FAILED_INIT_CONNECTION_R;
+	public static String FactoMineRCA_2;
+	public static String FactoMineRCA_3;
+	public static String FactoMineRCA_4;
+	public static String FactoMineRCA_5;
+	public static String Factor_0;
+	public static String FileCopy_0;
+	public static String FileCopy_2;
+	public static String FileCopy_4;
+	public static String FilterManager_0;
+	public static String FilterManager_1;
+	public static String Filter_7;
+	public static String Focus_1;
+	public static String GroovyImportScriptRunner_0;
+	public static String GroovyImportScriptRunner_1;
+	public static String GroovyImportScriptRunner_3;
+	public static String INT_VECTOR_ADDED_TO_WORKSPACE;
+	public static String InternalView_3;
+	public static String InternalView_6;
+	public static String InternalView_7;
+	public static String LEXICON;
+	public static String LEXICON_ADDED;
+	public static String LS_0;
+	public static String LS_1;
+	public static String LexicographicKeywordComparator_0;
+	public static String LexicographicLeftContextComparator_0;
+	public static String LexicographicRightContextComparator_0;
+	public static String Lexicon_0;
+	public static String Lexicon_3;
+	public static String Localizer_0;
+	public static String Localizer_1;
+	public static String Log_3;
+	public static String Log_5;
+	public static String Log_8;
+	public static String MATRIX_ADDED_TO_WORKSPACE;
+	public static String MainCorpus_0;
+	public static String MainCorpus_1;
+	public static String MainCorpus_2;
+	public static String MatrixImpl_0;
+	public static String MatrixImpl_1;
+	public static String MatrixImpl_10;
+	public static String MatrixImpl_11;
+	public static String MatrixImpl_13;
+	public static String MatrixImpl_14;
+	public static String MatrixImpl_19;
+	public static String MatrixImpl_2;
+	public static String MatrixImpl_20;
+	public static String MatrixImpl_21;
+	public static String MatrixImpl_22;
+	public static String MatrixImpl_23;
+	public static String MatrixImpl_28;
+	public static String MatrixImpl_29;
+	public static String MatrixImpl_4;
+	public static String MatrixImpl_5;
+	public static String MatrixImpl_6;
+	public static String MatrixImpl_67;
+	public static String MatrixImpl_7;
+	public static String MatrixImpl_73;
+	public static String MatrixImpl_79;
+	public static String MatrixImpl_88;
+	public static String MemCqiClient_0;
+	public static String MemCqiClient_1;
+	public static String MemCqiClient_10;
+	public static String MemCqiClient_11;
+	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 MessageBox_0;
+	public static String MessageBox_1;
+	public static String MessageBox_2;
+	public static String NEW_PARTION;
+	public static String NOT_FOUND_IN_R;
+	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 NullComparator_0;
+	public static String PACKAGE_LOADED;
+	public static String PARTITION_CREATED;
+	public static String PART_CREATED;
+	public static String Page_3;
+	public static String Pair_0;
+	public static String Pair_1;
+	public static String PartitionFocus_1;
+	public static String PartitionFocus_2;
+	public static String PartitionFocus_3;
+	public static String PartitionFocus_4;
+	public static String Partition_1;
+	public static String Partition_18;
+	public static String Partition_2;
+	public static String Partition_21;
+	public static String Partition_4;
+	public static String Partition_9;
+	public static String PatchCwbRegistry_0;
+	public static String PatchCwbRegistry_1;
+	public static String PatchCwbRegistry_13;
+	public static String PatchCwbRegistry_16;
+	public static String PatchCwbRegistry_2;
+	public static String PatchCwbRegistry_23;
+	public static String PatchCwbRegistry_27;
+	public static String PatchCwbRegistry_28;
+	public static String PatchCwbRegistry_29;
+	public static String PatchCwbRegistry_3;
+	public static String PatchCwbRegistry_34;
+	public static String PatchCwbRegistry_35;
+	public static String PatchCwbRegistry_4;
+	public static String PatchCwbRegistry_5;
+	public static String Project_0;
+	public static String Project_1;
+	public static String Project_10;
+	public static String Project_11;
+	public static String Project_12;
+	public static String Project_13;
+	public static String Project_14;
+	public static String Project_15;
+	public static String Project_16;
+	public static String Project_17;
+	public static String Project_18;
+	public static String Project_2;
+	public static String Project_25;
+	public static String Project_26;
+	public static String Project_27;
+	public static String Project_28;
+	public static String Project_3;
+	public static String Project_31;
+	public static String Project_4;
+	public static String Project_5;
+	public static String Project_6;
+	public static String Project_7;
+	public static String Project_8;
+	public static String Project_9;
+	public static String PropertiesReferenceComparator_0;
+	public static String QUERY;
+	public static String QUERYING_PARTITION;
+	public static String QuantitativeDataStructureImpl_0;
+	public static String QuantitativeDataStructureImpl_1;
+	public static String QuantitativeDataStructureImpl_2;
+	public static String QueryIndex_2;
+	public static String QueryIndex_3;
+	public static String QueryResult_0;
+	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_INTEGER_FROM_CQI_SERVER;
+	public static String READING_INT_ARRAY_FROM_CQI_SERVER;
+	public static String READING_STRING_ARRAY_FROM_CQI_SERVER;
+	public static String READING_STRING_FROM_CQI_SERVER;
+	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_HEADER_FROM_CQI_SERVER;
+	public static String READ_INTEGER_FROM_CQI_SERVER;
+	public static String READ_INT_ARRAY_FROM_CQI_SERVER;
+	public static String READ_STRING_ARRAY_FROM_CQI_SERVER;
+	public static String READ_STRING_FROM_CQI_SERVER;
+	public static String REQUESTED_OBJECT;
+	public static String RETURNING_CACHED_LEXICON;
+	public static String RETURN_FROM_QUERY;
+	public static String ReferencePattern_3;
+	public static String Referencer_1;
+	public static String Referencer_2;
+	public static String RelativeFrequency_3;
+	public static String SERVER_STARTED;
+	public static String SERVER_STOPED;
+	public static String STARTING_SERVER;
+	public static String STOPING_SERVER;
+	public static String SUBCORPUS_CREATED;
+	public static String SUBCORPUS_LEXICON;
+	public static String SUBCORPUS_SIZE;
+	public static String Selection_0;
+	public static String Selection_1;
+	public static String Selection_2;
+	public static String Selection_26;
+	public static String Selection_3;
+	public static String Selection_4;
+	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 Sh_4;
+	public static String StreamGobbler_0;
+	public static String StreamGobbler_1;
+	public static String StreamGobbler_2;
+	public static String StreamGobbler_3;
+	public static String StructuralUnitProperty_0;
+	public static String Subcorpus_1;
+	public static String Subcorpus_2;
+	public static String Subcorpus_3;
+	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 TSCmd_30;
+	public static String TSCmd_31;
+	public static String TSCorpusManager_0;
+	public static String TSCorpusManager_1;
+	public static String TSCorpus_0;
+	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 TigerXmlIndexing_2;
+	public static String TigerXmlIndexing_3;
+	public static String TigerXmlIndexing_6;
+	public static String TigerXmlIndexing_7;
+	public static String Toolbox_0;
+	public static String Toolbox_1;
+	public static String Toolbox_10;
+	public static String Toolbox_11;
+	public static String Toolbox_12;
+	public static String Toolbox_14;
+	public static String Toolbox_15;
+	public static String Toolbox_16;
+	public static String Toolbox_17;
+	public static String Toolbox_18;
+	public static String Toolbox_2;
+	public static String Toolbox_21;
+	public static String Toolbox_22;
+	public static String Error_CONNECTION_FAILED;
+
+	public static String Toolbox_27;
+	public static String Toolbox_28;
+	public static String Toolbox_29;
+	public static String Toolbox_3;
+	public static String Toolbox_30;
+	public static String Toolbox_31;
+	public static String Toolbox_33;
+	public static String Toolbox_34;
+	public static String Toolbox_37;
+	public static String Toolbox_38;
+	public static String Toolbox_39;
+	public static String Toolbox_4;
+	public static String Toolbox_40;
+	public static String Toolbox_7;
+	public static String Toolbox_8;
+	public static String Toolbox_9;
+	public static String Toolbox_connected_to_corpus_sever;
+	public static String Toolbox_wait_failed;
+	public static String Toolbox_workspace_init;
+	public static String Toolbox_workspace_init_failed;
+	public static String Toolbox_wrong_port;
+	public static String TxmObject_0;
+	public static String TxmObject_1;
+	public static String TxmObject_2;
+	public static String TxmRenderer_1;
+	public static String TxmRenderer_5;
+	public static String TxmRenderer_6;
+	public static String TxmRenderer_7;
+	public static String VARIABLE_REMOVED;
+	public static String ValidateXml_0;
+	public static String ValidateXml_1;
+	public static String ValidateXml_2;
+	public static String ValidateXml_3;
+	public static String VectorizeArray_0;
+	public static String VectorizeArray_1;
+	public static String VectorizeArray_10;
+	public static String VectorizeArray_11;
+	public static String VectorizeArray_3;
+	public static String VectorizeArray_4;
+	public static String VectorizeArray_5;
+	public static String VectorizeArray_7;
+	public static String VectorizeArray_8;
+	public static String VectorizeArray_9;
+	public static String Index_0;
+	public static String Index_1;
+	public static String Index_7;
+	public static String WORKSPACE_PURGED;
+	public static String Workspace_0;
+	public static String Workspace_1;
+	public static String Workspace_10;
+	public static String Workspace_2;
+	public static String Workspace_26;
+	public static String Workspace_27;
+	public static String Workspace_28;
+	public static String Workspace_29;
+	public static String Workspace_3;
+	public static String Workspace_30;
+	public static String Workspace_31;
+	public static String Workspace_4;
+	public static String Workspace_5;
+	public static String Workspace_6;
+	public static String Workspace_7;
+	public static String Workspace_8;
+	
+	
+	
+	static {
+		// initialize resource bundle
+		TXMCoreMessages.initializeMessages(BUNDLE_NAME, TXMCoreMessages.class);
+	}
+	
 	/**
 	 * Initializes messages using UTF-8 encoding.
 	 * @param baseName
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 0)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties	(revision 241)
@@ -0,0 +1,535 @@
+﻿
+AbsoluteFrequency_1 = Fréquence absolue
+
+AbstractCqiClient_2 = Pas d'erreur à notifier.
+
+ArrayIndex_0 = ** Le tableau d'index ne peut pas être nul ou vide.
+ArrayIndex_1 = ** Un index commençant à 0 ne peut pas être inférieur à 0 ou supérieur au nombre d'éléments indexés.
+
+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.
+
+CHAR_VECTOR_ADDED_TO_WORKSPACE = Le vecteur "{1}" ({0,number,integer} valeurs "character") a été transmis au Moteur Statistique.
+
+COMPUTE_DONE_NO_RESULT = Aucun résultat
+
+CONNECTED_TO_STATS_MODULE = connecté.
+
+CONNECTING_CQI_CLIENT = Connexion au moteur de recherche avec les paramètres suivants : {0}:{1}@{2}{3}...
+
+CONNECTION_OK = Connexion au Moteur Statistique établie.
+
+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.
+
+Catalog_0        = ** Fichier de catalogue introuvable
+
+CompositeComparator_0 = Composé : 
+
+Concordance_0  = \ 
+Concordance_1  = ** Echec de récupération de la propriété 'text_id' des lignes 
+Concordance_12 = ** Echec de l'exportation de la concordance : 
+Concordance_13 = Référence
+Concordance_14 = ContexteGauche
+Concordance_15 = Pivot
+Concordance_16 = ContexteDroit
+Concordance_17 = Référence
+Concordance_19 = Contexte
+Concordance_2  = indéfini
+Concordance_3  = \ résultats obtenus en 
+Concordance_4  = Echec de la suppression du QueryResult de CQP: 
+Concordance_6  = Récupération 
+Concordance_7  = \ résultats
+Concordance_8  = Echec de la récupération des limites de texte : 
+
+Contrasts_0 = Calcul: 
+
+Convert5To6_1  = ''{0}'' est introuvable.
+Convert5To6_10 = le dossier 'registry' est manquant
+Convert5To6_11 = le dossier 'html' est manquant
+Convert5To6_12 = traitement en cours...
+Convert5To6_15 = Reorganisation des fichiers de 
+Convert5To6_19 = Lecture des informatins sur le corpus depuis le fichier import.xml : 
+Convert5To6_30 = Remplissage du fichier 'import.xml' avec : 
+Convert5To6_46 = traitement du fichier : 
+Convert5To6_6  = Vérification du format...
+Convert5To6_7  = le dossier 'txm' est manquant
+Convert5To6_8  = le dossier 'html' est manquant
+Convert5To6_9  = le dossier 'data' est manquant
+
+CorpusManager_0 = ** Le client CQi n'est pas initilialisé
+CorpusManager_1 = ** Erreur : Cette exception ne devrait pas se lever
+
+Corpus_12       = ** Echec de la restauration du sous-corpus
+Corpus_13       = Corpus: getLocale: CQP est pas prêt à répondre : 
+Corpus_14       = Attention: le corpus ne peut pas être chargé 
+Corpus_15       = informations from workspace (selfElement  null)
+Corpus_19       = ** Echec de la restauration de la partition
+Corpus_2        = Corpus : 
+Corpus_3        = , Encodage : 
+Corpus_4        = , Langue : 
+Corpus_5        = Pas de valeur donnée
+Corpus_6        = ** Corpus : la référence au texte 
+Corpus_7        = \ est manquante
+Corpus_8        = \ dans
+
+CqiClient_0  = Récupération de la dernière erreur CQP
+CqiClient_1  = Lecture de CQI CTRL LAST GENERAL ERROR
+CqiClient_3  = ** Echec de la lecture de la dernière erreur CQP
+CqiClient_32 = Moteur de recherche lancé...
+CqiClient_33 = ** La connexion au moteur de recherche a échoué.
+CqiClient_34 = Moteur de recherche lancé.
+
+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 : 
+
+DONE = Terminé.
+
+DOUBLE_VECTOR_ADDED_TO_WORKSPACE = Le vecteur "{1}" ({0,number,integer} valeurs numériques "doubles") a été transmis au Moteur Statistique.
+
+DROP_PARTITION   = Suppression de la partition {0}
+DROP_QUERYRESULT = Suppression du résultat de requête {0}
+DROP_SUBCORPUS   = Suppression du sous-corpus {0}
+
+Diagnostic_0  = <h3>Propriétés des structures\n
+Diagnostic_1  = ** Echec d'accès au corpus
+Diagnostic_10 = Nom de la partition : 
+Diagnostic_11 = \ structures
+Diagnostic_12 = Nombre de parties :
+Diagnostic_13 = Taille de la partition : 
+Diagnostic_14 = Propriétés des unités lexicales (max {0} valeurs)
+Diagnostic_15 = Numéro de la partie : 
+Diagnostic_16 = Nombre d'unités de structure 
+Diagnostic_17 = Nom des parties : 
+Diagnostic_18 = Taille des parties : 
+Diagnostic_19 = Propriétés des parties : 
+Diagnostic_2  = ** Erreur
+Diagnostic_20 = Requêtes de parties : 
+Diagnostic_22 = Propriétés des structures (max {0} valeurs)
+Diagnostic_23 = \ valeurs)
+Diagnostic_26 = Pas de propriété
+Diagnostic_3  = Description du corpus 
+Diagnostic_4  = \ propriétés
+Diagnostic_40 = * Statistiques Générales\n
+Diagnostic_41 = - T
+Diagnostic_43 = - Propriétés de mot 
+Diagnostic_49 = - S
+Diagnostic_5  = Statistiques Générales
+Diagnostic_6  = ** Echec d'accès au corpus
+Diagnostic_7  = Nombre de mots 
+Diagnostic_8  = \ lexique
+Diagnostic_9  = Nombre de propriétés de mot 
+
+END_SUBCORPUS_LEXICON = Lexique du sous-corpus {0} calculé en {1} ms
+END_SUBCORPUS_SIZE    = Taille du sous-corpus {0} ({1}) calculée en {2} ms
+
+ERROR_EXTRACT_ITEM = ** Erreur lors de l'extraction de la liste d'items : \	
+
+EVALUATED_EXPRESSION = L''expression ''{0}'' a été évaluée.
+
+Error_CONNECTION_FAILED = ** Echec de connexion au moteur de recherche avec les paramètres suivants : 
+
+ExecTimer_0 = \ msec
+ExecTimer_1 = \ sec
+ExecTimer_2 = \ min et 
+ExecTimer_3 = h, 
+
+FAILED = Échec.
+
+FAILED_INIT_CONNECTION_R = ** Echec de connexion au serveur statistique.
+
+FMAX_1 = Fmax : 
+
+FMIN_1 = Fmin : 
+
+FactoMineRCA_2 = ** Echec d'accès à la colonne des contributions : 
+FactoMineRCA_3 = ** Echec d'accès à la colonne des cos² : 
+FactoMineRCA_4 = ** Echec d'accès à la ligne des contributions : 
+FactoMineRCA_5 = ** Echec d'accès à la ligne des cos² : 
+
+Factor_0 = ** Non implémenté
+
+FileCopy_0 = ** Copie de fichiers : échec d'accès à la source : 
+FileCopy_2 = ** Copie de fichiers : droits d'accès insuffisants à la source : 
+FileCopy_4 = ** Copie de fichiers : échec de création du dossier : 
+
+FilterManager_0 = ** Erreur du gestionnaire de filtre : initialisation 
+FilterManager_1 = \ n'existe pas.
+
+Filter_7        = ** Erreur de lecture
+
+Focus_1 = ** Le focus est vide ou nul.
+
+GroovyImportScriptRunner_0 = Initialisation de GroovyImportScriptRunner
+GroovyImportScriptRunner_1 = > début de l'exécution de 
+GroovyImportScriptRunner_3 = > fin de l'exécution
+
+INT_VECTOR_ADDED_TO_WORKSPACE = Le vecteur "{1}" ({0,number,integer} valeurs numériques "entières") a été transmis au Moteur Statistique.
+
+Index_0 = ** Erreur lors du calcul du lexique : \n
+Index_1 = console : 
+Index_7 = ** Echec de l'exportation du Lexique : 
+
+InternalView_3 = \  Information des structures :
+InternalView_6 = InternalView: erreur lors de la récupération des valeurs des propriétés de structure
+InternalView_7 = \  No d'informations sur les structures
+
+LEXICON = Lexique
+
+LEXICON_ADDED = Le lexique "{1}" ({0,number,integer} entrées) a été transmis au Moteur Statistique.
+
+LS_0 = Erreur : 
+LS_1 = \ n'est pas un dossier
+
+LexicographicKeywordComparator_0 = Pivot
+
+LexicographicLeftContextComparator_0 = Contexte gauche
+
+LexicographicRightContextComparator_0 = Contexte droit
+
+Lexicon_0 = Le tableau des formes et des fréquences doivent avoir la même longueur.
+Lexicon_3 = Lexique :
+
+Localizer_0 = [Traduction manquante] 
+Localizer_1 = messages
+
+Log_3 = Copie des messages dans 
+Log_5 = Ecriture des messages dans
+Log_8 = \nstack:\n
+
+MATRIX_ADDED_TO_WORKSPACE = La matrice "{2}" ({0,number,integer} lignes et {1,number,integer} colonnes) a été transmise au Moteur Statistique.
+
+MainCorpus_0 = \ n'est pas un identifiant de corpus CQP valide. Il doit être en majuscule.
+MainCorpus_1 = \ dans
+MainCorpus_2 = Suppression du dossier de corpus binaire : 
+
+MatrixImpl_0  = Une variable ("
+MatrixImpl_1  = ") n'existe pas dans l'espace de travail R.
+MatrixImpl_10 = Index de ligne (
+MatrixImpl_11 = ) trop grand (max 
+MatrixImpl_13 = Index de colonne (
+MatrixImpl_14 = ) trop grand (max 
+MatrixImpl_19 = L'objet R a une valeur nulle.
+MatrixImpl_2  = dim(
+MatrixImpl_20 = Type inconnu : 
+MatrixImpl_21 = mode
+MatrixImpl_22 = Index de ligne (
+MatrixImpl_23 = ) trop grand (max 
+MatrixImpl_28 = Index de colonne (
+MatrixImpl_29 = ) trop grand (max 
+MatrixImpl_4  = Les noms de lignes d'une matrice de contingence ne peuvent pas être nuls.
+MatrixImpl_5  = La dimension du vecteur des noms de lignes doit être égale au nombre de lignes de la matrice.
+MatrixImpl_6  = Les noms de colonnes d'une matrice de contingence ne peuvent pas être nuls.
+MatrixImpl_67 = Matrice: impossible d'obtenir le nombre de lignes: 
+MatrixImpl_7  = La dimension du vecteur des noms de colonnes doit être égale au nombre de colonnes de la matrice (
+MatrixImpl_73 = MatrixImpl: Erreur: la taille des colonnes diffère de l'originale
+MatrixImpl_79 = Impossible d'obtenir les noms de lignes
+MatrixImpl_88 = Impossible de supprimer toutes les lignes
+
+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 
+
+MessageBox_0 = Erreur
+MessageBox_1 = Attention
+MessageBox_2 = Information
+
+NEW_PARTION = Création d''une nouvelle partition du corpus {0} : {1}
+
+NOT_FOUND_IN_R = ) n'a pas été trouvé dans l'espace de travail R.
+
+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: 
+
+NullComparator_0 = Aucun
+
+PACKAGE_LOADED = Bibliothèque {0} chargée.
+
+PARTITION_CREATED = Partition {0} créée en {1} ms
+
+PART_CREATED      = Partie {0} créée en {1} ms
+
+PROPERTY_1 = Propriété :
+
+Page_3 = ** URL mal formée, fichier 
+
+Pair_0 = \ devrait valoir faux
+Pair_1 = \ devrait valoir vrai
+
+PartitionFocus_1 = Le focus ne doit pas être vide ou nul.
+PartitionFocus_2 = Le focus est vide ou nul
+PartitionFocus_3 = Le focus de la partie {0} n''appartient pas à la partition {1}.
+PartitionFocus_4 = ** Nom de partition inconnu.
+
+Partition_1      = \ dans
+Partition_18     = Erreur lors de la récupération de la dernière erreur CQP : 
+Partition_2      = \ dans
+Partition_21     = Attention : la partition n'a pu être sauvegardée
+Partition_4      = \ requête : 
+Partition_9      = ** Echec de la création de la partie :
+
+PatchCwbRegistry_0  = Mise à jour du registre du corpus "{0}"
+PatchCwbRegistry_1  = '
+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_12 = Chargement du corpus {0}...
+Project_13 = Ajout des textes : 
+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_16 = Le nom de corpus a été changé de {0} à {1} 
+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_25 = Erreur : le dossier 'registry' n'existe pas
+Project_26 = ** Erreur : le dossier d'entrée n'est pas conforme au format de corpus binaire de TXM :  
+Project_27 = Erreur lors de la reécriture du fichier 'registry' : 
+Project_28 = TXM a besoin des dossiers suivants : 
+Project_3  = Attention : deux corpus partagent le même identifiant (@name) dans leur fichier de configuration : {0}
+Project_31 = et le fichier
+Project_4  = Suppression des doublons de la liste des corpus:
+Project_5  = Analyse du dossier...
+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_9  = base
+
+PropertiesReferenceComparator_0 = Références
+
+QUERY = Requête sur {0} : {1} <- {2}
+
+QUERYING_PARTITION = Requête sur la partition {0}
+
+QUERY_1            = Requête :
+
+QuantitativeDataStructureImpl_0 = Aucun objet de nom "
+QuantitativeDataStructureImpl_1 = " dans l'espace de travail
+QuantitativeDataStructureImpl_2 = ** Impossible de supprimer un objet qui n'existe pas.
+
+QueryIndex_2 = Attention : requête dupliquée : 
+QueryIndex_3 = Attention: échec de la requête:
+
+QueryResult_0 = \ n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
+
+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_HEADER_FROM_CQI_SERVER          = Entête reçue 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}
+
+REQUESTED_OBJECT = L'objet demandé (
+
+RETURNING_CACHED_LEXICON = Recyclage du lexique {0}
+
+RETURN_FROM_QUERY        = {0} occurrences trouvées en {1} ms
+
+ReferencePattern_3 = Référence
+
+Referencer_1 = Références
+Referencer_2 = Références : l'export a échoué :  
+
+RelativeFrequency_3 = Fréquence Relative %
+
+SERVER_STARTED = Moteur de recherche lancé 
+SERVER_STOPED  = Moteur de recherche arrêté
+
+SORT_COLUMN = Colonne à trier
+SORT_DONE   = Tri terminé.
+
+STARTING_SERVER = Lancement du moteur de recherche : {0}
+
+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_0  = \ nombre de mots : 
+Selection_1  = \ nombre de textes : 
+Selection_2  = \ valeur : 
+Selection_26 = Echec de la récupération des valeurs de structures de
+Selection_3  = Propriété : 
+Selection_4  = nombre de mots : 
+Selection_5  = Métadonnées de textes : 
+Selection_6  = Erreur : le corpus
+Selection_7  = n'a pas de 'Base'
+Selection_8  = Erreur : pas de structures trouvées pour la métadonnée d'identifiant : 
+Selection_9  = Erreur lors de la récupération des metadonnées du corpus
+
+Sh_4 = Le processus a terminé avec le code d'erreur : 
+
+StreamGobbler_0 = Initialisation de l'enregistreur de journal
+StreamGobbler_1 = démarrage de l'enregistreur de journal
+StreamGobbler_2 = Arrêt de l'enregistreur de journal
+StreamGobbler_3 = Interruption de l'enregistreur de journal
+
+StructuralUnitProperty_0 = ** Echec de lecture des valeurs de la propriété de structure 
+
+Subcorpus_1 = \ dans
+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
+
+TSCorpusManager_0 = Erreur dans le dossier registre :
+TSCorpusManager_1 = Erreur dans le dossier de configuration : 
+
+TSCorpus_0        = Erreur : le corpus n'a pas les droits de lecture
+
+TSResult_0  = Nombre de match
+TSResult_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
+
+TigerXmlIndexing_2 = Erreur : n'existe pas
+TigerXmlIndexing_3 = Erreur : n'a pas les droits de lecture
+TigerXmlIndexing_6 = IO :
+TigerXmlIndexing_7 = SAX : 
+
+Toolbox_0                         = ** Le fichier 
+Toolbox_1                         = ** Plateforme : les paramètres SERVER_PATH_TO_EXECUTABLE, SERVER_PATH_TO_REGISTRY et SERVER_PATH_TO_INIT_FILE doivent être renseignés dans le fichier '.properties' donné à la plateforme 
+Toolbox_10                        = ** Pas d'espace de travail trouvé, création d'un nouvel espace de travail dans le dossier 
+Toolbox_11                        = Mis à jour avec : 
+Toolbox_12                        = Chargement de l'espace de travail à partir du fichier 
+Toolbox_14                        = ** Echec de lecture de l'espace de travail à partir du fichier 
+Toolbox_15                        = ** Erreur :
+Toolbox_16                        = \ n'existe pas.
+Toolbox_17                        = Fin du test d'attente de CQP
+Toolbox_18                        = ** Echec du test d'attente de CQP : 
+Toolbox_2                         = ** Erreur : valeur nulle pour la clé 
+Toolbox_21                        = \ R :
+Toolbox_22                        = \ Espace de travail : 
+Toolbox_27                        = \ et  
+Toolbox_28                        = Erreur lors du démarage du mode mémoire de CQP
+Toolbox_29                        = ** Échec de la connexion au moteur de recherche : 
+Toolbox_3                         = vrai
+Toolbox_30                        = - mauvais login/mot de passe/nom de machine/port :
+Toolbox_31                        = Echec de la commande 'taskkill /IM cqpserver.exe /F': 
+Toolbox_33                        = - ou le moteur de recherche n'a pas été lancé avec la ligne de commande : 
+Toolbox_34                        = Echec de la commande 'tskill cqpserver.exe': 
+Toolbox_37                        = kill `ps aux | grep cqpserver | awk '/-P 
+Toolbox_38                        = / {print $2}'`
+Toolbox_39                        = Echec de l'exécution de '
+Toolbox_4                         = Avec les paramètres suivants :
+Toolbox_40                        = ' :
+Toolbox_7                         = Le chemin vers le programme R est null
+Toolbox_8                         = Clés non définies :
+Toolbox_9                         = Paramètres de la plateforme :
+Toolbox_connected_to_corpus_sever = connecté.
+Toolbox_wait_failed               = ** Echec de l'attente du processus interrompu
+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_0 = ** Echec de l'accès à l'objet parent
+TxmObject_1 = TxmObject : delete : l'objet parent est nul
+TxmObject_2 = Erreur de la sauvegarde de l'attribut
+
+TxmRenderer_1 = TxmRenderer: erreur: pas de corpus trouvé
+TxmRenderer_5 = ligne : 
+TxmRenderer_6 = prop
+TxmRenderer_7 = mdc :
+
+VARIABLE_REMOVED = La variable R "{0}" a été supprimée.
+
+ValidateXml_0 = Validation XML : 
+ValidateXml_1 = est un dossier
+ValidateXml_2 = n'existe pas
+ValidateXml_3 = n'a pas les bon droits de lecture
+
+VectorizeArray_0  = ** Rien à faire avec une matrice vide
+VectorizeArray_1  = ** Les tableaux internes doivent avoir une dimension supérieure à 0
+VectorizeArray_10 = ** Un tableau interne ne peut pas être nul
+VectorizeArray_11 = ** Les tableaux internes n'ont pas tous la même dimension.
+VectorizeArray_3  = ** Les tableaux internes n'ont pas tous la même dimension.
+VectorizeArray_4  = ** Rien à faire avec une matrice vide
+VectorizeArray_5  = ** Les tableaux internes doivent avoir une dimension supérieure à 0
+VectorizeArray_7  = * Les tableaux internes n'ont pas tous la même dimension.
+VectorizeArray_8  = ** Rien à faire avec une matrice vide
+VectorizeArray_9  = ** Les tableaux internes doivent avoir une dimension supérieure à 0
+
+WORKSPACE_PURGED = Moteur Statistique nettoyé.
+
+Workspace_0  = , index 
+Workspace_1  = \	\	\	Édition : 
+Workspace_10 = corpus :
+Workspace_2  = ** Echec du chargement de l'espace de travail :
+Workspace_26 = \	\	\	\	Page : 
+Workspace_27 = \ identifiant de mot 
+Workspace_28 = \	\	Script : 
+Workspace_29 = , type :  
+Workspace_3  = Projet : 
+Workspace_30 = \	Corpus : 
+Workspace_31 = \	\	Texte : 
+Workspace_4  = \	Base : 
+Workspace_5  = \	\	Texte : 
+Workspace_6  = ** Echec de la création du fichier d'espace de travail : 
+Workspace_7  = \ pages
+Workspace_8  = Le fichier XML d'espace de travail est mal formé. Un nouveau doit être regénéré...

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

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 0)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties	(revision 241)
@@ -0,0 +1,543 @@
+
+AbsoluteFrequency_1 = Absolute Frequency
+
+AbstractCqiClient_2 = No error.
+
+ArrayIndex_0 = ** The index array can not be null or empty.
+ArrayIndex_1 = ** A zero-based index cannot be < 0 or > to the number of indexed elements.
+
+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: 
+
+BuildCwbEncodeArgs_0 = The file ''{0}'' cannot be found.
+
+CHAR_VECTOR_ADDED_TO_WORKSPACE = Vector "{1}" ({0,number,integer} "character") has been transmited to the Statistics Engine.
+
+COMPUTE_DONE_NO_RESULT = Done: no result
+
+CONNECTED_TO_STATS_MODULE = connected.
+
+CONNECTING_CQI_CLIENT = Connecting to the Search Engine with the following parameters: {0}:{1}@{2}{3}
+
+CONNECTION_OK = Connected to the Statistics Engine.
+
+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.
+
+Catalog_0        = ** Catalog File Not found 
+
+CompositeComparator_0 = Composite: 
+
+Concordance_0  = \ 
+Concordance_1  = ** Failed to retrieve text_id property from lines
+Concordance_12 = ** Failed to export Concordance: 
+Concordance_13 = Reference
+Concordance_14 = LeftContext
+Concordance_15 = Keyword
+Concordance_16 = RightContext
+Concordance_17 = Reference
+Concordance_19 = Context
+Concordance_2  = undefined
+Concordance_3  = \ results retrieved in 
+Concordance_4  = Failed to remove QueryResult from CQP: 
+Concordance_6  = Retrieving 
+Concordance_7  = \ results
+Concordance_8  = Failed to get texts limits: 
+
+Contrasts_0 = Computing: 
+
+Convert5To6_1  = is missing
+Convert5To6_10 = 'registry' file is missing: 
+Convert5To6_11 = 'html' directory is missing: 
+Convert5To6_12 = processing...
+Convert5To6_15 = reorganizing files of 
+Convert5To6_19 = Read corpus infos from old import.xml file: 
+Convert5To6_30 = Fill import.xml with: 
+Convert5To6_46 = processing text: 
+Convert5To6_6  = checking binary format...
+Convert5To6_7  = 'txm' directory is missing: 
+Convert5To6_8  = 'html' directory is missing: 
+Convert5To6_9  = 'data' directory is missing: 
+
+CorpusManager_0 = ** CQi Client not initialized
+CorpusManager_1 = ** Error: This exception should not be thrown
+
+Corpus_12       = ** Failed to restore subcorpus 
+Corpus_13       = Corpus:getLocale: CQP is not ready to answer: 
+Corpus_14       = Warning: can't load corpus 
+Corpus_15       = informations from workspace (selfElement  null)
+Corpus_19       = ** Failed to restore partition 
+Corpus_2        = Corpus: 
+Corpus_3        = , Encoding : 
+Corpus_4        = , Language : 
+Corpus_5        = No values given
+Corpus_6        = ** Corpus: the reference to text 
+Corpus_7        = \ is broken
+Corpus_8        = \ in \	\	\	\	\	\	\	\	
+
+CqiClient_0  = Get Last CQP error
+CqiClient_1  = Read CQI CTRL LAST GENERAL ERROR
+CqiClient_3  = ** Failed to get last CQP error
+CqiClient_32 = Search Engine launched...
+CqiClient_33 = ** failed to connect to Search Engine.
+CqiClient_34 = Running SearchEngine in memory mode.
+
+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 : 
+
+DONE = Done.
+
+DOUBLE_VECTOR_ADDED_TO_WORKSPACE = Vector "{1}" ({0,number,integer} "doubles") transmitted to the Statistics Engine.
+
+DROP_PARTITION   = Deleting partition {0}
+DROP_QUERYRESULT = Deleting query results {0}
+DROP_SUBCORPUS   = Deleting subcorpus {0}
+
+Diagnostic_0  = * Structural Units properties\n
+Diagnostic_1  = ** Failed to access corpus 
+Diagnostic_10 = Partition name: 
+Diagnostic_11 = \ structures
+Diagnostic_12 = Number of parts: 
+Diagnostic_13 = Partition size: 
+Diagnostic_14 = Lexical Units properties (max {0} values)
+Diagnostic_15 = Part number: 
+Diagnostic_16 = Number of structural units 
+Diagnostic_17 = Part names: 
+Diagnostic_18 = Part sizes: 
+Diagnostic_19 = Part properties: 
+Diagnostic_2  = ** Error
+Diagnostic_20 = Parts queries: 
+Diagnostic_22 = Structural Units properties (max {0} values)
+Diagnostic_23 = \ values)
+Diagnostic_26 = No property
+Diagnostic_3  = Description of 
+Diagnostic_4  = \ properties
+Diagnostic_40 = * General Statistics\n
+Diagnostic_41 = - T 
+Diagnostic_43 = - Word properties 
+Diagnostic_49 = - S 
+Diagnostic_5  = General Statistics
+Diagnostic_6  = ** Failed to access corpus 
+Diagnostic_7  = Number of words 
+Diagnostic_8  = \ lexicon
+Diagnostic_9  = Number of word properties 
+
+END_SUBCORPUS_LEXICON = Lexicon of subcorpus {0} computed in {1} ms
+END_SUBCORPUS_SIZE    = size of subcorpus {0} ({1}) computed in {2} ms
+
+ERROR_EXTRACT_ITEM = ** Error extracting list item: 
+
+EVALUATED_EXPRESSION = Expression "{0}" evaluated.
+
+Error_CONNECTION_FAILED = ** Error : while connection to search engine, with the following parameters: 
+
+ExecTimer_0 = msec
+ExecTimer_1 = sec
+ExecTimer_2 = min and 
+ExecTimer_3 = h, 
+
+FAILED = Failed.
+
+FAILED_INIT_CONNECTION_R = ** Failed to connect to Statistics Engine.
+
+FMAX_1 = Fmax: 
+FMAX_2 = , fmax 
+
+FMIN_1 = Fmin: 
+FMIN_2 = , fmin 
+
+FactoMineRCA_2 = ** Fail to get contrib column: 
+FactoMineRCA_3 = ** Fail to get cos² column: 
+FactoMineRCA_4 = ** Fail to get contrib row: 
+FactoMineRCA_5 = ** Fail to get cos² row: 
+
+Factor_0 = ** Not implemented
+
+FileCopy_0 = ** File copy: failed to find source: 
+FileCopy_2 = ** File copy: access right restriction to source: 
+FileCopy_4 = ** File copy: failed to create directory: 
+
+FilterManager_0 = ** Filter manager error : initialization 
+FilterManager_1 = \ does not exist.
+
+Filter_7        = ** Read error
+
+Focus_1 = ** The focus is empty or null.
+
+GroovyImportScriptRunner_0 = Initialization of GroovyImportScriptRunner
+GroovyImportScriptRunner_1 = > beginning execution of 
+GroovyImportScriptRunner_3 = > end of execution 
+
+INT_VECTOR_ADDED_TO_WORKSPACE = Vector "{1}" ({0,number,integer} "int") transmitted to Statistics Engine.
+
+Index_0 = ** Error while computing lexicon:\n 
+Index_1 = Console : 
+Index_7 = ** Failed to export Lexicon : 
+
+InternalView_3 = \  Structure informations: 
+InternalView_6 = InternalView: failed to retrieve struct properties values: 
+InternalView_7 = \  No structure informations
+
+LEXICON = Lexicon 
+
+LEXICON_ADDED = Lexicon "{1}" ({0,number,integer} entries) transmitted to Statistics Engine.
+
+LS_0 = Error: 
+LS_1 = is not a Directory!
+
+LexicographicKeywordComparator_0 = Keyword
+
+LexicographicLeftContextComparator_0 = Left context
+
+LexicographicRightContextComparator_0 = Right context
+
+Lexicon_0 = Forms and frequencies tables must be of the same length.
+Lexicon_3 = Lexicon : 
+
+Localizer_0 = [Missing translation] 
+Localizer_1 = messages
+
+Log_3 = Copying logs in 
+Log_5 = Start loging in 
+Log_8 = \nstack:\n
+
+MATRIX_ADDED_TO_WORKSPACE = Matrix "{2}" ({0,number,integer} rows and {1,number,integer} columns) transmitted to Statistics Engine.
+
+MainCorpus_0 = \ is not a valid CQP ID for a corpus. It must be in uppercase characters.
+MainCorpus_1 = \ in 
+MainCorpus_2 = Delete binary directory: 
+
+MatrixImpl_0  = A variable ("
+MatrixImpl_1  = ") does not exist in the R workspace.
+MatrixImpl_10 = Row index (
+MatrixImpl_11 = ) too big (max 
+MatrixImpl_13 = Col index (
+MatrixImpl_14 = ) too big (max 
+MatrixImpl_19 = R object evaluated to null.
+MatrixImpl_2  = dim(
+MatrixImpl_20 = Unknown type: 
+MatrixImpl_21 = mode
+MatrixImpl_22 = Row index (
+MatrixImpl_23 = ) too big (max 
+MatrixImpl_28 = Column index (
+MatrixImpl_29 = ) too big (max 
+MatrixImpl_4  = Row names of a contingency table cannot be null.
+MatrixImpl_5  = Row names vector length must be equal to the number of rows of the matrix.
+MatrixImpl_6  = Column names of a contingency table cannot be null
+MatrixImpl_67 = Matrix: failed to get nrow: 
+MatrixImpl_7  = Col names vector length must be equals to the number of columns of the matrix (
+MatrixImpl_73 = MatrixImpl: Error: column size differs: original
+MatrixImpl_79 = Failed to get row names
+MatrixImpl_88 = Cannot delete all lines
+
+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 
+
+MessageBox_0 = Error
+MessageBox_1 = Warning
+MessageBox_2 = Information
+
+NEW_PARTION = Creating new partion of corpus {0}: {1}
+
+NOT_FOUND_IN_R = ) was not found in the R workspace.
+
+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: 
+
+NullComparator_0 = None
+
+PACKAGE_LOADED = Library {0} loaded.
+
+PARTITION_CREATED = Partition {0} created in {1} ms
+
+PART_CREATED      = Part {0} created in {1} ms
+
+PROPERTY_1 = Property:
+
+Page_3 = ** Malformed URL, file 
+
+Pair_0 = \ should be false
+Pair_1 = \ should be true
+
+PartitionFocus_1 = The focus cannot be null or empty.
+PartitionFocus_2 = Focus is empty or null
+PartitionFocus_3 = The {0} part focus doesn''t belong to partition {1}.
+PartitionFocus_4 = ** Unknown partition name.
+
+Partition_1      = \ in 
+Partition_18     = Failed to get last CQP error: 
+Partition_2      = \ in 
+Partition_21     = Warning: the partition could not be saved in workspace: 
+Partition_4      = \ query: 
+Partition_9      = ** Failed to create part: 
+
+PatchCwbRegistry_0  = "{0}" corpus registry update
+PatchCwbRegistry_1  = ' corpus
+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_12 = Loading {0} corpus...  
+Project_13 = Adding texts: 
+Project_14 = Error: no version in import.xml file
+Project_15 = Error: the corpus version is too old to be loaded.
+Project_16 = Corpus name has been changed from {0} to {1} 
+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_25 = Error: registry directory does not exist ! 
+Project_26 = ** Error: ''{0}'' corpus directory is not conformant to TXM corpus binary format: corpus skipped." 
+Project_27 = Error while patching registry file: 
+Project_28 = TXM needs folders: 
+Project_3  = Project: load: malformed base node: duplicated 
+Project_31 = and file 
+Project_4  = Remove duplicate corpus from corpus list: 
+Project_5  = Analysing directory...
+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_9  = base
+
+PropertiesReferenceComparator_0 = References
+
+QUERY = Query on {0} : {1} <- {2}
+
+QUERYING_PARTITION = Querying partition {0}
+
+QUERY_1            = Query:
+
+QuantitativeDataStructureImpl_0 = No object with name "
+QuantitativeDataStructureImpl_1 = " in the workspace
+QuantitativeDataStructureImpl_2 = ** Cannot delete a non-existing object.
+
+QueryIndex_2 = Warning : duplicate query entry : 
+QueryIndex_3 = Warning: query failed: 
+
+QueryResult_0 = \ is not a valid CQP Id for a subcorpus. It must be an uppercase characters followed by lowercase characters.
+
+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_HEADER_FROM_CQI_SERVER          = Read header 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}
+
+REQUESTED_OBJECT = The object requested (
+
+RETURNING_CACHED_LEXICON = Recycling the lexicon {0}
+
+RETURN_FROM_QUERY        = {0} matches found in {1} ms
+
+ReferencePattern_3 = Reference
+
+Referencer_1 = Referencer
+Referencer_2 = Referencer export failed: 
+
+RelativeFrequency_3 = Relative Frenquency %
+
+SERVER_STARTED = Search Engine started 
+SERVER_STOPED  = Search Engine stopped
+
+SORT_COLUMN = Sorting column
+SORT_DONE   = Sort done.
+
+STARTING_SERVER = Starting Search Engine : {0}
+
+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_0  = \ number of words : 
+Selection_1  = \ number of texts : 
+Selection_2  = \ value : 
+Selection_26 = Failed to get sup values of 
+Selection_3  = Property : 
+Selection_4  = number of words : 
+Selection_5  = Text metadata: 
+Selection_6  = Selection error: the corpus 
+Selection_7  = has no base
+Selection_8  = Can't find structural unit for metadata with id: 
+Selection_9  = Error while getting metadatas from Base.importMetadatas: 
+
+Sh_4 = Process exited abnormally with code 
+
+StreamGobbler_0 = Initializing log recorder
+StreamGobbler_1 = Starting log recorder
+StreamGobbler_2 = Stopping log recorder
+StreamGobbler_3 = Interrupting log recorder
+
+StructuralUnitProperty_0 = ** Failed to access structural property values 
+
+Subcorpus_1 = \ in 
+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.
+
+TSCorpusManager_0 = Error reg dir: 
+TSCorpusManager_1 = Error configdir dir: 
+
+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 
+
+TigerXmlIndexing_2 = ERROR: !exists
+TigerXmlIndexing_3 = ERROR: !read
+TigerXmlIndexing_6 = IO: 
+TigerXmlIndexing_7 = SAX: 
+
+Toolbox_0                         = ** File
+Toolbox_1                         = ** Platform : the parameters SERVER_PATH_TO_EXECUTABLE, SERVER_PATH_TO_REGISTRY et SERVER_PATH_TO_INIT_FILE must be specified in a given '.properties' file.
+Toolbox_10                        = ** No worlspace found. Creating a new one.
+Toolbox_11                        = Updating with : 
+Toolbox_12                        = Loading workspace from file : 
+Toolbox_14                        = ** Error loadgin workspace from file : 
+Toolbox_15                        = ** Error : 
+Toolbox_16                        = \ does not exists
+Toolbox_17                        = End of CQP wait test
+Toolbox_18                        = ** Error while waiting for CQP
+Toolbox_2                         = ** Error: null value for key 
+Toolbox_21                        = \ R: 
+Toolbox_22                        = \ Workspace: 
+Toolbox_27                        = \ and 
+Toolbox_28                        = Failed to start MemCqiClient: 
+Toolbox_29                        = ** Error while connecting to search engine.
+Toolbox_3                         = true
+Toolbox_30                        = - wrong login or password or port : 
+Toolbox_31                        = Failed to exec 'taskkill /IM cqpserver.exe /F': 
+Toolbox_33                        = - or the engine was not started with the command line: 
+Toolbox_34                        = Failed to exec 'tskill cqpserver.exe': 
+Toolbox_37                        = kill `ps aux | grep cqpserver | awk '/-P 
+Toolbox_38                        = / {print $2}'`
+Toolbox_39                        = Failed to exec '
+Toolbox_4                         = With parameters: 
+Toolbox_40                        = ': 
+Toolbox_7                         = The path to R program is null
+Toolbox_8                         = Undefined keys : 
+Toolbox_9                         = Platform parameters: 
+Toolbox_connected_to_corpus_sever = connected
+Toolbox_wait_failed               = ** Failed to wait for the interrupted process
+Toolbox_workspace_init            = Reloading subcorpora and partitions...
+Toolbox_workspace_init_failed     = ** Error during workspace initialisation :
+Toolbox_wrong_port                = ** Error : the connexion to the server failed : wrong port format
+
+TxmObject_0 = ** Failed to get parent object
+TxmObject_1 = TxmObject: delete: parent object is null
+TxmObject_2 = Failed to save attribute 
+
+TxmRenderer_1 = TxmRenderer: error: no corpus found for result 
+TxmRenderer_5 = line: 
+TxmRenderer_6 = prop 
+TxmRenderer_7 = mdc: 
+
+V = , v 
+
+VARIABLE_REMOVED = R Variable "{0}" deleted.
+
+VMAX_1 = Vmax:
+
+ValidateXml_0 = XmlValidation: 
+ValidateXml_1 = is a directory
+ValidateXml_2 = does not exists
+ValidateXml_3 = is not read-able
+
+VectorizeArray_0  = ** Nothing to do with an empty matrix
+VectorizeArray_1  = ** Inner arrays must be of dimension > 0.
+VectorizeArray_10 = ** An inner array cannot be null.
+VectorizeArray_11 = ** All the inner array do not have the same length.
+VectorizeArray_3  = ** All the inner array do not have the same length.
+VectorizeArray_4  = ** Nothing to do with an empty matrix
+VectorizeArray_5  = ** Inner arrays must be of dimension > 0.
+VectorizeArray_7  = ** All the inner array do not have the same length.
+VectorizeArray_8  = ** Nothing to do with an empty matrix
+VectorizeArray_9  = ** Inner arrays must be of dimension > 0.
+
+WORKSPACE_PURGED = Statistics Engine cleaned up.
+
+Workspace_0  = , index 
+Workspace_1  = \	\	\	Edition: 
+Workspace_10 = corpus: 
+Workspace_2  = ** Failed to load workspace: 
+Workspace_26 = \	\	\	\	Page: 
+Workspace_27 = \ wordid 
+Workspace_28 = \	\	Script: 
+Workspace_29 = , type:  
+Workspace_3  = Project: 
+Workspace_30 = \	Corpora: 
+Workspace_31 = \	\	Text: 
+Workspace_4  = \	Base: 
+Workspace_5  = \	\	Text: 
+Workspace_6  = ** Failed to create empty workspace file: 
+Workspace_7  = \ pages
+Workspace_8  = Workspace XML file is mal formed. We need to recreate one...

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

Index: tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java	(revision 241)
@@ -1,14 +1,18 @@
 package org.txm.core.preferences;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.eclipse.core.internal.runtime.InternalPlatform;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.osgi.service.prefs.BackingStoreException;
+import org.txm.Toolbox;
 
 
 
@@ -371,7 +375,7 @@
 	 * @param key
 	 * @return
 	 */
-	public static double getFloat(String nodeQualifier, String key)	{
+	public static float getFloat(String nodeQualifier, String key)	{
 		return getFloat(nodeQualifier, null, key);
 	}
 	
@@ -459,6 +463,7 @@
 	 */
 	public static void dump(String nodeQualifier)	{
 		IEclipsePreferences preferences = scope.getNode(nodeQualifier);
+		System.out.println("TXMPreferences.dump(): node qualifier = " + nodeQualifier);
 		try {
 			String[] keys = preferences.keys();
 			for(int i = 0; i < keys.length; i++) {
@@ -531,6 +536,112 @@
 		return object.getClass().getName() + '@' + Integer.toHexString(object.hashCode());
 	}
 
-
 	
+	
+	//FIXME: this code is dedicated to dynamically retrieve the static field PREFERENCES_NODE of the runtime subclass and use it super class to avoid to pass it to all methods.
+	// eg. to use ProgressionPreferences.getBoolean("test") instead of TXMPreferences..getBoolean(ProgressionPreferences.PREFERENCES_NODE, "test")
+	// but it doesn"t work, need to continue the tests...
+//	/**
+//	 * 
+//	 * @author sjacquot
+//	 *
+//	 */
+//	public static class CurrentClassGetter extends SecurityManager {
+//		  public Class getCurrentClass() {
+//			  //FIXME: debug
+//			  for(int i = 0; i < getClassContext().length; i++) {
+//				System.err.println("TXMPreferences.CurrentClassGetter.getCurrentClass() class " + i + " = " + getClassContext()[i]);
+//			}
+//		    return getClassContext()[2];
+//		  }
+//		}
+//	
+//
+//	/**
+//	 * Gets the static field PREFERENCES_NODE of the runtime subclass.
+//	 * Convenience method to avoid to pass it to all methods. 
+//	 * @return
+//	 */
+//	private static String getNodeQualifier()	{
+//        String runtimeSubClassNodeQualifier  = null;
+//        try {
+//        	Class c = new CurrentClassGetter().getCurrentClass();
+//        	System.out.println("TXMPreferences.getNodeQualifier(): class = " + c);
+//            Field f = c.getDeclaredField("PREFERENCES_NODE");
+//            f.setAccessible(true);
+//            if(f.isAccessible())	{
+//                runtimeSubClassNodeQualifier = (String) f.get(null);
+//            }
+//        }
+//        catch (NoSuchFieldException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//        catch (SecurityException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//        catch (IllegalArgumentException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//        catch (IllegalAccessException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//        return runtimeSubClassNodeQualifier;
+//	}
+//	
+//	
+//	/**
+//	 * 
+//	 * @param key
+//	 * @return
+//	 */
+//	public static String getString(String key)	{
+//		return getString(getNodeQualifier(), key);
+//	}
+//
+//
+//	/**
+//	 * 
+//	 * @param key
+//	 * @return
+//	 */
+//	public static boolean getBoolean(String key)	{
+//    	Class c = new CurrentClassGetter().getCurrentClass();
+//    	System.out.println("TXMPreferences.getBoolean(): class = " + c);
+//		return getBoolean(getNodeQualifier(), key);
+//	}
+//	
+//	
+//	/**
+//	 * 
+//	 * @param key
+//	 * @return
+//	 */
+//	public static int getInt(String key)	{
+//		return getInt(getNodeQualifier(), key);
+//	}
+//	
+//	/**
+//	 * 
+//	 * @param key
+//	 * @return
+//	 */
+//	public static double getDouble(String key)	{
+//		return getDouble(getNodeQualifier(), key);
+//	}
+//	
+//	
+//	/**
+//	 * 
+//	 * @param key
+//	 * @return
+//	 */
+//	public static float getFloat(String key)	{
+//		return getFloat(getNodeQualifier(), key);
+//	}
+	//end of fixme
+	
 }
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/objects/Project.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Project.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/objects/Project.java	(revision 241)
@@ -39,10 +39,8 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.eclipse.osgi.util.NLS;
-import org.txm.Messages;
-import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.importer.cwb.PatchCwbRegistry;
-import org.txm.utils.FileCopy;
 import org.txm.utils.logger.Log;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -138,13 +136,13 @@
 				}
 				
 				if (name == null || name.length() == 0) { // check name attribute
-					System.out.println(Messages.bind(Messages.Project_2, PARAMS));
+					System.out.println(TXMCoreMessages.bind(TXMCoreMessages.Project_2, PARAMS));
 					if (PARAMS.exists() && PARAMS.canRead()) { // try fixing the name
-						System.out.println(Messages.Project_0);
+						System.out.println(TXMCoreMessages.Project_0);
 						name = PARAMS.getParentFile().getName().toUpperCase();
 						baseElement.setAttribute(NAME, name);
 					} else { // no luck :)
-						System.out.println(Messages.Project_1+PARAMS);
+						System.out.println(TXMCoreMessages.Project_1+PARAMS);
 						basesElem.removeChild(baseElement);
 					}
 				} 
@@ -194,14 +192,14 @@
 							basesToLoad.put(upperCasedName, parameters);
 						}
 					} else {
-						System.out.println(Messages.Project_6+PARAMS);
+						System.out.println(TXMCoreMessages.Project_6+PARAMS);
 					}
 				} else {
-					System.out.println(NLS.bind(Messages.Project_8, PARAMS));
+					System.out.println(NLS.bind(TXMCoreMessages.Project_8, PARAMS));
 					baseElement.getParentNode().removeChild(baseElement);
 				}
 			} catch (Exception e1) {
-				System.out.println(Messages.Project_10+e1);
+				System.out.println(TXMCoreMessages.Project_10+e1);
 			}
 		}
 		for (String k : basesToLoad.keySet()) {
@@ -214,7 +212,7 @@
 				b.load();
 				bases.put(b.getName(), b);
 			} catch (Exception e) {
-				System.out.println(Messages.Project_7+PARAMS);
+				System.out.println(TXMCoreMessages.Project_7+PARAMS);
 				org.txm.utils.logger.Log.printStackTrace(e);
 			}
 		}
@@ -268,16 +266,16 @@
 		{// minimal base data
 			BaseParameters parameters = new BaseParameters(PARAMS);
 			if (!parameters.load()) {
-				System.out.println(Messages.Project_11+PARAMS);
-				Log.severe(Messages.Project_11+PARAMS);
+				System.out.println(TXMCoreMessages.Project_11+PARAMS);
+				Log.severe(TXMCoreMessages.Project_11+PARAMS);
 				return null;
 			}
 
 			if (parameters.version == null || parameters.version.length() == 0) {
-				System.out.println(Messages.Project_14);
+				System.out.println(TXMCoreMessages.Project_14);
 				return null;
 			} else if (CURRENTCORPUSVERSION.compareTo(parameters.version) > 0) {
-				System.out.println(Messages.Project_15);
+				System.out.println(TXMCoreMessages.Project_15);
 				System.out.println(CURRENTCORPUSVERSION+" > "+parameters.version); //$NON-NLS-1$
 				return null;
 			}
@@ -300,8 +298,8 @@
 				File DATAc = new File(DATAs, corpusname);
 
 				if (!(PARAMS.exists() && HTMLc.exists() && REGISTRYc.exists() && DATAc.exists())) {
-					System.out.println(Messages.Project_17+corpusname);
-					System.out.println(Messages.Project_18+PARAMS);
+					System.out.println(TXMCoreMessages.Project_17+corpusname);
+					System.out.println(TXMCoreMessages.Project_18+PARAMS);
 					System.out.println("HTMLc: "+HTMLc+" : "+HTMLc.exists()); //$NON-NLS-1$ //$NON-NLS-2$
 					System.out.println("REGISTRYc: "+REGISTRYc+" : "+REGISTRYc.exists()); //$NON-NLS-1$ //$NON-NLS-2$
 					System.out.println("DATAc: "+DATAc+" : "+DATAc.exists()); //$NON-NLS-1$ //$NON-NLS-2$
@@ -322,8 +320,8 @@
 
 			return b;
 		} else {
-			System.out.println(Messages.bind(Messages.Project_26, binCorpusDir));
-			System.out.println(Messages.Project_28+HTMLs+", "+DATAs+", "+REGISTRY+Messages.Project_31+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
+			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.Project_26, binCorpusDir));
+			System.out.println(TXMCoreMessages.Project_28+HTMLs+", "+DATAs+", "+REGISTRY+TXMCoreMessages.Project_31+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
 		}
 		return null;
 	}
Index: tmp/org.txm.core/src/java/org/txm/objects/Base.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Base.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/objects/Base.java	(revision 241)
@@ -45,8 +45,8 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.txm.Messages;
 import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.functions.ProgressWatcher;
 import org.txm.searchengine.cqp.corpus.Alignement;
 import org.txm.searchengine.cqp.corpus.CorpusManager;
@@ -111,8 +111,7 @@
 			Source source = new DOMSource(params.root);
 
 			// Création du fichier de sortie
-			Writer writer = new BufferedWriter(new OutputStreamWriter(
-					new FileOutputStream(params.paramFile), "UTF-8")); //$NON-NLS-1$
+			Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(params.paramFile), "UTF-8")); //$NON-NLS-1$
 			Result resultat = new StreamResult(writer);
 
 			// Configuration du transformer
@@ -125,6 +124,7 @@
 			transformer.transform(source, resultat);
 			writer.close();
 		} catch (Exception e) {
+			e.printStackTrace();
 			Log.severe("Error while saving corpus parameters: "+e.getLocalizedMessage());
 			return false;
 		}
@@ -148,7 +148,7 @@
 			String target = link.getAttribute("target"); //$NON-NLS-1$
 			String[] split = target.split("#"); //$NON-NLS-1$
 			if (split.length != 3) {
-				System.out.println(Messages.Base_6+target);
+				System.out.println(TXMCoreMessages.Base_6+target);
 				continue;
 			}
 			String from = split[1].trim();
@@ -258,7 +258,7 @@
 		Element maincorpus = doc.createElement("corpus"); //$NON-NLS-1$
 		maincorpus.setAttribute("name", corpusName); //$NON-NLS-1$
 		if (selfElement.getElementsByTagName("corpora").getLength() == 0) { //$NON-NLS-1$
-			Log.severe(Messages.Base_22);
+			Log.severe(TXMCoreMessages.Base_22);
 			return null;
 		}
 		Element corporaElem = (Element) selfElement.getElementsByTagName("corpora").item(0); //$NON-NLS-1$
@@ -307,8 +307,8 @@
 			}
 			return true;
 		} else {
-			System.out.println(Messages.Base_0+binarydir+Messages.Base_3);
-			System.out.println(Messages.Base_4+exportzip.getParentFile()+Messages.Base_5);
+			System.out.println(TXMCoreMessages.Base_0+binarydir+TXMCoreMessages.Base_3);
+			System.out.println(TXMCoreMessages.Base_4+exportzip.getParentFile()+TXMCoreMessages.Base_5);
 
 		}
 		return false;
Index: tmp/org.txm.core/src/java/org/txm/objects/Corpus.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Corpus.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/objects/Corpus.java	(revision 241)
@@ -38,12 +38,11 @@
 
 import javax.persistence.EntityManager;
 
-import org.txm.Messages;
 import org.txm.Toolbox;
 import org.txm.annotation.AnnotationManager;
-import org.txm.annotation.DatabasePersistenceManager;
 import org.txm.annotation.repository.KnowledgeRepository;
 import org.txm.annotation.repository.KnowledgeRepositoryManager;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.functions.ProgressWatcher;
 import org.txm.metadatas.DateMetadata;
 import org.txm.metadatas.Metadata;
@@ -51,7 +50,6 @@
 import org.txm.metadatas.MinMaxDateGroup;
 import org.txm.searchengine.cqp.corpus.Alignement;
 import org.txm.searchengine.cqp.corpus.query.Query;
-import org.txm.sql.SQLConnection;
 import org.txm.utils.logger.Log;
 import org.txm.utils.zip.Zip;
 import org.w3c.dom.Document;
@@ -511,7 +509,7 @@
 		Element maincorpus = doc.createElement(CORPUS);
 		maincorpus.setAttribute(NAME, corpusName);
 		if (selfElement.getElementsByTagName(CORPORA).getLength() == 0) {
-			Log.severe(Messages.Base_22);
+			Log.severe(TXMCoreMessages.Base_22);
 			return null;
 		}
 		Element corporaElem = (Element) selfElement.getElementsByTagName(CORPORA).item(0);
@@ -547,8 +545,8 @@
 			}
 			return true;
 		} else {
-			System.out.println(Messages.Base_0+binarydir+Messages.Base_3);
-			System.out.println(Messages.Base_4+exportzip.getParentFile()+Messages.Base_5);
+			System.out.println(TXMCoreMessages.Base_0+binarydir+TXMCoreMessages.Base_3);
+			System.out.println(TXMCoreMessages.Base_4+exportzip.getParentFile()+TXMCoreMessages.Base_5);
 
 		}
 		return false;
Index: tmp/org.txm.core/src/java/org/txm/objects/Page.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Page.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/objects/Page.java	(revision 241)
@@ -37,8 +37,8 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamReader;
 
+import org.txm.core.messages.TXMCoreMessages;
 import org.w3c.dom.Element;
-import org.txm.Messages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -120,7 +120,7 @@
 		try {
 			return this.htmlfile.toURI().toURL().toString();
 		} catch (MalformedURLException e) {
-			System.err.println(Messages.Page_3 + htmlfile);
+			System.err.println(TXMCoreMessages.Page_3 + htmlfile);
 			return ""; //$NON-NLS-1$
 		}
 	}
Index: tmp/org.txm.core/src/java/org/txm/objects/Workspace.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Workspace.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/objects/Workspace.java	(revision 241)
@@ -48,13 +48,13 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
 import org.txm.utils.FileCopy;
 import org.txm.utils.logger.Log;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import org.txm.Messages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -113,8 +113,8 @@
 			writer.write("</workspace>\n"); //$NON-NLS-1$
 			writer.close();
 		} catch (IOException e) {
-			System.out.println(Messages.Workspace_6+xmlfile.getAbsolutePath());
-			Log.severe(Messages.Workspace_6+xmlfile.getAbsolutePath()+" : "+e.getMessage()); //$NON-NLS-1$
+			System.out.println(TXMCoreMessages.Workspace_6+xmlfile.getAbsolutePath());
+			Log.severe(TXMCoreMessages.Workspace_6+xmlfile.getAbsolutePath()+" : "+e.getMessage()); //$NON-NLS-1$
 			return false;
 		}
 		return true;
@@ -198,8 +198,8 @@
 			loadMetadata();
 			return true;
 		} catch (Exception e) {
-			System.out.println(Messages.Workspace_2 + e);
-			System.out.println(Messages.Workspace_8);
+			System.out.println(TXMCoreMessages.Workspace_2 + e);
+			System.out.println(TXMCoreMessages.Workspace_8);
 			File copyFile = new File(xmlfile.getParentFile(), "copy_of_"+xmlfile.getName());
 			try {
 				System.out.println("Writing a copy in "+copyFile);
@@ -253,11 +253,11 @@
 	public void describe() {
 		Workspace w = this;
 		for (Project p : w.projects.values()) {
-			System.out.println(Messages.Workspace_3 + p.getName());
+			System.out.println(TXMCoreMessages.Workspace_3 + p.getName());
 			for (Base b : p.bases.values()) {
-				System.out.println(Messages.Workspace_4 + b.getName());
+				System.out.println(TXMCoreMessages.Workspace_4 + b.getName());
 				for (MainCorpus c : b.corpora.values()) {
-					System.out.println(Messages.Workspace_10+c);
+					System.out.println(TXMCoreMessages.Workspace_10+c);
 				}
 			}
 		}
Index: tmp/org.txm.core/src/java/org/txm/objects/TxmObject.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/TxmObject.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/objects/TxmObject.java	(revision 241)
@@ -31,7 +31,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.results.ITXMResult;
 import org.txm.core.results.TXMResult;
 import org.w3c.dom.Document;
@@ -209,7 +209,7 @@
 		metadatas.put(key, new Property(key, value, "String", prop)); //$NON-NLS-1$
 		}
 		catch(Exception e){
-			System.out.println(Messages.TxmObject_2+key+":"+value); //$NON-NLS-1$
+			System.out.println(TXMCoreMessages.TxmObject_2+key+":"+value); //$NON-NLS-1$
 			org.txm.utils.logger.Log.printStackTrace(e);
 		}
 	}
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/MemCqiServer.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/MemCqiServer.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/MemCqiServer.java	(revision 241)
@@ -38,8 +38,8 @@
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.txm.Messages;
 import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
 import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
 import org.txm.searchengine.cqp.serverException.CqiCqpErrorNoSuchCorpus;
@@ -198,7 +198,7 @@
 			isLoaded = start(cmdLine);
 			//System.out.println("IS LOADED: "+isLoaded);
 			if (isLoaded) {
-				System.out.println(Messages.CqiClient_34);
+				System.out.println(TXMCoreMessages.CqiClient_34);
 			} else {
 				System.out.println("Failed to start SearchEngine in memory mode.");
 			}
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/NetCqiClient.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/NetCqiClient.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/NetCqiClient.java	(revision 241)
@@ -40,7 +40,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
 import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
@@ -171,7 +171,7 @@
 	 */
 	private synchronized String readString() throws UnexpectedAnswerException,
 	CqiServerError, IOException {
-		Log.finest(Messages.READING_STRING_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.READING_STRING_FROM_CQI_SERVER);
 		if (readHeaderFromServer() != CQI_DATA_STRING) {
 			throw new UnexpectedAnswerException();
 		}
@@ -179,7 +179,7 @@
 		byte[] bytes = new byte[length];
 		this.streamFromServer.readFully(bytes);
 		String res = new String(bytes, "UTF-8"); //$NON-NLS-1$
-		Log.finest(Messages.bind(Messages.READ_STRING_FROM_CQI_SERVER, res));
+		Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_STRING_FROM_CQI_SERVER, res));
 		return res;
 	}
 
@@ -198,13 +198,13 @@
 	private synchronized boolean readBoolean()
 			throws UnexpectedAnswerException, CqiServerError, IOException {
 		byte b = 0;
-		Log.finest(Messages.READING_BOOLEAN_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.READING_BOOLEAN_FROM_CQI_SERVER);
 		if (readHeaderFromServer() != CQI_DATA_BOOL) {
 			throw new UnexpectedAnswerException();
 		}
 		b = this.streamFromServer.readByte();
 		boolean res = (b == 1);
-		Log.finest(Messages.READ_BOOLEAN_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.READ_BOOLEAN_FROM_CQI_SERVER);
 		return res;
 	}
 
@@ -222,12 +222,12 @@
 	 */
 	private synchronized int readInt() throws UnexpectedAnswerException,
 	CqiServerError, IOException {
-		Log.finest(Messages.READING_INTEGER_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.READING_INTEGER_FROM_CQI_SERVER);
 		if (readHeaderFromServer() != CQI_DATA_INT) {
 			throw new UnexpectedAnswerException();
 		}
 		int res = this.streamFromServer.readInt();
-		Log.finest(Messages.READ_INTEGER_FROM_CQI_SERVER + res);
+		Log.finest(TXMCoreMessages.READ_INTEGER_FROM_CQI_SERVER + res);
 		return res;
 	}
 
@@ -245,7 +245,7 @@
 	 */
 	private synchronized String[] readStringArray()
 			throws UnexpectedAnswerException, CqiServerError, IOException {
-		Log.finest(Messages.READING_STRING_ARRAY_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.READING_STRING_ARRAY_FROM_CQI_SERVER);
 		byte[] header = readHeaderFromServer();
 		if (header != CQI_DATA_STRING_LIST) {
 			throw new UnexpectedAnswerException();
@@ -287,7 +287,7 @@
 		// long end = System.currentTimeMillis();
 		// System.out.println(nByteRead + " bytes read in " +(end-start)+ "ms ("
 		// + (nByteRead/(1+end-start)) + "kb/s)");
-		Log.finest(Messages.READ_STRING_ARRAY_FROM_CQI_SERVER
+		Log.finest(TXMCoreMessages.READ_STRING_ARRAY_FROM_CQI_SERVER
 				+ Arrays.asList(strings));
 		return strings;
 	}
@@ -341,7 +341,7 @@
 	 */
 	private synchronized int[] readIntList() throws UnexpectedAnswerException,
 	CqiServerError, IOException {
-		Log.finest(Messages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
 		if ((readHeaderFromServer()) != CQI_DATA_INT_LIST) {
 			throw new UnexpectedAnswerException();
 		}
@@ -422,7 +422,7 @@
 	 */
 	private synchronized int[][] readIntTable()
 			throws UnexpectedAnswerException, CqiServerError, IOException {
-		Log.finest(Messages.READING_2D_INT_ARRAY_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.READING_2D_INT_ARRAY_FROM_CQI_SERVER);
 		if ((readHeaderFromServer()) != CQI_DATA_INT_TABLE) {
 			throw new UnexpectedAnswerException();
 		}
@@ -432,7 +432,7 @@
 		for (int i = 0; i < nRow; i++)
 			for (int j = 0; j < nCol; j++)
 				ints[i][j] = this.streamFromServer.readInt();
-		Log.finest(Messages.READ_2D_INT_ARRAY_FROM_CQI_SERVER
+		Log.finest(TXMCoreMessages.READ_2D_INT_ARRAY_FROM_CQI_SERVER
 				+ Arrays.asList(ints));
 		return ints;
 	}
@@ -447,14 +447,14 @@
 	 */
 	private synchronized int[] readIntInt() throws IOException,
 	UnexpectedAnswerException, CqiServerError {
-		Log.finest(Messages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.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(Messages.READ_INT_ARRAY_FROM_CQI_SERVER
+		Log.finest(TXMCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER
 				+ Arrays.asList(res));
 		return res;
 	}
@@ -469,7 +469,7 @@
 	 */
 	private synchronized int[] readIntIntIntInt() throws IOException,
 	UnexpectedAnswerException, CqiServerError {
-		Log.finest(Messages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
 		if (readHeaderFromServer() != CQI_DATA_INT_INT_INT_INT) {
 			throw new UnexpectedAnswerException();
 		}
@@ -478,7 +478,7 @@
 		res[1] = this.streamFromServer.readInt();
 		res[2] = this.streamFromServer.readInt();
 		res[3] = this.streamFromServer.readInt();
-		Log.finest(Messages.READ_INT_ARRAY_FROM_CQI_SERVER
+		Log.finest(TXMCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER
 				+ Arrays.asList(res));
 		return res;
 	}
@@ -497,15 +497,15 @@
 	 */
 	private synchronized byte[] readHeaderFromServer()
 			throws UnexpectedAnswerException, CqiServerError, IOException {
-		Log.finest(Messages.READING_HEADER_FROM_CQI_SERVER);
+		Log.finest(TXMCoreMessages.READING_HEADER_FROM_CQI_SERVER);
 		byte b = this.streamFromServer.readByte();
-		Log.finest(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+		Log.finest(TXMCoreMessages.bind(TXMCoreMessages.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(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				return CQI_STATUS_OK;
@@ -518,8 +518,8 @@
 			}
 		case 0x02:// cf cqi.h:45
 			b = this.streamFromServer.readByte();
-			Log.finest(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
-			lastError = Messages.MemCqiClient_0+b;
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = TXMCoreMessages.MemCqiClient_0+b;
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				throw new CqiErrorGeneralError();
@@ -532,7 +532,7 @@
 			}
 		case 0x03:// cf cqi.h:53
 			b = this.streamFromServer.readByte();
-			Log.finest(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				return CQI_DATA_BYTE;
@@ -560,8 +560,8 @@
 		case 0x04:// cf cqi.h:67
 
 			b = this.streamFromServer.readByte();
-			lastError = Messages.MemCqiClient_1+b;
-			Log.finest(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = TXMCoreMessages.MemCqiClient_1+b;
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				throw new CqiClErrorNoSuchAttribute();
@@ -582,8 +582,8 @@
 		case 0x05:// cf cqi.h:94
 
 			b = this.streamFromServer.readByte();
-			lastError = Messages.MemCqiClient_2+b;
-			Log.finest(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = TXMCoreMessages.MemCqiClient_2+b;
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				throw new CqiCqpErrorErrorGeneral();
@@ -714,7 +714,7 @@
 						.getOutputStream());
 				this.streamFromServer = new DataInputStream(this.socket
 						.getInputStream());
-				System.out.print(Messages.CqiClient_32);
+				System.out.print(TXMCoreMessages.CqiClient_32);
 				return;
 			} catch (IOException e) {
 				System.err.print("."); //$NON-NLS-1$
@@ -726,7 +726,7 @@
 
 			attempts--;
 		}
-		throw new ServerNotFoundException(Messages.CqiClient_33);
+		throw new ServerNotFoundException(TXMCoreMessages.CqiClient_33);
 	}
 
 	// CQI_ERROR_CONNECT_REFUSED
@@ -745,14 +745,14 @@
 			throws UnexpectedAnswerException, IOException, CqiServerError {
 		this.username = username;
 		this.password = password;
-		Log.finest(Messages.CONNECTING_CQI_CLIENT + username
+		Log.finest(TXMCoreMessages.CONNECTING_CQI_CLIENT + username
 				+ ":" + password + "@" + host + ":" + port); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		this.streamToServer.write(CQI_CTRL_CONNECT);
 		this.writeString(username);
 		this.writeString(password);
 		try {
 			readHeaderFromServer();
-			Log.finest(Messages.CQI_CLIENT_CONNECTED);
+			Log.finest(TXMCoreMessages.CQI_CLIENT_CONNECTED);
 			return true;
 		} catch (CqiErrorConnectRefused e) {
 			return false;
@@ -786,7 +786,7 @@
 	public synchronized String getLastError(){	
 		if(lastError != null && lastError.length() > 0)
 			return lastError;
-		return Messages.AbstractCqiClient_2;
+		return TXMCoreMessages.AbstractCqiClient_2;
 	}
 
 	// CQI_CTRL_LAST_GENERAL_ERROR
@@ -801,14 +801,14 @@
 	@Override
 	public synchronized String getLastCqiError() throws UnexpectedAnswerException, IOException,
 	CqiServerError {
-		Log.severe(Messages.CqiClient_0);
+		Log.severe(TXMCoreMessages.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(Messages.NetCqiClient_1+e);
+			System.out.println(TXMCoreMessages.NetCqiClient_1+e);
 			return "error"; //$NON-NLS-1$
 		}
 	}
@@ -829,7 +829,7 @@
 			String ret = readString();
 			return ret;
 		} catch (Exception e) {
-			System.out.println(Messages.NetCqiClient_3+e);
+			System.out.println(TXMCoreMessages.NetCqiClient_3+e);
 			return "error"; //$NON-NLS-1$
 		}
 	}
@@ -1598,7 +1598,7 @@
 		try {
 			return connect(username, password);
 		} catch (Exception e) {
-			System.out.println(Messages.NetCqiClient_5+e);
+			System.out.println(TXMCoreMessages.NetCqiClient_5+e);
 			return false;
 		}
 	}
@@ -1765,7 +1765,7 @@
 		} catch(Exception e) { System.out.println("Exception : "+e);} //$NON-NLS-1$
 
 		try {
-			System.out.println(Messages.NetCqiClient_97+Arrays.toString(client.dumpSubCorpus(subcorpusid, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 10)));
+			System.out.println(TXMCoreMessages.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.core/src/java/org/txm/searchengine/cqp/MemCqiClient.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/MemCqiClient.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/MemCqiClient.java	(revision 241)
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
 import org.txm.searchengine.cqp.serverException.CqiClErrorCorpusAccess;
 import org.txm.searchengine.cqp.serverException.CqiClErrorInternal;
@@ -23,8 +23,6 @@
 import org.txm.searchengine.cqp.serverException.CqiServerError;
 import org.txm.utils.logger.Log;
 
-import com.sun.star.lang.IllegalArgumentException;
-
 /**
  * @author mdecorde
  * Declares all the natives methods
@@ -62,12 +60,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(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+		Log.finest(TXMCoreMessages.bind(TXMCoreMessages.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(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				return CQI_STATUS_OK;
@@ -78,12 +76,12 @@
 			case 0x04:// cf cqi.h:42
 				return CQI_STATUS_PING_OK;
 			default:
-				throw new CqiErrorGeneralError(Messages.MemCqiClient_3+b+Messages.MemCqiClient_9+b2); //$NON-NLS-2$
+				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_3+b+TXMCoreMessages.MemCqiClient_9+b2); //$NON-NLS-2$
 			}
 		case 0x02:// cf cqi.h:45
-			Log.finest(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 
-			lastError = Messages.MemCqiClient_0+" CQI_ERROR ("+b+")";
+			lastError = TXMCoreMessages.MemCqiClient_0+" CQI_ERROR ("+b+")";
 
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
@@ -95,10 +93,10 @@
 			case 0x04:// cf cqi.h:42
 				throw new CqiErrorSyntaxError();
 			default:
-				throw new CqiErrorGeneralError(Messages.MemCqiClient_5+b+Messages.MemCqiClient_9+b2); //$NON-NLS-2$
+				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_5+b+TXMCoreMessages.MemCqiClient_9+b2); //$NON-NLS-2$
 			}
 		case 0x03:// cf cqi.h:53
-			Log.finest(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				return CQI_DATA_BYTE;
@@ -123,12 +121,12 @@
 			case 0x0B:// cf cqi.h:42
 				return CQI_DATA_INT_TABLE;
 			default:
-				throw new CqiErrorGeneralError(Messages.MemCqiClient_7+b+Messages.MemCqiClient_9+b2); //$NON-NLS-2$
+				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_7+b+TXMCoreMessages.MemCqiClient_9+b2); //$NON-NLS-2$
 			}
 		case 0x04:// cf cqi.h:67
 
-			lastError = Messages.MemCqiClient_1+"CL_ERROR ("+b+")";
-			Log.finest(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = TXMCoreMessages.MemCqiClient_1+"CL_ERROR ("+b+")";
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				lastError += ": NoSuchAttribute error";
@@ -153,13 +151,13 @@
 				throw new CqiClErrorInternal();
 			default:
 				lastError += ": Unknown error";
-				throw new CqiErrorGeneralError(Messages.MemCqiClient_3+b+Messages.MemCqiClient_9+b2);
+				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_3+b+TXMCoreMessages.MemCqiClient_9+b2);
 			}
 
 		case 0x05:// cf cqi.h:94
 
-			lastError = Messages.MemCqiClient_2+"CQI_CQP_ERROR ("+b+")";
-			Log.finest(Messages.bind(Messages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = TXMCoreMessages.MemCqiClient_2+"CQI_CQP_ERROR ("+b+")";
+			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				lastError += ": General error";
@@ -177,10 +175,10 @@
 				lastError = getLastCQPError();
 				throw new CqiCqpErrorSyntax();
 			default:
-				throw new CqiErrorGeneralError(Messages.MemCqiClient_3+b+Messages.MemCqiClient_9+b2);
+				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_3+b+TXMCoreMessages.MemCqiClient_9+b2);
 			}
 		default:
-			throw new CqiErrorGeneralError(Messages.MemCqiClient_10+b+Messages.MemCqiClient_9+b2);
+			throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_10+b+TXMCoreMessages.MemCqiClient_9+b2);
 		}
 		//return null;
 	}
@@ -351,7 +349,7 @@
 			throws IOException, UnexpectedAnswerException, CqiServerError {
 		Boolean ret = server.query(arg0);
 		if(ret == null || !ret) {
-			System.out.println(Messages.MemCqiClient_11);
+			System.out.println(TXMCoreMessages.MemCqiClient_11);
 			throwExceptionFromCqi(server.getErrorCode());
 		}
 	}
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/NetCqiServer.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/NetCqiServer.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/NetCqiServer.java	(revision 241)
@@ -32,13 +32,14 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
 import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
 import org.txm.utils.logger.Log;
-import org.txm.Messages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -268,7 +269,7 @@
 						try {
 							while ((line = br.readLine()) != null) {
 								if(debug)
-									System.out.println(Messages.NetCqiServer_0+line);
+									System.out.println(TXMCoreMessages.NetCqiServer_0+line);
 							}
 						} catch (IOException e) {
 							// TODO Auto-generated catch block
@@ -288,7 +289,7 @@
 						try {
 							while ((line = br.readLine()) != null) {
 								if(debug)
-									System.out.println(Messages.NetCqiServer_1+line);
+									System.out.println(TXMCoreMessages.NetCqiServer_1+line);
 							}
 						} catch (IOException e) {
 							// TODO Auto-generated catch block
@@ -311,7 +312,7 @@
 	 */
 	@Override
 	public Boolean stop() {
-		Log.finest(Messages.STOPING_SERVER);
+		Log.finest(TXMCoreMessages.STOPING_SERVER);
 
 		try {
 			process.destroy();
@@ -320,7 +321,7 @@
 			Log.finest(Log.toString(e));
 			return false;
 		}
-		Log.finest(Messages.SERVER_STOPED);
+		Log.finest(TXMCoreMessages.SERVER_STOPED);
 		return true;
 	}
 
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Lexicon.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Lexicon.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Lexicon.java	(revision 241)
@@ -36,12 +36,12 @@
 import java.util.Arrays;
 import java.util.Map;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.functions.Function;
 import org.txm.searchengine.cqp.CqpDataProxy;
-import org.txm.stat.StatException;
-import org.txm.stat.data.Vector;
-import org.txm.stat.engine.r.data.VectorImpl;
+import org.txm.statsengine.core.StatException;
+import org.txm.statsengine.core.data.Vector;
+import org.txm.statsengine.r.core.data.VectorImpl;
 
 // TODO: Auto-generated Javadoc
 //  TODO should be put into stat.data package ?
@@ -97,7 +97,7 @@
 	protected Lexicon(Corpus corpus, Property property, final int[] freq, final int[] ids) {
 		super(corpus);
 		if (freq.length != ids.length)
-			throw new IllegalArgumentException(Messages.Lexicon_0);
+			throw new IllegalArgumentException(TXMCoreMessages.Lexicon_0);
 		this.freqs = freq;
 		this.ids = ids;
 		this.forms = null;
@@ -397,7 +397,7 @@
 
 	@Override
 	public String toString() {
-		return super.toString() + ": " + Messages.Lexicon_3 + getName();
+		return super.toString() + ": " + TXMCoreMessages.Lexicon_3 + getName();
 	}
 
 	
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/QueryResult.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/QueryResult.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/QueryResult.java	(revision 241)
@@ -31,6 +31,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.AbstractCqiClient;
 import org.txm.searchengine.cqp.NetCqiClient;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -39,7 +40,6 @@
 import org.txm.searchengine.cqp.corpus.query.Match;
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
-import org.txm.Messages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -140,7 +140,7 @@
 	@Override
 	public boolean checkCqpId(String cqpId) throws InvalidCqpIdException {
 		if (!AbstractCqiClient.checkSubcorpusId(cqpId))
-			throw new InvalidCqpIdException(cqpId + Messages.QueryResult_0);
+			throw new InvalidCqpIdException(cqpId + TXMCoreMessages.QueryResult_0);
 		return true;
 	}
 
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/CorpusManager.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/CorpusManager.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/CorpusManager.java	(revision 241)
@@ -31,8 +31,8 @@
 import java.util.List;
 
 import org.eclipse.persistence.annotations.Structure;
-import org.txm.Messages;
 import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.AbstractCqiClient;
 import org.txm.searchengine.cqp.NetCqiClient;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -90,7 +90,7 @@
 	 */
 	public static CorpusManager getCorpusManager() {
 		if (cqiClient == null)
-			throw new RuntimeException(Messages.CorpusManager_0);
+			throw new RuntimeException(TXMCoreMessages.CorpusManager_0);
 		if (corpusManager == null)
 			corpusManager = new CorpusManager();
 		return corpusManager;
@@ -181,7 +181,7 @@
 			try {
 				corpora.add(this.getCorpus(corporaName[i]));
 			} catch (InvalidCqpIdException e) {
-				throw new CqiClientException(Messages.CorpusManager_1, e);
+				throw new CqiClientException(TXMCoreMessages.CorpusManager_1, e);
 			}
 		}
 		
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Partition.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Partition.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Partition.java	(revision 241)
@@ -42,8 +42,8 @@
 import java.util.TreeMap;
 
 import org.eclipse.osgi.util.NLS;
-import org.txm.Messages;
 import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.objects.TxmObject;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.query.Query;
@@ -112,7 +112,7 @@
 	protected Partition(Corpus corpus, StructuralUnit structure, StructuralUnitProperty property, List<String> values)	throws CqiClientException {
 		super(corpus);
 		this.name = corpus.getName()+ "_" + structure.getName() + "_" + property.getName(); //$NON-NLS-1$ //$NON-NLS-2$
-		Log.finest(NLS.bind(Messages.NEW_PARTION, this.getCorpus(), this.name)); 
+		Log.finest(NLS.bind(TXMCoreMessages.NEW_PARTION, this.getCorpus(), this.name)); 
 		long start = System.currentTimeMillis();
 		this.structure = structure;
 		this.property = property;
@@ -171,7 +171,7 @@
 			parts.add(part);
 		}
 		long end = System.currentTimeMillis();
-		Log.finest(NLS.bind(Messages.PARTITION_CREATED, this.name, (end - start)));
+		Log.finest(NLS.bind(TXMCoreMessages.PARTITION_CREATED, this.name, (end - start)));
 	}
 
 	/**
@@ -203,7 +203,7 @@
 		if (name == null || name.trim().length() == 0)
 			name = "noname"; //$NON-NLS-1$
 		this.name = name;
-		Log.info(NLS.bind(Messages.NEW_PARTION, this.getCorpus(), this.name));
+		Log.info(NLS.bind(TXMCoreMessages.NEW_PARTION, this.getCorpus(), this.name));
 		long start = System.currentTimeMillis();
 		this.parts = new ArrayList<Part>();
 		for (int i = 0; i < queries.size(); i++) {
@@ -215,7 +215,7 @@
 			parts.add(part);
 		}
 		long end = System.currentTimeMillis();
-		Log.info(NLS.bind(Messages.PARTITION_CREATED, this.name, (end - start)));
+		Log.info(NLS.bind(TXMCoreMessages.PARTITION_CREATED, this.name, (end - start)));
 	}
 
 	/**
@@ -234,7 +234,7 @@
 		if (name == null || name.trim().length() == 0)
 			name = "noname"; //$NON-NLS-1$
 		this.name = name;
-		Log.info(NLS.bind(Messages.NEW_PARTION, this.getCorpus(), this.name));
+		Log.info(NLS.bind(TXMCoreMessages.NEW_PARTION, this.getCorpus(), this.name));
 		long start = System.currentTimeMillis();
 		this.parts = new ArrayList<Part>();
 		for (int i = 0; i < queries.size(); i++) {
@@ -246,7 +246,7 @@
 			parts.add(part);
 		}
 		long end = System.currentTimeMillis();
-		Log.info(NLS.bind(Messages.PARTITION_CREATED, this.name, (end - start)));
+		Log.info(NLS.bind(TXMCoreMessages.PARTITION_CREATED, this.name, (end - start)));
 	}
 
 	
@@ -284,7 +284,7 @@
 	throws CqiClientException {
 		Part part;
 		String partCqpId = CqpObject.partNamePrefix + Corpus.getNextSubcorpusCounter();
-		Log.finest(NLS.bind(Messages.CREATING_PART,partName, query));
+		Log.finest(NLS.bind(TXMCoreMessages.CREATING_PART,partName, query));
 		long start = System.currentTimeMillis();
 		try {
 			CorpusManager.getCorpusManager().getCqiClient().cqpQuery(
@@ -293,16 +293,16 @@
 					new Query(query));
 		} catch (Exception e) {
 			try {
-				throw new CqiClientException(Messages.Partition_9 + partitionName
+				throw new CqiClientException(TXMCoreMessages.Partition_9 + partitionName
 						+ "_" + partName+ e +" last error: "+Toolbox.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
 			} catch (Exception e1) {
-				System.out.println(Messages.Partition_18+e1);
+				System.out.println(TXMCoreMessages.Partition_18+e1);
 				org.txm.utils.logger.Log.printStackTrace(e1);
 				return null;
 			}
 		}
 		long end = System.currentTimeMillis();
-		Log.finest(NLS.bind(Messages.PART_CREATED, partitionName
+		Log.finest(NLS.bind(TXMCoreMessages.PART_CREATED, partitionName
 				+ "_" + partName, (end - start))); //$NON-NLS-1$//$NON-NLS-2$
 		return part;
 	}
@@ -403,7 +403,7 @@
 	 */
 	public List<QueryResult> query(Query query, String name)
 	throws CqiClientException {
-		Log.finest(Messages.QUERYING_PARTITION + this.name);
+		Log.finest(TXMCoreMessages.QUERYING_PARTITION + this.name);
 		List<QueryResult> results = new ArrayList<QueryResult>(parts.size());
 		for (Subcorpus part : parts)
 			results.add(part.query(query, part.getName() + "_" + name, false)); //$NON-NLS-1$
@@ -541,7 +541,7 @@
 				partitionElem.appendChild(partElem);
 			}
 		} catch (Exception e) {
-			System.out.println(Messages.Partition_21+e);
+			System.out.println(TXMCoreMessages.Partition_21+e);
 		}
 		this.load();
 	}
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Corpus.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Corpus.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Corpus.java	(revision 241)
@@ -37,7 +37,7 @@
 import java.util.Map;
 
 import org.eclipse.osgi.util.NLS;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.results.ITXMResult;
 import org.txm.functions.selection.SelectionResult;
 import org.txm.objects.Base;
@@ -48,7 +48,7 @@
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.searchengine.cqp.corpus.query.QueryPart;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
-import org.txm.stat.engine.r.RWorkspace;
+import org.txm.statsengine.r.core.RWorkspace;
 import org.txm.utils.logger.Log;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -437,7 +437,7 @@
 			boolean registered) throws CqiClientException {
 		Subcorpus subcorpus;
 		String subcorpusCqpId = subcorpusNamePrefix + getNextSubcorpusCounter().toString();
-		Log.finest(Messages.CREATING_SUBCORPUS + this.getQualifiedCqpId()
+		Log.finest(TXMCoreMessages.CREATING_SUBCORPUS + this.getQualifiedCqpId()
 				+ " " + subcorpusName + " " + query.getQueryString()); //$NON-NLS-1$ //$NON-NLS-2$
 
 		long start = System.currentTimeMillis();
@@ -452,8 +452,8 @@
 			throw new CqiClientException(e);
 		}
 		long end = System.currentTimeMillis();
-		Log.finest(Messages.SUBCORPUS_CREATED + subcorpusName
-				+ Messages.Corpus_8 + (end - start));
+		Log.finest(TXMCoreMessages.SUBCORPUS_CREATED + subcorpusName
+				+ TXMCoreMessages.Corpus_8 + (end - start));
 
 		if (!registered) subcorpus.registerToParent();
 		return subcorpus;
@@ -498,7 +498,7 @@
 			StructuralUnitProperty structuralUnitProperty, List<String> values,
 			String subcorpusName) throws CqiClientException {
 		if (values.size() == 0) {
-			Log.warning(Messages.Corpus_5);
+			Log.warning(TXMCoreMessages.Corpus_5);
 			return null;
 		}
 		String value = ""; //$NON-NLS-1$
@@ -604,7 +604,7 @@
 	 *             the cqi client exception
 	 */
 	public void dropPartition(Partition partition) throws CqiClientException {
-		Log.finest(Messages.DROP_PARTITION + partition.getName());
+		Log.finest(TXMCoreMessages.DROP_PARTITION + partition.getName());
 		for (Part part : partition.getParts())
 			try {
 				CorpusManager.getCorpusManager().getCqiClient().dropSubCorpus(part.getQualifiedCqpId());
@@ -625,7 +625,7 @@
 	 */
 	public void dropQueryResult(QueryResult queryResult)
 			throws CqiClientException {
-		Log.finest(Messages.DROP_QUERYRESULT + queryResult.getName());
+		Log.finest(TXMCoreMessages.DROP_QUERYRESULT + queryResult.getName());
 		try {
 			CorpusManager.getCorpusManager().getCqiClient().dropSubCorpus(queryResult.getQualifiedCqpId());
 		} catch (Exception e) {
@@ -643,7 +643,7 @@
 	 *             the cqi client exception
 	 */
 	public boolean dropSubcorpus(Corpus subcorpus) throws CqiClientException {
-		Log.finest(NLS.bind(Messages.DROP_SUBCORPUS, subcorpus.getName()));
+		Log.finest(NLS.bind(TXMCoreMessages.DROP_SUBCORPUS, subcorpus.getName()));
 		subcorpus.dropAllSubcorpora();
 		subcorpus.dropAllPartitions();
 		try {
@@ -722,8 +722,8 @@
 	 * @return the infos
 	 */
 	public String getInfos() {
-		return Messages.Corpus_2 + this.name + Messages.Corpus_3 + getCharset()
-				+ Messages.Corpus_4 + getLanguage();
+		return TXMCoreMessages.Corpus_2 + this.name + TXMCoreMessages.Corpus_3 + getCharset()
+				+ TXMCoreMessages.Corpus_4 + getLanguage();
 	}
 
 	/**
@@ -771,7 +771,7 @@
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				//org.txm.utils.logger.Log.printStackTrace(e);
-				System.out.println(Messages.Corpus_13+e);
+				System.out.println(TXMCoreMessages.Corpus_13+e);
 			}
 		}
 		if(lang != null)
@@ -1050,7 +1050,7 @@
 	public boolean load() {
 		//System.out.println("*** Load corpus: "+name);
 		if (selfElement == null) {
-			System.out.println(Messages.Corpus_14+this+Messages.Corpus_15);
+			System.out.println(TXMCoreMessages.Corpus_14+this+TXMCoreMessages.Corpus_15);
 			return false;
 		}
 
@@ -1075,7 +1075,7 @@
 					subcorp.selfElement = subcorpusElem;
 					subcorp.load();
 				} catch (CqiClientException e) {
-					Log.warning(this.name + Messages.Corpus_12 + name
+					Log.warning(this.name + TXMCoreMessages.Corpus_12 + name
 							+ " : " + e); //$NON-NLS-1$
 				}
 			}
@@ -1099,7 +1099,7 @@
 					Partition partition = this.createPartition(name, queries, names, true);
 					partition.load(partitionElem);
 				} catch (CqiClientException e) {
-					Log.warning(this.name + Messages.Corpus_19 + name
+					Log.warning(this.name + TXMCoreMessages.Corpus_19 + name
 							+ " : " + e); //$NON-NLS-1$
 					//c.getParentNode().removeChild(c);
 				}
@@ -1137,7 +1137,7 @@
 		QueryResult queryResult = null;
 		//String queryResultId = queryResultNamePrefix + UUID.randomUUID().toString();
 		String queryResultId = queryResultNamePrefix + getNextQueryCounter();
-		Log.finest(NLS.bind(Messages.QUERY, new String[]{this.getQualifiedCqpId(), queryResultId, query.getQueryString()})); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+		Log.finest(NLS.bind(TXMCoreMessages.QUERY, new String[]{this.getQualifiedCqpId(), queryResultId, query.getQueryString()})); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 		// long start = System.currentTimeMillis();
 		try {
 			CorpusManager.getCorpusManager().getCqiClient().cqpQuery(
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/StructuralUnitProperty.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/StructuralUnitProperty.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/StructuralUnitProperty.java	(revision 241)
@@ -32,11 +32,11 @@
 import java.util.List;
 import java.util.UUID;
 
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.AbstractCqiClient;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.utils.logger.Log;
-import org.txm.Messages;
 // TODO: Auto-generated Javadoc
 /**
  * A Property on the structural units the corpus. Represents a
@@ -117,7 +117,7 @@
 			AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
 			return cqiClient.getData(this, subcorpus);
 		} catch (Exception e) {
-			Log.severe(Messages.StructuralUnitProperty_0
+			Log.severe(TXMCoreMessages.StructuralUnitProperty_0
 					+ this.getFullName()+" : "+e); //$NON-NLS-1$
 		}
 		return new ArrayList<String>();
@@ -148,7 +148,7 @@
 			AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
 			return cqiClient.getData(this, number);
 		} catch (Exception e) {
-			Log.severe(Messages.StructuralUnitProperty_0
+			Log.severe(TXMCoreMessages.StructuralUnitProperty_0
 					+ this.getFullName()+" : "+e); //$NON-NLS-1$
 		}
 		return new ArrayList<String>();
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/MainCorpus.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/MainCorpus.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/MainCorpus.java	(revision 241)
@@ -38,11 +38,11 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.txm.Messages;
 import org.txm.Toolbox;
 import org.txm.annotation.AnnotationManager;
 import org.txm.annotation.repository.KnowledgeRepository;
 import org.txm.annotation.repository.KnowledgeRepositoryManager;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.functions.ProgressWatcher;
 import org.txm.objects.Base;
 import org.txm.objects.BaseParameters;
@@ -101,7 +101,7 @@
 	@Override
 	public boolean checkCqpId(String cqpId) throws InvalidCqpIdException {
 		if (!cqpId.equals(cqpId.toUpperCase()))
-			throw new InvalidCqpIdException(cqpId + Messages.MainCorpus_0);
+			throw new InvalidCqpIdException(cqpId + TXMCoreMessages.MainCorpus_0);
 		return true;
 	}
 	
@@ -126,11 +126,11 @@
 		// System.out.println("in "+this.getCqpId()+" look for cached lexicon "+property);
 		if (lexicons.containsKey(property.getName())
 				&& lexicons.get(property.getName()) != null) {
-			Log.finest(Messages.RETURNING_CACHED_LEXICON + this.name);
+			Log.finest(TXMCoreMessages.RETURNING_CACHED_LEXICON + this.name);
 			return lexicons.get(property.getName());
 		}
 		// System.out.println("not found");
-		Log.finest(Messages.LEXICON + this.name);
+		Log.finest(TXMCoreMessages.LEXICON + this.name);
 		long start = System.currentTimeMillis();
 		int lexiconSize;
 		try {
@@ -164,7 +164,7 @@
 		Lexicon lexicon = new Lexicon(this, property, freqs, ids);
 
 		long end = System.currentTimeMillis();
-		Log.finest(Messages.END_SUBCORPUS_LEXICON + this.name + Messages.MainCorpus_1 + (end - start));
+		Log.finest(TXMCoreMessages.END_SUBCORPUS_LEXICON + this.name + TXMCoreMessages.MainCorpus_1 + (end - start));
 
 		// System.out.println("add in "+this.getCqpId()+"cache "+property.getName());
 		lexicons.put(property.getName(), lexicon);
@@ -445,7 +445,7 @@
 
 		// delete binaries
 		File binaries = this.getBaseDirectory();
-		System.out.println(Messages.MainCorpus_2+binaries);
+		System.out.println(TXMCoreMessages.MainCorpus_2+binaries);
 		return DeleteDir.deleteDirectory(binaries);
 	}
 
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Subcorpus.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Subcorpus.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/Subcorpus.java	(revision 241)
@@ -32,9 +32,9 @@
 import java.util.List;
 
 import org.eclipse.osgi.util.NLS;
-import org.txm.Messages;
 import org.txm.annotation.AnnotationManager;
 import org.txm.annotation.repository.KnowledgeRepository;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.functions.selection.SelectionResult;
 import org.txm.objects.Base;
 import org.txm.objects.TxmObject;
@@ -143,7 +143,7 @@
 	 */
 	@Override
 	public int getSize() throws CqiClientException {
-		Log.finest(Messages.bind(Messages.SUBCORPUS_SIZE, new Object[]{this.name, "N/A"}));
+		Log.finest(TXMCoreMessages.bind(TXMCoreMessages.SUBCORPUS_SIZE, new Object[]{this.name, "N/A"}));
 		long start = System.currentTimeMillis();
 		if (this.size == -1) {
 			try {
@@ -169,7 +169,7 @@
 			}
 		}
 		long end = System.currentTimeMillis();
-		Log.finest(NLS.bind(Messages.END_SUBCORPUS_SIZE, new Object[]{this.name, this.size, (end - start)})); //$NON-NLS-1$
+		Log.finest(NLS.bind(TXMCoreMessages.END_SUBCORPUS_SIZE, new Object[]{this.name, this.size, (end - start)})); //$NON-NLS-1$
 		return this.size;
 	}
 
@@ -245,7 +245,7 @@
 	@Override
 	public boolean checkCqpId(String cqpId) throws InvalidCqpIdException {
 		if (!AbstractCqiClient.checkSubcorpusId(cqpId))
-			throw new InvalidCqpIdException(cqpId + Messages.Subcorpus_3);
+			throw new InvalidCqpIdException(cqpId + TXMCoreMessages.Subcorpus_3);
 		return true;
 	}
 
@@ -261,11 +261,11 @@
 		// System.out.println("in "+this.getCqpId()+" look for cached lexicon "+property);
 		if (lexicons.containsKey(property.getName())
 				&& lexicons.get(property.getName()) != null) {
-			Log.finest(Messages.RETURNING_CACHED_LEXICON + this.name);
+			Log.finest(TXMCoreMessages.RETURNING_CACHED_LEXICON + this.name);
 			return lexicons.get(property.getName());
 		}
 		//System.out.println("not found");
-		Log.finest(Messages.SUBCORPUS_LEXICON + this.name);
+		Log.finest(TXMCoreMessages.SUBCORPUS_LEXICON + this.name);
 		long start = System.currentTimeMillis();
 		int[][] fdist = null;
 		Subcorpus tmp = null;
@@ -299,8 +299,8 @@
 		Lexicon lexicon = new Lexicon(this, property, freqs, ids);
 
 		long end = System.currentTimeMillis();
-		Log.finest(Messages.END_SUBCORPUS_LEXICON + this.name
-				+ Messages.Subcorpus_1 + (end - start));
+		Log.finest(TXMCoreMessages.END_SUBCORPUS_LEXICON + this.name
+				+ TXMCoreMessages.Subcorpus_1 + (end - start));
 
 		// System.out.println("add in "+this.getCqpId()+"cache "+property.getName());
 		lexicons.put(property.getName(), lexicon);
@@ -340,7 +340,7 @@
 					subcorp.selfElement = subcorpusElem;
 					subcorp.load();
 				} catch (CqiClientException e) {
-					Log.warning(this.name + Messages.Corpus_12 + name
+					Log.warning(this.name + TXMCoreMessages.Corpus_12 + name
 							+ " : " + e); //$NON-NLS-1$
 				}
 			}
@@ -363,7 +363,7 @@
 					Partition partition = this.createPartition(name, queries, names, true);
 					partition.load(partitionElem);
 				} catch (CqiClientException e) {
-					Log.warning(this.name + Messages.Corpus_19 + name
+					Log.warning(this.name + TXMCoreMessages.Corpus_19 + name
 							+ " : " + e); //$NON-NLS-1$
 					//c.getParentNode().removeChild(c);
 				}
@@ -413,7 +413,7 @@
 				corporaElem.appendChild(subcorpusElem);
 				this.selfElement = subcorpusElem;
 			} catch (Exception e) {
-				System.out.println(Messages.Subcorpus_2+Log.toString(e));
+				System.out.println(TXMCoreMessages.Subcorpus_2+Log.toString(e));
 			}
 
 		this.load();
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java	(revision 241)
@@ -30,7 +30,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.corpus.Part;
 import org.txm.searchengine.cqp.corpus.Partition;
 import org.txm.utils.logger.Log;
@@ -87,13 +87,13 @@
 		List<String> partNames = partition.getPartNames();
 		for (String mod : modality) {
 			if (mod == null || mod.equals("")) { //$NON-NLS-1$
-				Log.finest(Messages.PartitionFocus_1);
-				throw new IllegalArgumentException(Messages.PartitionFocus_2);
+				Log.finest(TXMCoreMessages.PartitionFocus_1);
+				throw new IllegalArgumentException(TXMCoreMessages.PartitionFocus_2);
 			}
 			if (!partNames.contains(mod)) {
-				Log.finest(Messages.PartitionFocus_3 + mod
+				Log.finest(TXMCoreMessages.PartitionFocus_3 + mod
 						+ " " + partNames); //$NON-NLS-1$
-				throw new IllegalArgumentException(Messages.PartitionFocus_4);
+				throw new IllegalArgumentException(TXMCoreMessages.PartitionFocus_4);
 			}
 		}
 	}
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/query/Focus.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/query/Focus.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/corpus/query/Focus.java	(revision 241)
@@ -31,8 +31,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.Messages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -85,7 +85,7 @@
 	 */
 	private void checkModalityList() {
 		for (String mod : modality) {
-			if (mod == null || mod.equals(""))throw new IllegalArgumentException(Messages.Focus_1); //$NON-NLS-1$
+			if (mod == null || mod.equals(""))throw new IllegalArgumentException(TXMCoreMessages.Focus_1); //$NON-NLS-1$
 		}
 	}
 
Index: tmp/org.txm.core/src/java/org/txm/searchengine/cqp/AbstractCqiClient.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/searchengine/cqp/AbstractCqiClient.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/searchengine/cqp/AbstractCqiClient.java	(revision 241)
@@ -37,7 +37,7 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-import org.txm.Messages;
+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.corpus.Corpus;
@@ -49,7 +49,6 @@
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.searchengine.cqp.serverException.CqiCqpErrorNoSuchCorpus;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
-import org.txm.utils.ExecTimer;
 import org.txm.utils.logger.Log;
 
 /**
@@ -88,7 +87,7 @@
 	public synchronized String getLastError(){	
 		if(lastError != null && lastError.length() > 0)
 			return lastError;
-		return Messages.AbstractCqiClient_2;
+		return TXMCoreMessages.AbstractCqiClient_2;
 	}
 	
 	public List<String> getSingleData(Property prop) throws IOException, CqiServerError, CqiClientException {
Index: tmp/org.txm.core/src/java/org/txm/importer/filters/FilterManager.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/filters/FilterManager.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/filters/FilterManager.java	(revision 241)
@@ -30,7 +30,7 @@
 import java.io.File;
 import java.util.Hashtable;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -60,7 +60,7 @@
 		File home = new File(path);
 		if (!home.exists())
 			System.out
-					.println(Messages.FilterManager_0 + path + Messages.FilterManager_1); 
+					.println(TXMCoreMessages.FilterManager_0 + path + TXMCoreMessages.FilterManager_1); 
 		else {
 			File[] list = home.listFiles();
 			for (File f : list)
Index: tmp/org.txm.core/src/java/org/txm/importer/filters/CatalogManager.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/filters/CatalogManager.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/filters/CatalogManager.java	(revision 241)
@@ -30,7 +30,7 @@
 import java.io.File;
 import java.util.Hashtable;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -54,7 +54,7 @@
 		File home = new File(path);
 		if (!home.exists())
 			System.out
-					.println(Messages.CatalogManager_0 + path + Messages.CatalogManager_1); 
+					.println(TXMCoreMessages.CatalogManager_0 + path + TXMCoreMessages.CatalogManager_1); 
 		else {
 			File[] list = home.listFiles();
 			for (File f : list)
Index: tmp/org.txm.core/src/java/org/txm/importer/filters/Filter.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/filters/Filter.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/filters/Filter.java	(revision 241)
@@ -40,7 +40,7 @@
 import java.io.PipedReader;
 import java.io.PipedWriter;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -258,7 +258,7 @@
 			if (this.line != null)
 				return true;
 		} catch (IOException e) {
-			System.err.println(Messages.Filter_7); 
+			System.err.println(TXMCoreMessages.Filter_7); 
 			org.txm.utils.logger.Log.printStackTrace(e);
 			return false;
 		}
Index: tmp/org.txm.core/src/java/org/txm/importer/filters/Catalog.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/filters/Catalog.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/filters/Catalog.java	(revision 241)
@@ -32,8 +32,9 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.LinkedList;
-import org.txm.Messages;
 
+import org.txm.core.messages.TXMCoreMessages;
+
 // TODO: Auto-generated Javadoc
 /**
  * 
@@ -58,7 +59,7 @@
 	public Catalog(String path) {
 		source = new File(path);
 		if (!source.exists()) {
-			System.err.println(Messages.Catalog_0 + path); 
+			System.err.println(TXMCoreMessages.Catalog_0 + path); 
 			System.exit(-1);
 		}
 
Index: tmp/org.txm.core/src/java/org/txm/importer/ValidateXml.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/ValidateXml.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/ValidateXml.java	(revision 241)
@@ -40,7 +40,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -60,15 +60,15 @@
 	 */
 	public static boolean testAndThrow(File infile) throws XMLStreamException {
 		if (infile.isDirectory()) {
-			System.out.println( Messages.ValidateXml_0+infile+Messages.ValidateXml_1);
+			System.out.println( TXMCoreMessages.ValidateXml_0+infile+TXMCoreMessages.ValidateXml_1);
 			return false;
 		}
 		if (!infile.exists()) {
-			System.out.println( Messages.ValidateXml_0+infile+Messages.ValidateXml_2);
+			System.out.println( TXMCoreMessages.ValidateXml_0+infile+TXMCoreMessages.ValidateXml_2);
 			return false;
 		}
 		if (!infile.canRead()) {
-			System.out.println(Messages.ValidateXml_0+infile+Messages.ValidateXml_3);
+			System.out.println(TXMCoreMessages.ValidateXml_0+infile+TXMCoreMessages.ValidateXml_3);
 			return false;
 		}
 		try {
@@ -124,15 +124,15 @@
 	 */
 	public static boolean test(File infile) {
 		if (infile.isDirectory()) {
-			System.out.println( Messages.ValidateXml_0+infile+Messages.ValidateXml_1);
+			System.out.println( TXMCoreMessages.ValidateXml_0+infile+TXMCoreMessages.ValidateXml_1);
 			return false;
 		}
 		if (!infile.exists()) {
-			System.out.println( Messages.ValidateXml_0+infile+Messages.ValidateXml_2);
+			System.out.println( TXMCoreMessages.ValidateXml_0+infile+TXMCoreMessages.ValidateXml_2);
 			return false;
 		}
 		if (!infile.canRead()) {
-			System.out.println(Messages.ValidateXml_0+infile+Messages.ValidateXml_3);
+			System.out.println(TXMCoreMessages.ValidateXml_0+infile+TXMCoreMessages.ValidateXml_3);
 			return false;
 		}
 		try {
Index: tmp/org.txm.core/src/java/org/txm/importer/cwb/PatchCwbRegistry.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/cwb/PatchCwbRegistry.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/cwb/PatchCwbRegistry.java	(revision 241)
@@ -35,10 +35,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 
-import org.eclipse.core.runtime.Platform;
-import org.txm.Messages;
-import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
-import org.txm.utils.OSDetector;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.utils.logger.Log;
 
 // TODO: Auto-generated Javadoc
@@ -123,8 +120,8 @@
 		}
 		corpusEncoding = corpusEncoding.toLowerCase();
 
-		Log.info(Messages.PatchCwbRegistry_2 + corpus
-				+ Messages.PatchCwbRegistry_23 + corpusEncoding);
+		Log.info(TXMCoreMessages.PatchCwbRegistry_2 + corpus
+				+ TXMCoreMessages.PatchCwbRegistry_23 + corpusEncoding);
 		String line = reader.readLine();
 		while (line != null) {
 			if (line.startsWith("##:: charset") || line.startsWith("charset")) { //$NON-NLS-1$ //$NON-NLS-2$
@@ -162,8 +159,8 @@
 				new FileOutputStream(temp), encoding);
 
 		corpusLanguage = corpusLanguage.toLowerCase();
-		Log.info(Messages.PatchCwbRegistry_34 + corpus
-				+ Messages.PatchCwbRegistry_35 + corpusLanguage);
+		Log.info(TXMCoreMessages.PatchCwbRegistry_34 + corpus
+				+ TXMCoreMessages.PatchCwbRegistry_35 + corpusLanguage);
 		String line = reader.readLine();
 		while (line != null) {
 			if (line.startsWith("##:: language") || line.startsWith("language")) { //$NON-NLS-1$ //$NON-NLS-2$
@@ -192,11 +189,11 @@
 		String corpus = registryfile.getName();
 
 		if (!new File(registryfile.getParent(), targetcorpus).exists()) {
-			System.out.println(Messages.PatchCwbRegistry_3+" : "+new File(registryfile.getParent(), targetcorpus)); //$NON-NLS-1$
+			System.out.println(TXMCoreMessages.PatchCwbRegistry_3+" : "+new File(registryfile.getParent(), targetcorpus)); //$NON-NLS-1$
 			return false;
 		}
 		if (!registryfile.exists()) {
-			System.out.println(Messages.PatchCwbRegistry_13+registryfile.getAbsolutePath());
+			System.out.println(TXMCoreMessages.PatchCwbRegistry_13+registryfile.getAbsolutePath());
 			return false;
 		}
 		boolean alignmentwritten = false;
@@ -210,8 +207,8 @@
 		OutputStreamWriter writer = new OutputStreamWriter(
 				new FileOutputStream(temp), encoding);
 
-		Log.info(Messages.PatchCwbRegistry_4 + corpus
-				+ Messages.PatchCwbRegistry_5 + targetcorpus);
+		Log.info(TXMCoreMessages.PatchCwbRegistry_4 + corpus
+				+ TXMCoreMessages.PatchCwbRegistry_5 + targetcorpus);
 		String line = reader.readLine();
 		while (line != null) {
 			if (line.startsWith("ALIGNED " + targetcorpus)) { //$NON-NLS-1$
@@ -250,7 +247,7 @@
 		String datapath = ""; //$NON-NLS-1$
 		
 		if (!registryfile.exists()) {
-			Log.warning(Messages.PatchCwbRegistry_16);
+			Log.warning(TXMCoreMessages.PatchCwbRegistry_16);
 			return false;
 		}
 
@@ -286,7 +283,7 @@
 					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(Messages.PatchCwbRegistry_27+datadir +Messages.ValidateXml_2);
+				System.out.println(TXMCoreMessages.PatchCwbRegistry_27+datadir +TXMCoreMessages.ValidateXml_2);
 				writer.close();
 				reader.close();
 				return false;
@@ -294,13 +291,13 @@
 		}
 		else
 		{
-			System.out.println(Messages.PatchCwbRegistry_28);
+			System.out.println(TXMCoreMessages.PatchCwbRegistry_28);
 			
 			if(!found)
-				System.out.println(oldname +Messages.PatchCwbRegistry_29+registryfile);
+				System.out.println(oldname +TXMCoreMessages.PatchCwbRegistry_29+registryfile);
 			
 			if(!(datapath.length() > 0))
-				System.out.println(Messages.PatchCwbRegistry_27+oldname +Messages.PatchCwbRegistry_29+registryfile);
+				System.out.println(TXMCoreMessages.PatchCwbRegistry_27+oldname +TXMCoreMessages.PatchCwbRegistry_29+registryfile);
 			writer.close();
 			reader.close();
 			return false;
Index: tmp/org.txm.core/src/java/org/txm/importer/cwb/BuildCwbEncodeArgs.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/cwb/BuildCwbEncodeArgs.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/cwb/BuildCwbEncodeArgs.java	(revision 241)
@@ -43,7 +43,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -85,7 +85,7 @@
 	public boolean process(File xmlfile, ArrayList<String> wordstag)
 			throws XMLStreamException, FactoryConfigurationError, IOException {
 		if (xmlfile == null || !xmlfile.exists()) {
-			System.out.println(Messages.bind(Messages.BuildCwbEncodeArgs_0, xmlfile));
+			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.BuildCwbEncodeArgs_0, xmlfile));
 			return false;
 		}
 		URL u = xmlfile.toURI().toURL();
Index: tmp/org.txm.core/src/java/org/txm/importer/cwb/BuildCwbEncodeArgsFromWTC.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/cwb/BuildCwbEncodeArgsFromWTC.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/cwb/BuildCwbEncodeArgsFromWTC.java	(revision 241)
@@ -43,7 +43,7 @@
 import javax.xml.stream.FactoryConfigurationError;
 import javax.xml.stream.XMLStreamException;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -80,7 +80,7 @@
 	public boolean process(File wtcfile)
 			throws XMLStreamException, FactoryConfigurationError, IOException {
 		if (wtcfile == null || !wtcfile.exists()) {
-			System.out.println(Messages.bind(Messages.BuildCwbEncodeArgs_0, wtcfile));
+			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.BuildCwbEncodeArgs_0, wtcfile));
 			return false;
 		}
 
Index: tmp/org.txm.core/src/java/org/txm/importer/cwb/CwbEncode.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/cwb/CwbEncode.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/cwb/CwbEncode.java	(revision 241)
@@ -34,14 +34,13 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.lang.ArrayUtils;
 import org.eclipse.osgi.util.NLS;
+import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
 import org.txm.stat.utils.ConsoleProgressBar;
 import org.txm.utils.IOUtils;
 import org.txm.utils.OSDetector;
-import org.txm.Messages;
-import org.txm.Toolbox;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -242,34 +241,34 @@
 		File registry = new File(directory, "registry"); //$NON-NLS-1$
 		File corpora = new File(directory, "corpora"); //$NON-NLS-1$
 		if (!directory.exists()) {
-			System.err.println(Messages.CwbEncode_0 + directory);
+			System.err.println(TXMCoreMessages.CwbEncode_0 + directory);
 			return;
 		}
 		if (!bin.exists()) {
-			System.err.println(Messages.CwbEncode_21 + bin);
+			System.err.println(TXMCoreMessages.CwbEncode_21 + bin);
 			return;
 		}
 		if (!registry.exists()) {
-			System.err.println(Messages.CwbEncode_23 + registry);
+			System.err.println(TXMCoreMessages.CwbEncode_23 + registry);
 			return;
 		}
 		if (!corpora.exists()) {
-			System.err.println(Messages.CwbEncode_25 + corpora);
+			System.err.println(TXMCoreMessages.CwbEncode_25 + corpora);
 			return;
 		}
 
 		for (File corpus : corpora.listFiles()) {
-			System.out.println(Messages.CwbEncode_27 + corpus.getName());
+			System.out.println(TXMCoreMessages.CwbEncode_27 + corpus.getName());
 			File data = new File(corpus, "data"); //$NON-NLS-1$
 
 			if (!data.exists()) {
-				System.err.println(Messages.CwbEncode_29 + data);
+				System.err.println(TXMCoreMessages.CwbEncode_29 + data);
 				return;
 			}
 
 			String datapath = data.getAbsolutePath();
 			String regpath = registry.getAbsolutePath() + "/" + corpus.getName(); //$NON-NLS-1$
-			System.out.println(NLS.bind(Messages.CwbEncode_32, regpath, datapath));
+			System.out.println(NLS.bind(TXMCoreMessages.CwbEncode_32, regpath, datapath));
 			try {
 				PatchCwbRegistry.patch(new File(regpath), new File(datapath));
 			} catch (IOException e) {
Index: tmp/org.txm.core/src/java/org/txm/importer/cwb/CwbProcess.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/cwb/CwbProcess.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/cwb/CwbProcess.java	(revision 241)
@@ -33,14 +33,12 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
 import org.txm.utils.logger.Log;
-import org.txm.Messages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -97,7 +95,7 @@
 	 */
 	protected boolean run(List<String> cmd, boolean monitorOutput, boolean waitFor)
 			throws ServerNotFoundException, InterruptedException, IOException {
-		Log.info(Messages.CwbProcess_1 + StringUtils.join(cmd, " ")); //$NON-NLS-1$ 
+		Log.info(TXMCoreMessages.CwbProcess_1 + StringUtils.join(cmd, " ")); //$NON-NLS-1$ 
 		//System.out.println(StringUtils.join(cmd, " "));
 		for (String s : cmd) {
 			//System.out.println("s="+s);
@@ -159,9 +157,9 @@
 	 * Stop the cwb process.
 	 */
 	public void stop() {
-		Log.finest(Messages.CwbProcess_3 + name.toUpperCase());
+		Log.finest(TXMCoreMessages.CwbProcess_3 + name.toUpperCase());
 		this.process.destroy();
-		Log.finest(Messages.CwbProcess_4+name.toUpperCase());
+		Log.finest(TXMCoreMessages.CwbProcess_4+name.toUpperCase());
 	}
 
 	/**
@@ -246,7 +244,7 @@
 		String cwbLoc = org.txm.Toolbox.getParam(org.txm.Toolbox.CQI_SERVER_PATH_TO_CQPLIB)+File.separator;
 
 		if (!new File(cwbLoc).exists()) {
-			System.out.println(Messages.CwbProcess_5+cwbLoc);
+			System.out.println(TXMCoreMessages.CwbProcess_5+cwbLoc);
 			return null;
 		}
 
Index: tmp/org.txm.core/src/java/org/txm/importer/Convert5To6.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/Convert5To6.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/Convert5To6.java	(revision 241)
@@ -9,11 +9,11 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.objects.BaseParameters;
 import org.txm.objects.Page;
+import org.txm.utils.FileCopy;
 import org.txm.utils.xml.DomUtils;
-import org.txm.utils.FileCopy;
 import org.txm.utils.zip.Zip;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -35,7 +35,7 @@
 		File param = new File(corpusdir, "import.xml"); //$NON-NLS-1$
 		if (!param.exists()) { 
 			//System.out.println("\n");
-			System.out.println(Messages.bind(Messages.Convert5To6_1,param)); //$NON-NLS-1$
+			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.Convert5To6_1,param)); //$NON-NLS-1$
 			return false; 
 		}
 
@@ -58,29 +58,29 @@
 		File REGISTRY = new File(INDIR, "registry"); //$NON-NLS-1$
 		File IMPORT = new File(INDIR, "import.xml"); //$NON-NLS-1$
 		
-		if (!silent) System.out.println(Messages.Convert5To6_6);
+		if (!silent) System.out.println(TXMCoreMessages.Convert5To6_6);
 		if (!TXMs.exists()) {
-			if (!silent) System.out.println(Messages.Convert5To6_7+TXMs);
+			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_7+TXMs);
 			return false;
 		}
 
 		if (!HTMLs.exists()) {
-			if (!silent) System.out.println(Messages.Convert5To6_8+HTMLs);
+			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_8+HTMLs);
 			return false;
 		}
 
 		if (!DATAs.exists()) {
-			if (!silent) System.out.println(Messages.Convert5To6_9+DATAs);
+			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_9+DATAs);
 			return false;
 		}
 
 		if (!REGISTRY.exists()) {
-			if (!silent) System.out.println(Messages.Convert5To6_10+REGISTRY);
+			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_10+REGISTRY);
 			return false;
 		}
 
 		if (!HTMLmulti.exists()) {
-			if (!silent) System.out.println(Messages.Convert5To6_11+HTMLmulti);
+			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_11+HTMLmulti);
 			return false;
 		}
 
@@ -88,7 +88,7 @@
 	}
 
 	private boolean process() throws Exception {
-		System.out.println(Messages.Convert5To6_12);
+		System.out.println(TXMCoreMessages.Convert5To6_12);
 		String corpusname = REGISTRY.listFiles()[0].getName().toUpperCase();
 
 		// create the corpus directories
@@ -107,7 +107,7 @@
 		TXMc.mkdir();
 		DATAc.mkdir();
 		
-		System.out.println(Messages.Convert5To6_15+OUTDIR);
+		System.out.println(TXMCoreMessages.Convert5To6_15+OUTDIR);
 		// move files
 		for (File f : HTMLmulti.listFiles())
 			f.renameTo(new File(HTMLcmulti, f.getName()));
@@ -138,7 +138,7 @@
 		String date = BaseParameters.dateformat.format(new Date(IMPORT.lastModified()));
 
 		if (IMPORT.exists()) {
-			System.out.println(Messages.Convert5To6_19+IMPORT);
+			System.out.println(TXMCoreMessages.Convert5To6_19+IMPORT);
 			Document doc = DomUtils.load(IMPORT);
 			Element root = doc.getDocumentElement();
 			lang = root.getAttribute("language"); //$NON-NLS-1$
@@ -156,7 +156,7 @@
 		File PARAMS = new File(BINDIR, "import.xml"); //$NON-NLS-1$
 		System.out.println("writing "+PARAMS); //$NON-NLS-1$
 		BaseParameters.createEmptyParams(PARAMS, corpusname.toUpperCase());
-		System.out.println(Messages.Convert5To6_30);
+		System.out.println(TXMCoreMessages.Convert5To6_30);
 		BaseParameters params = new BaseParameters(PARAMS);
 		params.load();
 
@@ -181,7 +181,7 @@
 		//params.addEditionDefinition(corpusElem, "default", "groovy", "");
 		params.addEditionDefinition(corpusElem, "onepage", "groovy", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		for (File txmFile : TXMc.listFiles()) {
-			System.out.println(Messages.Convert5To6_46+txmFile);
+			System.out.println(TXMCoreMessages.Convert5To6_46+txmFile);
 			String textname = txmFile.getName();
 			textname = textname.substring(0, textname.indexOf(".")); //$NON-NLS-1$
 
Index: tmp/org.txm.core/src/java/org/txm/importer/scripting/GroovyImportScriptRunner.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/scripting/GroovyImportScriptRunner.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/importer/scripting/GroovyImportScriptRunner.java	(revision 241)
@@ -35,7 +35,7 @@
 import java.util.List;
 
 import org.codehaus.groovy.control.CompilationFailedException;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -80,7 +80,7 @@
 	 * @param args the args
 	 */
 	public GroovyImportScriptRunner(File scriptfile, Object[] args) {
-		System.out.println(Messages.GroovyImportScriptRunner_0);
+		System.out.println(TXMCoreMessages.GroovyImportScriptRunner_0);
 		this.executeScript(scriptfile.getAbsolutePath(), args);
 	}
 
@@ -91,7 +91,7 @@
 	 * @param args the args
 	 */
 	public void executeScript(String scriptfile, Object args) {
-		System.out.println(Messages.GroovyImportScriptRunner_1 + scriptfile);
+		System.out.println(TXMCoreMessages.GroovyImportScriptRunner_1 + scriptfile);
 		ClassLoader parent = getClass().getClassLoader();
 		GroovyClassLoader loader = new GroovyClassLoader(parent);
 		Class groovyClass = null;
@@ -123,7 +123,7 @@
 			System.err.println(e);
 			org.txm.utils.logger.Log.printStackTrace(e);
 		}
-		System.out.println(Messages.GroovyImportScriptRunner_3);
+		System.out.println(TXMCoreMessages.GroovyImportScriptRunner_3);
 	}
 
 	/**
Index: tmp/org.txm.core/src/java/org/txm/Toolbox.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/Toolbox.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/Toolbox.java	(revision 241)
@@ -43,6 +43,7 @@
 import java.util.logging.Level;
 
 import org.apache.commons.lang.StringUtils;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.results.ITXMResult;
 import org.txm.importer.cwb.PatchCwbRegistry;
 import org.txm.objects.Base;
@@ -58,8 +59,9 @@
 import org.txm.searchengine.cqp.corpus.CorpusManager;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
 import org.txm.searchengine.cqp.corpus.Partition;
-import org.txm.stat.engine.r.RWorkspace;
-import org.txm.stat.engine.r.RWorkspaceException;
+import org.txm.statsengine.r.core.RStatsEngine;
+import org.txm.statsengine.r.core.RWorkspace;
+import org.txm.statsengine.r.core.RWorkspaceException;
 import org.txm.utils.OSDetector;
 //import org.txm.tbx.chartsengine.jfreechart.JFCChartsEngine;
 //import org.txm.tbx.chartsengine.r.RChartsEngine;
@@ -90,9 +92,6 @@
 	/** The state search engine. */
 	private static boolean stateSearchEngine = false;
 
-	/** The state stat engine. */
-	private static boolean stateStatEngine = false;
-
 	/** The state workspace. */
 	private static boolean stateWorkspace = false;
 
@@ -108,7 +107,6 @@
 	/** The CQI client. */
 	private static AbstractCqiClient cqiClient;
 
-	private static boolean rIsMandatory = false;
 
 
 	/**
@@ -206,41 +204,41 @@
 	/** The Constant USER_TXM_HOME. */
 	public static final String USER_TXM_HOME = "user_txm_home"; //$NON-NLS-1$
 
-	/** The Constant R_REMOTE. */
-	public static final String IS_R_MANDATORY = "is_r_mandatory"; //$NON-NLS-1$
+//	/** The Constant R_REMOTE. */
+//	public static final String IS_R_MANDATORY = "is_r_mandatory"; //$NON-NLS-1$
+//
+//	/** The Constant R_PATH_TO_EXECUTABLE. */
+//	public static final String R_PATH_TO_EXECUTABLE = "r_path_to_executable"; //$NON-NLS-1$
+//
+//	/** The Constant R_REMOTE. */
+//	public static final String R_REMOTE = "r_remote"; //$NON-NLS-1$
+//	public static final String R_DEBUG = "r_debug"; //$NON-NLS-1$
+//
+//	/** The Constant R_SERVER_ADDRESS. */
+//	public static final String R_SERVER_ADDRESS = "r_server_adress"; //$NON-NLS-1$
+//
+//	/** The Constant R_PORT. */
+//	public static final String R_PORT = "r_port"; //$NON-NLS-1$
+//
+//	/** The Constant R_USER. */
+//	public static final String R_USER = "r_user"; //$NON-NLS-1$
+//
+//	/** The Constant R_PASSWORD. */
+//	public static final String R_PASSWORD = "r_password"; //$NON-NLS-1$
+//
+//	/** The Constant R_PACKAGES_PATH. */
+//	public static final String R_PACKAGES_PATH = "r_packages_path"; //$NON-NLS-1$
+//
+//	public static final String R_RARGS = "r_rargs"; //$NON-NLS-1$
+//	public static final String R_RSERVEARGS = "r_rserveargs"; //$NON-NLS-1$
+//
+//	/** The Constant R_DISABLE. */
+//	public static final String R_DISABLE = "r_disable"; //$NON-NLS-1$
+//
+//	/** The Constant R_FILE_TRANSFERT. */
+//	public static final String R_FILE_TRANSFERT = "r_file_transfert"; //$NON-NLS-1$
+//	public static final String R_SVG_DEVICE = "r_svg_device"; //$NON-NLS-1$
 
-	/** The Constant R_PATH_TO_EXECUTABLE. */
-	public static final String R_PATH_TO_EXECUTABLE = "r_path_to_executable"; //$NON-NLS-1$
-
-	/** The Constant R_REMOTE. */
-	public static final String R_REMOTE = "r_remote"; //$NON-NLS-1$
-	public static final String R_DEBUG = "r_debug"; //$NON-NLS-1$
-
-	/** The Constant R_SERVER_ADDRESS. */
-	public static final String R_SERVER_ADDRESS = "r_server_adress"; //$NON-NLS-1$
-
-	/** The Constant R_PORT. */
-	public static final String R_PORT = "r_port"; //$NON-NLS-1$
-
-	/** The Constant R_USER. */
-	public static final String R_USER = "r_user"; //$NON-NLS-1$
-
-	/** The Constant R_PASSWORD. */
-	public static final String R_PASSWORD = "r_password"; //$NON-NLS-1$
-
-	/** The Constant R_PACKAGES_PATH. */
-	public static final String R_PACKAGES_PATH = "r_packages_path"; //$NON-NLS-1$
-
-	public static final String R_RARGS = "r_rargs"; //$NON-NLS-1$
-	public static final String R_RSERVEARGS = "r_rserveargs"; //$NON-NLS-1$
-
-	/** The Constant R_DISABLE. */
-	public static final String R_DISABLE = "r_disable"; //$NON-NLS-1$
-
-	/** The Constant R_FILE_TRANSFERT. */
-	public static final String R_FILE_TRANSFERT = "r_file_transfert"; //$NON-NLS-1$
-	public static final String R_SVG_DEVICE = "r_svg_device"; //$NON-NLS-1$
-
 	/** The Constant TREETAGGER_INSTALL_PATH. */
 	public static final String TREETAGGER_INSTALL_PATH = "treetagger_install_path"; //$NON-NLS-1$
 	/** The Constant TREETAGGER_MODELS_PATH. */
@@ -267,19 +265,13 @@
 		CQI_SERVER_ADDITIONAL_OPTIONS, CQI_SERVER_MONITOR_OUTPUT,
 		CQI_SERVER_IS_REMOTE, CQI_NETWORK_MODE, CQP_EMPTY_VALUE_CODE, SCRIPT_ROOT_DIR,
 		SCRIPT_CURRENT_DIR, UI_LOCALE, WORKSPACE_LOCATION, INSTALL_DIR,
-		USER_TXM_HOME, IS_R_MANDATORY, R_PATH_TO_EXECUTABLE, R_DEBUG, R_REMOTE, R_SERVER_ADDRESS,
-		R_PORT, R_USER, R_PASSWORD, R_PACKAGES_PATH, R_RARGS, R_RSERVEARGS, R_DISABLE, R_FILE_TRANSFERT,R_SVG_DEVICE,
+		USER_TXM_HOME,
+//		IS_R_MANDATORY, R_PATH_TO_EXECUTABLE, R_DEBUG, R_REMOTE, R_SERVER_ADDRESS,
+//		R_PORT, R_USER, R_PASSWORD, R_PACKAGES_PATH, R_RARGS, R_RSERVEARGS, R_DISABLE, R_FILE_TRANSFERT,R_SVG_DEVICE,
+		
 		TREETAGGER_INSTALL_PATH, TREETAGGER_MODELS_PATH,TREETAGGER_OPTIONS, TREETAGGER_APOSTROPHE,
 		METADATA_ENCODING, METADATA_COLSEPARATOR,METADATA_TXTSEPARATOR
 
-		// FIXME : can't we dynamically populate this constants array from the plugins ? eg. : from the properties constants defined in ChartsEngine ?
-//		ChartsEngine.PROP_CHARTS_ENGINE_NAME,
-//		ChartsEngine.PROP_CHARTS_ENGINE_OUTPUT_FORMAT
-		
-		// FIXME : need to think about the properties dispatch between plugins
-//		,ChartsEngine.PROP_PARTITION_DIMENSIONS_SORTED_BY_SIZE,
-//		ChartsEngine.PROP_PARTITION_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE 
-
 	};
 
 
@@ -301,9 +293,9 @@
 		File configFile = new File(txmDirectory, "textometrie.properties"); //$NON-NLS-1$
 		if (!configFile.exists()) {
 			initializing = false;
-			throw new IllegalArgumentException(Messages.Toolbox_0 
+			throw new IllegalArgumentException(TXMCoreMessages.Toolbox_0 
 					+ configFile.getAbsolutePath()
-					+ Messages.Toolbox_16); 
+					+ TXMCoreMessages.Toolbox_16); 
 		}
 
 		boolean ret = initialize(configFile);
@@ -412,7 +404,7 @@
 		initializing = true;
 
 		try {
-			Log.info(Messages.Toolbox_4 + props.toString()); 
+			Log.info(TXMCoreMessages.Toolbox_4 + props.toString()); 
 
 			// Create default values for initialization
 			if (props.getProperty(INSTALL_DIR) == null)
@@ -467,39 +459,38 @@
 			if (props.getProperty(UI_LOCALE) == null)
 				props.setProperty(UI_LOCALE, "fr"); //$NON-NLS-1$
 			if (props.getProperty(WORKSPACE_LOCATION) == null)
-				props.setProperty(WORKSPACE_LOCATION, new File(TXMHOME,
-						"workspaces/default.xml").getAbsolutePath()); //$NON-NLS-1$ 
+				props.setProperty(WORKSPACE_LOCATION, new File(TXMHOME, "workspaces/default.xml").getAbsolutePath()); //$NON-NLS-1$ 
 
-			if (props.getProperty(IS_R_MANDATORY) == null)
-				props.setProperty(IS_R_MANDATORY, "" + false); //$NON-NLS-1$
-			if (props.getProperty(R_PATH_TO_EXECUTABLE) == null) {
-				props.setProperty(R_PATH_TO_EXECUTABLE, ""); //$NON-NLS-1$
-			}
-			if (props.getProperty(R_SERVER_ADDRESS) == null)
-				props.setProperty(R_SERVER_ADDRESS, "127.0.0.1"); //$NON-NLS-1$
-			if (props.getProperty(R_PACKAGES_PATH) == null)
-				props.setProperty(R_PACKAGES_PATH, ""); //$NON-NLS-1$
-			if (props.getProperty(R_REMOTE) == null)
-				props.setProperty(R_REMOTE, "" + false); //$NON-NLS-1$
-			if (props.getProperty(R_DISABLE) == null)
-				props.setProperty(R_DISABLE, "" + false); //$NON-NLS-1$
-			if (props.getProperty(R_DEBUG) == null || props.getProperty(R_DEBUG).length() == 0)
-				props.setProperty(R_DEBUG, "" + false); //$NON-NLS-1$
-			if (props.getProperty(R_PORT) == null || props.getProperty(R_PORT).length() == 0)
-				props.setProperty(R_PORT, "6311"); //$NON-NLS-1$
-			if (props.getProperty(R_USER) == null)
-				props.setProperty(R_USER, ""); //$NON-NLS-1$
-			if (props.getProperty(R_PASSWORD) == null)
-				props.setProperty(R_PASSWORD, ""); //$NON-NLS-1$
-			if (props.getProperty(R_RARGS) == null)
-				props.setProperty(R_RARGS, ""); //$NON-NLS-1$
-			if (props.getProperty(R_RSERVEARGS) == null)
-				props.setProperty(R_RSERVEARGS, ""); //$NON-NLS-1$
-			if (props.getProperty(R_FILE_TRANSFERT) == null)
-				props.setProperty(R_FILE_TRANSFERT, "false"); //$NON-NLS-1$
-			if (props.getProperty(R_SVG_DEVICE) == null) {
-				props.setProperty(R_SVG_DEVICE, "svg"); //$NON-NLS-1$
-			}
+//			if (props.getProperty(IS_R_MANDATORY) == null)
+//				props.setProperty(IS_R_MANDATORY, "" + false); //$NON-NLS-1$
+//			if (props.getProperty(R_PATH_TO_EXECUTABLE) == null) {
+//				props.setProperty(R_PATH_TO_EXECUTABLE, ""); //$NON-NLS-1$
+//			}
+//			if (props.getProperty(R_SERVER_ADDRESS) == null)
+//				props.setProperty(R_SERVER_ADDRESS, "127.0.0.1"); //$NON-NLS-1$
+//			if (props.getProperty(R_PACKAGES_PATH) == null)
+//				props.setProperty(R_PACKAGES_PATH, ""); //$NON-NLS-1$
+//			if (props.getProperty(R_REMOTE) == null)
+//				props.setProperty(R_REMOTE, "" + false); //$NON-NLS-1$
+//			if (props.getProperty(R_DISABLE) == null)
+//				props.setProperty(R_DISABLE, "" + false); //$NON-NLS-1$
+//			if (props.getProperty(R_DEBUG) == null || props.getProperty(R_DEBUG).length() == 0)
+//				props.setProperty(R_DEBUG, "" + false); //$NON-NLS-1$
+//			if (props.getProperty(R_PORT) == null || props.getProperty(R_PORT).length() == 0)
+//				props.setProperty(R_PORT, "6311"); //$NON-NLS-1$
+//			if (props.getProperty(R_USER) == null)
+//				props.setProperty(R_USER, ""); //$NON-NLS-1$
+//			if (props.getProperty(R_PASSWORD) == null)
+//				props.setProperty(R_PASSWORD, ""); //$NON-NLS-1$
+//			if (props.getProperty(R_RARGS) == null)
+//				props.setProperty(R_RARGS, ""); //$NON-NLS-1$
+//			if (props.getProperty(R_RSERVEARGS) == null)
+//				props.setProperty(R_RSERVEARGS, ""); //$NON-NLS-1$
+//			if (props.getProperty(R_FILE_TRANSFERT) == null)
+//				props.setProperty(R_FILE_TRANSFERT, "false"); //$NON-NLS-1$
+//			if (props.getProperty(R_SVG_DEVICE) == null) {
+//				props.setProperty(R_SVG_DEVICE, "svg"); //$NON-NLS-1$
+//			}
 
 			//			if (props.getProperty(ChartsEngine.PROP_CHARTS_ENGINE_NAME) == null) {
 			//				props.setProperty(ChartsEngine.PROP_CHARTS_ENGINE_NAME, "jfreechart_charts_engine"); //$NON-NLS-1$
@@ -544,28 +535,21 @@
 				Log.setPrintInFile(Boolean.parseBoolean(props.getProperty(LOG_IN_FILE)));
 
 			useNetCQi = Boolean.parseBoolean(props.getProperty(CQI_NETWORK_MODE));
-			rIsMandatory = Boolean.parseBoolean(props.getProperty(IS_R_MANDATORY));
 			//System.out.println("CQI MODE NETWORK : "+useNetCQi);
 
-			Log.info(Messages.Toolbox_8 + checkInexistantParameterKey(props)); 
-			Log.info(Messages.Toolbox_9 + getSortedPropertiesAsString()); 
+			Log.info(TXMCoreMessages.Toolbox_8 + checkInexistantParameterKey(props)); 
+			Log.info(TXMCoreMessages.Toolbox_9 + getSortedPropertiesAsString()); 
 
 			// start engines then the workspace
 			//System.out.println("REMOTE CQP: "+props.getProperty(CQI_SERVER_IS_REMOTE));
 			Log.warning("Killing CQP and RServe process if any");
 			processKiller();
 
-			Log.warning("Starting Corpus Engine");
 			startSearchEngine();
 
-			if (!Boolean.parseBoolean(properties.getProperty(R_DISABLE))) {
-				Log.warning("Starting Statistics Engine");
-				startStatEngine();
-			} else {
-				stateStatEngine = false;
-			}
+			RStatsEngine.start();
 
-			Log.info("Toolbox states: cqp:" + stateSearchEngine + Messages.Toolbox_21 + stateStatEngine + Messages.Toolbox_22 + stateWorkspace); //$NON-NLS-1$
+			Log.info("Toolbox states: cqp:" + stateSearchEngine + TXMCoreMessages.Toolbox_21 + RStatsEngine.isStarted() + TXMCoreMessages.Toolbox_22 + stateWorkspace); //$NON-NLS-1$
 		} catch (Exception e) {
 			initializing = false;
 			throw e;
@@ -599,9 +583,8 @@
 	 */
 	private static boolean checkState() {
 		state = stateSearchEngine && stateWorkspace;
-		if (!Boolean.parseBoolean(properties.getProperty(R_DISABLE))) {
-			if (rIsMandatory) 
-				state = state && stateStatEngine;
+		if (RStatsEngine.isMandatory())	{ 
+			state = state && RStatsEngine.isStarted();
 		}
 		return state;
 	}
@@ -613,7 +596,7 @@
 	 */
 	private static boolean startWorkspace() {
 		try {
-			System.out.print(Messages.Toolbox_workspace_init);
+			System.out.print(TXMCoreMessages.Toolbox_workspace_init);
 			String txmhome = getParam(USER_TXM_HOME);
 			if (txmhome.length() == 0) {
 				stateWorkspace = false;
@@ -624,21 +607,21 @@
 			System.out.println("Toolbox.startWorkspace(): workspace location = " + location);
 			
 			if (!new File(location).exists()) {
-				Log.info(Messages.Toolbox_10 + location); 
+				Log.info(TXMCoreMessages.Toolbox_10 + location); 
 				workspace = Workspace.createEmptyWorkspace(new File(location));
 			} else {
 				workspace = new Workspace(new File(location));
 			}
-			Log.info(Messages.Toolbox_12 + location); 
+			Log.info(TXMCoreMessages.Toolbox_12 + location); 
 			stateWorkspace = true;
 
 			if (workspace == null || workspace.getProject("default") == null) { //$NON-NLS-1$
-				Log.severe(Messages.Toolbox_14 + location); 
+				Log.severe(TXMCoreMessages.Toolbox_14 + location); 
 				stateWorkspace = false;
-				System.out.println(Messages.FAILED);
+				System.out.println(TXMCoreMessages.FAILED);
 				return false;
 			} else {
-				System.out.println(Messages.DONE);
+				System.out.println(TXMCoreMessages.DONE);
 			}
 
 			/*
@@ -665,8 +648,8 @@
 			 */
 
 		} catch (Exception e) {
-			System.err.println(Messages.Toolbox_workspace_init_failed + properties.getProperty(WORKSPACE_LOCATION)); 
-			Log.severe(Messages.Toolbox_15 + Log.toString(e));
+			System.err.println(TXMCoreMessages.Toolbox_workspace_init_failed + properties.getProperty(WORKSPACE_LOCATION)); 
+			Log.severe(TXMCoreMessages.Toolbox_15 + Log.toString(e));
 			Log.printStackTrace(e);
 			stateWorkspace = false;
 		}
@@ -674,63 +657,15 @@
 	}
 
 	/**
-	 * start the statengine if the engine is not remote then launch Rserve.
+	 * Starts the corpus engine if not remove then launch cqpserver.
 	 *
 	 * @return true, if successful
 	 */
-	private static boolean startStatEngine() {
-		try {
-			// try launching R server and connecting to it
-			int port = Integer.parseInt(properties.getProperty(R_PORT));
-			String user = properties.getProperty(R_USER);
-			String password = properties.getProperty(R_PASSWORD);
-			boolean remote = "true".equals(properties.getProperty(R_REMOTE)); //$NON-NLS-1$
-			boolean debug = "true".equals(properties.getProperty(R_DEBUG)); //$NON-NLS-1$
-			Log.info(Messages.Toolbox_23+user+Messages.Toolbox_24+remote+Messages.Toolbox_25+port+ Messages.Toolbox_5+debug);
-			// System.out.println("test remote :"+R_PATH_TO_EXECUTABLE+":"+properties.getProperty(R_PATH_TO_EXECUTABLE));
-			if (!remote) {
-				// start Rserve executable
-				stateStatEngine = RWorkspace.startExec(
-						properties.getProperty(R_PATH_TO_EXECUTABLE), 
-						port, 
-						debug, 
-						properties.getProperty(R_RARGS),
-						properties.getProperty(R_RSERVEARGS));
-
-				if (stateStatEngine) { // try connecting to R witout login
-					stateStatEngine = RWorkspace.connect("127.0.0.1", port); //$NON-NLS-1$
-				}
-			} else { // try connecting to R, with login and password
-				stateStatEngine = RWorkspace.connect(properties
-						.getProperty(R_SERVER_ADDRESS), port, user, password);
-			}
-
-			if (stateStatEngine) { // post configuration of R
-				String rPackagesPath = properties.getProperty(R_PACKAGES_PATH);
-				stateStatEngine = RWorkspace.getRWorkspaceInstance().postConfiguration(rPackagesPath);
-			}
-
-			if (properties.getProperty(R_FILE_TRANSFERT) != null) {
-				//System.out.println("try to set R_FILE_TRANSFERT to "+properties.getProperty(R_FILE_TRANSFERT));
-				RWorkspace.setUseFileCommunication(Boolean.parseBoolean(properties.getProperty(R_FILE_TRANSFERT)));
-				//	System.out.println("success");
-				//System.out.println("file transfert ? "+RWorkspace.isFileTranfert());
-			}
-		} catch (RWorkspaceException e) {
-			System.err.println(Messages.Toolbox_35); 
-			stateStatEngine = false;
-		}
-
-		return stateStatEngine;
-	}
-
-	/**
-	 * start the searchengine if not remove then launch cqpserver.
-	 *
-	 * @return true, if successful
-	 */
 	private static boolean startSearchEngine() {
 
+		Log.warning("Starting Corpus Engine.");
+
+		
 		if (workspace == null) {
 			System.out.println("Can't start CQP with workspace not ready.");
 			return false;
@@ -775,7 +710,7 @@
 			if (exec_path == null
 					|| reg_path == null
 					|| init_path == null) {
-				Log.severe(Messages.Toolbox_1); 
+				Log.severe(TXMCoreMessages.Toolbox_1); 
 			} else {
 				if (!useNetCQi) {
 					try {
@@ -811,7 +746,7 @@
 					try {
 						cqiClient = new MemCqiClient((MemCqiServer) cqiServer);
 					} catch(Exception e) {
-						Log.severe(Messages.Toolbox_28+e);
+						Log.severe(TXMCoreMessages.Toolbox_28+e);
 						cqiserverok = false;
 					}
 				} else {
@@ -821,9 +756,9 @@
 				}
 			}
 		} catch (NumberFormatException e1) {
-			Log.severe(Messages.Toolbox_wrong_port + properties.getProperty(CQI_SERVER_PORT)); 
+			Log.severe(TXMCoreMessages.Toolbox_wrong_port + properties.getProperty(CQI_SERVER_PORT)); 
 		} catch (ServerNotFoundException e1) {
-			Log.severe(Messages.Toolbox_26 + properties.getProperty(CQI_SERVER_HOST) + Messages.Toolbox_27 + properties.getProperty(CQI_SERVER_PORT)); 
+			Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + properties.getProperty(CQI_SERVER_HOST) + TXMCoreMessages.Toolbox_27 + properties.getProperty(CQI_SERVER_PORT)); 
 		}
 
 		// try connecting to the CWB server
@@ -838,13 +773,13 @@
 		}
 
 		if (stateSearchEngine == false) {
-			System.out.println(Messages.Toolbox_29); 
-			System.out.println(Messages.Toolbox_30 + properties.getProperty(CQI_SERVER_LOGIN) + " " + properties.getProperty(CQI_SERVER_PASSWORD) + properties.getProperty(CQI_SERVER_HOST) + " " + Integer.parseInt(properties.getProperty(CQI_SERVER_PORT))); //$NON-NLS-1$ //$NON-NLS-2$
+			System.out.println(TXMCoreMessages.Toolbox_29); 
+			System.out.println(TXMCoreMessages.Toolbox_30 + properties.getProperty(CQI_SERVER_LOGIN) + " " + properties.getProperty(CQI_SERVER_PASSWORD) + properties.getProperty(CQI_SERVER_HOST) + " " + Integer.parseInt(properties.getProperty(CQI_SERVER_PORT))); //$NON-NLS-1$ //$NON-NLS-2$
 			if (cqiServer != null)
-				System.out.println(Messages.Toolbox_33 + cqiServer.getLastCmdLine());
+				System.out.println(TXMCoreMessages.Toolbox_33 + cqiServer.getLastCmdLine());
 		} else {
 			if (cqiServer == null || cqiServer instanceof NetCqiServer)
-				System.out.println(Messages.Toolbox_connected_to_corpus_sever); 
+				System.out.println(TXMCoreMessages.Toolbox_connected_to_corpus_sever); 
 		}
 
 		CorpusManager.setCqiClient(cqiClient);
@@ -859,13 +794,13 @@
 				CorpusManager.getCorpusManager().getCorpora();
 				scount++;
 				if (scount >= 10) {
-					Log.warning(Messages.Toolbox_17); 
+					Log.warning(TXMCoreMessages.Toolbox_17); 
 					break;
 				}
 			} while (CorpusManager.getCorpusManager().getCorpora().size() == 0);
 		} catch (Exception e) {
 			org.txm.utils.logger.Log.printStackTrace(e);
-			Log.severe(Messages.Toolbox_18 + e);
+			Log.severe(TXMCoreMessages.Toolbox_18 + e);
 		} 
 
 		// initialize pre-configured subcorpus and partition of corpus registered in the default.xml workspace file
@@ -892,8 +827,8 @@
 					p = Runtime.getRuntime().exec("taskkill /IM cqpserver.exe /F"); //$NON-NLS-1$
 					p.waitFor();
 				} catch (IOException e) {
-					Log.severe(Messages.Toolbox_31+Log.toString(e));
-					System.out.println(Messages.Toolbox_31+Log.toString(e));
+					Log.severe(TXMCoreMessages.Toolbox_31+Log.toString(e));
+					System.out.println(TXMCoreMessages.Toolbox_31+Log.toString(e));
 					try {
 						Process p = Runtime.getRuntime().exec(
 								"tskill cqpserver.exe"); //$NON-NLS-1$
@@ -901,8 +836,8 @@
 						p = Runtime.getRuntime().exec("tskill cqpserver.exe"); //$NON-NLS-1$
 						p.waitFor();
 					} catch (IOException e2) {
-						Log.severe(Messages.Toolbox_34+Log.toString(e2));
-						System.out.println(Messages.Toolbox_34+Log.toString(e2));
+						Log.severe(TXMCoreMessages.Toolbox_34+Log.toString(e2));
+						System.out.println(TXMCoreMessages.Toolbox_34+Log.toString(e2));
 					} catch (InterruptedException e3) {
 						Log.severe(Log.toString(e3));
 						System.out.println(Log.toString(e3));
@@ -915,7 +850,7 @@
 			}
 		// Mac, Linux
 			else {
-				String cmd = Messages.Toolbox_37 + getParam(CQI_SERVER_PORT) + Messages.Toolbox_38;
+				String cmd = TXMCoreMessages.Toolbox_37 + getParam(CQI_SERVER_PORT) + TXMCoreMessages.Toolbox_38;
 				try {
 					//Process p = Runtime.getRuntime().exec("killall -9 cqpserver"); //$NON-NLS-1$
 					// System.out.println("kill `ps aux | grep cqpserver | awk '/-P "
@@ -934,74 +869,20 @@
 					// + getParam(CQI_SERVER_PORT) + "/ {print $2}'`");
 
 				} catch (Exception e) {
-					Log.severe(Messages.Toolbox_39+cmd+Messages.Toolbox_40+Log.toString(e));
-					System.out.println(Messages.Toolbox_39+cmd+Messages.Toolbox_40+Log.toString(e));
+					Log.severe(TXMCoreMessages.Toolbox_39+cmd+TXMCoreMessages.Toolbox_40+Log.toString(e));
+					System.out.println(TXMCoreMessages.Toolbox_39+cmd+TXMCoreMessages.Toolbox_40+Log.toString(e));
 					org.txm.utils.logger.Log.printStackTrace(e);
 				}
 			}
 	}
 
 	/**
-	 * kill Rserve process.
-	 */
-	private static void killStatEngine() {
-		if ("false".equals(getParam(R_REMOTE))) //$NON-NLS-1$
-			// Windows OS
-			if (OSDetector.isFamilyWindows()) {
-				try {
-					Process p = Runtime.getRuntime().exec(
-							//"taskkill /IM Rserve.exe /F"); //$NON-NLS-1$
-							"cmd /c FOR /F \"tokens=5 delims= \" %P IN ('netstat -ano ^| findstr :6330 ^| findstr LISTENING') DO taskkill /F /PID %P"); //$NON-NLS-1$
-
-					p.waitFor();
-				} catch (IOException e) {
-					Log.severe(Messages.Toolbox_43+Log.toString(e));
-					System.out.println(Messages.Toolbox_43+Log.toString(e));
-					try {
-						Process p = Runtime.getRuntime().exec(
-								//"tskill Rserve.exe"); //$NON-NLS-1$
-								"cmd /c FOR /F \"tokens=5 delims= \" %P IN ('netstat -ano ^| findstr :6330 ^| findstr LISTENING') DO tskill %P"); //$NON-NLS-1$
-						p.waitFor();
-					} catch (IOException e2) {
-						Log.severe(Messages.Toolbox_45+Log.toString(e2));
-						System.out.println(Messages.Toolbox_45+Log.toString(e2));
-						Log.printStackTrace(e2);
-					} catch (InterruptedException e3) {
-						Log.severe(Log.toString(e3));
-						System.out.println(Log.toString(e3));
-						org.txm.utils.logger.Log.printStackTrace(e3);
-					}
-				} catch (InterruptedException e) {
-					Log.severe("Error while closing R: "+e.getLocalizedMessage());
-					System.out.println(Log.toString(e));
-					org.txm.utils.logger.Log.printStackTrace(e);
-				}
-			}
-		// Mac, Linux
-			else {
-				try {
-					Process p = Runtime.getRuntime().exec(
-							"kill -9 `lsof -t -a -c Rserve-bin.so -i :"+getParam(R_PORT)+"`"); //$NON-NLS-1$ //$NON-NLS-2$
-					p.waitFor();
-				} catch (IOException e) {
-					Log.severe(Messages.Toolbox_47+Log.toString(e));
-					System.out.println(Messages.Toolbox_47+Log.toString(e));
-					org.txm.utils.logger.Log.printStackTrace(e);
-				} catch (InterruptedException e) {
-					Log.severe("Error while closing R: "+e.getLocalizedMessage());
-					System.out.println(Log.toString(e));
-					org.txm.utils.logger.Log.printStackTrace(e);
-				}
-			}
-	}
-
-	/**
 	 * Kill process cqpserver and R-serve for windows and unix platform Win :
 	 * taskkill or tskill Unix : pkill.
 	 */
 	static void processKiller() {
 		killSearchEngine();
-		killStatEngine();
+		RStatsEngine.kill();
 	}
 
 	/**
@@ -1012,7 +893,7 @@
 			Toolbox.workspace.save();
 		Toolbox.workspace = null;
 		shutdownSearchEngine();
-		shutdownStatEngine();
+		RStatsEngine.shutdown();
 		state = false;
 	}
 
@@ -1059,20 +940,8 @@
 		}
 	}
 
-	/**
-	 * Shut the toolbox statengine down.
-	 */
-	private static void shutdownStatEngine() {
-		try {
-			RWorkspace.shutdown();
-			killStatEngine();
-			stateStatEngine = false;
-			state = false;
-		} catch (Exception e) {
-			Log.severe("Error while closing R: "+e.getLocalizedMessage());
-		}
-	}
 
+
 	/**
 	 * Restart the toolbox's searchengine.
 	 *
@@ -1107,14 +976,16 @@
 	 */
 	public static boolean restartStatEngine(boolean serverdown) {
 		try {
-			if (!serverdown)
-				shutdownStatEngine();
+			if (!serverdown)	{
+				RStatsEngine.shutdown();
+			}
 
 			//remove results using R
 			CorpusManager cm = CorpusManager.getCorpusManager();
-			for(Corpus corpus : cm.getCorpora())
+			for(Corpus corpus : cm.getCorpora())	{
 				removeRResults(corpus);
-			startStatEngine();
+			}
+			RStatsEngine.start();
 		} catch (Exception e) {
 			Log.severe("Error while restarting R: "+e.getLocalizedMessage());
 		}
@@ -1189,14 +1060,14 @@
 			//System.out.println("maj TBX prop "+key+" with "+props.get(key));
 
 			if (props.get(key) == null) {
-				Log.severe(Messages.Toolbox_2 + key);
+				Log.severe(TXMCoreMessages.Toolbox_2 + key);
 			}
 			else	{
 				properties.put(key, props.get(key));
 			}
 		}
 		Log.setLevel(Level.parse(getParam(LOG_LEVEL)));
-		Log.info(Messages.Toolbox_11 + getSortedPropertiesAsString());
+		Log.info(TXMCoreMessages.Toolbox_11 + getSortedPropertiesAsString());
 	}
 
 	/**
@@ -1262,7 +1133,7 @@
 	 * @return true, if is initialized
 	 */
 	public static boolean isStatEngineInitialized() {
-		return stateStatEngine;
+		return RStatsEngine.isStarted();
 	}
 
 	/**
Index: tmp/org.txm.core/src/java/org/txm/functions/referencer/Referencer.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/referencer/Referencer.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/referencer/Referencer.java	(revision 241)
@@ -56,7 +56,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.functions.Function;
 import org.txm.searchengine.cqp.AbstractCqiClient;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -67,8 +67,8 @@
 import org.txm.searchengine.cqp.corpus.query.Match;
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
-import org.txm.stat.engine.r.RWorkspace;
-import org.txm.stat.engine.r.RWorkspaceException;
+import org.txm.statsengine.r.core.RWorkspace;
+import org.txm.statsengine.r.core.RWorkspaceException;
 import org.txm.utils.logger.Log;
 
 // TODO: Auto-generated Javadoc
@@ -178,7 +178,7 @@
 	 */
 	public boolean getQueryMatches() throws CqiClientException{
 
-		result = this.getCorpus().query(query, Messages.Referencer_1, false);
+		result = this.getCorpus().query(query, TXMCoreMessages.Referencer_1, false);
 		if (result.getNMatch() == 0)
 			return false;
 		matches = result.getMatches();
@@ -567,7 +567,7 @@
 			// if ("UTF-8".equals(encoding)) writer.write('\ufeff'); // UTF-8 BOM
 			toTxt(writer, 0, lines.size() - 1, colseparator, txtseparator);
 		} catch (Exception e) {
-			System.err.println(Messages.Referencer_2 + Log.toString(e));
+			System.err.println(TXMCoreMessages.Referencer_2 + Log.toString(e));
 			return false;
 		}
 		return true;
Index: tmp/org.txm.core/src/java/org/txm/functions/concordances/Concordance.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/concordances/Concordance.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/concordances/Concordance.java	(revision 241)
@@ -44,7 +44,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.annotation.Annotation;
 import org.txm.annotation.AnnotationManager;
 import org.txm.annotation.repository.AnnotationType;
@@ -64,8 +64,8 @@
 import org.txm.searchengine.cqp.corpus.query.Match;
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
-import org.txm.stat.engine.r.RWorkspace;
-import org.txm.stat.engine.r.RWorkspaceException;
+import org.txm.statsengine.r.core.RWorkspace;
+import org.txm.statsengine.r.core.RWorkspaceException;
 import org.txm.utils.logger.Log;
 
 // TODO: Auto-generated Javadoc
@@ -351,7 +351,7 @@
 		try {
 			if (queryResult != null) queryResult.drop();
 		} catch (CqiClientException e) {
-			System.out.println(Messages.Concordance_4+e);
+			System.out.println(TXMCoreMessages.Concordance_4+e);
 		}
 	}
 
@@ -393,7 +393,7 @@
 	 */
 	public List<Line> getLines(int from, int to) throws CqiClientException, IOException, CqiServerError {
 
-		Log.info(Messages.Concordance_6 + (to - from + 1) + Messages.Concordance_7);
+		Log.info(TXMCoreMessages.Concordance_6 + (to - from + 1) + TXMCoreMessages.Concordance_7);
 
 		AnnotationManager am = corpus.getAnnotationManager();
 
@@ -424,7 +424,7 @@
 				}
 			} catch (Exception e) {
 				org.txm.utils.logger.Log.printStackTrace(e);
-				Log.severe(Messages.Concordance_8+e);
+				Log.severe(TXMCoreMessages.Concordance_8+e);
 			}
 		}
 
@@ -597,7 +597,7 @@
 				} else {
 					keywordsTextValues = null;
 					keywordsIdValues = null;
-					Log.warning(Messages.Concordance_1);
+					Log.warning(TXMCoreMessages.Concordance_1);
 				}
 
 				// Since we get the value only for the first word of the
@@ -656,7 +656,7 @@
 						TextId = keywordsTextValues.get(k).get(0);
 						wordids = keywordsIdValues.get(k);
 					} else {
-						TextId = Messages.Concordance_2;
+						TextId = TXMCoreMessages.Concordance_2;
 						wordids = new ArrayList<String>();
 					}
 
@@ -695,7 +695,7 @@
 		}
 		List<Line> res = lines.subList(from, to + 1);// our to is inclusive,
 		// sublist's is exlusive
-		Log.info((to - from + 1) + Messages.Concordance_3
+		Log.info((to - from + 1) + TXMCoreMessages.Concordance_3
 				+ (System.currentTimeMillis() - start) + "ms"); //$NON-NLS-1$ 
 		return res;
 	}
@@ -850,7 +850,7 @@
 			// TODO Auto-generated catch block
 			org.txm.utils.logger.Log.printStackTrace(e);
 		} catch (Exception e) {
-			System.err.println(Messages.Concordance_12 + e);
+			System.err.println(TXMCoreMessages.Concordance_12 + e);
 			Log.printStackTrace(e);
 			return false;
 		} 
@@ -871,7 +871,7 @@
 					new FileOutputStream(outfile), "UTF-8")); //$NON-NLS-1$
 			toTxt(writer, 0, nLines - 1, format, "\t",""); //$NON-NLS-1$ //$NON-NLS-2$
 		} catch (Exception e) {
-			System.err.println(Messages.Concordance_12 + e);
+			System.err.println(TXMCoreMessages.Concordance_12 + e);
 			Log.printStackTrace(e);
 			return false;
 		}
@@ -966,15 +966,15 @@
 		if (format == Format.CONTEXT) {
 			keyColSeparator = "";
 			writer.write(
-					txtseparator+Messages.Concordance_17+txtseparator
-					+ colseparator+txtseparator+Messages.Concordance_19+txtseparator
+					txtseparator+TXMCoreMessages.Concordance_17+txtseparator
+					+ colseparator+txtseparator+TXMCoreMessages.Concordance_19+txtseparator
 					+ "\n"); //$NON-NLS-1$
 		} else {
 			writer.write(
-					addTxtSep(Messages.Concordance_13, txtseparator)+colseparator
-					+ addTxtSep(Messages.Concordance_14, txtseparator)+colseparator
-					+ addTxtSep(Messages.Concordance_15, txtseparator)+colseparator
-					+ addTxtSep(Messages.Concordance_16, txtseparator)
+					addTxtSep(TXMCoreMessages.Concordance_13, txtseparator)+colseparator
+					+ addTxtSep(TXMCoreMessages.Concordance_14, txtseparator)+colseparator
+					+ addTxtSep(TXMCoreMessages.Concordance_15, txtseparator)+colseparator
+					+ addTxtSep(TXMCoreMessages.Concordance_16, txtseparator)
 					+ "\n"); //$NON-NLS-1$
 		}
 
@@ -1225,7 +1225,7 @@
 	 * @return a generated name of the concordance with the corpus and the query
 	 */
 	public String getName() {
-		return Messages.Concordance_18 + corpus.getName()
+		return TXMCoreMessages.Concordance_18 + corpus.getName()
 				+ ":" //$NON-NLS-1$
 				+ queryResult.getQuery().getQueryString();
 	}
Index: tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/LexicographicLeftContextComparator.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/LexicographicLeftContextComparator.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/LexicographicLeftContextComparator.java	(revision 241)
@@ -33,7 +33,7 @@
 import org.txm.functions.concordances.Concordance;
 import org.txm.functions.concordances.Line;
 import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -43,7 +43,7 @@
 		StringListBasedComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = Messages.LexicographicLeftContextComparator_0;
+	private static final String NAME = TXMCoreMessages.LexicographicLeftContextComparator_0;
 	private Concordance conc;
 	private List<Property> props;
 
Index: tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/CompositeComparator.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/CompositeComparator.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/CompositeComparator.java	(revision 241)
@@ -31,7 +31,7 @@
 
 import org.txm.functions.concordances.Line;
 import org.txm.searchengine.cqp.corpus.Corpus;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -102,7 +102,7 @@
 	 */
 	public void setComparators(List<LineComparator> comp) {
 		this.comparators = comp;
-		this.name = Messages.CompositeComparator_0;
+		this.name = TXMCoreMessages.CompositeComparator_0;
 		for(LineComparator c: comp)
 			this.name += c.getName()+" "; //$NON-NLS-1$
 		}
Index: tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/LexicographicRightContextComparator.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/LexicographicRightContextComparator.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/LexicographicRightContextComparator.java	(revision 241)
@@ -33,7 +33,7 @@
 import org.txm.functions.concordances.Concordance;
 import org.txm.functions.concordances.Line;
 import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -43,7 +43,7 @@
 		StringListBasedComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = Messages.LexicographicRightContextComparator_0;
+	private static final String NAME = TXMCoreMessages.LexicographicRightContextComparator_0;
 	private Concordance conc;
 	private List<Property> props;
 
Index: tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/LexicographicKeywordComparator.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/LexicographicKeywordComparator.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/LexicographicKeywordComparator.java	(revision 241)
@@ -33,7 +33,7 @@
 import org.txm.functions.concordances.Concordance;
 import org.txm.functions.concordances.Line;
 import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -43,7 +43,7 @@
 public class LexicographicKeywordComparator extends LocalizedLineComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = Messages.LexicographicKeywordComparator_0;
+	private static final String NAME = TXMCoreMessages.LexicographicKeywordComparator_0;
 	private Concordance conc;
 	private List<Property> props;
 
Index: tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/NullComparator.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/NullComparator.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/NullComparator.java	(revision 241)
@@ -28,7 +28,7 @@
 package org.txm.functions.concordances.comparators;
 
 import org.txm.functions.concordances.Line;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -39,7 +39,7 @@
 public class NullComparator extends LocalizedLineComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = Messages.NullComparator_0;
+	private static final String NAME = TXMCoreMessages.NullComparator_0;
 
 	/**
 	 * Instantiates a new null comparator.
Index: tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/PropertiesReferenceComparator.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/PropertiesReferenceComparator.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/concordances/comparators/PropertiesReferenceComparator.java	(revision 241)
@@ -30,7 +30,7 @@
 import org.txm.functions.Reference;
 import org.txm.functions.concordances.Line;
 import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -39,7 +39,7 @@
 public class PropertiesReferenceComparator extends LocalizedLineComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = Messages.PropertiesReferenceComparator_0;
+	private static final String NAME = TXMCoreMessages.PropertiesReferenceComparator_0;
 
 	//protected Collator collator = Collator.getInstance(new Locale(System.getProperty("user.language"))); //$NON-NLS-1$
 
Index: tmp/org.txm.core/src/java/org/txm/functions/diagnostic/Diagnostic.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/diagnostic/Diagnostic.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/diagnostic/Diagnostic.java	(revision 241)
@@ -42,7 +42,7 @@
 import java.util.Locale;
 
 import org.eclipse.osgi.util.NLS;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.functions.Function;
 import org.txm.objects.Base;
 import org.txm.searchengine.cqp.AbstractCqiClient;
@@ -150,15 +150,15 @@
 			properties = corpus.getProperties();
 			NProperties = properties.size();
 		} catch (CqiClientException e1) {
-			Log.severe(Messages.Diagnostic_1 + corpus.getName()
-					+ Messages.Diagnostic_4);
+			Log.severe(TXMCoreMessages.Diagnostic_1 + corpus.getName()
+					+ TXMCoreMessages.Diagnostic_4);
 			return;
 		}
 		try {
 			T = corpus.getSize();// corpus.getLexicon(corpus.getProperty("id")).nbrOfToken();
 		} catch (CqiClientException e1) {
-			Log.severe(Messages.Diagnostic_6 + corpus.getName()
-					+ Messages.Diagnostic_8);
+			Log.severe(TXMCoreMessages.Diagnostic_6 + corpus.getName()
+					+ TXMCoreMessages.Diagnostic_8);
 			return;
 		} 
 	}
@@ -202,8 +202,8 @@
 		try {
 			structures = corpus.getOrderedStructuralUnits();
 		} catch (CqiClientException e1) {
-			Log.severe(Messages.Diagnostic_1 + corpus.getName()
-					+ Messages.Diagnostic_11);
+			Log.severe(TXMCoreMessages.Diagnostic_1 + corpus.getName()
+					+ TXMCoreMessages.Diagnostic_11);
 			return;
 		}
 		NStructures = structures.size();
@@ -226,7 +226,7 @@
 						.put(sup.getName(), allvalues.size());
 					} catch (Exception e) {
 						ArrayList<String> list = new ArrayList<String>(1);
-						list.add(Messages.Diagnostic_2);
+						list.add(TXMCoreMessages.Diagnostic_2);
 						internalArchitectureProperties.get(su.getName()).put(
 								sup.getName(), list);
 						internalArchitecturePropertiesCounts.get(su.getName())
@@ -247,7 +247,7 @@
 		corpus = partition.getCorpus();
 		this.partition = partition;
 		int T = corpus.getSize();
-		System.out.println(Messages.Diagnostic_12);
+		System.out.println(TXMCoreMessages.Diagnostic_12);
 		int nbParts = partition.getNPart();
 		List<String> partNames = partition.getPartNames();
 		List<Integer> partSizes = new ArrayList<Integer>();
@@ -274,26 +274,26 @@
 				"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>" + //$NON-NLS-1$
 				"</head>" + //$NON-NLS-1$
 				"<body>\n"); //$NON-NLS-1$
-		buff.append("<h2 style'font-family:\"Arial\";'>"+Messages.Diagnostic_3 + this.corpus.getName() + "</h2>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+		buff.append("<h2 style'font-family:\"Arial\";'>"+TXMCoreMessages.Diagnostic_3 + this.corpus.getName() + "</h2>\n"); //$NON-NLS-2$ //$NON-NLS-1$
 		
 		if (corpus.getDescription() != null && corpus.getDescription().length() > 0) {
 			buff.append("<p>"+corpus.getDescription()+"</p>"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		
-		buff.append("<h3 style'font-family:\"Arial\";'>"+Messages.Diagnostic_5+ "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
+		buff.append("<h3 style'font-family:\"Arial\";'>"+TXMCoreMessages.Diagnostic_5+ "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
 
 		
 		
 		// counts
 		buff.append("<ul>\n"); //$NON-NLS-1$
-		buff.append("<li>" + Messages.Diagnostic_7 + T + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
+		buff.append("<li>" + TXMCoreMessages.Diagnostic_7 + T + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
 		buff
-		.append("<li>" + Messages.Diagnostic_9 + (NProperties - 1) + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
-		buff.append("<li>" + Messages.Diagnostic_16 + NStructures + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+		.append("<li>" + TXMCoreMessages.Diagnostic_9 + (NProperties - 1) + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+		buff.append("<li>" + TXMCoreMessages.Diagnostic_16 + NStructures + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
 		buff.append("</ul>\n"); //$NON-NLS-1$
 
 		// Propriétés d'occurrences
-		buff.append("<h3 style'font-family:\"Arial\";'>"+NLS.bind(Messages.Diagnostic_14, maxvalue) + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
+		buff.append("<h3 style'font-family:\"Arial\";'>"+NLS.bind(TXMCoreMessages.Diagnostic_14, maxvalue) + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
 		ArrayList<String> properties = new ArrayList<String>(propertiesValues.keySet());
 		Collections.sort(properties);
 		buff.append("<ul>\n"); //$NON-NLS-1$
@@ -311,7 +311,7 @@
 		buff.append("</ul>\n"); //$NON-NLS-1$
 
 		// Propriété de structures
-		buff.append("<h3 style'font-family:\"Arial\";'>"+NLS.bind(Messages.Diagnostic_22, maxvalue)+"</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+		buff.append("<h3 style'font-family:\"Arial\";'>"+NLS.bind(TXMCoreMessages.Diagnostic_22, maxvalue)+"</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
 		buff.append("<ul>\n"); //$NON-NLS-1$
 		for (String s : internalArchitecture) {
 			StringBuffer subbuffer = new StringBuffer();
@@ -322,7 +322,7 @@
 			
 			subbuffer.append("<li> " + s + "\n<ul>\n"); //$NON-NLS-1$ //$NON-NLS-2$
 			if (internalArchitectureProperties.get(s).keySet().size() == 0)
-				subbuffer.append("<li>"+Messages.Diagnostic_26+"</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
+				subbuffer.append("<li>"+TXMCoreMessages.Diagnostic_26+"</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
 
 			
 			//System.out.println("struct: "+s+" >> "+properties);
@@ -383,14 +383,14 @@
 	public String dump(int maxvalue) {
 		StringBuffer buff = new StringBuffer();
 
-		buff.append(Messages.Diagnostic_40);
-		buff.append(Messages.Diagnostic_41 + String.format(Locale.FRANCE,"%,d", T) + "\n"); //$NON-NLS-1$ 
-		buff.append(Messages.Diagnostic_43 + String.format("%,d", NProperties) + "\n"); //$NON-NLS-1$ 
+		buff.append(TXMCoreMessages.Diagnostic_40);
+		buff.append(TXMCoreMessages.Diagnostic_41 + String.format(Locale.FRANCE,"%,d", T) + "\n"); //$NON-NLS-1$ 
+		buff.append(TXMCoreMessages.Diagnostic_43 + String.format("%,d", NProperties) + "\n"); //$NON-NLS-1$ 
 		/*for (String s : propertiesCounts.keySet())
 			if (!s.equals("id")) //$NON-NLS-1$
 				buff.append(" - " + s + " " + propertiesCounts.get(s) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				*/
-		buff.append(Messages.Diagnostic_49 + String.format("%,d", NStructures) + "\n"); //$NON-NLS-1$ 
+		buff.append(TXMCoreMessages.Diagnostic_49 + String.format("%,d", NStructures) + "\n"); //$NON-NLS-1$ 
 		for (String s : structuresCounts.keySet())
 			buff.append(" - " + s + "\n");//+structuresCounts.get(s)+"\n"); //$NON-NLS-1$ //$NON-NLS-2$
 
@@ -399,7 +399,7 @@
 		 * internalArchitecture)
 		 * buff.append(" - "+s+" "+hierarchieCounts.get(s)+"\n");
 		 */
-		buff.append(Messages.Diagnostic_0);
+		buff.append(TXMCoreMessages.Diagnostic_0);
 		for (String s : internalArchitecture) {
 			buff.append(" - " + s + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 			for (String ps : internalArchitectureProperties.get(s).keySet()) {
Index: tmp/org.txm.core/src/java/org/txm/functions/selection/Selection.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/selection/Selection.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/selection/Selection.java	(revision 241)
@@ -31,7 +31,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.results.TXMResult;
 import org.txm.metadatas.Metadata;
 import org.txm.metadatas.MetadataGroup;
@@ -113,7 +113,7 @@
 	private boolean init() {
 		try {
 			if (corpus.getBase() == null) {
-				System.out.println(Messages.Selection_6+corpus+Messages.Selection_7);
+				System.out.println(TXMCoreMessages.Selection_6+corpus+TXMCoreMessages.Selection_7);
 				return false;
 			}
 			metadatas = corpus.getImportMetadata();
@@ -136,12 +136,12 @@
 					try {
 						StructuralUnitProperty sup = text_su.getProperty(m.id);
 						if (sup == null) {
-							Log.warning(Messages.Selection_8+m.id);
+							Log.warning(TXMCoreMessages.Selection_8+m.id);
 							continue;
 						}
 						allProperties.add(sup);
 					} catch(Exception e) {
-						Log.severe(Messages.Selection_9+e);
+						Log.severe(TXMCoreMessages.Selection_9+e);
 					}
 				}
 			}
@@ -218,8 +218,8 @@
 	 * @throws CqiClientException the cqi client exception
 	 */
 	public void fullDump() throws CqiClientException {
-		System.out.println(Messages.Selection_5);
-		System.out.println(Messages.Corpus_2+corpus);
+		System.out.println(TXMCoreMessages.Selection_5);
+		System.out.println(TXMCoreMessages.Corpus_2+corpus);
 		System.out.println("Text query: "+query); //$NON-NLS-1$
 		System.out.println("Texts ids: "+textids); //$NON-NLS-1$
 		System.out.println("Text positions: "+Arrays.toString(positions)); //$NON-NLS-1$
@@ -443,7 +443,7 @@
 				try {
 					valuesPerMetadata.put(sup.getName(), sup.getValues());
 				} catch (CqiClientException e) {
-					System.out.println(Messages.Selection_26+sup.getFullName());
+					System.out.println(TXMCoreMessages.Selection_26+sup.getFullName());
 					org.txm.utils.logger.Log.printStackTrace(e);
 					return valuesPerMetadata;
 				}
Index: tmp/org.txm.core/src/java/org/txm/functions/ReferencePattern.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/ReferencePattern.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/ReferencePattern.java	(revision 241)
@@ -33,7 +33,7 @@
 
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -141,7 +141,7 @@
 			else
 				title += p.getName()+", "; //$NON-NLS-1$
 		if (title.length() == 0)
-			title = Messages.ReferencePattern_3;
+			title = TXMCoreMessages.ReferencePattern_3;
 		else
 			title = title.substring(0, title.length()-2);
 		return title;
Index: tmp/org.txm.core/src/java/org/txm/functions/internal/InternalView.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/internal/InternalView.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/internal/InternalView.java	(revision 241)
@@ -5,7 +5,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-import org.txm.Messages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.Toolbox;
 import org.txm.core.results.TXMResult;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -49,7 +49,7 @@
 
 		try {
 			if (structProperties.size() > 0) {
-				String str = Messages.InternalView_3;
+				String str = TXMCoreMessages.InternalView_3;
 				for (Property sup : structProperties) {
 					int[] array = {getCurrentSegmentNo()};
 					str += " "+sup.getName()+"="+Toolbox.getCqiClient().struc2Str(sup.getQualifiedName(), array)[0]; //$NON-NLS-1$ //$NON-NLS-2$
@@ -57,10 +57,10 @@
 				return str;
 			}
 		} catch (Exception e) {
-			System.out.println(Messages.InternalView_6+e.getMessage());
+			System.out.println(TXMCoreMessages.InternalView_6+e.getMessage());
 			org.txm.utils.logger.Log.printStackTrace(e);
 		}
-		return Messages.InternalView_7;
+		return TXMCoreMessages.InternalView_7;
 	}
 
 	public HashMap<Property, List<String>> getNext() throws CqiClientException {
Index: tmp/org.txm.core/src/java/org/txm/functions/summary/Summary.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/functions/summary/Summary.java	(revision 240)
+++ tmp/org.txm.core/src/java/org/txm/functions/summary/Summary.java	(revision 241)
@@ -3,8 +3,8 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-import org.txm.Messages;
 import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.results.TXMResult;
 import org.txm.objects.Edition;
 import org.txm.objects.Page;
@@ -142,7 +142,7 @@
 		if (wordids.length == 1 && textids.length == 1) {
 			Text text = corpus.getText(textids[0]);
 			if (text == null) {
-				System.out.println(Messages.Summary_13+textids[0]+Messages.Summary_14);
+				System.out.println(TXMCoreMessages.Summary_13+textids[0]+TXMCoreMessages.Summary_14);
 				return null;
 			}
 
@@ -158,14 +158,14 @@
 				}
 			}
 			if (edition == null) {
-				System.out.println(Messages.Summary_15);
+				System.out.println(TXMCoreMessages.Summary_15);
 				return null;
 			}
 
 			node.wordid = wordids[0];
 			return edition.getPageForWordId(wordids[0]);
 		} else {
-			System.out.println(Messages.Summary_16+Arrays.toString(textids)+Messages.Summary_17+Arrays.toString(wordids));
+			System.out.println(TXMCoreMessages.Summary_16+Arrays.toString(textids)+TXMCoreMessages.Summary_17+Arrays.toString(wordids));
 			return null;
 		}
 	}
Index: tmp/org.txm.index.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.index.rcp/META-INF/MANIFEST.MF	(revision 240)
+++ tmp/org.txm.index.rcp/META-INF/MANIFEST.MF	(revision 241)
@@ -9,7 +9,8 @@
  org.eclipse.ui;bundle-version="3.106.1",
  org.eclipse.core.runtime;bundle-version="3.10.0",
  org.txm.rcp,
- org.txm.r;bundle-version="1.0.0"
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.rcp
 Export-Package: org.txm.index.rcp.adapters,
  org.txm.index.rcp.editors,
  org.txm.index.rcp.handlers
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/ComputeIndex.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/ComputeIndex.java	(revision 240)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/ComputeIndex.java	(revision 241)
@@ -34,22 +34,31 @@
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.Toolbox;
+import org.txm.index.core.functions.Index;
 import org.txm.index.rcp.editors.IndexEditor;
 import org.txm.index.rcp.editors.IndexEditorInput;
 import org.txm.rcpapplication.Messages;
 import org.txm.rcpapplication.StatusLine;
 import org.txm.rcpapplication.TXMWindows;
+import org.txm.rcpapplication.views.corpora.CorporaView;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Partition;
 /**
  * Open the Index Editor.
+ * 
  * @author mdecorde
+ * @author sjacquot
  */
 public class ComputeIndex extends AbstractHandler {
 
-	/** The selection. */
-	private IStructuredSelection selection;
 	
+	
+	// adds a double click listener to the Corpus View
+	static	{
+		CorporaView.addDoubleClickListener(Index.class, ComputeIndex.class);
+	}
+	
+	
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
@@ -57,34 +66,47 @@
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		if (!Toolbox.isSearchEngineInitialized()) return false;
 		
-		selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
-
-		Object s = selection.getFirstElement();
+		IndexEditorInput editorInput = null;
+		boolean initializeFields = false;
+		Object s = ((IStructuredSelection) HandlerUtil.getCurrentSelection(event)).getFirstElement();
+		
+		System.err.println("ComputeIndex.execute(): " + s);
+		
+		// New editor from corpus
 		if (s instanceof Corpus) {
-			final Corpus corpus = (Corpus) s;
-			openEditor(corpus);
-		} else if (s instanceof Partition) {
-			final Partition partition = (Partition) s;
-			openEditor(partition);
+			editorInput = new IndexEditorInput((Corpus) s);
 		}
+		// New editor from partition
+		else if (s instanceof Partition) {
+			editorInput = new IndexEditorInput((Partition) s);
+			initializeFields = true;
+		}
+		// Reopen an existing result
+		else if (s instanceof Index) {
+			editorInput = new IndexEditorInput((Index) s);
+		}
+		openEditor(editorInput, initializeFields);
 
 		return null;
 	}
 	
+	
 	/**
-	 * Create an index from the specified corpus and opens an index editor.
-	 * @param corpus
+	 * Opens the editor with specified input.
+	 * @param editorInput
+	 * @param initializeFields
 	 * @return
 	 */
-	public static boolean openEditor(Corpus corpus) {
+	public static boolean openEditor(IndexEditorInput editorInput, boolean initializeFields) {
 		if (!Toolbox.isSearchEngineInitialized()) return false;
 		
 		IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
-		IndexEditorInput editorInput = new IndexEditorInput(corpus);
 		try {
 			StatusLine.setMessage(Messages.ComputeIndex_0);
 			IndexEditor editor = (IndexEditor) page.openEditor(editorInput, "IndexEditor"); //$NON-NLS-1$
-			//editor.initializeFields();
+			if(initializeFields)	{
+				editor.initializeFields();
+			}
 			return true;
 		} catch (Exception e) {
 			org.txm.rcpapplication.utils.Logger.printStackTrace(e);
@@ -92,23 +114,5 @@
 		return false;
 	}
 	
-	/**
-	 * Create an index from the specified partition and opens an index editor.
-	 * @param partition
-	 * @return
-	 */
-	public static boolean openEditor(Partition partition) {
-		if (!Toolbox.isSearchEngineInitialized()) return false;
-		IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
-		IndexEditorInput editorInput = new IndexEditorInput(partition);
-		try {
-			StatusLine.setMessage(Messages.ComputeIndex_0);
-			IndexEditor editor = (IndexEditor) page.openEditor(editorInput, "IndexEditor"); //$NON-NLS-1$
-			editor.initializeFields();
-			return true;
-		} catch (Exception e) {
-			org.txm.rcpapplication.utils.Logger.printStackTrace(e);
-		}
-		return false;
-	}
+
 }
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages.properties	(revision 0)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages.properties	(revision 241)
@@ -0,0 +1,11 @@
+
+IndexEditor_0  = Index: query is empty
+IndexEditor_1  = ** Failed to compute index
+IndexEditor_10 = CQP error:
+IndexEditor_2  = Index of <{0}> with property: {1} in the corpus: {2}
+IndexEditor_20 = Index of <{0}> with property: {1} in the partition: {2}
+IndexEditor_22 = Couldn't initialize Index table
+IndexEditor_29 = Opening the Index results
+IndexEditor_33 = Computing index
+IndexEditor_8  = Page size:
+IndexEditor_9  = Thresholds: 

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

Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_ru.properties	(revision 0)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_ru.properties	(revision 241)
@@ -0,0 +1,11 @@
+
+IndexEditor_0  = Запрос пуст
+IndexEditor_1  = ** Не удалось вычислить индекс
+IndexEditor_10 = N/A_CQP error:
+IndexEditor_2  = Индекс <{0}> со свойством {1} в корпусе {2}
+IndexEditor_20 = Индекс <{0}> со свойством {1} в корпусе {2}
+IndexEditor_22 = Не удается инициализировать таблицу индекса
+IndexEditor_29 = Открытие таблицы индекса
+IndexEditor_33 = Расчет индекса
+IndexEditor_8  = Число результатов на странице: 
+IndexEditor_9  = Пороги: 

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

Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_fr.properties	(revision 0)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_fr.properties	(revision 241)
@@ -0,0 +1,11 @@
+
+IndexEditor_0  = La requête est vide
+IndexEditor_1  = ** Échec du calcul de l'index
+IndexEditor_10 = Echec de la récupération de la dernière erreur CQP:  
+IndexEditor_2  = Index de <{0}> avec la propriété {1} dans le corpus {2}
+IndexEditor_20 = Index de <{0}> avec la propriété {1} dans la partition {2}
+IndexEditor_22 = Impossible d'initialiser le tableau d'index
+IndexEditor_29 = Ouverture du tableau d'index
+IndexEditor_33 = Calcul de l'index
+IndexEditor_8  = Résultats par page : 
+IndexEditor_9  = Seuils : 

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

Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java	(revision 0)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java	(revision 241)
@@ -0,0 +1,30 @@
+package org.txm.index.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.core.messages.TXMCoreMessages;
+
+public class IndexUIMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.index.rcp.messages.messages"; //$NON-NLS-1$
+
+	
+	public static String IndexEditor_0;
+	public static String IndexEditor_1;
+	public static String IndexEditor_10;
+	public static String IndexEditor_2;
+	public static String IndexEditor_20;
+	public static String IndexEditor_22;
+	public static String IndexEditor_29;
+	public static String IndexEditor_33;
+	public static String IndexEditor_8;
+	public static String IndexEditor_9;
+
+	
+	static {
+		// initialize resource bundle
+		TXMCoreMessages.initializeMessages(BUNDLE_NAME, IndexUIMessages.class);
+	}
+
+	private IndexUIMessages() {
+	}
+}

Property changes on: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

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 240)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 241)
@@ -70,9 +70,11 @@
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.index.core.functions.Index;
 import org.txm.index.core.functions.Line;
 import org.txm.index.core.functions.LineComparator.SortMode;
+import org.txm.index.rcp.messages.IndexUIMessages;
 import org.txm.rcp.editors.TXMEditorPart;
 import org.txm.rcpapplication.JobsTimer;
 import org.txm.rcpapplication.Messages;
@@ -88,14 +90,13 @@
 import org.txm.rcpapplication.swt.widget.PropertiesSelector;
 import org.txm.rcpapplication.utils.JobHandler;
 import org.txm.rcpapplication.views.QueriesView;
-import org.txm.rcpapplication.views.RVariablesView;
-import org.txm.rcpapplication.views.corpora.CorporaView;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Partition;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
 import org.txm.searchengine.cqp.corpus.query.Query;
+import org.txm.statsengine.r.rcp.views.RVariablesView;
 import org.txm.utils.logger.Log;
 // TODO: Auto-generated Javadoc
 /**
@@ -253,14 +254,14 @@
 	 * Compute index.
 	 */
 	public void compute() {
-		StatusLine.setMessage(Messages.IndexEditor_33);
+		StatusLine.setMessage(IndexUIMessages.IndexEditor_33);
 		final Query query; // if the query is empty then we put "[]" instead
 		if (queryWidget.isDisposed()) { // lexicon editor
 			query = new Query("[]"); //$NON-NLS-1$
 		} else if (!queryWidget.getQueryString().equals("\"\"")) { //$NON-NLS-1$
 			query = new Query(queryWidget.getQueryString());
 		} else {
-			System.err.println(Messages.IndexEditor_0);
+			System.err.println(IndexUIMessages.IndexEditor_0);
 			return;
 		}
 
@@ -270,10 +271,10 @@
 		final List<Property> properties = propsArea.getProperties();
 		//System.out.println("PROPERTIES: "+properties);
 		try {
-			title = NLS.bind(Messages.IndexEditor_2, new Object[]{
+			title = NLS.bind(IndexUIMessages.IndexEditor_2, new Object[]{
 					query.getQueryString(), properties, corpus.getName()});
 			if (partition != null)
-				title = NLS.bind(Messages.IndexEditor_20, new Object[]{
+				title = NLS.bind(IndexUIMessages.IndexEditor_20, new Object[]{
 						query.getQueryString(), properties, corpus.getName()});
 
 			JobHandler jobhandler = new JobHandler(title, go.getParent()) {
@@ -304,7 +305,7 @@
 							return Status.CANCEL_STATUS;
 
 						if (index == null) {
-							StatusLine.setMessage(Messages.IndexEditor_1);
+							StatusLine.setMessage(IndexUIMessages.IndexEditor_1);
 							return Status.CANCEL_STATUS;
 						}
 						Log.info("Filtering Fmin="+Fmin+" and Fmax="+Fmax);
@@ -334,13 +335,16 @@
 //						}
 						this.releaseSemaphore();
 
+						
+						getEditorInput().setResult(index);
+						
 						final String message;
 						if (index.getV() == 1)
 							message= (Messages.ConcordancesEditor_52);
 						else if (index.getV() > 0)
-							message= (Messages.bind(Messages.CreatePartition_55, index.getV(), index.getT()));
+							message = (Messages.bind(Messages.CreatePartition_55, index.getV(), index.getT()));
 						else
-							message= (Messages.IndexEditor_31);
+							message = (TXMCoreMessages.COMPUTE_DONE_NO_RESULT);
 
 						if (monitor.isCanceled())
 							return Status.CANCEL_STATUS;
@@ -354,13 +358,10 @@
 								System.out.println(message);
 								StatusLine.setMessage(message);
 
-								CorporaView.refreshObject(index.getParent());
+								refreshCorporaView();
+								
 								QueriesView.refresh();
 								RVariablesView.refresh();
-								if (partition != null)
-									setPartName(partition.getName()+": "+index.getName()); //$NON-NLS-1$
-								else
-									setPartName(corpus.getName()+": "+index.getName()); //$NON-NLS-1$
 
 								if (!queryWidget.isDisposed()) queryWidget.memorize();
 								nblinesperpage = NLignePPageSpinner.getSelection();
@@ -379,7 +380,7 @@
 						try {
 							System.out.println(Messages.LastCQPError+Toolbox.getCqiClient().getLastCQPError());
 						} catch (Exception e1) {
-							System.out.println(Messages.IndexEditor_10+e1);
+							System.out.println(IndexUIMessages.IndexEditor_10+e1);
 							org.txm.rcpapplication.utils.Logger.printStackTrace(e1);
 						}
 						Log.severe("Error while computing Index with "+query+" query: "+e.getLocalizedMessage());
@@ -506,7 +507,7 @@
 		// | Query: [ (v)] [Search] |
 		// Query:
 		queryLabel = new Label(queryArea, SWT.NONE);
-		queryLabel.setText(Messages.IndexEditor_3);
+		queryLabel.setText(TXMCoreMessages.QUERY_1);
 		queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false,
 				true));
 
@@ -546,7 +547,7 @@
 
 		//propsArea
 		go = new Button(queryArea, SWT.BOLD);
-		go.setText(Messages.IndexEditor_4);
+		go.setText(Messages.SEARCH);
 
 		Font f = go.getFont();
 		FontData defaultFont = f.getFontData()[0];
@@ -595,11 +596,11 @@
 		filtercontrols.setLayout(gridLayout);
 
 		Label tmp = new Label(filtercontrols, SWT.NONE);
-		tmp.setText(Messages.IndexEditor_9);
+		tmp.setText(IndexUIMessages.IndexEditor_9);
 		tmp.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		Label lFmin = new Label(filtercontrols, SWT.NONE);
-		lFmin.setText(Messages.IndexEditor_5);
+		lFmin.setText(TXMCoreMessages.FMIN_1);
 		lFmin.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		FminSpinner = new Spinner(filtercontrols, SWT.BORDER);
@@ -611,7 +612,7 @@
 		FminSpinner.addKeyListener(listener);
 
 		Label lFmax = new Label(filtercontrols, SWT.NONE);
-		lFmax.setText(Messages.IndexEditor_6);
+		lFmax.setText(TXMCoreMessages.FMAX_1);
 		lFmax.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		FmaxSpinner = new Spinner(filtercontrols, SWT.BORDER);
@@ -623,7 +624,7 @@
 		FmaxSpinner.addKeyListener(listener);
 
 		Label lVmax = new Label(filtercontrols, SWT.NONE);
-		lVmax.setText(Messages.IndexEditor_7);
+		lVmax.setText(TXMCoreMessages.VMAX_1);
 		lVmax.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		TmaxSpinner = new Spinner(filtercontrols, SWT.BORDER);
@@ -636,7 +637,7 @@
 		TmaxSpinner.addKeyListener(listener);
 
 		Label lNLigneppage = new Label(filtercontrols, SWT.NONE);
-		lNLigneppage.setText(Messages.IndexEditor_8);
+		lNLigneppage.setText(IndexUIMessages.IndexEditor_8);
 		lNLigneppage.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		NLignePPageSpinner = new Spinner(filtercontrols, SWT.BORDER);
@@ -852,7 +853,7 @@
 		unitColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.IndexEditor_36);
+				StatusLine.setMessage(Messages.SORT_COLUMN);
 				if (viewer.getTable().getSortColumn() != unitColumn) {
 					viewer.getTable().setSortColumn(unitColumn);
 					viewer.getTable().setSortDirection(SWT.UP);
@@ -867,7 +868,7 @@
 					}
 				}
 
-				StatusLine.setMessage(Messages.IndexEditor_37);
+				StatusLine.setMessage(Messages.SORT_DONE);
 				fillDisplayArea(topLine, bottomLine);
 			}
 
@@ -904,7 +905,7 @@
 						index.sortLines(SortMode.FREQUNIT, false);
 					}
 				}
-				StatusLine.setMessage(Messages.IndexEditor_37);
+				StatusLine.setMessage(Messages.SORT_DONE);
 				fillDisplayArea(topLine, bottomLine);
 			}
 
@@ -1044,10 +1045,6 @@
 			this.FminSpinner.setSelection(index.getFilterFmin());
 			this.FmaxSpinner.setSelection(index.getFilterFmax());
 
-			if (index.getPartition() != null)
-				setPartName(index.getPartition().getName()+": "+index.getName()); //$NON-NLS-1$
-			else
-				setPartName(index.getCorpus().getName()+": "+index.getName()); //$NON-NLS-1$
 			queryWidget.setFocus();
 
 			index.filterLines(index.getFilterFmin(), index
@@ -1064,13 +1061,9 @@
 			this.FminSpinner.setSelection(1);
 			this.FmaxSpinner.setSelection(9999999);
 
-			if (partition != null)
-				setPartName(Messages.ObjectExplorer_9 + partition.getName());
-			else
-				setPartName(Messages.ObjectExplorer_9 + corpus.getName());
 			queryWidget.setFocus();
 		} else {
-			System.err.println(Messages.IndexEditor_22);
+			System.err.println(IndexUIMessages.IndexEditor_22);
 		}
 		initializing = false;
 	}
@@ -1098,10 +1091,10 @@
 		navigationArea.setNextEnabled(to < index.getV());
 		navigationArea.setLastEnabled(to < index.getV());
 
-		lFminInfo.setText(Messages.IndexEditor_25 + index.getFmin());
-		lFmaxInfo.setText(Messages.IndexEditor_26 + index.getFmax());
-		lTInfo.setText(Messages.IndexEditor_27 + index.getT());
-		lVInfo.setText(Messages.IndexEditor_28 + index.getV());
+		lFminInfo.setText(TXMCoreMessages.FMIN_2 + index.getFmin());
+		lFmaxInfo.setText(TXMCoreMessages.FMAX_2 + index.getFmax());
+		lTInfo.setText(TXMCoreMessages.T + index.getT());
+		lVInfo.setText(TXMCoreMessages.V + index.getV());
 
 		lVInfo.getParent().layout();
 
@@ -1133,7 +1126,7 @@
 	public void setFocus() {
 		if (!this.queryWidget.isDisposed())
 			this.queryWidget.setFocus();
-		StatusLine.setMessage(Messages.IndexEditor_29);
+		StatusLine.setMessage(IndexUIMessages.IndexEditor_29);
 	}
 
 	/**
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditorInput.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditorInput.java	(revision 240)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditorInput.java	(revision 241)
@@ -43,9 +43,6 @@
 	/** The corpus. */
 	protected Corpus corpus;
 	
-	/** The index. */
-	protected Index index;
-	
 	/** The partition. */
 	protected Partition partition;
 
@@ -87,7 +84,6 @@
 		super(index);
 		this.corpus = corpus;
 		this.partition = partition;
-		this.index = index;
 	}
 	
 	/**
@@ -114,8 +110,9 @@
 	 * @return the index
 	 */
 	public Index getIndex() {
-		return index;
+		return (Index) this.result;
 	}
 
 
+
 }
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 240)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages.properties	(revision 241)
@@ -1,2 +1,6 @@
-IndexEditor_17=Index\:\n\tPartition {0}\n\tquery {1}\n\tproperties {2}\n\tFmin {3}\n\tFmax {4}
-IndexEditor_18=Index\:\n\tCorpus {0}\n\tquery {1}\n\tproperties {2}\n\tFmin {3}\n\tFmax {4}
\ No newline at end of file
+
+DetailsFromCorpus = Index:\n\	Corpus {0}\n\	query {1}\n\	properties {2}\n\	Fmin {3}\n\	Fmax {4}
+
+DetailsFromPartition = Index:\n\	Partition {0}\n\	query {1}\n\	properties {2}\n\	Fmin {3}\n\	Fmax {4}
+
+RESULT_TYPE = Index
Index: tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java	(revision 240)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java	(revision 241)
@@ -8,9 +8,11 @@
 	private static final String BUNDLE_NAME = "org.txm.index.core.messages.messages"; //$NON-NLS-1$
 
 	
-	public static String IndexEditor_17;
-	public static String IndexEditor_18;
+	public static String DetailsFromPartition;
+	public static String DetailsFromCorpus;
 	
+	
+	public static String RESULT_TYPE;
 
 	
 	static {
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 240)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_ru.properties	(revision 241)
@@ -1,2 +1,6 @@
-IndexEditor_17=Индекс:\n\tРаспределение {0}\n\tЗапрос {1}\n\tсвойства {2}\n\tFmin {3}\n\tFmax {4}
-IndexEditor_18=Индекс:\n\tКорпус {0}\n\tЗапрос {1}\n\tсвойства {2}\n\tFmin {3}\n\tFmax {4}
\ No newline at end of file
+
+DetailsFromCorpus = Индекс:\n\	Корпус {0}\n\	Запрос {1}\n\	свойства {2}\n\	Fmin {3}\n\	Fmax {4}
+
+DetailsFromPartition = Индекс:\n\	Распределение {0}\n\	Запрос {1}\n\	свойства {2}\n\	Fmin {3}\n\	Fmax {4}
+
+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 240)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_fr.properties	(revision 241)
@@ -1,2 +1,6 @@
-IndexEditor_17=Index\:\n\tPartition {0}\n\tRequ\u00EAte {1}\n\tpropriétés {2}\n\tFmin {3}\n\tFmax {4}
-IndexEditor_18=Index\:\n\tCorpus {0}\n\tRequ\u00EAte {1}\n\tpropriétés {2}\n\tFmin {3}\n\tFmax {4}
\ No newline at end of file
+
+DetailsFromCorpus = Index:\n\	Corpus {0}\n\	Requête {1}\n\	propriétés {2}\n\	Fmin {3}\n\	Fmax {4}
+
+DetailsFromPartition = Index:\n\	Partition {0}\n\	Requête {1}\n\	propriétés {2}\n\	Fmin {3}\n\	Fmax {4}
+
+RESULT_TYPE = Index
Index: tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 240)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 241)
@@ -42,8 +42,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.osgi.util.NLS;
-import org.txm.Messages;
 import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.functions.Function;
 import org.txm.index.core.messages.IndexCoreMessages;
 import org.txm.searchengine.cqp.ICqiClient;
@@ -59,8 +59,8 @@
 import org.txm.searchengine.cqp.corpus.query.Match;
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
-import org.txm.stat.engine.r.RWorkspace;
-import org.txm.stat.engine.r.RWorkspaceException;
+import org.txm.statsengine.r.core.RWorkspace;
+import org.txm.statsengine.r.core.RWorkspaceException;
 import org.txm.utils.logger.Log;
 
 // TODO: Auto-generated Javadoc
@@ -620,7 +620,7 @@
 		try {
 			toTxt(outfile, 0, lines.size(), encoding, colseparator, txtseparator);
 		} catch (Exception e) {
-			System.err.println(Messages.Index_7 + Log.toString(e));
+			System.err.println(TXMCoreMessages.Index_7 + Log.toString(e));
 			return false;
 		}
 		return true;
@@ -728,7 +728,7 @@
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 */
 	public void toConsole() throws CqiClientException, IOException {
-		System.out.println(Messages.Index_1 + (lines.size()));
+		System.out.println(TXMCoreMessages.Index_1 + (lines.size()));
 		toConsole(0, lines.size());
 	}
 
@@ -1047,13 +1047,18 @@
 
 	@Override
 	public String getName() {
-		return "Index: " + this.getSimpleName();
+		try {
+			return IndexCoreMessages.RESULT_TYPE + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();	
+		}
+		catch(Exception e) {
+		}
+		return "";
 	}
 	
 	@Override
 	public String getSimpleName() {
 		try {
-			String name = query.getQueryString() + ":"; //$NON-NLS-1$
+			String name = query.getQueryString() + ": "; //$NON-NLS-1$
 			for (Property s : props)	{
 				name += s + propSeparator;
 			}
@@ -1073,10 +1078,10 @@
 			Object[] params = new Object[]{this.parent.getSimpleName(), this.getQuery().getQueryString(), this.getProperties(), this.getFmin(), this.getFmax()}; 
 			String str;
 			if(this.parent instanceof Partition)	{
-				str = IndexCoreMessages.IndexEditor_17;
+				str = IndexCoreMessages.DetailsFromPartition;
 			}
 			else	{
-				str = IndexCoreMessages.IndexEditor_18;
+				str = IndexCoreMessages.DetailsFromCorpus;
 			}
 			return NLS.bind(str, params);
 		}
@@ -1084,31 +1089,6 @@
 			return "";
 		}
 	}
+
 	
-//	@Override
-//	public boolean delete() {
-//		return getParent().removeResult(this);
-//	}
-//	
-//	ArrayList<Object> results = new ArrayList<Object>();
-//	@Override
-//	public List<Object> getResults() {
-//		return results;
-//	}
-//
-//	@Override
-//	public boolean removeResult(Object result) {
-//		return results.remove(result);
-//	}
-//
-//	@Override
-//	public List<HasResults> getSubHasResults() {
-//		return new ArrayList<HasResults>();
-//	}
-//
-//	@Override
-//	public void storeResult(Object result) {
-//		results.add(result);
-//	}
-	
 }
Index: tmp/org.txm.index.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.index.core/META-INF/MANIFEST.MF	(revision 240)
+++ tmp/org.txm.index.core/META-INF/MANIFEST.MF	(revision 241)
@@ -3,13 +3,13 @@
 Bundle-Name: Index Core
 Bundle-SymbolicName: org.txm.index.core
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.r;bundle-version="1.0.0",
+Require-Bundle: org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.eclipse.core.runtime,
  org.txm.core;bundle-version="0.7.0",
  org.txm.utils;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.index.core.functions,
+ org.txm.index.core.messages,
  org.txm.macro.r,
  org.txm.test
-Import-Package: org.txm.stat.engine.r
