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 1357)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 1358)
@@ -156,7 +156,7 @@
 	public static String print2; 
 	public static String failedToExec; 
 	public static String dDot; 
-	public static String connected; 
+	public static String connectedToCQP; 
 	public static String errorDuringWorkspaceInitializationDDot; 
 	public static String errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat; 
 	public static String queryWasDDot; 
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 1357)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties	(revision 1358)
@@ -1,4 +1,4 @@
-#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
+#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
 #TXM messages generated by the PluginMessagesManager class
 #Mon Nov 12 17:18:22 CET 2018
 
@@ -41,7 +41,7 @@
 
 computingDDot = Calcul: 
 
-connected = connecté.
+connectedToCQP = Connecté à CQP.
 
 corpusDDot = Corpus : 
 
@@ -69,7 +69,7 @@
 
 encodingDDot = , Encodage : 
 
-endOfCQPWaitTest = Fin du test d'attente de CQP
+endOfCQPWaitTest = Fin du test d'attente de CQP.
 
 errorConfigdirDirDDot = Erreur dans le dossier de configuration : 
 
@@ -83,11 +83,11 @@
 
 errorDDotSkippingTheLoadingOfCorpusDDot = Erreur : le corpus ne sera pas chargé
 
-errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat = ** La connexion au moteur de recherche a échoué : le port fourni en paramètre n'est pas un nombre entier
+errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat = ** La connexion au moteur de recherche a échoué : le port fourni en paramètre n'est pas un nombre entier: {0}.
 
 errorDDotThisExceptionShouldNotBeThrown = ** Erreur : Cette exception ne devrait pas se lever
 
-errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot = ** Echec de connexion au moteur de recherche avec les paramètres suivants : 
+errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot = ** Echec de connexion au moteur de recherche avec les paramètres suivants : {0} et {1}.
 
 errorDuringWorkspaceInitializationDDot = ** Echec de l'initialisation de l'espace de travail : 
 
@@ -99,7 +99,7 @@
 
 errorWhileGettingMetadatasFromBaseimportMetadatasDDot = Erreur lors de la récupération des metadonnées du corpus
 
-errorWhileWaitingForCQP = ** Échec du test d'attente de CQP : 
+errorWhileWaitingForCQP = ** Échec du test d'attente de CQP : {0}.
 
 error_error                                                                          = ** Erreur : {0}.
 error_error2                                                                         = Erreur
@@ -111,11 +111,11 @@
 
 failedToCreatePartDDot = ** Echec de la création de la partie :
 
-failedToExec = Echec de l'exécution de '
+failedToExec = Echec de l'exécution de '{0} : {1}.
 
-failedToExecTaskkillIMCqpserverexeFDDot = Echec de la commande 'taskkill /IM cqpserver.exe /F': 
+failedToExecTaskkillIMCqpserverexeFDDot = Echec de la commande 'taskkill /IM cqpserver.exe /F': {0}.
 
-failedToExecTskillCqpserverexeDDot = Echec de la commande 'tskill cqpserver.exe': 
+failedToExecTskillCqpserverexeDDot = Echec de la commande 'tskill cqpserver.exe': {0}.
 
 failedToGetLastCQPErrorDDot = Erreur lors de la récupération de la dernière erreur CQP : 
 
@@ -127,7 +127,7 @@
 
 failedToRestoreSubcorpus = ** Echec de la restauration du sous-corpus
 
-failedToStartMemCqiClientDDot = Erreur lors du démarage du mode mémoire de CQP
+failedToStartMemCqiClientDDot = Erreur lors du démarage du mode mémoire de CQP.
 
 file = ** Le fichier 
 
@@ -179,7 +179,7 @@
 
 numberOfSubMatch = Nombre de sous graph
 
-orTheEngineWasNotStartedWithTheCommandLineDDot = - ou le moteur de recherche n'a pas été lancé avec la ligne de commande : 
+orTheEngineWasNotStartedWithTheCommandLineDDot = Le démarrage du serveur CQI a échoué avec la ligne de commande : {0}.
 
 pARAMSDDot = Paramètres : 
 
@@ -235,6 +235,6 @@
 
 workspaceDDot = \ Espace de travail : 
 
-wrongLoginOrPasswordOrPortDDot = - mauvais login/mot de passe/nom de machine/port :
+wrongLoginOrPasswordOrPortDDot = Mauvais login, mot de passe, nom de machine ou port dans : {0} {1} {2} {3}.
 
 xmlValidationDDot = Validation XML : 
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 1357)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties	(revision 1358)
@@ -22,7 +22,7 @@
 common_description               = Description
 common_done                      = Done.
 common_fMax                      = Fmax
