Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties	(revision 1341)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties	(revision 1342)
@@ -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
 
@@ -149,7 +149,7 @@
 
 corpusNameOnlyCapsAndNoDigitAtBeginning = Имя корпуса*
 
-couldNotCreateBackupDirectoryDDot = ** Ошибка: не удалсоь создать папку для сохранения корпуса
+couldNotCreateBackupDirectoryDDot = ** Ошибка: не удалсоь создать папку для сохранения корпуса: {0}.
 
 couldNotFindDirectoryDDotP0 = ** Библиография: не удается найти папку {0}
 
@@ -157,7 +157,7 @@
 
 couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator = Не удается запустить встроенные браузер. Вы должны отрегулировать соответствующий параметр в Настройках, с помощью меню Общие / Веб браузер
 
-couldNotReadInstallPreferencesFile = ** Ошибка чтения файла опций установки
+couldNotReadInstallPreferencesFile = ** Ошибка чтения файла опций установки: {0}.
 
 couldNotUnzipBinaryCorpusDDot = ** Не удалось загрузить бинарный корпус: {0}
 
@@ -175,7 +175,7 @@
 
 creatingASubcorpusOnP0 = Создать новый подокорпус для {0}
 
-creatingTXMUserWorkingDirectory = Создание рабочего пространства пользователя TXM.
+creatingTXMUserWorkingDirectory = Создание рабочего пространства пользователя TXM...
 
 dDot = : 
 
@@ -313,7 +313,7 @@
 
 extractingBinaryCorpus = Извлечение бинарного корпуса
 
-failedToBackupExistingCorporaDDot = ** Невозможно сохранить существующие корпусы:
+failedToBackupExistingCorporaDDot = ** Невозможно сохранить существующие корпусы: {0}.
 
 failedToCancel = N/A_Failed to cancel 
 
@@ -337,7 +337,7 @@
 
 failedToLoadCorpusP0 = ** Не удалось загрузить корпус {0}
 
-failedToMoveCorpus = ** Невозможно перенести корпус 
+failedToMoveCorpus = ** Невозможно перенести корпус {0} to {1}.
 
 failedToRename = ** Не удалось переименовать 
 
@@ -661,7 +661,7 @@
 
 startsWith = начинается с
 
-startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Запуск платформы прерван. Пожалуйста, отрегулируйте опции (в меню 'Файл>Опции')
+startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Запуск платформы прерван. Пожалуйста, отрегулируйте опции (в меню 'Файл>Опции'): {0}.
 
 string = Цепочка знаков
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 1341)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 1342)
@@ -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
 
@@ -177,7 +177,7 @@
 
 corpusNameOnlyCapsAndNoDigitAtBeginning = Nom du corpus* (majuscules et pas de chiffre en début)
 
-couldNotCreateBackupDirectoryDDot = ** Échec : le dossier de sauvegarde des corpus n'a pas pu être créé
+couldNotCreateBackupDirectoryDDot = ** Échec : le dossier de sauvegarde des corpus n'a pas pu être créé: {0}.
 
 couldNotFindDirectoryDDotP0 = ** Bibliographie : dossier {0} introuvable
 
@@ -185,7 +185,7 @@
 
 couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator = Impossible de lancer le navigateur interne. Vous devez régler ce paramètre dans les préférences, au menu : Général / Navigateur web
 
-couldNotReadInstallPreferencesFile = ** Échec de lecture du fichier des préférences d'installation
+couldNotReadInstallPreferencesFile = ** Échec de lecture du fichier des préférences d'installation: {0}.
 
 couldNotUnzipBinaryCorpusDDot = ** Échec de l''extraction du corpus binaire : {0}
 
@@ -203,7 +203,7 @@
 
 creatingASubcorpusOnP0 = Créer un nouveau sous-corpus de {0}
 
-creatingTXMUserWorkingDirectory = Création de l'espace de travail utilisateur de TXM.
+creatingTXMUserWorkingDirectory = Création de l'espace de travail utilisateur de TXM...
 
 dDot = : 
 
@@ -361,7 +361,7 @@
 
 extractingBinaryCorpus = Extraction du corpus binaire
 
-failedToBackupExistingCorporaDDot = ** Impossible de sauvegarder les corpus existants : 
+failedToBackupExistingCorporaDDot = ** Impossible de sauvegarder les corpus existants : {0}.
 
 failedToCancel = Impossible d'annuler  
 
@@ -389,7 +389,7 @@
 
 failedToLoadCorpusP0 = ** Échec du chargement du corpus {0}
 
-failedToMoveCorpus = ** Impossible de déplacer le corpus 
+failedToMoveCorpus = ** Impossible de déplacer le corpus {0} vers {1}.
 
 failedToRename = ** Échec du renommage 
 
@@ -761,7 +761,7 @@
 
 startsWith = commence par
 
-startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu 'Fichier>Préférences')
+startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu 'Fichier>Préférences') : {0}.
 
 string = Chaîne de caractères
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 1341)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 1342)
@@ -183,7 +183,7 @@
 
 corpusNameOnlyCapsAndNoDigitAtBeginning = Corpus name* (only caps and no digit at beginning)
 
-couldNotCreateBackupDirectoryDDot = ** Could not create backup directory :
+couldNotCreateBackupDirectoryDDot = ** Could not create backup directory: {0}.
 
 couldNotFindDirectoryDDotP0 = Could not find directory: {0}
 
@@ -191,7 +191,7 @@
 
 couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator = Could not launch the internal web browser. You must set that parameter in the preferences, menu: General>WebNavigator
 
-couldNotReadInstallPreferencesFile = ** Could not read install preferences file
+couldNotReadInstallPreferencesFile = ** Could not read install preferences file: {0}.
 
 couldNotStartProxyConfigurationDDot = Could not start proxy configuration: {0}.
 
@@ -211,7 +211,7 @@
 
 creatingASubcorpusOnP0 = Creating a sub-corpus on {0}
 
-creatingTXMUserWorkingDirectory = Creating TXM user working directory.
+creatingTXMUserWorkingDirectory = Creating TXM user working directory...
 
 dDot = :
 
@@ -343,7 +343,7 @@
 
 errorWhileGettingCurrentPositionValueDDot = Error while getting current position value:
 
-errorWhileLoadingTXMDDot = Error while loading TXM: 
+errorWhileLoadingTXMDDot = Error while loading TXM: {0}.
 
 errorWhileOpeningBibliographicRecordP0WithURLEqualsP1 = ** Error while opening bibliographic record {0} with URL={1}
 
@@ -353,7 +353,7 @@
 
 errorWhileRunningScriptDDotP0 = Error while running script: {0}
 
-errorWhileUpdatingTXMDDot = Error while updating TXM: 
+errorWhileUpdatingTXMDDot = Error while updating TXM: {0}.
 
 errorWhileUpdatingTXMDDotNoHandlerServiceFound = Error while updating TXM: no handler service found
 
@@ -395,7 +395,7 @@
 
 extractingBinaryCorpus = Extracting binary corpus
 
-failedToBackupExistingCorporaDDot = ** Failed to backup existing corpora:
+failedToBackupExistingCorporaDDot = ** Failed to backup existing corpora: {0}.
 
 failedToCancel = Failed to cancel
 
@@ -423,7 +423,7 @@
 
 failedToLoadCorpusP0 = ** Failed to load corpus  {0}
 
-failedToMoveCorpus = ** Failed to move corpus
+failedToMoveCorpus = ** Failed to move corpus {0} to {1}.
 
 failedToRename = ** Failed to rename
 
@@ -841,7 +841,7 @@
 
 startsWith = starts with
 
-startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Startup failed, please check TXM preferences (in the 'File>Preferences' menu) or contact txm-users mailing list (menu: Help>
+startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Startup failed, please check TXM preferences (in the 'File>Preferences' menu) or contact txm-users mailing list (menu: Help>): {0}.
 
 string = String
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 1341)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 1342)
@@ -82,6 +82,7 @@
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
 import org.txm.Toolbox;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.objects.Project;
@@ -186,14 +187,14 @@
 			CGUMessageDialog dialog = new CGUMessageDialog(Display.getCurrent().getActiveShell(), 
 					TXMUIMessages.termsOfService, 
 					IImageKeys.getImage(IImageKeys.TXM_ICON), 
-					TXMUIMessages.infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt, 
+					TXMUIMessages.infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt,
 					IImageKeys.getImage(IImageKeys.TXM), 
 					TXMUIMessages.iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpDDottextometrieenslyonfrspipphprubrique61SupPage, 
 					dialogButtonLabels, 0) {
 			};
 			boolean ret = (dialog.open() == MessageDialog.OK) && dialog.hasCheckBeenPressed();
 			if (ret) {
-				TBXPreferences.getInstance().put("cgu", "true");
+				TBXPreferences.getInstance().put("cgu", true); //$NON-NLS-1$
 			} else {
 				System.exit(0);
 			}