-common_fMin                      = Fmin
+common_fMin                      = Fmin
 common_fMinEquals                = Fmin={0}
 common_frequency                 = Frequency
 common_lowestFrequency           = Lowest frequency
@@ -43,7 +43,7 @@
 
 computingDDot = Computing: 
 
-connected = connected
+connectedToCQP = Connected to CQP.
 
 corpusDDot = Corpus: 
 
@@ -71,7 +71,7 @@
 
 encodingDDot = , Encoding: 
 
-endOfCQPWaitTest = End of CQP wait test
+endOfCQPWaitTest = End of CQP waiting test.
 
 errorConfigdirDirDDot = Error configdir dir: 
 
@@ -85,11 +85,11 @@
 
 errorDDotSkippingTheLoadingOfCorpusDDot = Error: skipping the loading of corpus: 
 
-errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat = ** Error : the connexion to the server failed: wrong port format
+errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat = ** Error : the connexion to the server failed: wrong port format: {0}.
 
 errorDDotThisExceptionShouldNotBeThrown = ** Error: This exception should not be thrown
 
-errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot = ** Error : while connection to search engine, with the following parameters: 
+errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot = ** Error while connecting to search engine with the following parameters: {0} and {1}.
 
 errorDuringWorkspaceInitializationDDot = ** Error during workspace initialization:
 
@@ -97,11 +97,11 @@
 
 errorRegDirDDot = Error reg dir: 
 
-errorWhileConnectingToSearchEngine = ** Error while connecting to search engine.
+errorWhileConnectingToSearchEngine = ** Error while connecting CQP server.
 
 errorWhileGettingMetadatasFromBaseimportMetadatasDDot = Error while getting metadatas from Base.importMetadatas: 
 
-errorWhileWaitingForCQP = ** Error while waiting for CQP
+errorWhileWaitingForCQP = ** Error while waiting for CQP: {0}.
 
 error_error                                                                          = ** Error: {0}.
 error_error2                                                                         = Error
@@ -117,11 +117,11 @@
 
 failedToCreatePartDDot = ** Failed to create part: 
 
-failedToExec = Failed to exec '
+failedToExec = Failed to exec '{0}: {1}.
 
-failedToExecTaskkillIMCqpserverexeFDDot = Failed to exec 'taskkill /IM cqpserver.exe /F': 
+failedToExecTaskkillIMCqpserverexeFDDot = Failed to exec 'taskkill /IM cqpserver.exe /F': {0}.
 
-failedToExecTskillCqpserverexeDDot = Failed to exec 'tskill cqpserver.exe': 
+failedToExecTskillCqpserverexeDDot = Failed to exec 'tskill cqpserver.exe': {0}.
 
 failedToGetLastCQPErrorDDot = Failed to get last CQP error: 
 
@@ -133,7 +133,7 @@
 
 failedToRestoreSubcorpus = ** Failed to restore subcorpus 
 
-failedToStartMemCqiClientDDot = Failed to start MemCqiClient: 
+failedToStartMemCqiClientDDot = Failed to start CQP in memory mode.
 
 file = ** File
 
@@ -191,7 +191,7 @@
 
 numberOfSubMatch = Number of sub match 
 
-orTheEngineWasNotStartedWithTheCommandLineDDot = - or the engine was not started with the command line: 
+orTheEngineWasNotStartedWithTheCommandLineDDot = CQI server failed to started with the command line: {0}.
 
 pARAMSDDot = PARAMS: 
 
@@ -249,6 +249,6 @@
 
 workspaceDDot = \ Workspace: 
 