@@ -210,8 +211,7 @@
 
 		try {			
 			// create the Toolbox initialization job
-			JobHandler jobhandler = new JobHandler(
-					TXMUIMessages.initializationOfThePlatform, true) {
+			JobHandler jobhandler = new JobHandler(TXMUIMessages.initializationOfThePlatform, true) {
 				@Override
 				protected IStatus run(final IProgressMonitor monitor) {
 					JobsTimer.start();
@@ -276,7 +276,7 @@
 
 						monitor.done();
 					} catch (Exception e) {
-						System.out.println(TXMUIMessages.errorWhileLoadingTXMDDot+e);
+						System.out.println(TXMCoreMessages.bind(TXMUIMessages.errorWhileLoadingTXMDDot, e));
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 					} catch(ThreadDeath td) {
 						System.out.println("TXM initialization has been canceled by user. Please restart TXM.");
@@ -292,8 +292,8 @@
 			startUpdateLookUpJob(false);
 
 		} catch (Exception e) {
-			Log.severe(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup+" "+e.getMessage());
-			System.out.println(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup+" "+e.getMessage());
+			Log.severe(TXMCoreMessages.bind(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup, e.getMessage()));
+			System.out.println(TXMCoreMessages.bind(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup, e.getMessage()));
 			Log.printStackTrace(e);
 		}
 	}
@@ -376,11 +376,11 @@
 			//					public void run() {
 
 			try {
-				URL url = new URL("http://textometrie.ens-lyon.fr/dist/index.html");
-				Log.warning("Test if update site is available: "+url);
+				URL url = new URL("http://textometrie.ens-lyon.fr/dist/index.html"); //$NON-NLS-1$
+				Log.warning(TXMCoreMessages.bind("Testing if update site is available: {0}.", url));
 				url.openStream().read();
 			} catch(Exception e){
-				Log.warning("TXM cannot fetch updates ("+e+")");
+				Log.warning(TXMCoreMessages.bind("TXM cannot fetch updates ({0}).", e));
 				doUpdate = false;
 				return;
 			}
@@ -397,7 +397,7 @@
 							e.display = Display.getDefault();
 							handlerService.executeCommand(TXMUpdateHandler.ID, e);
 						} catch (Exception e) {
-							System.out.println(TXMUIMessages.errorWhileUpdatingTXMDDot+e);
+							System.out.println(TXMCoreMessages.bind(TXMUIMessages.errorWhileUpdatingTXMDDot, e));
 							Log.printStackTrace(e);
 						}
 					} else {
@@ -416,18 +416,18 @@
 		String path = Toolbox.getTxmHomePath();
 
 		if (path == null || path.trim().equals("")) {
-			Log.warning("TXM user directory is not set ('" + TBXPreferences.USER_TXM_HOME + "' preference is not set).");
+			Log.warning(TXMCoreMessages.bind("TXM user directory is not set ('{0}' preference is not set).", TBXPreferences.USER_TXM_HOME));
 			return true;
 		}
 		File dir = new File(Toolbox.getTxmHomePath().trim());
 		if (!dir.exists()) {
-			Log.warning("TXM user directory is set to '"+dir+"' but does not exist.");
+			Log.warning(TXMCoreMessages.bind("TXM user directory is set to '{0}' but does not exist.", dir));
 			return true;
 		} else if (!dir.canWrite()) {
-			Log.warning("TXM user directory is set to '"+dir+"' but TXM can't write in this directory.");
+			Log.warning(TXMCoreMessages.bind("TXM user directory is set to '{0}' but TXM can't write in this directory.", dir));
 			return true;
 		} else if (!dir.canExecute()) {
-			Log.warning("TXM user directory is set to '"+dir+"' but TXM can't cd in this directory.");
+			Log.warning(TXMCoreMessages.bind("TXM user directory is set to '{0}' but TXM can't cd in this directory.", dir));
 			return true;
 		}
 
@@ -437,7 +437,7 @@
 	public static boolean testTXMINSTALLPreferenceAndDirectory() {
 		//		TxmPreferences.dump();
 		if (Toolbox.getInstallDirectory() == null) {
-			Log.warning("TXM install directory is not set ('"+TBXPreferences.INSTALL_DIR+"' preference is not set).");
+			Log.warning(TXMCoreMessages.bind("TXM install directory is not set ('{0}' preference is not set).", TBXPreferences.INSTALL_DIR));
 			return true;
 		}
 
@@ -446,13 +446,13 @@
 			Log.warning("TXM install directory is set to ''.");
 			return true;
 		} else if (!installdir.exists()) {
-			Log.warning("TXM install directory is set to '"+installdir+"' but does not exists.");
+			Log.warning(TXMCoreMessages.bind("TXM install directory is set to '{0}' but does not exists.", installdir));
 			return true;
 		} else if (!installdir.canRead()) {
-			Log.warning("TXM install directory is set to '"+installdir+"' but is not readable.");
+			Log.warning(TXMCoreMessages.bind("TXM install directory is set to '{0}' but is not readable.", installdir));
 			return true;
 		} else if (!installdir.canExecute()) {
-			Log.warning("TXM install directory is set to '"+installdir+"' but is not cdable.");
+			Log.warning(TXMCoreMessages.bind("TXM install directory is set to '{0}' but is not cdable.", installdir));
 			return true;
 		}
 		return false;
@@ -589,7 +589,7 @@
 				return true;
 			}
 		} catch (Exception e) {
-			System.err.println(TXMUIMessages.couldNotReadInstallPreferencesFile+ " " +e.getLocalizedMessage());
+			System.err.println(TXMCoreMessages.bind(TXMUIMessages.couldNotReadInstallPreferencesFile, e.getLocalizedMessage()));
 			Log.printStackTrace(e);
 			return false;
 		}
@@ -627,7 +627,10 @@
 				if (record.getLevel() != Level.SEVERE) return;
 
 				final IWorkbench w = PlatformUI.getWorkbench();
-				if (w == null) {System.out.println("no workbench");return;}
+				if (w == null) {
+					System.out.println("no workbench");
+					return;
+				}
 
 				w.getDisplay().syncExec(new Runnable() {
 					@Override
@@ -684,15 +687,15 @@
 			try {
 				Log.info(NLS.bind(TXMUIMessages.installPathDDotP0, Toolbox.getInstallDirectory()));
 
-				Log.info("Checking TXM user directory.");
+				Log.info("Checking TXM user directory...");
 				if (Toolbox.getTxmHomePath().trim().isEmpty()) {
-					Version v = BundleUtils.getBundleVersion("org.txm.rcp");
+					Version v = BundleUtils.getBundleVersion("org.txm.rcp");//$NON-NLS-1$
 					if (v == null) {
 						System.out.println("Error: no 'org.txm.rcp' version found.");
 						return false;
 					}
 					String version = v.getMajor()+"."+v.getMinor()+"."+v.getMicro();
-					if ("qualifier".equals(v.getQualifier())) {
+					if ("qualifier".equals(v.getQualifier())) { //$NON-NLS-1$
 						System.out.println("RUNNING TXM FROM ECLIPSE - DEV MODE ACTIVATED");
 						version += "-dev";
 					}
@@ -704,7 +707,7 @@
 				txmhomedir.mkdirs(); // creates the directory if needed
 
 				if (!txmhomedir.exists()) {
-					Log.severe("Error: The provided TXMHOME directory does not exists: "+txmhomedir+". Aborting");
+					Log.severe(TXMCoreMessages.bind("Error: The provided TXMHOME directory does not exists: {0}. Aborting.", txmhomedir));
 					return false;
 				}
 
@@ -713,13 +716,13 @@
 				TBXPreferences.getInstance().flush();
 				//TXMPreferences.saveAll();
 
-				Log.info("TXM User directory is set to: "+txmhomedir);
+				Log.info(TXMCoreMessages.bind("TXM User directory is set to: {0}.", txmhomedir));
 
 				txmHomeRestored = true;
 			} catch (Exception e) {
 				org.txm.rcp.utils.Logger.printStackTrace(e);
-				System.out.println(TXMUIMessages.failedToBackupExistingCorporaDDot+" "+e.getLocalizedMessage()); //$NON-NLS-1$
-				Log.severe(TXMUIMessages.failedToBackupExistingCorporaDDot+e.getLocalizedMessage());
+				System.out.println(TXMCoreMessages.bind(TXMUIMessages.failedToBackupExistingCorporaDDot, e.getLocalizedMessage()));
+				Log.severe(TXMCoreMessages.bind(TXMUIMessages.failedToBackupExistingCorporaDDot, e.getLocalizedMessage()));
 				return false;
 			}
 
@@ -756,7 +759,7 @@
 				backup.mkdir();
 
 				if (!backup.exists()) {
-					System.out.println(TXMUIMessages.couldNotCreateBackupDirectoryDDot + backup);
+					System.out.println(TXMCoreMessages.bind(TXMUIMessages.couldNotCreateBackupDirectoryDDot, backup));
 					return;
 				}
 
@@ -791,10 +794,10 @@
 					System.out.println();
 				}
 				if (moved.size() > 0) {
-					Log.info(TXMUIMessages.bind(TXMUIMessages.corporaBackupedDDotP0,oldbackup,StringUtils.join(moved,", "))); //$NON-NLS-1$
+					Log.info(TXMCoreMessages.bind(TXMUIMessages.corporaBackupedDDotP0, oldbackup, StringUtils.join(moved, ", "))); //$NON-NLS-1$
 				}
 				if (failed.size() > 0) {
-					System.out.println(TXMUIMessages.failedToMoveCorpus+failed+TXMUIMessages.to+backup);
+					System.out.println(TXMCoreMessages.bind(TXMUIMessages.failedToMoveCorpus, failed, backup));
 				}
 			}
 		}