-wrongLoginOrPasswordOrPortDDot = - wrong login or password or port : 
+wrongLoginOrPasswordOrPortDDot = Wrong login, password, host or port in : {0} {1} {2} {3}.
 
 xmlValidationDDot = XmlValidation: 
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java	(revision 1357)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java	(revision 1358)
@@ -27,6 +27,9 @@
 
 public class CQPSearchEngine extends SearchEngine {
 
+	
+	public static final String NAME = "CQP";
+	
 	/**
 	 * initialization state
 	 */
@@ -35,7 +38,7 @@
 
 	@Override
 	public String getName() {
-		return "CQP";
+		return CQPSearchEngine.NAME;
 	}
 
 	/**
@@ -54,7 +57,7 @@
 
 		useNetCQi = CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_NETWORK_MODE);
 
-		Log.warning("Killing CQP and RServe process if any");
+		Log.warning("Killing CQP processes if any.");
 		killSearchEngine();
 
 		boolean remote = CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_SERVER_IS_REMOTE);
@@ -65,7 +68,7 @@
 		String path_separator = System.getProperty("path.separator");
 		File wl = Toolbox.workspace.getLocation();
 		if (wl == null) {
-			System.out.println("Error: Toolbox not correctly initialized. Aborting CQP engine initializing.");
+			System.out.println("Error: Toolbox is not correctly initialized. Aborting CQP engine start...");
 			return false;
 		}
 		for (File binDir : wl.listFiles()) {
@@ -89,7 +92,7 @@
 					try {
 						PatchCwbRegistry.patch(registryFile, dataDirectory);
 					} catch (IOException e) {
-						System.out.println("Error while updating registry file "+registryFile+": "+e);
+						System.out.println(TXMCoreMessages.bind("Error while updating registry file {0}.", registryFile));
 						Log.printStackTrace(e);
 						return false;
 					}
@@ -101,7 +104,7 @@
 
 		String init_path = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE);
 		if (init_path.length() > 0 && !new File(init_path).exists()) {
-			System.out.println("Warning: the given CQP init file path cannot be found: "+init_path);
+			System.out.println(TXMCoreMessages.bind("Warning: the given CQP init file path can not be found in {0}.", init_path));
 			init_path = null;
 		}
 
@@ -122,12 +125,12 @@
 
 				String exec_path = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE);
 
-				if (exec_path == null || exec_path.length() == 0) {
-					System.out.println("Error: the '"+CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE+"' preference is not set.");
+				if (exec_path == null || exec_path.length() == 0 || new File(exec_path).exists()) {
+					System.out.println(TXMCoreMessages.bind("Error: the '{0}' preference is not set.", CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE));
 				}
-				if (new File(exec_path).exists()) {
-					System.out.println("Error: the '"+CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE+"' preference is not set.");
-				}
+//				if (new File(exec_path).exists()) {
+//					System.out.println("Error: the '"+CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE+"' preference is not set.");
+//				}
 
 				cqiServer = new NetCqiServer(exec_path,
 						reg_path, 
@@ -149,7 +152,8 @@
 					try {
 						cqiClient = new MemCqiClient((MemCqiServer) cqiServer);
 					} catch(Exception e) {
-						Log.severe(TXMCoreMessages.failedToStartMemCqiClientDDot+e);
+						Log.severe(TXMCoreMessages.failedToStartMemCqiClientDDot);
+						Log.printStackTrace(e);
 						cqiserverok = false;
 					}
 				} else {
@@ -159,10 +163,10 @@
 				}
 			}
 		} catch (NumberFormatException e1) {
-			Log.severe(TXMCoreMessages.errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
+			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat, CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT))); 
 		} catch (ServerNotFoundException e1) {
-			Log.severe(TXMCoreMessages.errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST)
-					+ TXMCoreMessages.and + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
+			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot, CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST),
+					CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT))); 
 		}
 
 		// try connecting to the CWB server
@@ -179,18 +183,16 @@
 		if (state == false) {
 			System.out.println(TXMCoreMessages.errorWhileConnectingToSearchEngine); 
 			if (cqiClient instanceof NetCqiClient) {
-				System.out.println(TXMCoreMessages.wrongLoginOrPasswordOrPortDDot + 
-						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_LOGIN) + " " + //$NON-NLS-1$
-						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PASSWORD) + 
-						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST) + " " + //$NON-NLS-1$
-						CQPLibPreferences.getInstance().getInt(CQPLibPreferences.CQI_SERVER_PORT));
+				System.out.println(TXMCoreMessages.bind(TXMCoreMessages.wrongLoginOrPasswordOrPortDDot, CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_LOGIN),
+						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PASSWORD), CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST),
+						CQPLibPreferences.getInstance().getInt(CQPLibPreferences.CQI_SERVER_PORT)));
 			}
 			if (cqiServer != null && cqiServer instanceof NetCqiServer) {
-				System.out.println(TXMCoreMessages.orTheEngineWasNotStartedWithTheCommandLineDDot + cqiServer.getLastCmdLine());
+				System.out.println(TXMCoreMessages.bind(TXMCoreMessages.orTheEngineWasNotStartedWithTheCommandLineDDot, cqiServer.getLastCmdLine()));
 			}
 		} else {
 			if (cqiServer == null || cqiServer instanceof NetCqiServer)
-				System.out.println(TXMCoreMessages.connected); 
+				System.out.println(TXMCoreMessages.connectedToCQP); 
 		}
 
 		CorpusManager.setCqiClient(cqiClient);
@@ -211,11 +213,12 @@
 			} while (CorpusManager.getCorpusManager().getCorpora().size() == 0);
 		} catch (Exception e) {
 			org.txm.utils.logger.Log.printStackTrace(e);
-			Log.severe(TXMCoreMessages.errorWhileWaitingForCQP + e);
+			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.errorWhileWaitingForCQP, e));
 		} 
 
+		// FIXME: SJ: this test should be moved at start of this method? before running CQP? 
 		if (Toolbox.workspace == null) {
-			System.out.println("Can't start CQP with workspace not ready.");
+			Log.severe("Can't start CQP with workspace not ready.");
 			return false;
 		}
 
@@ -230,7 +233,7 @@
 //			}
 //		}
 		
-		System.out.println(TXMCoreMessages.common_done);
+		Log.info(TXMCoreMessages.common_done);
 
 		return state;
 	}
@@ -351,8 +354,8 @@
 					p = Runtime.getRuntime().exec("taskkill /IM cqpserver.exe /F"); //$NON-NLS-1$
 					p.waitFor();
 				} catch (IOException e) {
-					Log.severe(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot+Log.toString(e));
-					System.out.println(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot+Log.toString(e));
+					Log.severe(TXMCoreMessages.bind(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot, Log.toString(e)));
+					System.out.println(TXMCoreMessages.bind(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot, Log.toString(e)));
 					try {
 						Process p = Runtime.getRuntime().exec(
 								"tskill cqpserver.exe"); //$NON-NLS-1$
@@ -360,14 +363,17 @@
 						p = Runtime.getRuntime().exec("tskill cqpserver.exe"); //$NON-NLS-1$
 						p.waitFor();
 					} catch (IOException e2) {
-						Log.severe(TXMCoreMessages.failedToExecTskillCqpserverexeDDot+Log.toString(e2));
-						System.out.println(TXMCoreMessages.failedToExecTskillCqpserverexeDDot+Log.toString(e2));
+						e2.printStackTrace();
+						Log.severe(TXMCoreMessages.bind(TXMCoreMessages.failedToExecTskillCqpserverexeDDot, Log.toString(e2)));
+						System.out.println(TXMCoreMessages.bind(TXMCoreMessages.failedToExecTskillCqpserverexeDDot, Log.toString(e2)));
 					} catch (InterruptedException e3) {
+						e3.printStackTrace();
 						Log.severe(Log.toString(e3));
 						System.out.println(Log.toString(e3));
 					}
 				} catch (InterruptedException e) {
-					Log.severe("Error while closing CQP: "+e.getLocalizedMessage());
+					Log.severe(TXMCoreMessages.bind("Error while closing CQP: {0}.", e.getLocalizedMessage()));
+					e.printStackTrace();
 					System.out.println(Log.toString(e));
 				}
 				;
@@ -393,8 +399,8 @@
 					// + CQPPreferences.getInstance().getString(CQI_SERVER_PORT) + "/ {print $2}'`");
 
 				} catch (Exception e) {
-					Log.severe(TXMCoreMessages.failedToExec+cmd+TXMCoreMessages.dDot+Log.toString(e));
-					System.out.println(TXMCoreMessages.failedToExec+cmd+TXMCoreMessages.dDot+Log.toString(e));
+					Log.severe(TXMCoreMessages.bind(TXMCoreMessages.failedToExec, cmd, Log.toString(e)));
+					System.out.println(TXMCoreMessages.bind(TXMCoreMessages.failedToExec, cmd, Log.toString(e)));
 					org.txm.utils.logger.Log.printStackTrace(e);
 				}
 			}
@@ -412,7 +418,7 @@
 			ret = ret && start(null);
 			return ret;
 		} catch (Exception e) {
-			Log.severe("Error while restarting CQP: "+e.getLocalizedMessage());
+			Log.severe(TXMCoreMessages.bind("Error while restarting CQP: {0}.", e.getLocalizedMessage()));
 		}
 		return false;
 	}
@@ -423,7 +429,7 @@
 	 * @return true, if is initialized
 	 */
 	public static boolean isInitialized() {
-		return Toolbox.getEngineManager(EngineType.SEARCH).getEngine("CQP").isRunning();
+		return Toolbox.getEngineManager(EngineType.SEARCH).getEngine(CQPSearchEngine.NAME).isRunning();
 	}
 
 	@Override
@@ -442,7 +448,7 @@
 
 	@Override
 	public Query newQuery() {
-		return new CQLQuery("");
+		return new CQLQuery(""); //$NON-NLS-1$
 	}
 
 	@Override
@@ -465,6 +471,6 @@
 	}
 
 	public static CQPSearchEngine getEngine() {
-		return (CQPSearchEngine) Toolbox.getEngineManager(EngineType.SEARCH).getEngine("CQP");
+		return (CQPSearchEngine) Toolbox.getEngineManager(EngineType.SEARCH).getEngine(CQPSearchEngine.NAME);
 	}
 }
\ No newline at end of file
