Index: tmp/org.txm.statsengine.r.rcp/.classpath
===================================================================
--- tmp/org.txm.statsengine.r.rcp/.classpath	(revision 512)
+++ tmp/org.txm.statsengine.r.rcp/.classpath	(revision 513)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/Submit.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/Submit.java	(revision 512)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/Submit.java	(revision 513)
@@ -42,7 +42,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TxtEditor;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.statsengine.r.rcp.handlers.ExecuteRScript;
@@ -70,7 +70,7 @@
 		if (editor instanceof TxtEditor) {
 			final TxtEditor Teditor = (TxtEditor) editor;
 			final ISelection selection = Teditor.getSelectionProvider().getSelection();
-			JobHandler job = new JobHandler(Messages.Submit_0, true) {
+			JobHandler job = new JobHandler(RCPMessages.Submit_0, true) {
 
 				@Override
 				protected IStatus run(final IProgressMonitor monitor) {
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/OpenEmptyEditor.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/OpenEmptyEditor.java	(revision 512)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/OpenEmptyEditor.java	(revision 513)
@@ -36,7 +36,7 @@
 import org.eclipse.osgi.util.NLS;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.EditFile;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.utils.logger.Log;
@@ -56,7 +56,7 @@
 		scripts.mkdir();
 		if (!scripts.exists())
 		{
-			System.out.println(NLS.bind(Messages.OpenEmptyEditor_2, scripts));
+			System.out.println(NLS.bind(RCPMessages.OpenEmptyEditor_2, scripts));
 			return null;
 		}
 		
@@ -64,7 +64,7 @@
 		Rscripts.mkdir();
 		if (!Rscripts.exists())
 		{
-			System.out.println(NLS.bind(Messages.OpenEmptyEditor_2, Rscripts));
+			System.out.println(NLS.bind(RCPMessages.OpenEmptyEditor_2, Rscripts));
 			return null;
 		}
 		
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java	(revision 512)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java	(revision 513)
@@ -32,7 +32,7 @@
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * The Class ShowSvgHelp.
@@ -45,12 +45,12 @@
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		
-		MessageDialog.openInformation(new Shell(), Messages.ShowSvgHelp_0, 
-				Messages.ShowSvgHelp_1 +
-				Messages.ShowSvgHelp_2 +
-				Messages.ShowSvgHelp_3 +
-				Messages.ShowSvgHelp_4 +
-				Messages.ShowSvgHelp_5);
+		MessageDialog.openInformation(new Shell(), RCPMessages.ShowSvgHelp_0, 
+				RCPMessages.ShowSvgHelp_1 +
+				RCPMessages.ShowSvgHelp_2 +
+				RCPMessages.ShowSvgHelp_3 +
+				RCPMessages.ShowSvgHelp_4 +
+				RCPMessages.ShowSvgHelp_5);
 		return event;
 		
 		/*
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java	(revision 512)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java	(revision 513)
@@ -41,7 +41,7 @@
 import org.txm.Toolbox;
 import org.txm.Toolbox;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.statsengine.r.core.RWorkspace;
 import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
 import org.txm.utils.MessagePrinter;
@@ -231,7 +231,7 @@
 	public void connectToRWorkspace() {
 		if (!readyToDisplay && Toolbox.getEngineManager(EngineType.STAT).getEngine("R").getState()) {
 			RWorkspace rw = null;
-			Log.warning(Messages.RConsole_0);
+			Log.warning(RCPMessages.RConsole_0);
 			try {
 				rw = RWorkspace.getRWorkspaceInstance();
 				if (rw == null) return;
@@ -246,7 +246,7 @@
 					readyToDisplay = true;
 				//}
 			} catch (RWorkspaceException e) {
-				System.out.println(Messages.RConsole_1+e);
+				System.out.println(RCPMessages.RConsole_1+e);
 				Log.printStackTrace(e);
 			}
 		}
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java	(revision 512)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java	(revision 513)
@@ -72,7 +72,7 @@
 import org.txm.objects.Base;
 import org.txm.progression.core.functions.Progression;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.EditFile;
 import org.txm.rcp.commands.R.CopySelection;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -233,7 +233,7 @@
 		Button export = new Button(parent, SWT.PUSH);
 		export.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 				false));
-		export.setText(Messages.RVariablesView_1);
+		export.setText(RCPMessages.RVariablesView_1);
 		export.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent arg0) {
@@ -247,7 +247,7 @@
 		
 		Button logs = new Button(parent, SWT.PUSH);
 		logs.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,	false));
-		logs.setText(Messages.RVariablesView_2);
+		logs.setText(RCPMessages.RVariablesView_2);
 		logs.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent arg0) {
@@ -348,7 +348,7 @@
 			if (symbol == null)
 				return name;
 			else
-				return NLS.bind(Messages.RVariablesView_9, name, symbol);
+				return NLS.bind(RCPMessages.RVariablesView_9, name, symbol);
 		}
 
 		/* (non-Javadoc)
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/ExecuteRScript.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/ExecuteRScript.java	(revision 512)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/ExecuteRScript.java	(revision 513)
@@ -49,7 +49,7 @@
 import org.eclipse.ui.ide.FileStoreEditorInput;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TxtEditor;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -130,7 +130,7 @@
 	public static void executeScript(String scriptfile) {
 		File rFile = new File(scriptfile);
 		if (!rFile.exists()) {
-			System.err.println(NLS.bind(Messages.ExecuteScriptR_0, rFile));
+			System.err.println(NLS.bind(RCPMessages.ExecuteScriptR_0, rFile));
 			return;
 		}
 
@@ -144,7 +144,7 @@
 		boolean initState = rw.isLogging();
 		rw.setLog(true);
 		try {
-			System.out.println(NLS.bind(Messages.ExecuteRScript_1, rFile.getName()));
+			System.out.println(NLS.bind(RCPMessages.ExecuteRScript_1, rFile.getName()));
 			long time = System.currentTimeMillis();
 			//execute a file line per line
 
@@ -173,10 +173,10 @@
 //				if (rw.isLogging() && str.length() > 0)
 //					RConsole.printServer(cmd);
 //			}
-			System.out.println(Messages.ExecuteRScript_2+(System.currentTimeMillis()-time)+Messages.ExecuteRScript_3);
+			System.out.println(RCPMessages.ExecuteRScript_2+(System.currentTimeMillis()-time)+RCPMessages.ExecuteRScript_3);
 		} catch(Exception e) {
-			System.out.println(NLS.bind(Messages.ExecuteScriptR_1, rFile, e)); 
-			StatusLine.error(NLS.bind(Messages.ExecuteScriptR_1, rFile, e)); 
+			System.out.println(NLS.bind(RCPMessages.ExecuteScriptR_1, rFile, e)); 
+			StatusLine.error(NLS.bind(RCPMessages.ExecuteScriptR_1, rFile, e)); 
 			Log.printStackTrace(e);
 		}
 
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/ExecuteRText.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/ExecuteRText.java	(revision 512)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/ExecuteRText.java	(revision 513)
@@ -34,7 +34,7 @@
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.statsengine.r.core.RWorkspace;
 import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
@@ -83,7 +83,7 @@
 		rw.setLog(true);
 
 		try {
-			System.out.println(Messages.ExecuteRText_0);
+			System.out.println(RCPMessages.ExecuteRText_0);
 			long time = System.currentTimeMillis();
 			//execute a file line per line
 
@@ -93,10 +93,10 @@
 //				RConsole.printServer(str);
 			RWorkspace.appendtoEvalLog(text);
 
-			System.out.println(Messages.ExecuteRScript_2+(System.currentTimeMillis()-time)+Messages.ExecuteRText_2); 
+			System.out.println(RCPMessages.ExecuteRScript_2+(System.currentTimeMillis()-time)+RCPMessages.ExecuteRText_2); 
 		} catch(Exception e) {
-			System.out.println(NLS.bind(Messages.ExecuteRText_1, text, Log.toString(e))); 
-			StatusLine.error(NLS.bind(Messages.ExecuteRText_1, text, Log.toString(e))); 
+			System.out.println(NLS.bind(RCPMessages.ExecuteRText_1, text, Log.toString(e))); 
+			StatusLine.error(NLS.bind(RCPMessages.ExecuteRText_1, text, Log.toString(e))); 
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 		}
 
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java	(revision 512)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.preferences.TXMPreferencePage;
 import org.txm.rcp.preferences.TXMPreferenceStore;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.statsengine.r.core.RWorkspace;
 import org.txm.statsengine.r.core.preferences.RPreferences;
 import org.txm.statsengine.r.rcp.messages.RUIMessages;
@@ -196,7 +196,7 @@
 				RWorkspace.setUseFileCommunication(TXMPreferences.getBoolean(RPreferences.FILE_TRANSFERT, RPreferences.PREFERENCES_NODE));
 			}
 		} catch (Exception e) {
-			System.err.println(Messages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(RCPMessages.FAILED_TO_SAVE_PREFERENCES + e);
 		}
 		return true;
 	}
Index: tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java	(revision 512)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java	(revision 513)
@@ -107,7 +107,7 @@
 			
 			
 		} catch (Exception e) {
-			System.err.println(org.txm.rcp.Messages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(org.txm.rcp.RCPMessages.FAILED_TO_SAVE_PREFERENCES + e);
 		}
 		return true;
 	}
Index: tmp/org.txm.rcp/.settings/org.eclipse.core.resources.prefs
===================================================================
--- tmp/org.txm.rcp/.settings/org.eclipse.core.resources.prefs	(revision 512)
+++ tmp/org.txm.rcp/.settings/org.eclipse.core.resources.prefs	(revision 513)
@@ -3,5 +3,4 @@
 encoding//OSGI-INF/l10n/bundle_ru_utf-8.properties=UTF-8
 encoding//src/main/java/org/txm/rcp/messages_fr.properties=UTF-8
 encoding//src/main/java/org/txm/rcp/messages_ru.properties=UTF-8
-encoding//src/main/java/org/txm/rcp/messages_ru_utf8.properties=UTF-8
 encoding/<project>=UTF-8
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages_ru_utf8.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages_ru_utf8.properties	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages_ru_utf8.properties	(revision 513)
@@ -1,855 +0,0 @@
-About_Menu_Label=О платформе TXM...
-AdapterFactory_0=** Предупреждение: корпус {0} поврежден. Некоторые команды могут быть недоступны или функционировать некорркетно.
-AddBase_1=Новый корпус: {0}.
-AddBase_10=Платформа TXM готова к использованию.
-AddBase_16=** Невозможно записать язык {0} как свойство ''LANG'' структуры <txmcorpus>
-AddBase_17=** Файл {0} недоступен
-AddBase_19=Внимание
-AddBase_2=** Ошибка загрузки корпуса из папки: {0}.\nНевозможно найти необходимые составные элементы.
-AddBase_20=Корпус {0} уже существует. Хотите ли вы его заменить?
-AddBase_22=Файл {0} не соответствует формату TXM.
-AddBase_23=Корпус {0} не имеет свойства ''LANG'' при структуре <txmcorpus>
-AddBase_24=** Не удалось загрузить корпус {0}
-AddBase_25=Корпус TXM в бинарном формате - это либо файл с расширением .txm или .zip, либо директория с папками ''html'', ''data'', ''registry'', ''txm''
-AddBase_27=Загрузить корпус
-AddBase_28=Извлечение бинарного корпуса
-AddBase_29=Извлечено {0} за {1}
-AddBase_31=** Не удалось загрузить бинарный корпус: {0}
-AddBase_32=Загрузка корпуса в платформу
-AddBase_33=Перезагрузка платформы
-AddBase_34=Рабочая среда TXM не инициализирована. Пожалуйста, перезагрузите TXM.
-AddBase_4=** Не удалось загрузить бинарный корпу (null error).
-AddBase_7=** Не удалось создать бинарный корпус.
-AddProject_3=Введите название проекта
-AdvancePreferencePage_1=Папка установки TXM
-AdvancePreferencePage_12=Уровень детализации отчета
-AdvancePreferencePage_13=Добавить технический комментарий
-AdvancePreferencePage_14=Копировать отчет в файл
-AdvancePreferencePage_2=Папка пользователя TXM
-AdvancePreferencePage_3=Показывать время выполнения на консоли
-AdvancePreferencePage_4=N/A_Expert user mode
-Property=Свойства:
-NumberOfLines=Число строк:
-ApplicationWorkbenchAdvisor_0=Инициализация платформы...
-ApplicationWorkbenchAdvisor_1=Инициализация платформы...
-ApplicationWorkbenchAdvisor_11=Загрузка демонстрационных корпусов
-ApplicationWorkbenchAdvisor_12=** Ошибка: переменная среды ''TXMHOME'' задана ({0}), но нет папки: 
-ApplicationWorkbenchAdvisor_13=** Не удалось создать папку TXMHOME : {0}
-ApplicationWorkbenchAdvisor_14=\ проверка расширения:  
-ApplicationWorkbenchAdvisor_16=N/A_Removing old corpus backup directory: 
-ApplicationWorkbenchAdvisor_17=N/A_.
-ApplicationWorkbenchAdvisor_18=N/A_Corpus backuped: {0}
-ApplicationWorkbenchAdvisor_19=** Не удалось задать параметры программы TreeTagger : {0}
-ApplicationWorkbenchAdvisor_2=Загрузка опций установки TXM из: {0}
-ApplicationWorkbenchAdvisor_20=N/A_\ in 
-ApplicationWorkbenchAdvisor_22=N/A_Processing folder: 
-ApplicationWorkbenchAdvisor_23=N/A_\ ...
-ApplicationWorkbenchAdvisor_24=N/A_Failed moving old corpus from 
-ApplicationWorkbenchAdvisor_25=Чтение опций из места установки: {0}
-ApplicationWorkbenchAdvisor_26=N/A_\ to  
-ApplicationWorkbenchAdvisor_27=Рабочая папка TXM уже существует. Загрузить ранее созданные корпусы?
-ApplicationWorkbenchAdvisor_28=Сохранение рабочей папки...
-ApplicationWorkbenchAdvisor_29=N/A_Error: 
-ApplicationWorkbenchAdvisor_3=Проверка наличия рабочей папки
-ApplicationWorkbenchAdvisor_30=Перемещение существующих корпусов...
-ApplicationWorkbenchAdvisor_31=** Не удалось создать рабочее пространство ''default.xml''
-ApplicationWorkbenchAdvisor_32=** TreeTagger не установлен или неверно заданы пути доступа.
-ApplicationWorkbenchAdvisor_33=Пути доступа к TreeTagger приведены к значениями по умолчанию.
-ApplicationWorkbenchAdvisor_34=** Ошибка: не удалсоь создать папку для сохранения корпуса
-ApplicationWorkbenchAdvisor_35=N/A_\nCorpus 
-ApplicationWorkbenchAdvisor_36=Перемещение \ 
-ApplicationWorkbenchAdvisor_37=\ в 
-ApplicationWorkbenchAdvisor_38=Внимание: корпус уже был сохранен.
-ApplicationWorkbenchAdvisor_39=Не хватает папки в директории установки TXM : {0}
-ApplicationWorkbenchAdvisor_4=Проверка установки TreeTagger
-ApplicationWorkbenchAdvisor_40=** Не удалось скопировать файлы из папки TXMINSTALL в TXMHOME: {0}
-ApplicationWorkbenchAdvisor_41=** Не удалось задать опции: {0}
-ApplicationWorkbenchAdvisor_42=\ перемещение 
-ApplicationWorkbenchAdvisor_43=Corpora {0} not restored, since this setup provides more recent ones.
-ApplicationWorkbenchAdvisor_43_single=Corpus {0} not restored, since this setup provides more recent ones.
-ApplicationWorkbenchAdvisor_44=** Невозможно перенести корпус 
-ApplicationWorkbenchAdvisor_45=** Файл не читается: {0}
-ApplicationWorkbenchAdvisor_46=N/A_\nCorpus 
-ApplicationWorkbenchAdvisor_47=** Невозможно сохранить существующие корпусы:
-ApplicationWorkbenchAdvisor_48=\nCorpus ''{0}'' could not be restored and are moved to ''{1}''.
-ApplicationWorkbenchAdvisor_49=N/A_Initializing the toolbox...
-ApplicationWorkbenchAdvisor_5=Стандартный выход
-ApplicationWorkbenchAdvisor_51=** Не удалось загрузить корпус из файла: 
-ApplicationWorkbenchAdvisor_52=** Не удалось загрузить демонстрационные корпусы: {0}
-ApplicationWorkbenchAdvisor_53=Восстановление корпусов из {0}
-ApplicationWorkbenchAdvisor_54=Преобразование корпусов из формата TXM 0.5 
-ApplicationWorkbenchAdvisor_55=\ в формат TXM 0.6.
-ApplicationWorkbenchAdvisor_56=** Не удалось преобразовать корпус в формат TXM 0.6
-ApplicationWorkbenchAdvisor_57=Загрузка преобразованного корпуса 0.5 
-ApplicationWorkbenchAdvisor_58=Загрузка корпуса 0.6 
-ApplicationWorkbenchAdvisor_59=** Ошибка во время загрузки 
-ApplicationWorkbenchAdvisor_6=Исключение: 
-ApplicationWorkbenchAdvisor_60=** Ошибка: корпус 
-ApplicationWorkbenchAdvisor_61=\ не является бинарным корпусом TXM 0.6
-ApplicationWorkbenchAdvisor_7=Создание рабочего пространства пользователя TXM.
-ApplicationWorkbenchAdvisor_71=Загрузка демонстрационных корпусов.
-ApplicationWorkbenchAdvisor_8=Путь установки: {0}
-ApplicationWorkbenchAdvisor_9=** Ошибка чтения файла опций установки
-ApplicationWorkbenchAdvisor_init=Запуск...
-ApplicationWorkbenchAdvisor_init_failed=** Запуск платформы прерван. Пожалуйста, отрегулируйте опции (в меню ''Файл>Опции'')
-ApplicationWorkbenchAdvisor_ready=Готово.
-Application_4=N/A_This file is not meant to run TXM. Please consult TXM user manual.
-Application_6=** Вы должны установить версию 1.6 Java или более поздниюю, прежде чем запустить TXM, установленная на этой машине версия Java: {0}
-AssistedQueryWidget_0=Ouvrir l''assistant de requêtes
-BackToText_0=Показать в полнотекстовом режиме
-CANT_CREATE_GRAPHIC=** Невозможно создать график
-CQPPreferenceInitializer_0=localhost
-CQPPreferenceInitializer_1=anonymous
-CQPPreferencePage_0=N/A_CQPlib path
-CQPPreferencePage_1=Использовать сетевой протокол
-CQPPreferencePage_10=Удаленный &сервер CWB
-CQPPreferencePage_11=Удаленный сервер: &имя машины
-CQPPreferencePage_12=Удаленный сервер: &номер порта
-CQPPreferencePage_13=Удаленный сервер: &логин
-CQPPreferencePage_14=Удаленный сервер: &пароль
-CQPPreferencePage_15=Путь к исполняемому &файлу ''cqpserver''
-CQPPreferencePage_16=Путь к папке &Регистр сервера CWB
-CQPPreferencePage_17=Путь к файлу инициализации сервера CWB
-CQPPreferencePage_18=Дополнительные опции сервера CWB: 
-Cannot_ask_simple_when_advance=Невозможно отобразить закладку простых опций, когда пользователь выбрал отображение дополнительных опций
-ColRowInfosLabelProvider_19=Qual
-ColRowInfosLabelProvider_9=\u03C7²
-ColsRowsInfosEditor_0=Ошибочный ввод
-ColsRowsInfosEditor_2=Информация: {0}
-Commands_0=Ошибка: невозможно инициализировать команды
-ComplexSortSelector_0=Ключи для сортировки:
-ComplexSortSelector_1=Мульти-сортировка
-ComplexSortSelector_2=Сортировка
-ComplexSortSelector_5=** Ошибка при сортировке: {0}
-ComplexSortSelector_6=по умолчанию
-ComplexSort_0=Открытие диалогового окна сложной сортировки
-ComplexSort_1=&Сложная сортировка
-ComplexSort_10=Недопустимый блок сравнения
-ComplexSort_11=Необходимо выбрать не менее двух блоков сравнения
-ComplexSort_12=Добавить в выделенному
-ComplexSort_14=Удалить из выделенного
-ComplexSort_16=Поднять выделение на один уровень
-ComplexSort_18=Опустить выделение на один уровень
-ComplexSort_2=Задать и использовать сложную сортировку
-ComplexSort_3=Выберите сложную сортировку
-ComplexSort_4=&Новый
-ComplexSort_5=Создать новый метод сортировки
-ComplexSort_6=Имя: 
-ComplexSort_9=Поле Имя обязательно.
-ComplexSubcorpusPanel_0=Выделить
-ComplexSubcorpusPanel_1=Все критерии
-ComplexSubcorpusPanel_16=не содержит
-ComplexSubcorpusPanel_2=отдельные критерии
-ComplexSubcorpusPanel_4=Запрос 
-ComplexSubcorpusPanel_5=Обновить
-ComputeConcordance_0=Открытие окна конкорданса
-ComputeConcordance_1=N/A_Failed to open concordance editor.
-ComputeCoocFromLines_0=Идет расчет совместной встречаемости
-ComputeCoocFromLines_1=Открытие таблицы совместной встречаемости
-ComputeCoocMatrix_0=N/A_Cooc matrix: 
-ComputeCoocMatrix_1=N/A_Number of nodes: 
-ComputeCoocMatrix_10=N/A_Distance
-ComputeCoocMatrix_11=N/A_Minimal co frequence
-ComputeCoocMatrix_12=N/A_Outfile : none
-ComputeCoocMatrix_13=N/A_Choose outfile
-ComputeCoocMatrix_2=N/A_Number of edges: 
-ComputeCoocMatrix_3=N/A_Distance: 
-ComputeCoocMatrix_4=N/A_Writing cooc matrix in GRAPHML file: 
-ComputeCoocMatrix_5=N/A_\"
-ComputeCoocMatrix_7=N/A_CoocMatrix parameters
-ComputeCooccurrences_0=Загрузка таблицы совместной встречаемости
-ComputeCooccurrences_1=** Невозможно вычислить совместную встречаемость в выделении
-ComputeFrequencyList_2=Расчет списка значений свойства {0} в корпусе {1}
-ComputeIndexFromLines_0=Выполнить команду Индекс на выделении
-ComputeLexicalTable_0=Составление словарной таблицы {0}
-ComputeLexicalTable_1=Составление словарной таблицы {0} со свойством {1}
-ComputeLexicalTable_10=Открытие словарной таблицы
-ComputeLexicalTable_12=Употребления в индексе
-ComputeLexicalTable_13=Выберите пределы для расчетов
-ComputeLexicalTable_16=Использовать все употребления
-ComputeLexicalTable_2=N/A_no property
-ComputeLexicalTable_3=Открытие диалогового окна конфигурации пределов
-ComputeLexicalTable_5=** Невозможно построить словарную таблицу из Индекса, рассчитанного на корпусе
-ComputeLexicalTable_6=** Списки значений должны строиться на одинаковых сочетаниях свойств: {0}
-ComputeLexicalTable_7=Списки значений должны иметь одинаковое распределение: {0}
-ComputeLexicalTable_9=** Диалоговое окно словарной таблицы: невозможно получить размер корпуса. Причина {0}
-ComputeReferencer_0=Открытие результата Ссылок
-ComputeSpecificitiesDialog_0=** Диалоговое окно ''Расчет специфичности'' - {0}
-ComputeSpecificitiesDialog_1=** Синтаксическая ошибка в регулярном выражении: {0}
-ComputeSpecificitiesDialog_3=Фокус:
-ComputeSpecificitiesDialog_4=Фокус части:
-ComputeSpecificitiesDialog_9=Нет доступного фильтра для части
-ComputeSpecificities_0=Расчет специфичности
-ComputeSpecificities_2=Расчет специфичности {0}, свойство {1} 
-ComputeSpecifities_10=Открытие таблицы результатов специфичности
-ComputeSpecifities_11=Расчет специфичности в словарной таблице {0}
-ComputeSpecifities_2=Обновление вида корпусов...
-ComputeSpecifities_3=Расчет специфичности в подкорпусе {0} корпуса {1}, свойство {2}
-Compute_Specificities=Расчет специфичности
-ConcordancerPreferencePage_3=Параметры конкордансов
-ConcordancerPreferencePage_4=Количество строк на &Странице : 
-ConcordancerPreferencePage_5=&Левый контекст (в словах)
-ConcordancerPreferencePage_6=&Правый контекст (в словах)
-ConcordancesEditorContributor_0=Конкорданс
-ConcordancesEditor_0=Последняя ошибка CQi : 
-ConcordancesEditor_1=Ссылка
-ConcordancesEditor_11=|<
-ConcordancesEditor_12=<
-ConcordancesEditor_13=>
-ConcordancesEditor_14=>|
-ConcordancesEditor_16=&Мотив: 
-ConcordancesEditor_18=&Редактировать
-ConcordancesEditor_19={0} употреблений
-ConcordancesEditor_2=Левый контекст
-ConcordancesEditor_20=Загрузка данных о строке...
-ConcordancesEditor_26=идентификатор проекта {0} идентификатор корпуса {1} идентификатор текста {2}
-ConcordancesEditor_27=Возврат к тексту: текст {0} отсутствует
-ConcordancesEditor_29=Страница не найдена... для 
-ConcordancesEditor_3=Мотив
-ConcordancesEditor_30=Возврат к тексту: издание по умолчанию не найдено
-ConcordancesEditor_34=Загрузка конкорданса
-ConcordancesEditor_37=Сортировка ссылок
-ConcordancesEditor_38=Скрыть параметры
-ConcordancesEditor_39=Показать параметры
-ConcordancesEditor_4=Правый контекст
-ConcordancesEditor_41=Сортировка левого контекста
-ConcordancesEditor_43=Корпус {0} не имеет ссылок по умолчанию: {1}
-ConcordancesEditor_45=Сортировка мотива
-ConcordancesEditor_46=** Невозможно показать в тексте: {0}
-ConcordancesEditor_48=Сортировка правого контекста
-ConcordancesEditor_5=Конкорданс мотива <{0}> в корпусе {1}
-ConcordancesEditor_50=Открытие издания
-ConcordancesEditor_52=Готово: один результат
-ConcordancesEditor_55=Открытие диалогового окна свойств
-ConcordancesEditor_56=Начало расчета конкордансов
-ConcordancesEditor_6=Сортировка...
-ConcordancesEditor_7=N/A_CQP error: 
-ConcordancesEditor_8=N/A_The corpus has no text_id property
-ConvertCorpus_0=N/A_Corpus conversion failed.
-CorporaView_0=Корпус
-CorporaView_1=** Ошибка: {0}
-CorporaView_2=** Не удалось получить размеры корпуса {0}
-CorporaView_3=** Произошла ошибка при расчете конкорданса
-CorporaView_4=N/A_CoocMatrix symbol is: 
-CorporaView_5=** Произошла ошибка при расчете специфичности
-CorporaView_6=** Не удалось открыть окно Мастера ссылок\t
-CorporaView_7=** Произошла ошибка при расчете словарной таблицы
-CorporaView_9=** Ошибка: не удается проивести запись в {0}
-CorpusPage_0=Издания
-CorpusPage_1=Добавить издание
-CorpusPage_10=Свойства слова
-CorpusPage_11=Добавить определение свойства
-CorpusPage_12=Добавить опредление свойства структуры
-CorpusPage_13=Удалить определение свойства
-CorpusPage_14=Подкорпуса и распределения по умолчанию
-CorpusPage_15=Добавить подкорпус
-CorpusPage_16=N/A_punctuation characters
-CorpusPage_17=Удалить подкорпус
-CorpusPage_18=Добавить распределение
-CorpusPage_19=N/A_Elision characters
-CorpusPage_2=Удалить издание
-CorpusPage_20=Удалить распределение
-CorpusPage_21=Добавить запрос
-CorpusPage_22=N/A_End of sentence characters
-CorpusPage_23=Удалить запрос
-CorpusPage_24=Свойства структуры
-CorpusPage_25=Добавить определение свойства структуры
-CorpusPage_26=N/A_Annotate the corpus
-CorpusPage_27=Удалить определение свойства структуры
-CorpusPage_28=Использовать только эти тесты при словарной сегментации
-CorpusPage_29=Добавить параметр
-CorpusPage_3=Шрифт
-CorpusPage_31=Удалить параметр
-CorpusPage_32=Добавить тест
-CorpusPage_33=Добавить параметр
-CorpusPage_34=Удалить тест
-CorpusPage_35=1.\tНажмите на значок 
-CorpusPage_36= ''папка'', чтобы 
-CorpusPage_37=выбрать папку с исходными материалами.
-CorpusPage_38=2.\tВы можете изменить параметры на следующих этапах.
-CorpusPage_39=3.\tВы можете 
-CorpusPage_4=Добавить параметр
-CorpusPage_40=сохранить параметры импорта,
-CorpusPage_41=\ нажав на значок дискеты: 
-CorpusPage_42=4.\tЧтобы
-CorpusPage_43=начать импортирование,
-CorpusPage_44=\ нажмите на этот значок: 
-CorpusPage_45=ПИ
-CorpusPage_46=Папка с исходными материалами не содержала файл ''import.xml''. Создан новый.
-CorpusPage_47=Ошибка при создании файла ''import.xml'' 
-CorpusPage_48=Загрузка параметров импорта из файла: 
-CorpusPage_49=N/A_Default
-CorpusPage_5=N/A_Whitespace characters
-CorpusPage_50=Параметры модуля: 
-CorpusPage_51=Только эти тесты
-CorpusPage_52=Сохранение параметров импорта...
-CorpusPage_53=Имя корпуса обязательно
-CorpusPage_54=Имя корпуса должно содержать хотя бы одну букву
-CorpusPage_55=Только эти тесты
-CorpusPage_6=Удалить параметр
-CorpusPage_60=N/A_OK
-CorpusPage_65=N/A_Cannot save import configuration. No source folder selected.
-CorpusPage_66=N/A_Cannot start import configuration. No source folder selected.
-CorpusPage_7=Общая информация
-CorpusPage_8=Имя корпуса*
-CorpusPage_9=Описание - HTML
-CreateFile_1=Новый файл: {0}
-CreateFolder_1=Новая папка: {0}
-CreateFrequencyList_8=Загрузка таблицы частотности
-CreateMacro_0=N/A_Macro name
-CreateMacro_1=N/A_Please write the macro name
-CreatePartitionDialog_0=Создать Распределение
-CreatePartitionDialog_1=Простое
-CreatePartitionDialog_16=Запросы не должны быть пустыми
-CreatePartitionDialog_2=&Структура: 
-CreatePartitionDialog_3=С подсказкой
-CreatePartitionDialog_4=С&войство: 
-CreatePartitionDialog_5=Продвинутое
-CreatePartitionDialog_6=&Имя: 
-CreatePartitionDialog_7=Часть 
-CreatePartitionDialog_8=Не задана ни одна часть
-CreatePartitionDialog_9=Имя распределения не вводилось. Автоматическое имя: {0}
-CreatePartition_0=Создание распределения по {0}
-CreatePartition_2=** Ошибка: распределение не создано
-CreatePartition_5=Готово: {0} пунктов на {1} употреблений
-CreatePartition_55=N/A_Done: {0} items for {1} occurrences
-CreatePartition_6=Готово: {0} частей
-CreatePartition_9=Обновление вида корпусов...
-CreateSubCorpus_0=** Ошибка: подкорпус не был создан
-CreateSubCorpus_1=Последняя ошибка CQP: 
-CreateSubCorpus_2=N/A_Failed to get last CQP error: 
-CreateSubCorpus_begin=Новый &Подкорпус
-CreateSubCorpus_create=Создать новый подокорпус для {0}
-CreateSubcorpusDialog_0=Создать подкорпус
-CreateSubcorpusDialog_10=&Запрос: 
-CreateSubcorpusDialog_11=Некорректное имя
-CreateSubcorpusDialog_13=Некорректный запрос
-CreateSubcorpusDialog_14=Поле Запрос не должно быть пустым.
-CreateSubcorpusDialog_6=Зна&чение: 
-CreateSubcorpusDialog_8=Имя подкорпуса создано автоматически.
-CreateSubcorpus_7=Составление подкорпуса для {0}, структура {1}, свойство {2} : {3}
-CreateSubcorpus_8=Готово : {0} образован 
-CreateSubcorpus_9=Составление подкорпуса для {0} по запросу <{1}>
-DONE=Готово: {0}
-DefineReferencePattern_0=Шаблон ссылок для отображения
-DefineReferencePattern_1=Шаблон ссылок для &отображения
-DefineReferencePattern_2=Шаблон ссылок для отображения
-DefineReferencePattern_3=Шаблон ссылок для &сортировки
-DefineReferencePattern_4=Шаблон ссылок для сортировки
-DefineReferencePattern_5=Шаблон ссылок для сортировки
-DeleteFile_0=Вы уверены, что хотите удалить 
-DeleteFile_2=** Не удалось удалить файл 
-DeleteInCorporaView_1=** Ошибка при удалении подкорпуса {0}
-DeleteInCorporaView_2=** Ошибка при удалении распределения {0}
-DeleteLines_0=Таблица должна содержать хотя бы одну строчку
-DeleteLines_1=Вы уверены?
-DeleteObject_0=Вы действительно хотите удалить {0}?
-DeleteObject_10={0} удален(о)
-DeleteObject_3=** Ошибка во время удаления
-DeleteObject_4=Ошибка во время удаления {0} : {1}
-DeleteObject_5=Удаление {0}
-DiagnosticPreferencePage_1=Описание
-DiagnosticPreferencePage_2=Число отображаемых значений свойства
-DiagnosticPreferencePage_3=Сортировать части по размеру
-Diagnostique_0=Структурные единицы {0}
-Diagnostique_1=Информация о {0} уже сформирована. Хотите ли Вы ее обновить?
-Diagnostique_10=Получение информации о структурных единицах
-Diagnostique_11=Открытие окна
-Diagnostique_2=** Ошибка при чтении файла *informations* 
-Diagnostique_7=Создание окна с информацией
-Diagnostique_8=Получение общей информации
-Diagnostique_9=Получение данных о словарных единицах
-ERROR_WHILE_LOADING_CONCORDANCE_LINE=** Ошибка во время загрузки строк конкорданса: {0}
-ElementTreeLabelProvider_0=** Ошибка: элемент не записан 
-ElementTreeLabelProvider_1=** Ошибка: объект не является ''org.w3c.Element''
-EmpantWidget_0=Контекст: 
-EmpantWidget_1=форма
-EmpantWidget_2=структура
-EmpantWidget_3=от -
-EmpantWidget_4=до -
-EmpantWidget_5=и от
-EmpantWidget_6=до
-EmpantWidget_7=вклюая структуру, содержащую мотив
-EmpantWidget_8=Активный левый контекст
-EmpantWidget_9=Активный правый контекст
-Error_computing_specificities=** Ошибка во время расчета специфичности: {0}
-Error_creating_partition=** Ошибка во время создания распределения: {0}
-ExecuteGroovyScriptFromFile_2=Скрипт Groovy должен находиться в папке {0}
-ExecuteGroovyScript_0=\ мс
-ExecuteGroovyScript_1=N/A_Error during parameters initialisation
-ExecuteGroovyScript_2=N/A_The user canceled the script execution
-ExecuteRScript_1=Выполнение 
-ExecuteRScript_2=Готово: 
-ExecuteRScript_3=\ мс
-ExecuteRText_0=Выполнение выделения текста... 
-ExecuteRText_1=** Ошибка во время выполнения скрипта R {0}: {1}
-ExecuteRText_2=\ мс
-ExecuteScriptImport_0=Начало импортирования
-ExecuteScriptImport_1=** Файл скрипта {0} не найден
-ExecuteScriptImport_2=** Ошибка: папка ''corpora'' не существует: 
-ExecuteScriptImport_3=N/A_Error: the folder {0} still exists. Cannot continue import. You can delete it manually and restart the import.
-ExecuteScriptImport_5=** Ошибка в параметрах словарной сегментации: импортирование прервано.
-ExecuteScriptImport_6=Импортирование не завершено.
-ExecuteScriptImport_7=Импортирование завершено: 
-ExecuteScriptImport_8=** Ошибка при загрузке корпуса
-ExecuteScriptR_0=** Файл скрипта R {0} не найден
-ExecuteScriptR_1=** Ошибка при выполнении скрипта R {0}: {1}
-ExecuteScript_3=** Не найдено ни одного интерпретатора для расширения файла скрипта 
-Exit_Menu_Label=Выход
-Explorer_0=Папка {0} не должна быть удалена
-Explorer_1=N/A_Go to parent folder
-Explorer_2=N/A_Go to TXM home
-Explorer_3=TXM
-Explorer_4=\u21E7
-Explorer_5=\u21BB
-Explorer_6=N/A_Refresh
-Explorer_7=N/A_\u2302
-Explorer_8=N/A_Go to TXM Home
-ExportCorpus_0=** Не удалось экспортировать корпу {0}
-ExportCorpus_3=Экпортирование 
-ExportCorpus_4=Готово, бинарный файл - {0}
-ExportPreferencePage_1=Конфигурация экспорта
-ExportPreferencePage_18=Разделитель полей
-ExportPreferencePage_19=Разделитель текста
-ExportPreferencePage_21=Формат графиков R по умолчанию
-ExportPreferencePage_3=Кодировка экспортируемых файлов
-ExportPreferencePage_4=Показать результаты экспорта в текстовом редакторе
-ExportResult_0=Экспорт результатов
-ExportResult_1=N/A_Exporting...
-ExportResult_2=Результаты экспорта сохранены: 
-ExportResult_3=** Экспорт: невозможно создать файл {0}: {1}
-ExportResult_4=** Не удалось произвести экспорт в 
-ExportResult_5=** Не удается прочитать {0}
-ExportResult_6=** Не удалось экспортировать результат {0}: {1}
-ExportSVG_0=N/A_Exporting SVG...
-ExportSVG_2=N/A_Exporting with device: 
-FAILED_TO_PARSE_OPTIONS=** Не удалось проанализировать опции TXM {0}: {1}
-FAILED_TO_SAVE_PREFERENCES=** Не удалось сохранить персональные настройки
-FactorialMapEditor_0=Факторы:  
-FactorialMapEditor_10=** Внутренняя ошибка: ошибка выбора плана ФАС
-FactorialMapEditor_11=Изменить размер
-FactorialMapEditor_13=Обновление факторного плана
-FactorialMapEditor_4=Показать: 
-FactorialMapEditor_5=колонки
-FactorialMapEditor_6=строки
-FactorialMapEditor_8=Перезагрузка факторного плана
-FileExplorerPreferencePage_0=Рег. выр. скрытых файлов
-FileExplorerPreferencePage_1=Показать скрытые файлы
-FileExplorerPreferencePage_2=Показать папки
-FileTreeContentProvider_1=** Проводник: некорректное регулярное выражение
-FileTreeContentProvider_2=\ ОШИБКА 
-FileTreeContentProvider_3=Элемент ошибки: ''
-FileTreeContentProvider_4=''
-FrequencyListEditorInput_0=Список форм
-FrequencyListEditorInput_1=Pareto
-FrequencyListEditorInput_2=Список форм не может быть пустым
-FrequencyListEditorInput_3=Форма
-FrequencyListEditorInput_4=Частотность
-FrequencyListEditorInput_5=Цепочка знаков
-FrequencyListEditorInput_6=Целое
-FrequencyListEditorInput_9=Тип
-GenericMultiPageEditor_1=** Внутренняя ошибка: невозможно показать данные {0}.
-GenericMultiPageEditor_3=** Внутренняя ошибка: число редакторов RCP ({0}) должно соответствовать числу вводов ({1}).
-GetConcordancesDialog_0=** Диалоговое окно конкордансов: {0}
-GetConcordancesDialog_1=Расчет специфичности 
-GetConcordancesDialog_13=Вы должны выбрать одно свойство
-GetConcordancesDialog_14=Некорректное свойство
-GetConcordancesDialog_15=Вы должны выбрать одно свойство
-GetConcordancesDialog_4=С&войство : 
-GetConcordancesDialog_5=&Левый контекст (слова) : 
-GetConcordancesDialog_6=&Правый контекст (слова) : 
-GetConcordancesDialog_7=&Ссылка: 
-GetConcordances_4=** Ошибка при расчете конкордансов: {0}
-GraphicalLogger_0=** Ошибка {0}
-GroovyConsole_4=\nВнутренняя ошибка.
-GroovyConsole_5=Ошибка: 
-ImportDialog_0=Параметры импорта - {0}
-ImportDialog_1=Папка с исходными материалами
-ImportDialog_13=Не удается найти корпус в бинарном формате в этой папке
-ImportDialog_14=Кодировка по умолчанию этого компьютера
-ImportDialog_16=Угадать
-ImportDialog_19=Язык по умолчанию этого компьютера
-ImportDialog_22=Выбрать
-ImportDialog_23=Опции
-ImportDialog_4=Кодировка букв: 
-ImportDialog_5=Основной язык: 
-ImportDialog_6=Параметры словарной сегментации: 
-ImportFormEditor_0=** отсутствует скрипт для импорта {0} 
-ImportPreferencePage_0=Кодировка
-ImportSelectedText_0=Импорт текста из буфера обмена
-ImportSelectedText_1=буфер обмена
-ImportSelectedText_10=Идентифицированный язык 
-ImportSelectedText_12=Невозможно определить язык текста. Будет использован 
-ImportSelectedText_2=** Буфер обмена пуст
-ImportSelectedText_3=Подтвердить
-ImportSelectedText_4=Корпус {0} будет удален
-ImportSelectedText_6=** Внутренняя ошибка: не удается найти проект ''default'' 
-InternalCorpusView_0=** Ошибка при подготовке информации о корпусе
-InternalCorpusView_1=Перезагрузить
-InternalCorpusView_2=** Внутренняя ошибка: getText {0}
-
-Invalid_analysis_property=Некорректное свойство
-JobHandler_0=N/A_Canceling...
-JobHandler_1=N/A_Canceling 
-JobHandler_2=N/A_\ canceling requested
-JobHandler_3=N/A_Failed to cancel 
-JobsTimer_12=ч., 
-JobsTimer_13=\ мин. и 
-JobsTimer_15=Проделано за {0} ({1}).
-JobsTimer_16=. (
-JobsTimer_17=\ мс)
-JobsTimer_19=\u041F\u0440\u043E\u0434\u0435\u043B\u0430\u043D\u043E \u0437\u0430 {0}.
-JobsTimer_2=\ мс
-JobsTimer_20=Job: 
-JobsTimer_21=Exec: 
-JobsTimer_5=\ с
-JobsTimer_9=\ мин. и 
-LanguageSwitchHandler_0=Язык интерфейса (LOCALE) не был определен
-LanguageSwitchHandler_1=Файл {0} не найден
-LanguageSwitchHandler_3=Выбрать язык
-LanguageSwitchHandler_5=** Изменение яызка: некорректый формат URL {0}
-LanguageSwitchHandler_7=TXM.ini : 
-LexicalTableEditor_1=** Ошибка: Не совпадает число колонок: до 
-LexicalTableEditor_10=Объед. или Удал. колонок
-LexicalTableEditor_11=Объед. колонок: {0}
-LexicalTableEditor_12=Удал. колонок: {0}
-LexicalTableEditor_13=Объед. или Удал. строк
-LexicalTableEditor_14=** Не удалось импортировать словарную таблицу
-LexicalTableEditor_15=** Ошибка при импортировании данных:  
-LexicalTableEditor_16=Фильтрация строк
-LexicalTableEditor_18=Объединение строк
-LexicalTableEditor_2=, Fmin 
-LexicalTableEditor_3=, Fmax 
-LexicalTableEditor_4=Оставить
-LexicalTableEditor_5=Оставить {0} строк, Fmin {1}
-LexicalTableEditor_6=Fmin :
-LexicalTableEditor_7=\ после  
-LexicalTableEditor_8=Число строк 
-LexicalTablePreferencePage_0=Словарная таблица
-LexicalTablePreferencePage_1=Минимальная частотность
-LexicalTable_1=Свойство
-LineLabelProvider_1=Не должно происходить
-LocalePreferencePage_1=Конфигрурация языка пользовательского интерфейса
-LocalePreferencePage_2=Язык интерфейса 
-MacrosExplorer_0=N/A_New macro
-MacrosExplorer_1=N/A_Create a new macro from a template
-MainPage_0=Главная страница
-MainPage_1=Главный
-MainPage_10=\tЧтобы перейти на следующую панель, используйте закладку снизу.\n
-MainPage_11=3-\tВы можете сохранить параметры импорта с помощью значка дискеты.\n
-MainPage_12=4-\tДля запуска импорта нажмите на зелёную стрелку.
-MainPage_13=параллелизм
-MainPage_14=Корпуса
-MainPage_15=Добавить параллельный корпус
-MainPage_17=Введите имя корпуса
-MainPage_18=Входная стилевая таблица XSL
-MainPage_19=Параметры словарной сегментации
-MainPage_2=Параметры импорта в модуле {0}
-MainPage_20=Основной язык
-MainPage_22=Удалить корпус
-MainPage_23=Кодировка
-MainPage_25=Введите имя удаляемого корпуса
-MainPage_27=Гиперссылки
-MainPage_28=** Ошибка при получении кодировки
-MainPage_29=Добавить гиперссылку
-MainPage_3=Папка с исходными материалами: 
-MainPage_30=Создать гиперссылку из корпуса: 
-MainPage_31=Выберите 2 корпуса:
-MainPage_33=seg
-MainPage_34=Удалить гиперссылку
-MainPage_36=Введите номер удаляемой строки
-MainPage_38=Убрать гиперссылку №
-MainPage_39=Введите корректное число
-MainPage_4=Имя корпуса (базы)
-MainPage_40=Первый корпус
-MainPage_42=Структура выравнивания
-MainPage_44=* \n(имя архива без расширения, в котором будет храниться корпус)
-MainPage_45=Описание
-MainPage_46=Добавить 
-MainPage_47=N/A_
-MainPage_49=N/A_base name is mandatory
-MainPage_5=N/A_Opening...
-MainPage_50=N/A_refresh links table
-MainPage_52=N/A_The source directory does not contain import.xml
-MainPage_53=N/A_Sorry, ''the import.xml'' file could not been created
-MainPage_54=N/A_Load params from: 
-MainPage_55=N/A_Params: 
-MainPage_6=N/A_Saving...
-MainPage_7=N/A_Starting...
-MainPage_8=N/A_1-\tClick on the ''folder'' icon to choose the source directory\n
-MainPage_9=N/A_2-\tIf you want to add details such as default subcorpus, exemple queries or types of word properties,\n
-MergeCols_1=Новое имя
-MergeCols_2=Имя новой колонки, образованной объединением
-MergeCols_5=Имена: 
-MergeCols_6=Объединение колонок завершено.
-MergeDeleteDialog_0=объединить
-MergeDeleteDialog_1=Объединить/Удалить
-MergeDeleteDialog_4=имя результата объединения
-MergeLines_2=Наберите имя новой строки, образованной в результате объединения
-MetadataPage_1=Метаданные
-MetadataPage_2=Параметры метаданных
-MetadataPage_3=Открыть файл с метаданными
-MetadataPage_4=Заглавия колонок в файле с метаданными 
-MetadataPage_5=Индентификатор текста
-MetadataPage_7=** Не удалось найти файл с метаданными {0}
-MultipleValueTreeDialog_0=добавление: 
-NavigationWidget_0=N/A_Error while getting current position value : 
-ObjectExplorer_0=Информация: 
-ObjectExplorer_10=Удалить свойство
-ObjectExplorer_12=Набрать имя удаляемого свойства
-ObjectExplorer_15=Добавить свойство нижестоящим элементам
-ObjectExplorer_2=Значение
-ObjectExplorer_21=Удалить свойство у нижестоящих элементов
-ObjectExplorer_26=Имя
-ObjectExplorer_27=Ключ
-ObjectExplorer_3=Новое свойство
-ObjectExplorer_4=Имя свойства
-ObjectExplorer_5=Введите имя добавляемого свойства
-ObjectExplorer_7=новое имя
-ObjectExplorer_9=
-ObjectSelectionDialog_0=Селектор значений
-ObjectSelectionDialog_3=Найдено {0} значений
-ObjectSelectionDialog_5=Некорректное регулярное выражение: {0}
-ObjectSelector_0=Объект: 
-ObjectSelector_1=Выбор
-OpenBiblio_1=** В корпусе нет ни одного текста {0}
-OpenBiblio_2=Выбрать текст
-OpenBiblio_7=** Не удается найти текст {0} в корпусе {1}
-OpenBiblio_9=** Нет ни одной библиографической записи для текста {0}
-OpenBrowser_0=** Ошибка при открытии библиографической записи 
-OpenBrowser_1=. URL
-OpenEdition_0=Выбрать часть
-OpenEdition_1=** Не удалось загрузить издание {0}
-OpenEdition_3=Открытие издания 
-OpenEdition_5=** Не удается найти первый текст с идентификатором {0} в корпусе или
-OpenEdition_7=** Не удается найти издание по умолчанию 
-OpenEdition_8=** Не удается найти первую страницу издания 
-OpenEmptyEditor_2=** Библиография: не удается найти папку {0}
-OpenGraph_8=** Не удается октрыть график {0}
-OpenParaBrowser_0=Открытие Парабраузер//
-OpenSVGGraph_0=График SVG 
-OpenTXMUserPreferences_0=Параметры по умолчанию
-OpenURI_0=** OpenURL : Рабочий стол не поддерживается
-OpenURI_1=** Ошибка при открытии файла {0}
-ParaBrowserEditor_11=ParaBrowser : get next({0}) struct {1} paraid {2} value {3}
-ParaBrowserEditor_18=-Перейти к 
-ParaBrowserEditor_19=-Оставаться на месте!!!!! NEXT - 
-ParaBrowserEditor_21=_
-ParaBrowserEditor_22=Открыть встроенный браузер
-ParaBrowserEditor_3=Ссылка : 
-ParaBrowserEditor_4=Ссылки
-ParaBrowserEditor_5=Структура
-ParaBrowserEditor_9=Ссылки: {0} : {1}
-ParametersDialog_0={0} parameters input
-ParametersDialog_1=N/A_Run
-ParametersDialog_10=N/A_Unknowed widget name: ''
-ParametersDialog_11=N/A_(* mandatory fields)
-ParametersDialog_12=N/A_** Error : missing value: 
-ParametersDialog_13=N/A_** Error : format error: 
-ParametersDialog_14=N/A_Error in @Option name declaration: 
-ParametersDialog_15=N/A_Error: the bean is not a groovy.lang.Script object
-ParametersDialog_17=N/A_Error: the ''monitor'' (JobHandler class) binding is missing. Got\: {0}.
-PartitionComposer_0=Структура: 
-PartitionComposer_11=Удалить
-PartitionComposer_2=Выбрать значения для назначения: 
-PartitionComposer_3=Новая часть
-PartitionComposer_5=Часть
-PartitionComposer_6=Удалить все части
-PartitionComposer_8=Заголовок: 
-PartitionComposer_9=Назначить
-PartsSize_0=N/A_\n Sorted by size
-PartsSize_10=Размеры распределения {0} корпуса {1} в порядке величины
-PartsSize_2=N/A_Number of words per part
-PasteFile_1=** Ошибка при копировании  
-PasteFile_3=** Не удалось удалить
-PasteFile_4= : 
-Preferences_Menu_Label=Опции
-ProgressionForm_0=N/A_Type :
-ProgressionForm_1=N/A_cumulatif
-ProgressionForm_10=N/A_R�p�t�
-ProgressionForm_11=N/A_N&&B
-ProgressionForm_12=N/A_REQUETES :
-ProgressionForm_13=N/A_ajouter
-ProgressionForm_14=N/A_supprimer
-ProgressionForm_2=N/A_densit�
-ProgressionForm_3=N/A_Echelle
-ProgressionForm_5=N/A_Options d''affichage
-ProgressionForm_6=N/A_Unit� structurelle :
-ProgressionForm_7=N/A_Propri�t� :
-ProgressionForm_8=N/A_Exp. R�g. :
-ProgressionForm_9=N/A_Syles de ligne diff�rents
-PropertiesSelector_0=Не удается загрузить свойства корпуса {0} ({1})
-PropertiesSelector_1=Свойства: 
-PropertiesSelector_2=Править
-PropertySelector_0=Выбрать свойство
-PurgeCorpora_0=Осторожно! Эта команда приведет к удалению всех выделенных корпусов. Продолжить?
-PurgeCorpora_1=Удаляемые корпуса 
-PurgeCorpora_10=Создание нового рабочего пространства
-PurgeCorpora_12=Перезагрузка платформы
-PurgeCorpora_13=** Ошибка: не удалось найти рабочее пространство: 
-PurgeCorpora_2=** Внимание! не были удалены корпуса: 
-PurgeCorpora_3=Осторожно! Эта команда приведет к удалению всех корпусов. Продолжить?
-PurgeCorpora_4=** Ошибка: переменная окружения ''TXMHOME'' не задана (ее значение по умолчанию -  ''$HOME/TXM''). Работа прекращена.
-PurgeCorpora_5=Удаление всех корпусов
-PurgeCorpora_7=** Не удалось удалить корпуса
-PurgeCorpora_9=** Не удалось удалить регистр
-QueriesView_1=Экспортировать всё
-QueriesView_10=ошибка: 
-QueriesView_5=Запросы:\n
-QueryAssistDialog_0=Мастер Запросов
-QueryAssistDialog_1=Дополнительное слово
-QueryAssistDialog_10=совпадает с
-QueryAssistDialog_11=начинается с
-QueryAssistDialog_12=заканчивается на
-QueryAssistDialog_13=содержит
-QueryAssistDialog_2=Я ищу: 
-QueryAssistDialog_3= слово
-QueryAssistDialog_32=за ним 
-QueryAssistDialog_33=с интервалом не менее 0 слов
-QueryAssistDialog_34=с интервалом не менее 1 слова
-QueryAssistDialog_8=- Слово №
-QueryIndexEditor_0=N/A_Query Index of 
-QueryIndexEditor_1=N/A_replacing line: 
-QueryIndexEditor_10=N/A_queries
-QueryIndexEditor_11=N/A_QueryIndex tooltip
-QueryIndexEditor_2=N/A_Failed to add line with query: 
-QueryIndexEditor_3=N/A_Line added.
-QueryIndexEditor_4=N/A_Load from a file
-QueryIndexEditor_5=N/A_*.properties
-QueryIndexEditor_6=N/A_Cannot read from file: 
-QueryIndexEditor_7=N/A_Link to concordance
-QueryIndexEditor_8=N/A_Link to progression
-QueryIndexEditor_9=N/A_delete lines
-RPreferencePage_0=N/A_Run RServe in debug mode
-RPreferencePage_1=N/A_Port (default is 6311)
-RPreferencePage_2=Путь к исполняемому &файлу R
-RPreferencePage_3=Удаленное соединение
-RPreferencePage_4=Адрес сервера
-RPreferencePage_5=Пользователь
-RPreferencePage_6=Пароль
-RPreferencePage_7=Использовать передачу данных R через файл
-RVariablesView_1=Обновить переменные
-RVariablesView_2=Показать отчет об оценках
-RVariablesView_9=имя TXM {0} >> имя R {1}
-ReferencerEditor_0=Расчет ссылок <{0}> в {1} с приоритетом {2} по шаблону {3}
-ReferencerEditor_10=Получение индексов
-ReferencerEditor_11=Ссылки
-ReferencerEditor_12=Группировка позиций по индексам
-ReferencerEditor_13=Обновление интерфейса
-ReferencerEditor_17=Показ первой страницы результатов 
-ReferencerEditor_19=Показ последней страницы результатов 
-ReferencerEditor_21=Показ следующей страницы результатов 
-ReferencerEditor_23=Показ предыдущей страницы результатов 
-ReferencerEditor_25=Открытие конкорданса
-ReferencerEditor_5=Расчет ссылок {0}
-ReferencerEditor_6=Шаблон ссылок 
-ReferencerEditor_7=Ни одного результата
-ReferencerEditor_8=Получение употреблений
-ReferencerEditor_9=Единицы
-ReferencerPreferencePage_2=Ссылки
-ReferencerPreferencePage_3=Сортировать ссылки по частотности
-RenameFile_0=Переименовать файл
-RenameFile_2=Переименование через: 
-RenameFile_3=** Не удалось переименовать 
-ProgressionDialog_0=Параметры прогрессии 
-ProgressionDialog_1=Тип графа: 
-ProgressionDialog_10=Прогрессия: некорректное регулярное выражение: 
-ProgressionDialog_11=Масштаб полос
-ProgressionDialog_13=Опции вида
-ProgressionDialog_14=Различные стили строк
-ProgressionDialog_15=Повторять идентичные значения
-ProgressionDialog_16=Ч/Б
-ProgressionDialog_17=Ошибка: мультипликатор полосы: 
-ProgressionDialog_2=кумулятивный
-ProgressionDialog_3=плотность
-ProgressionDialog_4=Структурная единица: 
-ProgressionDialog_5=удалить
-ProgressionDialog_7=Рег. Выр.: 
-ProgressionDialog_8=Запросы: 
-ProgressionDialog_9=добавить
-ProgressionEditorInput_0=PROGRESSION NAME
-RestartTXM_0=Перезагрузка видов...
-RestartTXM_1=Перезагрузить TXM
-RunGroovyScript_0=Выполнение скрипта
-RunGroovyScript_1=&Выполнить скрипт
-RunGroovyScript_2=Выполнить скрипт
-RunGroovyScript_3=*.groovy
-RunGroovyScript_4=Ошибка при открытии скрипта groovy : {0}
-RunGroovyScript_8=** Ошибка при выполнении скрипта groovy : {0}
-RunGroovyScript_9=Выполнение скрипта
-SVGGraphicEditor_1=Не удается показать график на основе предоставленной информации.
-SaveAs_2=** Не удалось сохранить 
-ScriptPreferencePage_0=Следующий номер сессии 
-ScriptPreferencePage_3=&Корневая папка
-SendToR_0=Передача в рабочее пространство R: 
-SendToR_3=Поиск видов...
-SetContextSize_1=Задать размер &контекстов
-SetContextSize_2=Задать размер контекстов
-SetContextSize_3=Размер левого контекста
-SetContextSize_4=Размер правого контекста
-SetEncoding_0=Изменить кодировку
-SetEncoding_1=Изменить кодировку.\n\n\tИспользуемая кодировка: 
-SetEncoding_2=\n\tКодировка по умолчанию:  
-SetLineNumber_0=Количество строк на странице
-SetLineNumber_1=№ строки
-SetSortProperty_1=Задать свойство &Сортировки
-SetSortProperty_2=Задать свойство сортировки
-SetSortProperty_3=Свойство сортировки
-ShowSelected_4=Править свойство ''LANG''
-ShowSvgHelp_0=Команды SVG
-ShowSvgHelp_1=Перевод: Shift + Левый щелчок + Перетащить\n
-ShowSvgHelp_2=Масштаб +/- : Shift + Правый щелчок + Перетащить\n
-ShowSvgHelp_3=Увеличение выделения: Ctrl + Левый щелчок + Перетащить\n
-ShowSvgHelp_4=Поворот: Ctrl + Правый щелчок + Перетащить\n
-ShowSvgHelp_5=Исходное состояние: F5
-SingularValuesEditor_0=Ошибочный ввод
-SortPropertySelection_0=Выбрать свойства для сортировки
-Structure_field_not_empty=Поле Структура не должно быть пустым.
-Submit_0=Сохранить
-TXMCqpServerWatcher_0=Поисковая машина остановлена
-TXMCqpServerWatcher_1=Пожалуйста, подождите, пока поисковая машина перезагружается...
-TXMRServeWatcher_0=Статистическая машина остановлена
-TXMRServeWatcher_1=Пожалуйста, подождите, пока статистическая машина перезагружается...
-TXMRServeWatcher_2=Ok
-TXMRServeWatcher_3=Перезагрузка вида корпусов...
-TXMRServeWatcher_4=Пожалуйста, подождите...
-TablableVector_0=Обе таблицы должны быть одинакового размера.
-TableEditor_0=Невозможно показать таблицу с предложенной информацией
-TableKeyListener_1=Наберите регулярное выражение вашего запроса
-TableKeyListener_6=Скопированные строки: \n
-TableSorter_0=Номер колонки слишком велик.
-TextometriePreferencePage_0=N/A_Automatically find new updates and notify me
-TextometriePreferencePage_1=N/A_General preferences
-TextometriePreferencePage_14=Настройки сохранены в 
-TextometriePreferencePage_15=Экспорт настроек в файл
-TextometriePreferencePage_18=Настройки импортированы из 
-TextometriePreferencePage_19=Необходимо закрыть окно настроек, чтобы TXM могла их обновить
-TextometriePreferencePage_2=N/A_Auto updates
-TextometriePreferencePage_20=Импортировать из файла
-TreeTaggerPreferencePage_0=N/A_Don''t normalize apotrophes to '' 
-TreeTaggerPreferencePage_1=Путь к установочной папке TreeTagger
-TreeTaggerPreferencePage_2=Путь к папке с языковыми моделами для TreeTagger
-TreeTaggerPreferencePage_3=Опции [разделитель ''  '' (2 пробела)]
-TxmBrowser_0=Начало
-TxmBrowser_10=Не удается запустить встроенные браузер. Вы должны отрегулировать соответствующий параметр в Настройках, с помощью меню Общие / Веб браузер
-TxmBrowser_11=Нет предыдущего текста
-TxmBrowser_12=Нет следующего текста
-TxmBrowser_5=предыдущая страница
-TxmBrowser_6=следующая страница
-TxmBrowser_7=В конец
-TxmBrowser_8=следующий текст
-TxmBrowser_9=предыдущий текст
-TxmCommand_1=Загрузка расширения
-TxtEditor_0=ТекстовыйРедактор: 
-TxtEditor_1=Найденная кодировка 
-UIParameterException_0=N/A_Error  
-UserPreferencePage_0=Страница Пользователя
-UserPreferencePage_3=Не требуется подтверждение для удаления объекта
-ViewPropertySelectionDialog_0=Выбрать свойства
-ViewPropertySelection_0=Выбрать свойства
-IndexToCooccurrence_0=** Ошибка при связывании Индекса и Совместной встречаемости
-IndexToLexicalTable_0=Невозможно составить словарную таблицу из Индекса, полученного на Корпусе
-WordCloudPreferencePage_0=N/A_Maximum number of words
-WordCloudPreferencePage_1=N/A_Minimal frequency
-WordCloudPreferencePage_2=N/A_Percents of rotated words
-WordCloudPreferencePage_3=N/A_Random color order
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/Messages.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/Messages.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/Messages.java	(revision 513)
@@ -1,1204 +0,0 @@
-
-package org.txm.rcp;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-public class Messages extends NLS {
-	
-	// The Constant BUNDLE_NAME. 
-	private static final String BUNDLE_NAME = "org.txm.rcp.messages"; //$NON-NLS-1$
-
-	public static String REFRESH;
-
-	public static String OK;
-	
-	public static String CGU_TITLE;
-	public static String CGU_MESSAGE;
-	public static String CGU_CHECKMESSAGE;
-	
-	public static String SORT_COLUMN;
-	public static String SORT_DONE;
-
-	public static String About_Menu_Label;
-	public static String AdapterFactory_0;
-	public static String AddBase_1;
-	public static String AddBase_10;
-	public static String AddBase_16;
-	public static String AddBase_17;
-	public static String AddBase_19;
-	public static String AddBase_2;
-	public static String AddBase_20;
-	public static String AddBase_22;
-	public static String AddBase_23;
-	public static String AddBase_24;
-	public static String AddBase_25;
-	public static String AddBase_27;
-	public static String AddBase_28;
-	public static String AddBase_29;
-	public static String AddBase_31;
-	public static String AddBase_32;
-	public static String AddBase_33;
-	public static String AddBase_34;
-	public static String AddBase_4;
-	public static String AddBase_7;
-	public static String AddProject_3;
-	public static String AdvancePreferencePage_0;
-
-	public static String AdvancePreferencePage_1;
-	public static String AdvancePreferencePage_12;
-	public static String AdvancePreferencePage_13;
-	public static String AdvancePreferencePage_14;
-	public static String AdvancePreferencePage_2;
-	public static String AdvancePreferencePage_3;
-	public static String AdvancePreferencePage_4;
-
-	public static String AdvancePreferencePage_6;
-	public static String AnnotationPreferences_0;
-	public static String AnnotationPreferences_1;
-	public static String AnnotationPreferences_2;
-	public static String AdvancePreferencePage_7;
-	
-	public static String Property;
-	public static String NumberOfLines;
-	
-	public static String ApplicationWorkbenchAdvisor_0;
-	public static String ApplicationWorkbenchAdvisor_1;
-	public static String ApplicationWorkbenchAdvisor_11;
-	public static String ApplicationWorkbenchAdvisor_12;
-	public static String ApplicationWorkbenchAdvisor_13;
-	public static String ApplicationWorkbenchAdvisor_16;
-	public static String ApplicationWorkbenchAdvisor_17;
-	public static String ApplicationWorkbenchAdvisor_18;
-	public static String ApplicationWorkbenchAdvisor_19;
-	public static String ApplicationWorkbenchAdvisor_2;
-	public static String ApplicationWorkbenchAdvisor_20;
-	public static String ApplicationWorkbenchAdvisor_21;
-	public static String ApplicationWorkbenchAdvisor_22;
-	public static String ApplicationWorkbenchAdvisor_23;
-	public static String ApplicationWorkbenchAdvisor_24;
-	public static String ApplicationWorkbenchAdvisor_25;
-	public static String ApplicationWorkbenchAdvisor_26;
-	public static String ApplicationWorkbenchAdvisor_27;
-	public static String ApplicationWorkbenchAdvisor_28;
-	public static String ApplicationWorkbenchAdvisor_29;
-	public static String ApplicationWorkbenchAdvisor_3;
-	public static String ApplicationWorkbenchAdvisor_30;
-	public static String ApplicationWorkbenchAdvisor_31;
-	public static String ApplicationWorkbenchAdvisor_32;
-	public static String ApplicationWorkbenchAdvisor_33;
-	public static String ApplicationWorkbenchAdvisor_34;
-	public static String ApplicationWorkbenchAdvisor_35;
-	public static String ApplicationWorkbenchAdvisor_36;
-	public static String ApplicationWorkbenchAdvisor_37;
-	public static String ApplicationWorkbenchAdvisor_38;
-	public static String ApplicationWorkbenchAdvisor_39;
-	public static String ApplicationWorkbenchAdvisor_4;
-	public static String ApplicationWorkbenchAdvisor_40;
-	public static String ApplicationWorkbenchAdvisor_41;
-	public static String ApplicationWorkbenchAdvisor_42;
-	public static String ApplicationWorkbenchAdvisor_43;
-	public static String ApplicationWorkbenchAdvisor_43_single;
-	public static String ApplicationWorkbenchAdvisor_44;
-	public static String ApplicationWorkbenchAdvisor_45;
-	public static String ApplicationWorkbenchAdvisor_46;
-	public static String ApplicationWorkbenchAdvisor_47;
-	public static String ApplicationWorkbenchAdvisor_48;
-	public static String ApplicationWorkbenchAdvisor_49;
-	public static String ApplicationWorkbenchAdvisor_5;
-	public static String ApplicationWorkbenchAdvisor_51;
-	public static String ApplicationWorkbenchAdvisor_52;
-	public static String ApplicationWorkbenchAdvisor_53;
-	public static String ApplicationWorkbenchAdvisor_54;
-	public static String ApplicationWorkbenchAdvisor_55;
-	public static String ApplicationWorkbenchAdvisor_56;
-	public static String ApplicationWorkbenchAdvisor_57;
-	public static String ApplicationWorkbenchAdvisor_58;
-	public static String ApplicationWorkbenchAdvisor_59;
-	public static String ApplicationWorkbenchAdvisor_60;
-	public static String ApplicationWorkbenchAdvisor_61;
-	public static String ApplicationWorkbenchAdvisor_63;
-	public static String ApplicationWorkbenchAdvisor_64;
-	public static String ApplicationWorkbenchAdvisor_65;
-	public static String ApplicationWorkbenchAdvisor_66;
-	public static String ApplicationWorkbenchAdvisor_67;
-	public static String ApplicationWorkbenchAdvisor_68;
-	public static String ApplicationWorkbenchAdvisor_69;
-	public static String ApplicationWorkbenchAdvisor_7;
-	public static String ApplicationWorkbenchAdvisor_71;
-	public static String ApplicationWorkbenchAdvisor_72;
-	public static String ApplicationWorkbenchAdvisor_73;
-	public static String ApplicationWorkbenchAdvisor_74;
-	public static String ApplicationWorkbenchAdvisor_75;
-	public static String ApplicationWorkbenchAdvisor_76;
-	public static String ApplicationWorkbenchAdvisor_77;
-	public static String ApplicationWorkbenchAdvisor_78;
-	public static String ApplicationWorkbenchAdvisor_79;
-	public static String ApplicationWorkbenchAdvisor_8;
-	public static String ApplicationWorkbenchAdvisor_86;
-	public static String ApplicationWorkbenchAdvisor_87;
-	public static String ApplicationWorkbenchAdvisor_88;
-	public static String ApplicationWorkbenchAdvisor_89;
-	public static String ApplicationWorkbenchAdvisor_9;
-	public static String ApplicationWorkbenchAdvisor_init;
-	public static String ApplicationWorkbenchAdvisor_init_failed;
-
-	public static String ApplicationWorkbenchAdvisor_PROGRESS_BAR_LOADING_CORPORA;
-	public static String ApplicationWorkbenchAdvisor_ready;
-
-	public static String ApplicationWorkbenchWindowAdvisor_0;
-
-	public static String ApplicationWorkbenchWindowAdvisor_9;
-	public static String Application_0;
-
-	public static String Application_1;
-
-	public static String Application_10;
-
-	public static String Application_11;
-
-	public static String Application_2;
-
-	public static String Application_4;
-	public static String Application_6;
-
-	public static String Application_8;
-
-	public static String Application_9;
-	public static String AssistedQueryWidget_0;
-	public static String BackToText_0;
-	public static String CANT_CREATE_GRAPHIC;
-	public static String CQPPreferenceInitializer_0;
-	public static String CQPPreferenceInitializer_1;
-	public static String CQPPreferencePage_0;
-	public static String CQPPreferencePage_1;
-	public static String CQPPreferencePage_10;
-	public static String CQPPreferencePage_11;
-	public static String CQPPreferencePage_12;
-	public static String CQPPreferencePage_13;
-	public static String CQPPreferencePage_14;
-	public static String CQPPreferencePage_15;
-	public static String CQPPreferencePage_16;
-	public static String CQPPreferencePage_17;
-	public static String CQPPreferencePage_18;
-	public static String CaEditor_0;
-
-	public static String Cannot_ask_simple_when_advance;
-	public static String ColRowInfosLabelProvider_19;
-	public static String ColRowInfosLabelProvider_9;
-	public static String ColsRowsInfosEditor_0;
-	public static String ColsRowsInfosEditor_2;
-	public static String Commands_0;
-	public static String ComplexSortSelector_0;
-	public static String ComplexSortSelector_1;
-	public static String ComplexSortSelector_2;
-	public static String ComplexSortSelector_5;
-	public static String ComplexSortSelector_6;
-	public static String ComplexSort_0;
-	public static String ComplexSort_1;
-	public static String ComplexSort_10;
-	public static String ComplexSort_11;
-	public static String ComplexSort_12;
-	public static String ComplexSort_14;
-	public static String ComplexSort_16;
-	public static String ComplexSort_18;
-	public static String ComplexSort_2;
-	public static String ComplexSort_3;
-	public static String ComplexSort_4;
-	public static String ComplexSort_5;
-	public static String ComplexSort_6;
-	public static String ComplexSort_9;
-	public static String ComplexSubcorpusPanel_0;
-	public static String ComplexSubcorpusPanel_1;
-	public static String ComplexSubcorpusPanel_16;
-	public static String ComplexSubcorpusPanel_2;
-	public static String ComplexSubcorpusPanel_4;
-	public static String ComplexSubcorpusPanel_5;
-	public static String ComputeConcordance_0;
-	public static String ComputeConcordance_1;
-	public static String ComputeCoocFromLines_0;
-	public static String ComputeCoocFromLines_1;
-	public static String ComputeCoocMatrix_0;
-	public static String ComputeCoocMatrix_1;
-	public static String ComputeCoocMatrix_10;
-	public static String ComputeCoocMatrix_11;
-	public static String ComputeCoocMatrix_12;
-	public static String ComputeCoocMatrix_13;
-	public static String ComputeCoocMatrix_2;
-	public static String ComputeCoocMatrix_3;
-	public static String ComputeCoocMatrix_4;
-	public static String ComputeCoocMatrix_7;
-	public static String ComputeCooccurrences_0;
-	public static String ComputeCooccurrences_1;
-
-	public static String ComputeCooccurrences_2;
-	public static String ComputeFrequencyList_2;
-	public static String ComputeIndexFromLines_0;
-
-
-	public static String ComputeLexicalTable_0;
-	public static String ComputeLexicalTable_1;
-	public static String ComputeLexicalTable_10;
-	public static String ComputeLexicalTable_12;
-	public static String ComputeLexicalTable_13;
-	public static String ComputeLexicalTable_16;
-	public static String ComputeLexicalTable_2;
-	public static String ComputeLexicalTable_3;
-
-	public static String ComputeLexicalTable_4;
-	public static String ComputeLexicalTable_5;
-	public static String ComputeLexicalTable_6;
-	public static String ComputeLexicalTable_7;
-	public static String ComputeLexicalTable_9;
-	public static String ComputeReferencer_0;
-	public static String ComputeSpecificitiesDialog_0;
-	public static String ComputeSpecificitiesDialog_1;
-	public static String ComputeSpecificitiesDialog_3;
-	public static String ComputeSpecificitiesDialog_4;
-	public static String ComputeSpecificitiesDialog_9;
-	public static String ComputeSpecificities_0;
-	public static String ComputeSpecificities_2;
-	public static String ComputeSpecifities_0;
-
-	public static String ComputeSpecifities_1;
-
-	public static String ComputeSpecifities_10;
-	public static String ComputeSpecifities_11;
-	public static String ComputeSpecifities_2;
-	public static String ComputeSpecifities_3;
-
-	public static String ComputeSpecifities_4;
-	public static String Compute_Specificities;
-
-	public static String ComputeDiagnostic_0;
-
-	public static String ComputeDiagnostic_1;
-	public static String ConcordancerPreferencePage_3;
-	public static String ConcordancerPreferencePage_4;
-	public static String ConcordancerPreferencePage_5;
-	public static String ConcordancerPreferencePage_6;
-	public static String ConcordancesEditorContributor_0;
-	public static String ConcordancesEditor_0;
-	public static String ConcordancesEditor_1;
-
-	public static String ConcordancesEditor_10;
-
-	public static String ConcordancesEditor_101;
-
-	public static String ConcordancesEditor_108;
-	public static String ConcordancesEditor_11;
-
-	public static String ConcordancesEditor_111;
-
-	public static String ConcordancesEditor_112;
-
-	public static String ConcordancesEditor_113;
-	public static String ConcordancesEditor_12;
-	public static String ConcordancesEditor_13;
-	public static String ConcordancesEditor_14;
-
-	public static String ConcordancesEditor_15;
-	public static String ConcordancesEditor_16;
-
-	public static String ConcordancesEditor_17;
-	public static String ConcordancesEditor_18;
-	public static String ConcordancesEditor_19;
-	public static String ConcordancesEditor_2;
-	public static String ConcordancesEditor_20;
-
-	public static String ConcordancesEditor_21;
-
-	public static String ConcordancesEditor_22;
-
-	public static String ConcordancesEditor_23;
-
-	public static String ConcordancesEditor_24;
-
-	public static String ConcordancesEditor_25;
-	public static String ConcordancesEditor_26;
-	public static String ConcordancesEditor_27;
-
-	public static String ConcordancesEditor_28;
-	public static String ConcordancesEditor_29;
-	public static String ConcordancesEditor_3;
-	public static String ConcordancesEditor_30;
-
-	public static String ConcordancesEditor_31;
-
-	public static String ConcordancesEditor_32;
-
-	public static String ConcordancesEditor_33;
-	public static String ConcordancesEditor_34;
-
-	public static String ConcordancesEditor_35;
-
-	public static String ConcordancesEditor_36;
-
-	public static String ConcordancesEditor_37;
-	public static String ConcordancesEditor_38;
-	public static String ConcordancesEditor_39;
-	public static String ConcordancesEditor_4;
-
-	public static String ConcordancesEditor_40;
-
-	public static String ConcordancesEditor_41;
-
-	public static String ConcordancesEditor_42;
-	public static String ConcordancesEditor_43;
-
-	public static String ConcordancesEditor_44;
-
-	public static String ConcordancesEditor_45;
-	public static String ConcordancesEditor_46;
-
-	public static String ConcordancesEditor_47;
-
-	public static String ConcordancesEditor_48;
-
-	public static String ConcordancesEditor_49;
-	public static String ConcordancesEditor_5;
-	public static String ConcordancesEditor_50;
-
-	public static String ConcordancesEditor_51;
-
-	public static String ConcordancesEditor_52;
-
-	public static String ConcordancesEditor_53;
-
-	public static String ConcordancesEditor_54;
-
-	public static String ConcordancesEditor_55;
-	public static String ConcordancesEditor_56;
-
-	public static String ConcordancesEditor_57;
-
-	public static String ConcordancesEditor_58;
-
-	public static String ConcordancesEditor_59;
-
-	public static String ConcordancesEditor_6;
-
-	public static String ConcordancesEditor_60;
-
-	public static String ConcordancesEditor_61;
-
-	public static String ConcordancesEditor_62;
-
-	public static String ConcordancesEditor_63;
-
-	public static String ConcordancesEditor_64;
-
-	public static String ConcordancesEditor_65;
-
-	public static String ConcordancesEditor_66;
-
-	public static String ConcordancesEditor_67;
-
-	public static String ConcordancesEditor_68;
-
-	public static String ConcordancesEditor_69;
-	public static String ConcordancesEditor_7;
-
-	public static String ConcordancesEditor_70;
-
-	public static String ConcordancesEditor_71;
-
-	public static String ConcordancesEditor_72;
-
-	public static String ConcordancesEditor_73;
-
-	public static String ConcordancesEditor_74;
-
-	public static String ConcordancesEditor_75;
-
-	public static String ConcordancesEditor_76;
-
-	public static String ConcordancesEditor_77;
-
-	public static String ConcordancesEditor_78;
-
-	public static String ConcordancesEditor_79;
-	public static String ConcordancesEditor_8;
-
-	public static String ConcordancesEditor_80;
-
-	public static String ConcordancesEditor_81;
-
-	public static String ConcordancesEditor_82;
-
-	public static String ConcordancesEditor_83;
-
-	public static String ConcordancesEditor_84;
-
-	public static String ConcordancesEditor_85;
-
-	public static String ConcordancesEditor_86;
-
-	public static String ConcordancesEditor_87;
-
-	public static String ConcordancesEditor_88;
-
-	public static String ConcordancesEditor_9;
-
-	public static String ConcordancesEditor_99;
-	public static String ConcordancesEditor_100;
-	public static String ConcordancesEditor_110;
-	public static String ConcordancesEditor_114;
-	public static String ConcordancesEditor_115;
-	public static String ConcordancesEditor_116;
-	public static String ConvertCorpus_0;
-	public static String CorporaView_0;
-	public static String CorporaView_1;
-	public static String CorporaView_2;
-	public static String CorporaView_3;
-	public static String CorporaView_4;
-	public static String CorporaView_5;
-	public static String CorporaView_6;
-	public static String CorporaView_7;
-	public static String CorporaView_9;
-	public static String CorpusPage_0;
-	public static String CorpusPage_1;
-	public static String CorpusPage_10;
-	public static String CorpusPage_11;
-	public static String CorpusPage_12;
-	public static String CorpusPage_13;
-	public static String CorpusPage_14;
-	public static String CorpusPage_15;
-	public static String CorpusPage_16;
-	public static String CorpusPage_16a;
-	public static String CorpusPage_17;
-	public static String CorpusPage_18;
-	public static String CorpusPage_19;
-	public static String CorpusPage_2;
-	public static String CorpusPage_20;
-	public static String CorpusPage_21;
-	public static String CorpusPage_22;
-	public static String CorpusPage_23;
-	public static String CorpusPage_24;
-	public static String CorpusPage_25;
-	public static String CorpusPage_26;
-	public static String CorpusPage_27;
-	public static String CorpusPage_28;
-	public static String CorpusPage_29;
-	public static String CorpusPage_3;
-
-	public static String CorpusPage_30;
-	public static String CorpusPage_31;
-	public static String CorpusPage_32;
-	public static String CorpusPage_33;
-	public static String CorpusPage_34;
-	public static String CorpusPage_35;
-	public static String CorpusPage_36;
-	public static String CorpusPage_37;
-	public static String CorpusPage_38;
-	public static String CorpusPage_39;
-	public static String CorpusPage_4;
-	public static String CorpusPage_40;
-	public static String CorpusPage_41;
-	public static String CorpusPage_42;
-	public static String CorpusPage_43;
-	public static String CorpusPage_44;
-	public static String CorpusPage_45;
-	public static String CorpusPage_46;
-	public static String CorpusPage_47;
-	public static String CorpusPage_48;
-	public static String CorpusPage_49;
-	public static String CorpusPage_5;
-	public static String CorpusPage_50;
-	public static String CorpusPage_51;
-	public static String CorpusPage_52;
-	public static String CorpusPage_53;
-	public static String CorpusPage_54;
-	public static String CorpusPage_55;
-
-	public static String CorpusPage_57;
-	public static String CorpusPage_6;
-	public static String CorpusPage_60;
-
-	public static String CorpusPage_61;
-
-	public static String CorpusPage_63;
-
-	public static String CorpusPage_64;
-	public static String CorpusPage_65;
-	public static String CorpusPage_66;
-	public static String CorpusPage_67;
-	
-	public static String CorpusPage_7;
-	public static String CorpusPage_8;
-
-	public static String CorpusPage_80;
-	public static String CorpusPage_9;
-
-	public static String CorpusPage_90;
-
-	public static String CorpusPage_91;
-
-	public static String CorpusPage_92;
-
-	public static String CorpusPage_93;
-	public static String CreateFile_1;
-	public static String CreateFolder_1;
-	public static String CreateFrequencyList_8;
-	public static String CreateMacro_0;
-	public static String CreateMacro_1;
-	public static String CreatePartitionDialog_0;
-	public static String CreatePartitionDialog_1;
-
-	public static String CreatePartitionDialog_10;
-	public static String CreatePartitionDialog_16;
-	public static String CreatePartitionDialog_2;
-	public static String CreatePartitionDialog_3;
-	public static String CreatePartitionDialog_4;
-	public static String CreatePartitionDialog_5;
-	public static String CreatePartitionDialog_6;
-	public static String CreatePartitionDialog_7;
-	public static String CreatePartitionDialog_8;
-	public static String CreatePartitionDialog_9;
-	public static String CreatePartition_0;
-	public static String CreatePartition_2;
-	public static String CreatePartition_5;
-	public static String CreatePartition_55;
-	public static String CreatePartition_6;
-	public static String RefreshingCorporaView;
-	public static String CreateSubCorpus_0;
-
-	public static String CreateSubCorpus_1;
-	public static String LastCQPError;
-	public static String CreateSubCorpus_2;
-
-	public static String CreateSubCorpus_3;
-	public static String CreateSubCorpus_begin;
-	public static String CreateSubCorpus_create;
-	public static String CreateSubcorpusDialog_0;
-	public static String CreateSubcorpusDialog_10;
-	public static String CreateSubcorpusDialog_11;
-	public static String CreateSubcorpusDialog_13;
-	public static String CreateSubcorpusDialog_14;
-	public static String CreateSubcorpusDialog_6;
-	public static String CreateSubcorpusDialog_8;
-	public static String CreateSubcorpus_7;
-	public static String CreateSubcorpus_8;
-	public static String CreateSubcorpus_9;
-	public static String DONE;
-	public static String DefineReferencePattern_0;
-	public static String DefineReferencePattern_1;
-	public static String DefineReferencePattern_2;
-	public static String DefineReferencePattern_3;
-	public static String DefineReferencePattern_4;
-	public static String DefineReferencePattern_5;
-	public static String DeleteFile_0;
-	public static String DeleteFile_2;
-	public static String DeleteInCorporaView_1;
-	public static String DeleteInCorporaView_2;
-	public static String DeleteLines_0;
-	public static String DeleteLines_1;
-	public static String DeleteObject_0;
-	public static String DeleteObject_1;
-
-	public static String DeleteObject_10;
-	public static String DeleteObject_3;
-	public static String DeleteObject_4;
-	public static String DeleteObject_5;
-	public static String DiagnosticPreferencePage_1;
-	public static String DiagnosticPreferencePage_2;
-	public static String DiagnosticPreferencePage_3;
-	public static String Diagnostique_0;
-	public static String Diagnostique_1;
-	public static String Diagnostique_10;
-	public static String Diagnostique_11;
-	public static String Diagnostique_2;
-	public static String Diagnostique_7;
-	public static String Diagnostique_8;
-	public static String Diagnostique_9;
-	public static String ERROR_WHILE_LOADING_CONCORDANCE_LINE;
-	public static String ElementTreeLabelProvider_0;
-	public static String ElementTreeLabelProvider_1;
-	public static String EmpantWidget_0;
-	public static String EmpantWidget_1;
-	public static String EmpantWidget_2;
-	public static String EmpantWidget_3;
-	public static String EmpantWidget_4;
-	public static String EmpantWidget_5;
-	public static String EmpantWidget_6;
-	public static String EmpantWidget_7;
-	public static String EmpantWidget_8;
-	public static String EmpantWidget_9;
-	public static String Error_computing_specificities;
-	public static String Error_creating_partition;
-	public static String ExecuteGroovyScriptFromFile_2;
-	public static String ExecuteGroovyScript_0;
-	public static String ExecuteGroovyScript_1;
-	public static String ExecuteGroovyScript_2;
-
-	public static String ExecuteGroovyScript_9;
-	public static String ExecuteRScript_1;
-	public static String ExecuteRScript_2;
-	public static String ExecuteRScript_3;
-	public static String ExecuteRText_0;
-	public static String ExecuteRText_1;
-	public static String ExecuteRText_2;
-	public static String ExecuteScriptImport_0;
-	public static String ExecuteScriptImport_1;
-	public static String ExecuteScriptImport_2;
-	public static String ExecuteScriptImport_3;
-	public static String ExecuteScriptImport_5;
-	public static String ExecuteScriptImport_6;
-	public static String ExecuteScriptImport_7;
-	public static String ExecuteScriptImport_8;
-	public static String ExecuteScriptR_0;
-	public static String ExecuteScriptR_1;
-	public static String ExecuteScript_0;
-
-	public static String ExecuteScript_1;
-
-	public static String ExecuteScript_2;
-
-	public static String ExecuteScript_3;
-
-	public static String ExecuteScript_4;
-
-	public static String ExecuteScript_5;
-
-	public static String ExecuteScript_6;
-
-	public static String ExecuteScript_7;
-	public static String Exit_Menu_Label;
-	public static String Explorer_0;
-	public static String Explorer_1;
-	public static String Explorer_2;
-	public static String Explorer_3;
-	public static String Explorer_4;
-	public static String Explorer_5;
-	public static String Explorer_6;
-	public static String Explorer_7;
-	public static String Explorer_8;
-	public static String ExportCorpus_0;
-	public static String ExportCorpus_3;
-	public static String ExportCorpus_4;
-	public static String ExportPreferencePage_1;
-	public static String ExportPreferencePage_18;
-	public static String ExportPreferencePage_19;
-	public static String ExportPreferencePage_21;
-	public static String ExportPreferencePage_3;
-	public static String ExportPreferencePage_4;
-	public static String ExportAnnotation_0;
-	public static String ExportResult_0;
-	public static String ExportResult_1;
-	public static String ExportResult_2;
-	public static String ExportResult_3;
-	public static String ExportResult_4;
-	public static String ExportResult_5;
-	public static String ExportResult_6;
-	public static String ExportSVG_0;
-
-	public static String ExportSVG_1;
-	public static String ExportSVG_2;
-
-	public static String ExportSVG_3;
-	public static String FAILED_TO_PARSE_OPTIONS;
-	public static String FAILED_TO_SAVE_PREFERENCES;
-	public static String FactorialMapEditor_0;
-	public static String FactorialMapEditor_10;
-	public static String FactorialMapEditor_11;
-	public static String FactorialMapEditor_13;
-	public static String FactorialMapEditor_4;
-	public static String FactorialMapEditor_5;
-	public static String FactorialMapEditor_6;
-	public static String FactorialMapEditor_8;
-	public static String FileExplorerPreferencePage_0;
-	public static String FileExplorerPreferencePage_1;
-	public static String FileExplorerPreferencePage_2;
-	public static String FileTreeContentProvider_1;
-	public static String FileTreeContentProvider_2;
-	public static String FileTreeContentProvider_3;
-	public static String FileTreeContentProvider_4;
-	public static String FrequencyListEditorInput_0;
-	public static String FrequencyListEditorInput_1;
-	public static String FrequencyListEditorInput_2;
-	public static String FrequencyListEditorInput_3;
-	public static String FrequencyListEditorInput_4;
-	public static String FrequencyListEditorInput_5;
-	public static String FrequencyListEditorInput_6;
-	public static String FrequencyListEditorInput_9;
-	public static String GenericMultiPageEditor_1;
-	public static String GenericMultiPageEditor_3;
-	public static String GetConcordancesDialog_0;
-	public static String GetConcordancesDialog_1;
-	public static String GetConcordancesDialog_13;
-	public static String GetConcordancesDialog_14;
-	public static String GetConcordancesDialog_15;
-	public static String GetConcordancesDialog_4;
-	public static String GetConcordancesDialog_5;
-	public static String GetConcordancesDialog_6;
-	public static String GetConcordancesDialog_7;
-	public static String GetConcordances_4;
-	public static String GraphicalLogger_0;
-	public static String GroovyConsole_4;
-	public static String GroovyConsole_5;
-	public static String ImportDialog_0;
-	public static String ImportDialog_1;
-	public static String ImportDialog_13;
-	public static String ImportDialog_14;
-	public static String ImportDialog_16;
-	public static String ImportDialog_19;
-	public static String ImportDialog_22;
-	public static String ImportDialog_23;
-	public static String ImportDialog_4;
-	public static String ImportDialog_5;
-	public static String ImportDialog_6;
-	public static String ImportFormEditor_0;
-
-	public static String ImportFormEditor_1;
-	public static String ImportPreferencePage_0;
-
-	public static String ImportPreferencePage_2;
-
-	public static String ImportPreferencePage_3;
-
-	public static String ImportPreferencePage_4;
-
-	public static String ImportPreferencePage_5;
-	public static String ImportSelectedText_0;
-	public static String ImportSelectedText_1;
-	public static String ImportSelectedText_10;
-	public static String ImportSelectedText_12;
-	public static String ImportSelectedText_2;
-	public static String ImportSelectedText_3;
-	public static String ImportSelectedText_4;
-	public static String ImportSelectedText_6;
-	public static String InternalCorpusView_0;
-	public static String InternalCorpusView_1;
-	public static String InternalCorpusView_2;
-
-	public static String Invalid_analysis_property;
-	public static String JobHandler_0;
-	public static String JobHandler_1;
-	public static String JobHandler_2;
-	public static String JobHandler_3;
-	public static String JobsTimer_12;
-	public static String JobsTimer_13;
-	public static String JobsTimer_15;
-	public static String JobsTimer_16;
-	public static String JobsTimer_17;
-	public static String JobsTimer_19;
-	public static String JobsTimer_2;
-	public static String JobsTimer_20;
-	public static String JobsTimer_21;
-	public static String JobsTimer_5;
-	public static String JobsTimer_9;
-	public static String LanguageSwitchHandler_0;
-	public static String LanguageSwitchHandler_1;
-	public static String LanguageSwitchHandler_3;
-	public static String LanguageSwitchHandler_5;
-	public static String LanguageSwitchHandler_7;
-	public static String LineLabelProvider_1;
-	public static String LoadBinaryCorpus_0;
-
-	public static String LoadBinaryCorpus_1;
-
-	public static String LoadBinaryCorpus_10;
-
-	public static String LoadBinaryCorpus_11;
-
-	public static String LoadBinaryCorpus_12;
-
-	public static String LoadBinaryCorpus_13;
-
-	public static String LoadBinaryCorpus_14;
-
-	public static String LoadBinaryCorpus_15;
-
-	public static String LoadBinaryCorpus_2;
-
-	public static String LoadBinaryCorpus_3;
-
-	public static String LoadBinaryCorpus_4;
-
-	public static String LoadBinaryCorpus_5;
-
-	public static String LoadBinaryCorpus_6;
-
-	public static String LoadBinaryCorpus_7;
-
-	public static String LocalePreferencePage_1;
-	public static String LocalePreferencePage_2;
-	public static String MacroExplorer_2;
-
-	public static String MacrosExplorer_0;
-	public static String MacrosExplorer_1;
-	public static String MainPage_0;
-	public static String MainPage_1;
-	public static String MainPage_10;
-	public static String MainPage_11;
-	public static String MainPage_12;
-	public static String MainPage_13;
-	public static String MainPage_14;
-	public static String MainPage_15;
-	public static String MainPage_17;
-	public static String MainPage_18;
-	public static String MainPage_19;
-	public static String MainPage_2;
-	public static String MainPage_20;
-	public static String MainPage_22;
-	public static String MainPage_23;
-	public static String MainPage_25;
-	public static String MainPage_27;
-	public static String MainPage_28;
-	public static String MainPage_29;
-	public static String MainPage_3;
-	public static String MainPage_30;
-	public static String MainPage_31;
-	public static String MainPage_33;
-	public static String MainPage_34;
-	public static String MainPage_36;
-	public static String MainPage_38;
-	public static String MainPage_39;
-	public static String MainPage_4;
-	public static String MainPage_40;
-	public static String MainPage_42;
-	public static String MainPage_44;
-	public static String MainPage_45;
-	public static String MainPage_46;
-	public static String MainPage_47;
-	public static String MainPage_49;
-	public static String MainPage_5;
-	public static String MainPage_50;
-	public static String MainPage_52;
-	public static String MainPage_53;
-	public static String MainPage_54;
-	public static String MainPage_55;
-	public static String MainPage_6;
-	public static String MainPage_7;
-	public static String MainPage_8;
-	public static String MainPage_9;
-	public static String MergeCols_1;
-	public static String MergeCols_2;
-	public static String MergeCols_5;
-	public static String MergeCols_6;
-	public static String MergeDeleteDialog_0;
-	public static String MergeDeleteDialog_1;
-	public static String MergeDeleteDialog_4;
-	public static String MergeLines_2;
-	public static String MetadataPage_1;
-	public static String MetadataPage_2;
-	public static String MetadataPage_3;
-	public static String MetadataPage_4;
-	public static String MetadataPage_5;
-	public static String MetadataPage_7;
-	public static String MultipleValueTreeDialog_0;
-	public static String NavigationWidget_0;
-	public static String ObjectExplorer_0;
-	public static String ObjectExplorer_10;
-	public static String ObjectExplorer_12;
-	public static String ObjectExplorer_15;
-	public static String ObjectExplorer_2;
-	public static String ObjectExplorer_21;
-	public static String ObjectExplorer_26;
-	public static String ObjectExplorer_27;
-	public static String ObjectExplorer_3;
-	public static String ObjectExplorer_4;
-	public static String ObjectExplorer_5;
-	public static String ObjectExplorer_7;
-	public static String ObjectExplorer_9;
-	public static String ObjectSelectionDialog_0;
-	public static String ObjectSelectionDialog_3;
-	public static String ObjectSelectionDialog_5;
-	public static String ObjectSelector_0;
-	public static String ObjectSelector_1;
-	public static String OpenBiblio_1;
-	public static String OpenBiblio_2;
-	public static String OpenBiblio_7;
-	public static String OpenBiblio_9;
-	public static String OpenBrowser_0;
-	public static String OpenBrowser_1;
-	public static String OpenEdition_0;
-	public static String OpenEdition_1;
-
-	public static String OpenEdition_2;
-	public static String OpenEdition_3;
-	public static String OpenEdition_5;
-	public static String OpenEdition_7;
-	public static String OpenEdition_8;
-	public static String OpenEmptyEditor_2;
-	public static String OpenGraph_8;
-	public static String OpenParaBrowser_0;
-	public static String OpenSVGGraph_0;
-	public static String OpenTXMUserPreferences_0;
-	public static String OpenURI_0;
-	public static String OpenURI_1;
-	public static String ParaBrowserEditor_11;
-	public static String ParaBrowserEditor_18;
-	public static String ParaBrowserEditor_19;
-	public static String ParaBrowserEditor_21;
-	public static String ParaBrowserEditor_22;
-	public static String ParaBrowserEditor_3;
-	public static String ParaBrowserEditor_4;
-	public static String ParaBrowserEditor_5;
-	public static String ParaBrowserEditor_9;
-	public static String ParametersDialog_0;
-	public static String ParametersDialog_1;
-	public static String ParametersDialog_10;
-	public static String ParametersDialog_11;
-	public static String ParametersDialog_12;
-	public static String ParametersDialog_13;
-	public static String ParametersDialog_14;
-	public static String ParametersDialog_15;
-	public static String ParametersDialog_17;
-	public static String PartitionComposer_0;
-	public static String PartitionComposer_1;
-
-	public static String PartitionComposer_11;
-	public static String PartitionComposer_2;
-	public static String PartitionComposer_3;
-	public static String PartitionComposer_5;
-	public static String PartitionComposer_6;
-	public static String PartitionComposer_8;
-	public static String PartitionComposer_9;
-	public static String PartsSize_0;
-	public static String PartsSize_10;
-	public static String PartsSize_2;
-	public static String PasteFile_1;
-	public static String PasteFile_3;
-	public static String PasteFile_4;
-	public static String Preferences_Menu_Label;
-	public static String ProgressionForm_0;
-	public static String ProgressionForm_1;
-	public static String ProgressionForm_10;
-	public static String ProgressionForm_11;
-	public static String ProgressionForm_12;
-	public static String ProgressionForm_13;
-	public static String ProgressionForm_14;
-	public static String ProgressionForm_2;
-	public static String ProgressionForm_3;
-	public static String ProgressionForm_5;
-	public static String ProgressionForm_6;
-	public static String ProgressionForm_7;
-	public static String ProgressionForm_8;
-	public static String ProgressionForm_9;
-	public static String PropertiesSelector_0;
-	public static String PropertiesSelector_1;
-	public static String PropertiesSelector_2;
-	public static String PropertySelector_0;
-	public static String PurgeCorpora_0;
-	public static String PurgeCorpora_1;
-	public static String PurgeCorpora_10;
-	public static String PurgeCorpora_12;
-	public static String PurgeCorpora_13;
-	public static String PurgeCorpora_2;
-	public static String PurgeCorpora_3;
-	public static String PurgeCorpora_4;
-	public static String PurgeCorpora_5;
-	public static String PurgeCorpora_7;
-	public static String PurgeCorpora_9;
-	public static String QueriesView_1;
-	public static String QueriesView_10;
-	public static String QueriesView_5;
-	public static String QueryAssistDialog_0;
-	public static String QueryAssistDialog_1;
-	public static String QueryAssistDialog_10;
-	public static String QueryAssistDialog_11;
-	public static String QueryAssistDialog_12;
-	public static String QueryAssistDialog_13;
-	public static String QueryAssistDialog_2;
-	public static String QueryAssistDialog_3;
-	public static String QueryAssistDialog_32;
-	public static String QueryAssistDialog_33;
-	public static String QueryAssistDialog_34;
-	public static String QueryAssistDialog_8;
-	public static String QueryIndexEditor_0;
-	public static String QueryIndexEditor_1;
-	public static String QueryIndexEditor_10;
-	public static String QueryIndexEditor_11;
-	public static String QueryIndexEditor_2;
-	public static String QueryIndexEditor_3;
-	public static String QueryIndexEditor_4;
-	public static String QueryIndexEditor_5;
-	public static String QueryIndexEditor_6;
-	public static String QueryIndexEditor_7;
-	public static String QueryIndexEditor_8;
-	public static String QueryIndexEditor_9;
-	public static String RConsole_0;
-
-	public static String RConsole_1;
-
-	public static String RVariablesView_1;
-	public static String RVariablesView_2;
-	public static String RVariablesView_9;
-	public static String ReferencerEditor_0;
-	public static String ReferencerEditor_10;
-	public static String ReferencerEditor_11;
-	public static String ReferencerEditor_12;
-	public static String ReferencerEditor_13;
-	public static String ReferencerEditor_17;
-	public static String ReferencerEditor_19;
-	public static String ReferencerEditor_21;
-	public static String ReferencerEditor_23;
-	public static String ReferencerEditor_25;
-	public static String ReferencerEditor_5;
-	public static String ReferencerEditor_6;
-	public static String ReferencerEditor_7;
-	public static String ReferencerEditor_8;
-	public static String ReferencerEditor_9;
-	public static String ReferencerPreferencePage_2;
-	public static String ReferencerPreferencePage_3;
-	public static String RenameFile_0;
-	public static String RenameFile_2;
-	public static String RenameFile_3;
-	public static String ProgressionDialog_0;
-	public static String ProgressionDialog_1;
-	public static String ProgressionDialog_10;
-	public static String ProgressionDialog_11;
-	public static String ProgressionDialog_13;
-	public static String ProgressionDialog_14;
-	public static String ProgressionDialog_15;
-	public static String ProgressionDialog_16;
-	public static String ProgressionDialog_17;
-	public static String ProgressionDialog_2;
-	public static String ProgressionDialog_3;
-	public static String ProgressionDialog_4;
-	public static String ProgressionDialog_5;
-	public static String ProgressionDialog_7;
-	public static String ProgressionDialog_8;
-	public static String ProgressionDialog_9;
-	public static String ProgressionEditorInput_0;
-	public static String RestartTXM_0;
-	public static String RestartTXM_1;
-	public static String RunGroovyScript_0;
-	public static String RunGroovyScript_1;
-	public static String RunGroovyScript_2;
-	public static String RunGroovyScript_3;
-	public static String RunGroovyScript_4;
-	public static String RunGroovyScript_8;
-	public static String RunGroovyScript_9;
-	public static String RunGroovyScript_10;
-	public static String SVGGraphicEditor_1;
-	public static String SaveAs_2;
-	public static String ScriptPreferencePage_0;
-
-	public static String ScriptPreferencePage_1;
-	public static String ScriptPreferencePage_3;
-	public static String SetContextSize_1;
-	public static String SetContextSize_2;
-	public static String SetContextSize_3;
-	public static String SetContextSize_4;
-	public static String SetEncoding_0;
-	public static String SetEncoding_1;
-	public static String SetEncoding_2;
-	public static String SetLineNumber_0;
-	public static String SetLineNumber_1;
-	public static String SetSortProperty_1;
-	public static String SetSortProperty_2;
-	public static String SetSortProperty_3;
-	public static String ShowSelected_4;
-	public static String ShowSvgHelp_0;
-	public static String ShowSvgHelp_1;
-	public static String ShowSvgHelp_2;
-	public static String ShowSvgHelp_3;
-	public static String ShowSvgHelp_4;
-	public static String ShowSvgHelp_5;
-	public static String SimpleSubcorpusPanel_0;
-
-	public static String SingularValuesEditor_0;
-	public static String SortPropertySelection_0;
-	public static String Structure_field_not_empty;
-	public static String Submit_0;
-
-	public static String SummaryView_0;
-	public static String TXMCqpServerWatcher_0;
-	public static String TXMCqpServerWatcher_1;
-	public static String TXMRServeWatcher_0;
-	public static String TXMRServeWatcher_1;
-	public static String TXMRServeWatcher_2;
-	public static String TXMRServeWatcher_3;
-	public static String TXMRServeWatcher_4;
-	public static String TablableVector_0;
-	public static String TableEditor_0;
-	public static String TableKeyListener_0;
-
-	public static String TableKeyListener_1;
-	public static String TableKeyListener_6;
-	public static String TableSorter_0;
-	public static String TextometriePreferencePage_0;
-	public static String TextometriePreferencePage_1;
-	public static String TextometriePreferencePage_14;
-	public static String TextometriePreferencePage_15;
-	public static String TextometriePreferencePage_18;
-	public static String TextometriePreferencePage_19;
-	public static String TextometriePreferencePage_2;
-	public static String TextometriePreferencePage_20;
-	public static String TextualPlansSection_milestone_label;
-
-	public static String TextualPlansSection_milestone_tooltip;
-
-	public static String TextualPlansSection_outsidetext_label;
-
-	public static String TextualPlansSection_outsidetext_tooltip;
-
-	public static String TextualPlansSection_outsidetexttoedit_label;
-
-	public static String TextualPlansSection_outsidetexttoedit_tooltip;
-
-	public static String TextualPlansSection_save_error;
-
-	public static String TextualPlansSection_title;
-
-	public static String TextualPlansSection_update_error;
-
-	public static String TreeTaggerPreferencePage_0;
-	public static String TreeTaggerPreferencePage_1;
-	public static String TreeTaggerPreferencePage_2;
-	public static String TreeTaggerPreferencePage_3;
-	public static String TxmBrowser_0;
-	public static String TxmBrowser_10;
-	public static String TxmBrowser_11;
-	public static String TxmBrowser_12;
-	public static String TxmBrowser_5;
-	public static String TxmBrowser_6;
-	public static String TxmBrowser_7;
-	public static String TxmBrowser_8;
-	public static String TxmBrowser_9;
-	public static String TxmCommand_1;
-	public static String TxtEditor_0;
-	public static String TxtEditor_1;
-	public static String UIParameterException_0;
-	public static String UserPreferencePage_0;
-
-	public static String UserPreferencePage_1;
-	public static String UserPreferencePage_3;
-	public static String ViewPropertySelectionDialog_0;
-	public static String ViewPropertySelection_0;
-	public static String IndexToCooccurrence_0;
-	public static String IndexToLexicalTable_0;
-
-	public static String WordCloudPreferencePage_0;
-	public static String WordCloudPreferencePage_1;
-	public static String WordCloudPreferencePage_2;
-	public static String WordCloudPreferencePage_3;
-	public static String ConcordancesEditor_referenceColumn_text;
-	public static String ConcordancesEditor_xpndtmNewExpanditem_text;
-	public static String ConcordancesEditor_xpndtmNewParameters_text;
-	public static String ConcordancesEditor_xpndtmNewExpanditem_text_1;
-	public static String ConcordancesEditor_xpndtmNewExpanditem_text_2;
-
-	public static String CleanPerspective_1;
-	public static String CleanPerspective_2;
-	public static String ExecuteLastGroovyScript_0;
-	public static String ExecuteLastGroovyScript_1;
-	public static String ExecuteLastGroovyScript_3;
-	public static String ShowSelected_0;
-	public static String SaveBeforeExecutionDialog_0;
-	public static String DownloadJobHandler_0;
-	public static String FixUpdateHandler_0;
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-		//NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	public static String SEARCH;
-
-	private Messages() {
-	}
-}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java	(revision 513)
@@ -44,7 +44,7 @@
 import org.osgi.framework.Version;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.Activator;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.TxmPreferences;
 import org.txm.rcp.preferences.AdvancePreferencePage;
 import org.txm.rcp.preferences.RCPPreferences;
@@ -133,7 +133,7 @@
 		try {
 			location = new URL(path); //$NON-NLS-1$
 		} catch (MalformedURLException e) {
-			Log.severe(NLS.bind(Messages.LanguageSwitchHandler_5, location));
+			Log.severe(NLS.bind(RCPMessages.LanguageSwitchHandler_5, location));
 			return false;
 		}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/FixUpdateHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/FixUpdateHandler.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/FixUpdateHandler.java	(revision 513)
@@ -7,7 +7,7 @@
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
 import org.eclipse.equinox.p2.engine.IProfileRegistry;
 import org.eclipse.equinox.p2.ui.ProvisioningUI;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.TxmPreferences;
 import org.txm.rcp.preferences.AdvancePreferencePage;
 import org.txm.utils.logger.Log;
@@ -67,6 +67,6 @@
 		// this is the default repository
 		//TXMUpdateHandler.addDefaultUpdateSites(agent);
 
-		Log.info(Messages.FixUpdateHandler_0);
+		Log.info(RCPMessages.FixUpdateHandler_0);
 	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java	(revision 513)
@@ -80,7 +80,7 @@
 					firstCorpusDiag = false;
 					for (MainCorpus corpus : corpora) {
 						if (corpus.getBase() == null)
-							System.out.println(NLS.bind(Messages.AdapterFactory_0, corpus));
+							System.out.println(NLS.bind(RCPMessages.AdapterFactory_0, corpus));
 					}
 				}
 				children = corpora.toArray();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/RCPMessages.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/RCPMessages.java	(revision 0)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/RCPMessages.java	(revision 513)
@@ -0,0 +1,1017 @@
+
+package org.txm.rcp;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+public class RCPMessages extends NLS {
+	
+	// The Constant BUNDLE_NAME. 
+	private static final String BUNDLE_NAME = "org.txm.rcp.messages"; //$NON-NLS-1$
+
+	public static String REFRESH;
+
+	public static String OK;
+	
+	public static String CGU_TITLE;
+	public static String CGU_MESSAGE;
+	public static String CGU_CHECKMESSAGE;
+	
+	public static String SORT_COLUMN;
+	public static String SORT_DONE;
+	
+	public static String ONE_RESULT;
+
+	public static String About_Menu_Label;
+	public static String AdapterFactory_0;
+	public static String AddBase_1;
+	public static String AddBase_10;
+	public static String AddBase_16;
+	public static String AddBase_17;
+	public static String AddBase_19;
+	public static String AddBase_2;
+	public static String AddBase_20;
+	public static String AddBase_22;
+	public static String AddBase_23;
+	public static String AddBase_24;
+	public static String AddBase_25;
+	public static String AddBase_27;
+	public static String AddBase_28;
+	public static String AddBase_29;
+	public static String AddBase_31;
+	public static String AddBase_32;
+	public static String AddBase_33;
+	public static String AddBase_34;
+	public static String AddBase_4;
+	public static String AddBase_7;
+	public static String AddProject_3;
+	public static String AdvancePreferencePage_0;
+
+	public static String AdvancePreferencePage_1;
+	public static String AdvancePreferencePage_12;
+	public static String AdvancePreferencePage_13;
+	public static String AdvancePreferencePage_14;
+	public static String AdvancePreferencePage_2;
+	public static String AdvancePreferencePage_3;
+	public static String AdvancePreferencePage_4;
+
+	public static String AdvancePreferencePage_6;
+	public static String AnnotationPreferences_0;
+	public static String AnnotationPreferences_1;
+	public static String AnnotationPreferences_2;
+	public static String AdvancePreferencePage_7;
+	
+	public static String Property;
+	public static String NumberOfLines;
+	
+	public static String ApplicationWorkbenchAdvisor_0;
+	public static String ApplicationWorkbenchAdvisor_1;
+	public static String ApplicationWorkbenchAdvisor_11;
+	public static String ApplicationWorkbenchAdvisor_12;
+	public static String ApplicationWorkbenchAdvisor_13;
+	public static String ApplicationWorkbenchAdvisor_16;
+	public static String ApplicationWorkbenchAdvisor_17;
+	public static String ApplicationWorkbenchAdvisor_18;
+	public static String ApplicationWorkbenchAdvisor_19;
+	public static String ApplicationWorkbenchAdvisor_2;
+	public static String ApplicationWorkbenchAdvisor_20;
+	public static String ApplicationWorkbenchAdvisor_21;
+	public static String ApplicationWorkbenchAdvisor_22;
+	public static String ApplicationWorkbenchAdvisor_23;
+	public static String ApplicationWorkbenchAdvisor_24;
+	public static String ApplicationWorkbenchAdvisor_25;
+	public static String ApplicationWorkbenchAdvisor_26;
+	public static String ApplicationWorkbenchAdvisor_27;
+	public static String ApplicationWorkbenchAdvisor_28;
+	public static String ApplicationWorkbenchAdvisor_29;
+	public static String ApplicationWorkbenchAdvisor_3;
+	public static String ApplicationWorkbenchAdvisor_30;
+	public static String ApplicationWorkbenchAdvisor_31;
+	public static String ApplicationWorkbenchAdvisor_32;
+	public static String ApplicationWorkbenchAdvisor_33;
+	public static String ApplicationWorkbenchAdvisor_34;
+	public static String ApplicationWorkbenchAdvisor_35;
+	public static String ApplicationWorkbenchAdvisor_36;
+	public static String ApplicationWorkbenchAdvisor_37;
+	public static String ApplicationWorkbenchAdvisor_38;
+	public static String ApplicationWorkbenchAdvisor_39;
+	public static String ApplicationWorkbenchAdvisor_4;
+	public static String ApplicationWorkbenchAdvisor_40;
+	public static String ApplicationWorkbenchAdvisor_41;
+	public static String ApplicationWorkbenchAdvisor_42;
+	public static String ApplicationWorkbenchAdvisor_43;
+	public static String ApplicationWorkbenchAdvisor_43_single;
+	public static String ApplicationWorkbenchAdvisor_44;
+	public static String ApplicationWorkbenchAdvisor_45;
+	public static String ApplicationWorkbenchAdvisor_46;
+	public static String ApplicationWorkbenchAdvisor_47;
+	public static String ApplicationWorkbenchAdvisor_48;
+	public static String ApplicationWorkbenchAdvisor_49;
+	public static String ApplicationWorkbenchAdvisor_5;
+	public static String ApplicationWorkbenchAdvisor_51;
+	public static String ApplicationWorkbenchAdvisor_52;
+	public static String ApplicationWorkbenchAdvisor_53;
+	public static String ApplicationWorkbenchAdvisor_54;
+	public static String ApplicationWorkbenchAdvisor_55;
+	public static String ApplicationWorkbenchAdvisor_56;
+	public static String ApplicationWorkbenchAdvisor_57;
+	public static String ApplicationWorkbenchAdvisor_58;
+	public static String ApplicationWorkbenchAdvisor_59;
+	public static String ApplicationWorkbenchAdvisor_60;
+	public static String ApplicationWorkbenchAdvisor_61;
+	public static String ApplicationWorkbenchAdvisor_63;
+	public static String ApplicationWorkbenchAdvisor_64;
+	public static String ApplicationWorkbenchAdvisor_65;
+	public static String ApplicationWorkbenchAdvisor_66;
+	public static String ApplicationWorkbenchAdvisor_67;
+	public static String ApplicationWorkbenchAdvisor_68;
+	public static String ApplicationWorkbenchAdvisor_69;
+	public static String ApplicationWorkbenchAdvisor_7;
+	public static String ApplicationWorkbenchAdvisor_71;
+	public static String ApplicationWorkbenchAdvisor_72;
+	public static String ApplicationWorkbenchAdvisor_73;
+	public static String ApplicationWorkbenchAdvisor_74;
+	public static String ApplicationWorkbenchAdvisor_75;
+	public static String ApplicationWorkbenchAdvisor_76;
+	public static String ApplicationWorkbenchAdvisor_77;
+	public static String ApplicationWorkbenchAdvisor_78;
+	public static String ApplicationWorkbenchAdvisor_79;
+	public static String ApplicationWorkbenchAdvisor_8;
+	public static String ApplicationWorkbenchAdvisor_86;
+	public static String ApplicationWorkbenchAdvisor_87;
+	public static String ApplicationWorkbenchAdvisor_88;
+	public static String ApplicationWorkbenchAdvisor_89;
+	public static String ApplicationWorkbenchAdvisor_9;
+	public static String ApplicationWorkbenchAdvisor_init;
+	public static String ApplicationWorkbenchAdvisor_init_failed;
+
+	public static String ApplicationWorkbenchAdvisor_PROGRESS_BAR_LOADING_CORPORA;
+	public static String ApplicationWorkbenchAdvisor_ready;
+
+	public static String ApplicationWorkbenchWindowAdvisor_0;
+
+	public static String ApplicationWorkbenchWindowAdvisor_9;
+	public static String Application_0;
+	public static String Application_1;
+	public static String Application_10;
+	public static String Application_11;
+	public static String Application_2;
+	public static String Application_4;
+	public static String Application_6;
+
+	public static String Application_8;
+
+	public static String Application_9;
+	public static String AssistedQueryWidget_0;
+	public static String BackToText_0;
+	public static String CANT_CREATE_GRAPHIC;
+	public static String CQPPreferenceInitializer_0;
+	public static String CQPPreferenceInitializer_1;
+	public static String CQPPreferencePage_0;
+	public static String CQPPreferencePage_1;
+	public static String CQPPreferencePage_10;
+	public static String CQPPreferencePage_11;
+	public static String CQPPreferencePage_12;
+	public static String CQPPreferencePage_13;
+	public static String CQPPreferencePage_14;
+	public static String CQPPreferencePage_15;
+	public static String CQPPreferencePage_16;
+	public static String CQPPreferencePage_17;
+	public static String CQPPreferencePage_18;
+	public static String CaEditor_0;
+
+	public static String Cannot_ask_simple_when_advance;
+	public static String ColRowInfosLabelProvider_19;
+	public static String ColRowInfosLabelProvider_9;
+	public static String ColsRowsInfosEditor_0;
+	public static String ColsRowsInfosEditor_2;
+	public static String Commands_0;
+	public static String ComplexSortSelector_0;
+	public static String ComplexSortSelector_1;
+	public static String ComplexSortSelector_2;
+	public static String ComplexSortSelector_5;
+	public static String ComplexSortSelector_6;
+	public static String ComplexSort_0;
+	public static String ComplexSort_1;
+	public static String ComplexSort_10;
+	public static String ComplexSort_11;
+	public static String ComplexSort_12;
+	public static String ComplexSort_14;
+	public static String ComplexSort_16;
+	public static String ComplexSort_18;
+	public static String ComplexSort_2;
+	public static String ComplexSort_3;
+	public static String ComplexSort_4;
+	public static String ComplexSort_5;
+	public static String ComplexSort_6;
+	public static String ComplexSort_9;
+	public static String ComplexSubcorpusPanel_0;
+	public static String ComplexSubcorpusPanel_1;
+	public static String ComplexSubcorpusPanel_16;
+	public static String ComplexSubcorpusPanel_2;
+	public static String ComplexSubcorpusPanel_4;
+	public static String ComplexSubcorpusPanel_5;
+
+	public static String ComputeCoocFromLines_0;
+	public static String ComputeCoocFromLines_1;
+	public static String ComputeCoocMatrix_0;
+	public static String ComputeCoocMatrix_1;
+	public static String ComputeCoocMatrix_10;
+	public static String ComputeCoocMatrix_11;
+	public static String ComputeCoocMatrix_12;
+	public static String ComputeCoocMatrix_13;
+	public static String ComputeCoocMatrix_2;
+	public static String ComputeCoocMatrix_3;
+	public static String ComputeCoocMatrix_4;
+	public static String ComputeCoocMatrix_7;
+	public static String ComputeCooccurrences_0;
+	public static String ComputeCooccurrences_1;
+
+	public static String ComputeCooccurrences_2;
+	public static String ComputeFrequencyList_2;
+	public static String ComputeIndexFromLines_0;
+
+
+	public static String ComputeLexicalTable_0;
+	public static String ComputeLexicalTable_1;
+	public static String ComputeLexicalTable_10;
+	public static String ComputeLexicalTable_12;
+	public static String ComputeLexicalTable_13;
+	public static String ComputeLexicalTable_16;
+	public static String ComputeLexicalTable_2;
+	public static String ComputeLexicalTable_3;
+
+	public static String ComputeLexicalTable_4;
+	public static String ComputeLexicalTable_5;
+	public static String ComputeLexicalTable_6;
+	public static String ComputeLexicalTable_7;
+	public static String ComputeLexicalTable_9;
+	public static String ComputeReferencer_0;
+	public static String ComputeSpecificitiesDialog_0;
+	public static String ComputeSpecificitiesDialog_1;
+	public static String ComputeSpecificitiesDialog_3;
+	public static String ComputeSpecificitiesDialog_4;
+	public static String ComputeSpecificitiesDialog_9;
+	public static String ComputeSpecificities_0;
+	public static String ComputeSpecificities_2;
+	public static String ComputeSpecifities_0;
+
+	public static String ComputeSpecifities_1;
+
+	public static String ComputeSpecifities_10;
+	public static String ComputeSpecifities_11;
+	public static String ComputeSpecifities_2;
+	public static String ComputeSpecifities_3;
+
+	public static String ComputeSpecifities_4;
+	public static String Compute_Specificities;
+
+	public static String ComputeDiagnostic_0;
+
+	public static String ComputeDiagnostic_1;
+	
+
+
+	public static String ConvertCorpus_0;
+	public static String CorporaView_0;
+	public static String CorporaView_1;
+	public static String CorporaView_2;
+	public static String CorporaView_3;
+	public static String CorporaView_4;
+	public static String CorporaView_5;
+	public static String CorporaView_6;
+	public static String CorporaView_7;
+	public static String CorporaView_9;
+	public static String CorpusPage_0;
+	public static String CorpusPage_1;
+	public static String CorpusPage_10;
+	public static String CorpusPage_11;
+	public static String CorpusPage_12;
+	public static String CorpusPage_13;
+	public static String CorpusPage_14;
+	public static String CorpusPage_15;
+	public static String CorpusPage_16;
+	public static String CorpusPage_16a;
+	public static String CorpusPage_17;
+	public static String CorpusPage_18;
+	public static String CorpusPage_19;
+	public static String CorpusPage_2;
+	public static String CorpusPage_20;
+	public static String CorpusPage_21;
+	public static String CorpusPage_22;
+	public static String CorpusPage_23;
+	public static String CorpusPage_24;
+	public static String CorpusPage_25;
+	public static String CorpusPage_26;
+	public static String CorpusPage_27;
+	public static String CorpusPage_28;
+	public static String CorpusPage_29;
+	public static String CorpusPage_3;
+
+	public static String CorpusPage_30;
+	public static String CorpusPage_31;
+	public static String CorpusPage_32;
+	public static String CorpusPage_33;
+	public static String CorpusPage_34;
+	public static String CorpusPage_35;
+	public static String CorpusPage_36;
+	public static String CorpusPage_37;
+	public static String CorpusPage_38;
+	public static String CorpusPage_39;
+	public static String CorpusPage_4;
+	public static String CorpusPage_40;
+	public static String CorpusPage_41;
+	public static String CorpusPage_42;
+	public static String CorpusPage_43;
+	public static String CorpusPage_44;
+	public static String CorpusPage_45;
+	public static String CorpusPage_46;
+	public static String CorpusPage_47;
+	public static String CorpusPage_48;
+	public static String CorpusPage_49;
+	public static String CorpusPage_5;
+	public static String CorpusPage_50;
+	public static String CorpusPage_51;
+	public static String CorpusPage_52;
+	public static String CorpusPage_53;
+	public static String CorpusPage_54;
+	public static String CorpusPage_55;
+
+	public static String CorpusPage_57;
+	public static String CorpusPage_6;
+	public static String CorpusPage_60;
+
+	public static String CorpusPage_61;
+
+	public static String CorpusPage_63;
+
+	public static String CorpusPage_64;
+	public static String CorpusPage_65;
+	public static String CorpusPage_66;
+	public static String CorpusPage_67;
+	
+	public static String CorpusPage_7;
+	public static String CorpusPage_8;
+
+	public static String CorpusPage_80;
+	public static String CorpusPage_9;
+
+	public static String CorpusPage_90;
+
+	public static String CorpusPage_91;
+
+	public static String CorpusPage_92;
+
+	public static String CorpusPage_93;
+	public static String CreateFile_1;
+	public static String CreateFolder_1;
+	public static String CreateFrequencyList_8;
+	public static String CreateMacro_0;
+	public static String CreateMacro_1;
+	public static String CreatePartitionDialog_0;
+	public static String CreatePartitionDialog_1;
+
+	public static String CreatePartitionDialog_10;
+	public static String CreatePartitionDialog_16;
+	public static String CreatePartitionDialog_2;
+	public static String CreatePartitionDialog_3;
+	public static String CreatePartitionDialog_4;
+	public static String CreatePartitionDialog_5;
+	public static String CreatePartitionDialog_6;
+	public static String CreatePartitionDialog_7;
+	public static String CreatePartitionDialog_8;
+	public static String CreatePartitionDialog_9;
+	public static String CreatePartition_0;
+	public static String CreatePartition_2;
+	public static String CreatePartition_5;
+	public static String CreatePartition_55;
+	public static String CreatePartition_6;
+	public static String RefreshingCorporaView;
+	public static String CreateSubCorpus_0;
+
+	public static String CreateSubCorpus_1;
+	public static String LastCQPError;
+	public static String CreateSubCorpus_2;
+
+	public static String CreateSubCorpus_3;
+	public static String CreateSubCorpus_begin;
+	public static String CreateSubCorpus_create;
+	public static String CreateSubcorpusDialog_0;
+	public static String CreateSubcorpusDialog_10;
+	public static String CreateSubcorpusDialog_11;
+	public static String CreateSubcorpusDialog_13;
+	public static String CreateSubcorpusDialog_14;
+	public static String CreateSubcorpusDialog_6;
+	public static String CreateSubcorpusDialog_8;
+	public static String CreateSubcorpus_7;
+	public static String CreateSubcorpus_8;
+	public static String CreateSubcorpus_9;
+	public static String DONE;
+	public static String DefineReferencePattern_0;
+	public static String DefineReferencePattern_1;
+	public static String DefineReferencePattern_2;
+	public static String DefineReferencePattern_3;
+	public static String DefineReferencePattern_4;
+	public static String DefineReferencePattern_5;
+	public static String DeleteFile_0;
+	public static String DeleteFile_2;
+	public static String DeleteInCorporaView_1;
+	public static String DeleteInCorporaView_2;
+	public static String DeleteLines_0;
+	public static String DeleteLines_1;
+	public static String DeleteObject_0;
+	public static String DeleteObject_1;
+
+	public static String DeleteObject_10;
+	public static String DeleteObject_3;
+	public static String DeleteObject_4;
+	public static String DeleteObject_5;
+	public static String DiagnosticPreferencePage_1;
+	public static String DiagnosticPreferencePage_2;
+	public static String DiagnosticPreferencePage_3;
+	public static String Diagnostique_0;
+	public static String Diagnostique_1;
+	public static String Diagnostique_10;
+	public static String Diagnostique_11;
+	public static String Diagnostique_2;
+	public static String Diagnostique_7;
+	public static String Diagnostique_8;
+	public static String Diagnostique_9;
+	
+	public static String ElementTreeLabelProvider_0;
+	public static String ElementTreeLabelProvider_1;
+	public static String EmpantWidget_0;
+	public static String EmpantWidget_1;
+	public static String EmpantWidget_2;
+	public static String EmpantWidget_3;
+	public static String EmpantWidget_4;
+	public static String EmpantWidget_5;
+	public static String EmpantWidget_6;
+	public static String EmpantWidget_7;
+	public static String EmpantWidget_8;
+	public static String EmpantWidget_9;
+	public static String Error_computing_specificities;
+	public static String Error_creating_partition;
+	public static String ExecuteGroovyScriptFromFile_2;
+	public static String ExecuteGroovyScript_0;
+	public static String ExecuteGroovyScript_1;
+	public static String ExecuteGroovyScript_2;
+
+	public static String ExecuteGroovyScript_9;
+	public static String ExecuteRScript_1;
+	public static String ExecuteRScript_2;
+	public static String ExecuteRScript_3;
+	public static String ExecuteRText_0;
+	public static String ExecuteRText_1;
+	public static String ExecuteRText_2;
+	public static String ExecuteScriptImport_0;
+	public static String ExecuteScriptImport_1;
+	public static String ExecuteScriptImport_2;
+	public static String ExecuteScriptImport_3;
+	public static String ExecuteScriptImport_5;
+	public static String ExecuteScriptImport_6;
+	public static String ExecuteScriptImport_7;
+	public static String ExecuteScriptImport_8;
+	public static String ExecuteScriptR_0;
+	public static String ExecuteScriptR_1;
+	public static String ExecuteScript_0;
+
+	public static String ExecuteScript_1;
+
+	public static String ExecuteScript_2;
+
+	public static String ExecuteScript_3;
+
+	public static String ExecuteScript_4;
+
+	public static String ExecuteScript_5;
+
+	public static String ExecuteScript_6;
+
+	public static String ExecuteScript_7;
+	public static String Exit_Menu_Label;
+	public static String Explorer_0;
+	public static String Explorer_1;
+	public static String Explorer_2;
+	public static String Explorer_3;
+	public static String Explorer_4;
+	public static String Explorer_5;
+	public static String Explorer_6;
+	public static String Explorer_7;
+	public static String Explorer_8;
+	public static String ExportCorpus_0;
+	public static String ExportCorpus_3;
+	public static String ExportCorpus_4;
+	public static String ExportPreferencePage_1;
+	public static String ExportPreferencePage_18;
+	public static String ExportPreferencePage_19;
+	public static String ExportPreferencePage_21;
+	public static String ExportPreferencePage_3;
+	public static String ExportPreferencePage_4;
+	public static String ExportAnnotation_0;
+	public static String ExportResult_0;
+	public static String ExportResult_1;
+	public static String ExportResult_2;
+	public static String ExportResult_3;
+	public static String ExportResult_4;
+	public static String ExportResult_5;
+	public static String ExportResult_6;
+	public static String ExportSVG_0;
+
+	public static String ExportSVG_1;
+	public static String ExportSVG_2;
+
+	public static String ExportSVG_3;
+	public static String FAILED_TO_PARSE_OPTIONS;
+	public static String FAILED_TO_SAVE_PREFERENCES;
+	public static String FactorialMapEditor_0;
+	public static String FactorialMapEditor_10;
+	public static String FactorialMapEditor_11;
+	public static String FactorialMapEditor_13;
+	public static String FactorialMapEditor_4;
+	public static String FactorialMapEditor_5;
+	public static String FactorialMapEditor_6;
+	public static String FactorialMapEditor_8;
+	public static String FileExplorerPreferencePage_0;
+	public static String FileExplorerPreferencePage_1;
+	public static String FileExplorerPreferencePage_2;
+	public static String FileTreeContentProvider_1;
+	public static String FileTreeContentProvider_2;
+	public static String FileTreeContentProvider_3;
+	public static String FileTreeContentProvider_4;
+	public static String FrequencyListEditorInput_0;
+	public static String FrequencyListEditorInput_1;
+	public static String FrequencyListEditorInput_2;
+	public static String FrequencyListEditorInput_3;
+	public static String FrequencyListEditorInput_4;
+	public static String FrequencyListEditorInput_5;
+	public static String FrequencyListEditorInput_6;
+	public static String FrequencyListEditorInput_9;
+	public static String GenericMultiPageEditor_1;
+	public static String GenericMultiPageEditor_3;
+
+
+	public static String GraphicalLogger_0;
+	public static String GroovyConsole_4;
+	public static String GroovyConsole_5;
+	public static String ImportDialog_0;
+	public static String ImportDialog_1;
+	public static String ImportDialog_13;
+	public static String ImportDialog_14;
+	public static String ImportDialog_16;
+	public static String ImportDialog_19;
+	public static String ImportDialog_22;
+	public static String ImportDialog_23;
+	public static String ImportDialog_4;
+	public static String ImportDialog_5;
+	public static String ImportDialog_6;
+	public static String ImportFormEditor_0;
+
+	public static String ImportFormEditor_1;
+	public static String ImportPreferencePage_0;
+
+	public static String ImportPreferencePage_2;
+
+	public static String ImportPreferencePage_3;
+
+	public static String ImportPreferencePage_4;
+
+	public static String ImportPreferencePage_5;
+	public static String ImportSelectedText_0;
+	public static String ImportSelectedText_1;
+	public static String ImportSelectedText_10;
+	public static String ImportSelectedText_12;
+	public static String ImportSelectedText_2;
+	public static String ImportSelectedText_3;
+	public static String ImportSelectedText_4;
+	public static String ImportSelectedText_6;
+	public static String InternalCorpusView_0;
+	public static String InternalCorpusView_1;
+	public static String InternalCorpusView_2;
+
+	public static String Invalid_analysis_property;
+	public static String JobHandler_0;
+	public static String JobHandler_1;
+	public static String JobHandler_2;
+	public static String JobHandler_3;
+	public static String JobsTimer_12;
+	public static String JobsTimer_13;
+	public static String JobsTimer_15;
+	public static String JobsTimer_16;
+	public static String JobsTimer_17;
+	public static String JobsTimer_19;
+	public static String JobsTimer_2;
+	public static String JobsTimer_20;
+	public static String JobsTimer_21;
+	public static String JobsTimer_5;
+	public static String JobsTimer_9;
+	public static String LanguageSwitchHandler_0;
+	public static String LanguageSwitchHandler_1;
+	public static String LanguageSwitchHandler_3;
+	public static String LanguageSwitchHandler_5;
+	public static String LanguageSwitchHandler_7;
+	public static String LineLabelProvider_1;
+	public static String LoadBinaryCorpus_0;
+
+	public static String LoadBinaryCorpus_1;
+
+	public static String LoadBinaryCorpus_10;
+
+	public static String LoadBinaryCorpus_11;
+
+	public static String LoadBinaryCorpus_12;
+
+	public static String LoadBinaryCorpus_13;
+
+	public static String LoadBinaryCorpus_14;
+
+	public static String LoadBinaryCorpus_15;
+
+	public static String LoadBinaryCorpus_2;
+
+	public static String LoadBinaryCorpus_3;
+
+	public static String LoadBinaryCorpus_4;
+
+	public static String LoadBinaryCorpus_5;
+
+	public static String LoadBinaryCorpus_6;
+
+	public static String LoadBinaryCorpus_7;
+
+	public static String LocalePreferencePage_1;
+	public static String LocalePreferencePage_2;
+	public static String MacroExplorer_2;
+
+	public static String MacrosExplorer_0;
+	public static String MacrosExplorer_1;
+	public static String MainPage_0;
+	public static String MainPage_1;
+	public static String MainPage_10;
+	public static String MainPage_11;
+	public static String MainPage_12;
+	public static String MainPage_13;
+	public static String MainPage_14;
+	public static String MainPage_15;
+	public static String MainPage_17;
+	public static String MainPage_18;
+	public static String MainPage_19;
+	public static String MainPage_2;
+	public static String MainPage_20;
+	public static String MainPage_22;
+	public static String MainPage_23;
+	public static String MainPage_25;
+	public static String MainPage_27;
+	public static String MainPage_28;
+	public static String MainPage_29;
+	public static String MainPage_3;
+	public static String MainPage_30;
+	public static String MainPage_31;
+	public static String MainPage_33;
+	public static String MainPage_34;
+	public static String MainPage_36;
+	public static String MainPage_38;
+	public static String MainPage_39;
+	public static String MainPage_4;
+	public static String MainPage_40;
+	public static String MainPage_42;
+	public static String MainPage_44;
+	public static String MainPage_45;
+	public static String MainPage_46;
+	public static String MainPage_47;
+	public static String MainPage_49;
+	public static String MainPage_5;
+	public static String MainPage_50;
+	public static String MainPage_52;
+	public static String MainPage_53;
+	public static String MainPage_54;
+	public static String MainPage_55;
+	public static String MainPage_6;
+	public static String MainPage_7;
+	public static String MainPage_8;
+	public static String MainPage_9;
+	public static String MergeCols_1;
+	public static String MergeCols_2;
+	public static String MergeCols_5;
+	public static String MergeCols_6;
+	public static String MergeDeleteDialog_0;
+	public static String MergeDeleteDialog_1;
+	public static String MergeDeleteDialog_4;
+	public static String MergeLines_2;
+	public static String MetadataPage_1;
+	public static String MetadataPage_2;
+	public static String MetadataPage_3;
+	public static String MetadataPage_4;
+	public static String MetadataPage_5;
+	public static String MetadataPage_7;
+	public static String MultipleValueTreeDialog_0;
+	public static String NavigationWidget_0;
+	public static String ObjectExplorer_0;
+	public static String ObjectExplorer_10;
+	public static String ObjectExplorer_12;
+	public static String ObjectExplorer_15;
+	public static String ObjectExplorer_2;
+	public static String ObjectExplorer_21;
+	public static String ObjectExplorer_26;
+	public static String ObjectExplorer_27;
+	public static String ObjectExplorer_3;
+	public static String ObjectExplorer_4;
+	public static String ObjectExplorer_5;
+	public static String ObjectExplorer_7;
+	public static String ObjectExplorer_9;
+	public static String ObjectSelectionDialog_0;
+	public static String ObjectSelectionDialog_3;
+	public static String ObjectSelectionDialog_5;
+	public static String ObjectSelector_0;
+	public static String ObjectSelector_1;
+	public static String OpenBiblio_1;
+	public static String OpenBiblio_2;
+	public static String OpenBiblio_7;
+	public static String OpenBiblio_9;
+	public static String OpenBrowser_0;
+	public static String OpenBrowser_1;
+	public static String OpenEdition_0;
+	public static String OpenEdition_1;
+
+	public static String OpenEdition_2;
+	public static String OpenEdition_3;
+	public static String OpenEdition_5;
+	public static String OpenEdition_7;
+	public static String OpenEdition_8;
+	public static String OpenEmptyEditor_2;
+	public static String OpenGraph_8;
+	public static String OpenParaBrowser_0;
+	public static String OpenSVGGraph_0;
+	public static String OpenTXMUserPreferences_0;
+	public static String OpenURI_0;
+	public static String OpenURI_1;
+	public static String ParaBrowserEditor_11;
+	public static String ParaBrowserEditor_18;
+	public static String ParaBrowserEditor_19;
+	public static String ParaBrowserEditor_21;
+	public static String ParaBrowserEditor_22;
+	public static String ParaBrowserEditor_3;
+	public static String ParaBrowserEditor_4;
+	public static String ParaBrowserEditor_5;
+	public static String ParaBrowserEditor_9;
+	public static String ParametersDialog_0;
+	public static String ParametersDialog_1;
+	public static String ParametersDialog_10;
+	public static String ParametersDialog_11;
+	public static String ParametersDialog_12;
+	public static String ParametersDialog_13;
+	public static String ParametersDialog_14;
+	public static String ParametersDialog_15;
+	public static String ParametersDialog_17;
+	public static String PartitionComposer_0;
+	public static String PartitionComposer_1;
+
+	public static String PartitionComposer_11;
+	public static String PartitionComposer_2;
+	public static String PartitionComposer_3;
+	public static String PartitionComposer_5;
+	public static String PartitionComposer_6;
+	public static String PartitionComposer_8;
+	public static String PartitionComposer_9;
+	public static String PartsSize_0;
+	public static String PartsSize_10;
+	public static String PartsSize_2;
+	public static String PasteFile_1;
+	public static String PasteFile_3;
+	public static String PasteFile_4;
+	public static String Preferences_Menu_Label;
+	public static String ProgressionForm_0;
+	public static String ProgressionForm_1;
+	public static String ProgressionForm_10;
+	public static String ProgressionForm_11;
+	public static String ProgressionForm_12;
+	public static String ProgressionForm_13;
+	public static String ProgressionForm_14;
+	public static String ProgressionForm_2;
+	public static String ProgressionForm_3;
+	public static String ProgressionForm_5;
+	public static String ProgressionForm_6;
+	public static String ProgressionForm_7;
+	public static String ProgressionForm_8;
+	public static String ProgressionForm_9;
+	public static String PropertiesSelector_0;
+	public static String PropertiesSelector_1;
+	public static String PropertiesSelector_2;
+	public static String PropertySelector_0;
+	public static String PurgeCorpora_0;
+	public static String PurgeCorpora_1;
+	public static String PurgeCorpora_10;
+	public static String PurgeCorpora_12;
+	public static String PurgeCorpora_13;
+	public static String PurgeCorpora_2;
+	public static String PurgeCorpora_3;
+	public static String PurgeCorpora_4;
+	public static String PurgeCorpora_5;
+	public static String PurgeCorpora_7;
+	public static String PurgeCorpora_9;
+	public static String QueriesView_1;
+	public static String QueriesView_10;
+	public static String QueriesView_5;
+	public static String QueryAssistDialog_0;
+	public static String QueryAssistDialog_1;
+	public static String QueryAssistDialog_10;
+	public static String QueryAssistDialog_11;
+	public static String QueryAssistDialog_12;
+	public static String QueryAssistDialog_13;
+	public static String QueryAssistDialog_2;
+	public static String QueryAssistDialog_3;
+	public static String QueryAssistDialog_32;
+	public static String QueryAssistDialog_33;
+	public static String QueryAssistDialog_34;
+	public static String QueryAssistDialog_8;
+	public static String QueryIndexEditor_0;
+	public static String QueryIndexEditor_1;
+	public static String QueryIndexEditor_10;
+	public static String QueryIndexEditor_11;
+	public static String QueryIndexEditor_2;
+	public static String QueryIndexEditor_3;
+	public static String QueryIndexEditor_4;
+	public static String QueryIndexEditor_5;
+	public static String QueryIndexEditor_6;
+	public static String QueryIndexEditor_7;
+	public static String QueryIndexEditor_8;
+	public static String QueryIndexEditor_9;
+	public static String RConsole_0;
+
+	public static String RConsole_1;
+
+	public static String RVariablesView_1;
+	public static String RVariablesView_2;
+	public static String RVariablesView_9;
+	public static String ReferencerEditor_0;
+	public static String ReferencerEditor_10;
+	public static String ReferencerEditor_11;
+	public static String ReferencerEditor_12;
+	public static String ReferencerEditor_13;
+	public static String ReferencerEditor_17;
+	public static String ReferencerEditor_19;
+	public static String ReferencerEditor_21;
+	public static String ReferencerEditor_23;
+	public static String ReferencerEditor_25;
+	public static String ReferencerEditor_5;
+	public static String ReferencerEditor_6;
+	public static String ReferencerEditor_7;
+	public static String ReferencerEditor_8;
+	public static String ReferencerEditor_9;
+	public static String ReferencerPreferencePage_2;
+	public static String ReferencerPreferencePage_3;
+	public static String RenameFile_0;
+	public static String RenameFile_2;
+	public static String RenameFile_3;
+	public static String ProgressionDialog_0;
+	public static String ProgressionDialog_1;
+	public static String ProgressionDialog_10;
+	public static String ProgressionDialog_11;
+	public static String ProgressionDialog_13;
+	public static String ProgressionDialog_14;
+	public static String ProgressionDialog_15;
+	public static String ProgressionDialog_16;
+	public static String ProgressionDialog_17;
+	public static String ProgressionDialog_2;
+	public static String ProgressionDialog_3;
+	public static String ProgressionDialog_4;
+	public static String ProgressionDialog_5;
+	public static String ProgressionDialog_7;
+	public static String ProgressionDialog_8;
+	public static String ProgressionDialog_9;
+	public static String ProgressionEditorInput_0;
+	public static String RestartTXM_0;
+	public static String RestartTXM_1;
+	public static String RunGroovyScript_0;
+	public static String RunGroovyScript_1;
+	public static String RunGroovyScript_2;
+	public static String RunGroovyScript_3;
+	public static String RunGroovyScript_4;
+	public static String RunGroovyScript_8;
+	public static String RunGroovyScript_9;
+	public static String RunGroovyScript_10;
+	public static String SVGGraphicEditor_1;
+	public static String SaveAs_2;
+	public static String ScriptPreferencePage_0;
+
+	public static String ScriptPreferencePage_1;
+	public static String ScriptPreferencePage_3;
+	public static String SetContextSize_1;
+	public static String SetContextSize_2;
+	public static String SetContextSize_3;
+	public static String SetContextSize_4;
+	public static String SetEncoding_0;
+	public static String SetEncoding_1;
+	public static String SetEncoding_2;
+	public static String SetLineNumber_0;
+	public static String SetLineNumber_1;
+	public static String SetSortProperty_1;
+	public static String SetSortProperty_2;
+	public static String SetSortProperty_3;
+	public static String ShowSelected_4;
+	public static String ShowSvgHelp_0;
+	public static String ShowSvgHelp_1;
+	public static String ShowSvgHelp_2;
+	public static String ShowSvgHelp_3;
+	public static String ShowSvgHelp_4;
+	public static String ShowSvgHelp_5;
+	public static String SimpleSubcorpusPanel_0;
+
+	public static String SingularValuesEditor_0;
+	public static String SortPropertySelection_0;
+	public static String Structure_field_not_empty;
+	public static String Submit_0;
+
+	public static String SummaryView_0;
+	public static String TXMCqpServerWatcher_0;
+	public static String TXMCqpServerWatcher_1;
+	public static String TXMRServeWatcher_0;
+	public static String TXMRServeWatcher_1;
+	public static String TXMRServeWatcher_2;
+	public static String TXMRServeWatcher_3;
+	public static String TXMRServeWatcher_4;
+	public static String TablableVector_0;
+	public static String TableEditor_0;
+	public static String TableKeyListener_0;
+
+	public static String TableKeyListener_1;
+	public static String TableKeyListener_6;
+	public static String TableSorter_0;
+	public static String TextometriePreferencePage_0;
+	public static String TextometriePreferencePage_1;
+	public static String TextometriePreferencePage_14;
+	public static String TextometriePreferencePage_15;
+	public static String TextometriePreferencePage_18;
+	public static String TextometriePreferencePage_19;
+	public static String TextometriePreferencePage_2;
+	public static String TextometriePreferencePage_20;
+	public static String TextualPlansSection_milestone_label;
+
+	public static String TextualPlansSection_milestone_tooltip;
+
+	public static String TextualPlansSection_outsidetext_label;
+
+	public static String TextualPlansSection_outsidetext_tooltip;
+
+	public static String TextualPlansSection_outsidetexttoedit_label;
+
+	public static String TextualPlansSection_outsidetexttoedit_tooltip;
+
+	public static String TextualPlansSection_save_error;
+
+	public static String TextualPlansSection_title;
+
+	public static String TextualPlansSection_update_error;
+
+	public static String TreeTaggerPreferencePage_0;
+	public static String TreeTaggerPreferencePage_1;
+	public static String TreeTaggerPreferencePage_2;
+	public static String TreeTaggerPreferencePage_3;
+	public static String TxmBrowser_0;
+	public static String TxmBrowser_10;
+	public static String TxmBrowser_11;
+	public static String TxmBrowser_12;
+	public static String TxmBrowser_5;
+	public static String TxmBrowser_6;
+	public static String TxmBrowser_7;
+	public static String TxmBrowser_8;
+	public static String TxmBrowser_9;
+	public static String TxmCommand_1;
+	public static String TxtEditor_0;
+	public static String TxtEditor_1;
+	public static String UIParameterException_0;
+	public static String UserPreferencePage_0;
+
+	public static String UserPreferencePage_1;
+	public static String UserPreferencePage_3;
+	public static String ViewPropertySelectionDialog_0;
+	public static String ViewPropertySelection_0;
+	public static String IndexToCooccurrence_0;
+	public static String IndexToLexicalTable_0;
+
+	public static String WordCloudPreferencePage_0;
+	public static String WordCloudPreferencePage_1;
+	public static String WordCloudPreferencePage_2;
+	public static String WordCloudPreferencePage_3;
+
+	public static String CleanPerspective_1;
+	public static String CleanPerspective_2;
+	public static String ExecuteLastGroovyScript_0;
+	public static String ExecuteLastGroovyScript_1;
+	public static String ExecuteLastGroovyScript_3;
+	public static String ShowSelected_0;
+	public static String SaveBeforeExecutionDialog_0;
+	public static String DownloadJobHandler_0;
+	public static String FixUpdateHandler_0;
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, RCPMessages.class);
+		//NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	public static String SEARCH;
+
+	private RCPMessages() {
+	}
+}

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

Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java	(revision 513)
@@ -59,7 +59,7 @@
 import org.eclipse.ui.part.ViewPart;
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.TXMWindows;
 import org.txm.rcp.commands.CopyFile;
 import org.txm.rcp.commands.CreateMacro;
@@ -139,8 +139,8 @@
 		controls.setLayout(controlsLayout);
 		
 		Button refresh = new Button(controls, SWT.NONE);
-		refresh.setText(Messages.Explorer_5);
-		refresh.setToolTipText(Messages.Explorer_6);
+		refresh.setText(RCPMessages.Explorer_5);
+		refresh.setToolTipText(RCPMessages.Explorer_6);
 		refresh.setLayoutData(new GridData());
 		refresh.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -153,8 +153,8 @@
 		
 		Button newMacro = new Button(controls, SWT.NONE);
 		newMacro.setLayoutData(new GridData());
-		newMacro.setText(Messages.MacrosExplorer_0);
-		newMacro.setToolTipText(Messages.MacrosExplorer_1);
+		newMacro.setText(RCPMessages.MacrosExplorer_0);
+		newMacro.setToolTipText(RCPMessages.MacrosExplorer_1);
 		newMacro.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -162,7 +162,7 @@
 				File currentRootDir = new File(scriptRootDir, "macro/org/txm/macro"); //$NON-NLS-1$
 				currentRootDir.mkdirs();
 				
-				InputDialog dialog = new InputDialog(e.display.getActiveShell(), Messages.CreateMacro_0, Messages.CreateMacro_1, "", null); //$NON-NLS-1$
+				InputDialog dialog = new InputDialog(e.display.getActiveShell(), RCPMessages.CreateMacro_0, RCPMessages.CreateMacro_1, "", null); //$NON-NLS-1$
 				
 				dialog.open();
 				String name = dialog.getValue();
@@ -280,7 +280,7 @@
 				selectedItem.equals(samples) ||
 				selectedItem.equals(xsl))
 		{
-			System.out.println(NLS.bind(Messages.Explorer_0, selectedItem));
+			System.out.println(NLS.bind(RCPMessages.Explorer_0, selectedItem));
 			return false;
 		}
 		return false;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeContentProvider.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeContentProvider.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeContentProvider.java	(revision 513)
@@ -34,7 +34,7 @@
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 
 // TODO: Auto-generated Javadoc
@@ -56,7 +56,7 @@
 		p = null;
 		try {
 		p = Pattern.compile(regex);
-		} catch(Exception e) { System.out.println(Messages.FileTreeContentProvider_1+regex+Messages.FileTreeContentProvider_2+e);}
+		} catch(Exception e) { System.out.println(RCPMessages.FileTreeContentProvider_1+regex+RCPMessages.FileTreeContentProvider_2+e);}
 		
 		Object[] kids = ((File) element).listFiles(new FileFilter() {	
 			@Override
@@ -102,7 +102,7 @@
 	public Object getParent(Object element) {
 		if (element instanceof File)
 			return ((File) element).getParentFile();
-		System.out.println(Messages.FileTreeContentProvider_3+element+Messages.FileTreeContentProvider_4);
+		System.out.println(RCPMessages.FileTreeContentProvider_3+element+RCPMessages.FileTreeContentProvider_4);
 		return null;
 	}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java	(revision 513)
@@ -56,7 +56,7 @@
 import org.eclipse.ui.part.ViewPart;
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.CopyFile;
 import org.txm.rcp.commands.CutFile;
 import org.txm.rcp.commands.DeleteFile;
@@ -129,8 +129,8 @@
 
 		// its widgets
 		Button go_up = new Button(controls, SWT.NONE);
-		go_up.setText(Messages.Explorer_4);
-		go_up.setToolTipText(Messages.Explorer_1);
+		go_up.setText(RCPMessages.Explorer_4);
+		go_up.setToolTipText(RCPMessages.Explorer_1);
 		go_up.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -145,7 +145,7 @@
 		if (currentPath == null)
 			currentPath = "/"; //$NON-NLS-1$
 		address.setText(currentPath);
-		address.setToolTipText(Messages.Explorer_2);
+		address.setToolTipText(RCPMessages.Explorer_2);
 		address.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent e) {
@@ -159,8 +159,8 @@
 		});
 
 		Button go = new Button(controls, SWT.NONE);
-		go.setText(Messages.Explorer_5);
-		go.setToolTipText(Messages.Explorer_6);
+		go.setText(RCPMessages.Explorer_5);
+		go.setToolTipText(RCPMessages.Explorer_6);
 		go.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -172,8 +172,8 @@
 		});
 		
 		Button homeBtn = new Button(controls, SWT.NONE);
-		homeBtn.setText(Messages.Explorer_7);
-		homeBtn.setToolTipText(Messages.Explorer_8);
+		homeBtn.setText(RCPMessages.Explorer_7);
+		homeBtn.setToolTipText(RCPMessages.Explorer_8);
 		homeBtn.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -309,7 +309,7 @@
 				selectedItem.equals(samples) ||
 				selectedItem.equals(xsl))
 		{
-			System.out.println(NLS.bind(Messages.Explorer_0, selectedItem));
+			System.out.println(NLS.bind(RCPMessages.Explorer_0, selectedItem));
 			return false;
 		}
 		return false;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 513)
@@ -65,7 +65,7 @@
 import org.txm.core.results.TXMResult;
 import org.txm.objects.Project;
 import org.txm.objects.Workspace;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.TXMWindows;
 import org.txm.rcp.commands.base.DeleteObject;
@@ -171,7 +171,7 @@
 	public void createPartControl(Composite parent) {
 		treeViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(
-				treeViewer.getControl(), Messages.CorporaView_0);
+				treeViewer.getControl(), RCPMessages.CorporaView_0);
 		getSite().setSelectionProvider(treeViewer);
 
 		treeViewer.setContentProvider(new TXMResultContentProvider());
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * not used yet, must display the groovy logs only @ author mdecorde.
@@ -169,8 +169,8 @@
 					return;
 			}
 		} catch (Exception e) {
-			textArea.append(Messages.GroovyConsole_4);
-			textArea.append(Messages.GroovyConsole_5 + e);
+			textArea.append(RCPMessages.GroovyConsole_4);
+			textArea.append(RCPMessages.GroovyConsole_5 + e);
 		}
 	}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java	(revision 513)
@@ -68,7 +68,7 @@
 import org.txm.objects.SavedQuery;
 import org.txm.objects.TxmObject;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.EditFile;
 import org.txm.rcp.commands.base.DeleteObject;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -159,7 +159,7 @@
 		Button export = new Button(parent, SWT.PUSH);
 		export.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 				false));
-		export.setText(Messages.QueriesView_1);
+		export.setText(RCPMessages.QueriesView_1);
 		export.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent arg0) {
@@ -172,7 +172,7 @@
 					dialog.setFilterPath(LastOpened.getFolder(ID));
 					dialog.setFileName(LastOpened.getFile(ID));
 				} else {
-					dialog.setFilterPath(new File(txmhome, Messages.Explorer_3).getAbsolutePath());
+					dialog.setFilterPath(new File(txmhome, RCPMessages.Explorer_3).getAbsolutePath());
 				}
 				String path = dialog.open();
 				if (path == null) return;
@@ -186,7 +186,7 @@
 				
 				try {
 					FileWriter writer = new FileWriter(output);
-					writer.write(Messages.QueriesView_5);
+					writer.write(RCPMessages.QueriesView_5);
 					for (MainCorpus b : CorpusManager.getCorpusManager().getCorpora()) {
 						writer.write(" " + b.getName() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 						for (SavedQuery q : b.getQueriesLog()) {
@@ -302,7 +302,7 @@
 				return ((TxmObject) element).getName();
 			else if (element instanceof SavedQuery)
 				return ((SavedQuery) element).toString();
-			return NLS.bind(Messages.QueriesView_10, element);
+			return NLS.bind(RCPMessages.QueriesView_10, element);
 		}
 
 		/* (non-Javadoc)
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java	(revision 513)
@@ -59,7 +59,7 @@
 import org.txm.Toolbox;
 import org.txm.functions.summary.Summary;
 import org.txm.objects.Page;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.OpenBrowser;
 import org.txm.rcp.editors.TXMBrowser;
 import org.txm.rcp.swt.widget.PropertiesSelector;
@@ -153,7 +153,7 @@
 				refresh();
 			}
 		} catch (Exception e) {
-			System.out.println(Messages.InternalCorpusView_0);
+			System.out.println(RCPMessages.InternalCorpusView_0);
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 		} 
 	}
@@ -306,7 +306,7 @@
 		//Button reload
 		Button openeditdialog = new Button(parent, SWT.PUSH);
 		openeditdialog.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		openeditdialog.setText(Messages.InternalCorpusView_1);
+		openeditdialog.setText(RCPMessages.InternalCorpusView_1);
 		openeditdialog.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -345,7 +345,7 @@
 						}
 						attachedBrowserEditor.showPage(openedPage);
 					} else {
-						System.out.println(Messages.SummaryView_0+node);
+						System.out.println(RCPMessages.SummaryView_0+node);
 					}
 
 					if (progresslistener != null) {
@@ -442,7 +442,7 @@
 		public String getText(Object element) {
 			if (element instanceof Summary.TreeNode)
 				return ((Summary.TreeNode) element).getInfo();
-			return NLS.bind(Messages.InternalCorpusView_2, element);
+			return NLS.bind(RCPMessages.InternalCorpusView_2, element);
 		}
 
 		/* (non-Javadoc)
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationActionBarAdvisor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationActionBarAdvisor.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationActionBarAdvisor.java	(revision 513)
@@ -106,13 +106,13 @@
 	protected void makeActions(IWorkbenchWindow window) {
 
 		preferenceAction = ActionFactory.PREFERENCES.create(window);
-		preferenceAction.setText(Messages.Preferences_Menu_Label);
+		preferenceAction.setText(RCPMessages.Preferences_Menu_Label);
 		register(preferenceAction);
 		exitAction = ActionFactory.QUIT.create(window);
-		exitAction.setText(Messages.Exit_Menu_Label);
+		exitAction.setText(RCPMessages.Exit_Menu_Label);
 		register(exitAction);
 		aboutAction = ActionFactory.ABOUT.create(window);
-		aboutAction.setText(Messages.About_Menu_Label);
+		aboutAction.setText(RCPMessages.About_Menu_Label);
 		register(aboutAction);
 		deleteAction = ActionFactory.DELETE.create(window);
 		// register(deleteAction);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/GetConcordancesDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/GetConcordancesDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/GetConcordancesDialog.java	(revision 513)
@@ -1,411 +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.rcp.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-import org.txm.rcp.Messages;
-import org.txm.searchengine.cqp.ReferencePattern;
-import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
-import org.txm.searchengine.cqp.corpus.Corpus;
-import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.searchengine.cqp.corpus.StructuralUnit;
-import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
-import org.txm.searchengine.cqp.corpus.query.Query;
-// TODO: Auto-generated Javadoc
-/**
- * The Class GetConcordancesDialog.
- *
- * @deprecated has been moved to concordance editor @ author mdecorde
- */
-@Deprecated
-public class GetConcordancesDialog extends Dialog {
-
-	/** The properties. */
-	private List<Property> properties;
-	
-	/** The ana prop combo. */
-	private Combo anaPropCombo;
-	
-	/** The view prop combo. */
-	private Combo viewPropCombo;
-	
-	/** The query text. */
-	private Text queryText;
-	
-	/** The available reference items. */
-	private List<Property> availableReferenceItems;
-	
-	/** The selected reference items. */
-	private List<Property> selectedReferenceItems;
-	
-	/** The left context spinner. */
-	private Spinner leftContextSpinner;
-	
-	/** The right context spinner. */
-	private Spinner rightContextSpinner;
-
-	/** The analysis property. */
-	private Property analysisProperty;
-	
-	/** The view property. */
-	private Property viewProperty;
-	
-	/** The query. */
-	private Query query;
-	
-	/** The reference pattern. */
-	private ReferencePattern referencePattern;
-	
-	/** The left context size. */
-	private int leftContextSize;
-	
-	/** The right context size. */
-	private int rightContextSize;
-
-	/**
-	 * Instantiates a new gets the concordances dialog.
-	 *
-	 * @param parentShell the parent shell
-	 * @param corpus the corpus
-	 */
-	public GetConcordancesDialog(Shell parentShell, Corpus corpus) {
-		super(parentShell);
-		try {
-			this.properties = new ArrayList<Property>(corpus.getOrderedProperties());
-			this.availableReferenceItems = new ArrayList<Property>();
-			this.selectedReferenceItems = new ArrayList<Property>();
-			this.availableReferenceItems.addAll(corpus.getOrderedProperties());
-			List<StructuralUnit> structuralUnits = corpus.getOrderedStructuralUnits();
-			for (StructuralUnit unit : structuralUnits) {
-				availableReferenceItems.addAll(unit.getOrderedProperties());
-			}
-		} catch (CqiClientException e) {
-			System.err.println(NLS.bind(Messages.GetConcordancesDialog_0,
-					e));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	@Override
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(Messages.GetConcordancesDialog_1);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-
-		Composite mainArea = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		mainArea.setLayout(layout);
-
-		Label queryLabel = new Label(mainArea, SWT.NONE);
-		queryLabel.setText(Messages.CreateSubcorpusDialog_10);
-		queryLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-				false, false));
-		queryText = new Text(mainArea, SWT.BORDER);
-		GridData gridData = new GridData(GridData.FILL, GridData.FILL, true,
-				false);
-		gridData.widthHint = convertWidthInCharsToPixels(20);
-		queryText.setLayoutData(gridData);
-		// queryText.setText("\"Graal\"");
-
-		Label anaPropLabel = new Label(mainArea, SWT.NONE);
-		anaPropLabel.setText(Messages.CreatePartitionDialog_4);
-		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-				false, false));
-
-		anaPropCombo = new Combo(mainArea, SWT.READ_ONLY);
-		anaPropCombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
-				true, false));
-		for (Property property : properties) {
-			anaPropCombo.add(property.getName());
-		}
-		anaPropCombo.select(0);
-
-		Label viewPropLabel = new Label(mainArea, SWT.NONE);
-		viewPropLabel.setText(Messages.GetConcordancesDialog_4);
-		viewPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-				false, false));
-
-		viewPropCombo = new Combo(mainArea, SWT.READ_ONLY);
-		viewPropCombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
-				true, false));
-		for (Property property : properties) {
-			viewPropCombo.add(property.getName());
-		}
-		viewPropCombo.select(0);
-
-		Label leftContextLabel = new Label(mainArea, SWT.NONE);
-		leftContextLabel.setText(Messages.GetConcordancesDialog_5);
-		leftContextLabel.setLayoutData(new GridData(GridData.END,
-				GridData.CENTER, false, false));
-		leftContextSpinner = new Spinner(mainArea, SWT.BORDER);
-		leftContextSpinner.setSelection(15);
-
-		Label rightContextLabel = new Label(mainArea, SWT.NONE);
-		rightContextLabel.setText(Messages.GetConcordancesDialog_6);
-		rightContextLabel.setLayoutData(new GridData(GridData.END,
-				GridData.CENTER, false, false));
-		rightContextSpinner = new Spinner(mainArea, SWT.BORDER);
-		rightContextSpinner.setSelection(15);
-
-		Label referenceLabel = new Label(mainArea, SWT.NONE);
-		referenceLabel.setText(Messages.GetConcordancesDialog_7);
-		referenceLabel.setLayoutData(new GridData(GridData.END,
-				GridData.BEGINNING, false, false));
-		Composite referencePatternComposer = new Composite(mainArea, SWT.NONE);
-		referencePatternComposer.setLayout(new GridLayout(4, false));
-
-		final org.eclipse.swt.widgets.List availbleItems = new org.eclipse.swt.widgets.List(
-				referencePatternComposer, SWT.BORDER | SWT.V_SCROLL);
-		for (Property property : availableReferenceItems) {
-			if (property instanceof StructuralUnitProperty) {
-				StructuralUnitProperty sProperty = (StructuralUnitProperty) property;
-				availbleItems.add(sProperty.getStructuralUnit().getName()
-						+ ": " + property.getName()); //$NON-NLS-1$
-			} else {
-				availbleItems.add(property.getName());
-			}
-		}
-		gridData = new GridData(GridData.FILL, GridData.FILL, true, false);
-		Point size = availbleItems.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		gridData.widthHint = size.x;
-		availbleItems.setLayoutData(gridData);
-
-		Composite selectionButtons = new Composite(referencePatternComposer,
-				SWT.NONE);
-		selectionButtons.setLayout(new GridLayout(1, false));
-		Button select = new Button(selectionButtons, SWT.ARROW | SWT.RIGHT);
-		Button unselect = new Button(selectionButtons, SWT.ARROW | SWT.LEFT);
-
-		final org.eclipse.swt.widgets.List selectedItems = new org.eclipse.swt.widgets.List(
-				referencePatternComposer, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
-		selectedItems.setLayoutData(gridData);
-
-		Composite orderButtons = new Composite(referencePatternComposer,
-				SWT.NONE);
-		orderButtons.setLayout(new GridLayout(1, false));
-		Button up = new Button(orderButtons, SWT.ARROW | SWT.UP);
-		Button down = new Button(orderButtons, SWT.ARROW | SWT.DOWN);
-
-		select.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				int ind = availbleItems.getSelectionIndex();
-				selectedItems.add(availbleItems.getItem(ind));
-				availbleItems.remove(ind);
-				selectedReferenceItems.add(availableReferenceItems.get(ind));
-				availableReferenceItems.remove(ind);
-				availbleItems.setSelection(ind);
-			}
-		});
-
-		unselect.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				int ind = selectedItems.getSelectionIndex();
-				availbleItems.add(selectedItems.getItem(ind));
-				selectedItems.remove(ind);
-				availableReferenceItems.add(selectedReferenceItems.get(ind));
-				selectedReferenceItems.remove(ind);
-				selectedItems.setSelection(ind);
-			}
-		});
-
-		up.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				int ind = selectedItems.getSelectionIndex();
-				if (ind > 0) {
-					selectedItems.add(selectedItems.getItem(ind), ind - 1);
-					selectedItems.remove(ind + 1);
-					selectedReferenceItems.add(selectedReferenceItems
-							.get(ind - 1));
-					selectedReferenceItems.remove(ind + 1);
-					selectedItems.setSelection(ind - 1);
-				}
-			}
-		});
-
-		down.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				int ind = selectedItems.getSelectionIndex();
-				if (ind < selectedItems.getItemCount() - 1) {
-					selectedItems.add(selectedItems.getItem(ind), ind + 2);
-					selectedItems.remove(ind);
-					selectedReferenceItems.add(selectedReferenceItems
-							.get(ind + 2));
-					selectedReferenceItems.remove(ind);
-					selectedItems.setSelection(ind + 2);
-				}
-			}
-		});
-
-		return mainArea;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	@Override
-	protected void okPressed() {
-		if (queryText.getText().equals("")) { //$NON-NLS-1$
-			MessageDialog.openError(getShell(),
-					Messages.CreateSubcorpusDialog_13,
-					Messages.CreateSubcorpusDialog_14);
-			return;
-		} else
-			query = new Query(wrap(queryText.getText()));
-
-		if (anaPropCombo.getSelectionIndex() == -1) {
-			MessageDialog.openError(getShell(),
-					Messages.Invalid_analysis_property,
-					Messages.GetConcordancesDialog_13);
-			return;
-		} else
-			analysisProperty = properties.get(anaPropCombo.getSelectionIndex());
-
-		if (viewPropCombo.getSelectionIndex() == -1) {
-			MessageDialog.openError(getShell(),
-					Messages.GetConcordancesDialog_14,
-					Messages.GetConcordancesDialog_15);
-			return;
-		} else
-			viewProperty = properties.get(viewPropCombo.getSelectionIndex());
-
-		referencePattern = new ReferencePattern();
-		for (Property prop : selectedReferenceItems)
-			referencePattern.addProperty(prop);
-
-		leftContextSize = leftContextSpinner.getSelection();
-		rightContextSize = rightContextSpinner.getSelection();
-
-		super.okPressed();
-	}
-
-	/**
-	 * Wrap.
-	 *
-	 * @param text the text
-	 * @return the string
-	 */
-	private String wrap(String text) {
-		Pattern quoted = Pattern.compile("\".*\""); //$NON-NLS-1$
-		if (quoted.matcher(text).matches())
-			return text;
-		Pattern bracketed = Pattern.compile("\\[.*\\]"); //$NON-NLS-1$
-		if (bracketed.matcher(text).matches())
-			return text;
-		Pattern equals = Pattern.compile(".*\".*\""); //$NON-NLS-1$
-		if (equals.matcher(text).matches())
-			return '[' + text + ']';
-		return '"' + text + '"'; //$NON-NLS-1$
-	}
-
-	/**
-	 * Gets the analysis property.
-	 *
-	 * @return the analysis property
-	 */
-	public Property getAnalysisProperty() {
-		return analysisProperty;
-	}
-
-	/**
-	 * Gets the view property.
-	 *
-	 * @return the view property
-	 */
-	public Property getViewProperty() {
-		return viewProperty;
-	}
-
-	/**
-	 * Gets the query.
-	 *
-	 * @return the query
-	 */
-	public Query getQuery() {
-		return query;
-	}
-
-	/**
-	 * Gets the reference pattern.
-	 *
-	 * @return the reference pattern
-	 */
-	public ReferencePattern getReferencePattern() {
-		return referencePattern;
-	}
-
-	/**
-	 * Gets the left context size.
-	 *
-	 * @return the left context size
-	 */
-	public int getLeftContextSize() {
-		return leftContextSize;
-	}
-
-	/**
-	 * Gets the right context size.
-	 *
-	 * @return the right context size
-	 */
-	public int getRightContextSize() {
-		return rightContextSize;
-	}
-
-}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateFrequencyListDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateFrequencyListDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateFrequencyListDialog.java	(revision 513)
@@ -40,7 +40,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
@@ -83,7 +83,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(Messages.FrequencyListEditorInput_0);
+		newShell.setText(RCPMessages.FrequencyListEditorInput_0);
 	}
 
 	/**
@@ -105,7 +105,7 @@
 		composite.setLayout(layout);
 
 		Label anaPropLabel = new Label(composite, SWT.NONE);
-		anaPropLabel.setText(Messages.CreatePartitionDialog_4);
+		anaPropLabel.setText(RCPMessages.CreatePartitionDialog_4);
 		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 				false, false));
 
@@ -129,8 +129,8 @@
 		int propIndex = anaPropCombo.getSelectionIndex();
 		if (propIndex == -1) {
 			MessageDialog.openError(getShell(),
-					Messages.Invalid_analysis_property,
-					Messages.Structure_field_not_empty);
+					RCPMessages.Invalid_analysis_property,
+					RCPMessages.Structure_field_not_empty);
 			return;
 		}
 		property = properties.get(propIndex);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/SaveBeforeExecutionDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/SaveBeforeExecutionDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/SaveBeforeExecutionDialog.java	(revision 513)
@@ -62,7 +62,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(org.txm.rcp.Messages.SaveBeforeExecutionDialog_0);
+		newShell.setText(org.txm.rcp.RCPMessages.SaveBeforeExecutionDialog_0);
 		newShell.setMinimumSize(300, 460);
 
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___DeleteInCorporaView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___DeleteInCorporaView.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___DeleteInCorporaView.java	(revision 513)
@@ -34,7 +34,7 @@
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Partition;
 import org.txm.searchengine.cqp.corpus.Subcorpus;
@@ -99,7 +99,7 @@
 			try {
 				subcorpus.getMotherSubcorpus().dropSubcorpus(subcorpus);
 			} catch (CqiClientException e) {
-				System.err.println(NLS.bind(Messages.DeleteInCorporaView_1, e));
+				System.err.println(NLS.bind(RCPMessages.DeleteInCorporaView_1, e));
 			}
 		}
 		if (selection.getFirstElement() instanceof Partition) {
@@ -108,7 +108,7 @@
 				partition.getCorpus().dropPartition(partition);
 			} catch (CqiClientException e) {
 				System.err.println(NLS.bind(
-						Messages.DeleteInCorporaView_2, e));
+						RCPMessages.DeleteInCorporaView_2, e));
 			}
 		}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateSubcorpusDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateSubcorpusDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateSubcorpusDialog.java	(revision 513)
@@ -45,7 +45,7 @@
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Text;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.widget.ComplexSubcorpusPanel;
 import org.txm.rcp.swt.widget.QueryWidget;
 import org.txm.rcp.swt.widget.SimpleSubcorpusPanel;
@@ -115,7 +115,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(Messages.CreateSubcorpusDialog_0);
+		newShell.setText(RCPMessages.CreateSubcorpusDialog_0);
 		newShell.setMinimumSize(300, 300);
 	}
 
@@ -151,7 +151,7 @@
 		nameComposite.setLayout(layout4nameComposite);
 
 		Label nameLabel = new Label(nameComposite, SWT.NONE);
-		nameLabel.setText(Messages.CreatePartitionDialog_6);
+		nameLabel.setText(RCPMessages.CreatePartitionDialog_6);
 		nameLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
 
 		name = new Text(nameComposite, SWT.BORDER);
@@ -163,19 +163,19 @@
 		
 		// First tab
 		TabItem simpleTab = new TabItem(tabFolder, SWT.NONE);
-		simpleTab.setText(Messages.CreatePartitionDialog_1);
+		simpleTab.setText(RCPMessages.CreatePartitionDialog_1);
 		simplePanel = new SimpleSubcorpusPanel(tabFolder, SWT.NONE, this, corpus);
 		simpleTab.setControl(simplePanel);
 		
 		//Second tab: assisted mode
 		TabItem secondTab = new TabItem(tabFolder, SWT.NONE);
-		secondTab.setText(Messages.CreatePartitionDialog_3);
+		secondTab.setText(RCPMessages.CreatePartitionDialog_3);
 		this.complexPanel = new ComplexSubcorpusPanel(tabFolder, SWT.NONE, this.corpus);
 		secondTab.setControl(complexPanel);
 
 		// Third tab: advanced mode
 		TabItem advancedTab = new TabItem(tabFolder, SWT.NONE);
-		advancedTab.setText(Messages.CreatePartitionDialog_5);
+		advancedTab.setText(RCPMessages.CreatePartitionDialog_5);
 
 		Composite compositeForAdvanced = new Composite(tabFolder, SWT.NONE);
 		advancedTab.setControl(compositeForAdvanced);
@@ -184,7 +184,7 @@
 		compositeForAdvanced.setLayout(layoutForAdvanced);
 
 		Label advancedPartLabel = new Label(compositeForAdvanced, SWT.NONE);
-		advancedPartLabel.setText(Messages.CreateSubcorpusDialog_10);
+		advancedPartLabel.setText(RCPMessages.CreateSubcorpusDialog_10);
 		advancedPartLabel.setLayoutData(new GridData(GridData.END,
 				GridData.CENTER, false, false));
 
@@ -236,7 +236,7 @@
 		if (name.getText().length() == 0) {
 			String generated = "subcorpus"; //$NON-NLS-1$
 
-			System.out.println(Messages.CreateSubcorpusDialog_8);
+			System.out.println(RCPMessages.CreateSubcorpusDialog_8);
 			if (isAdvancedSelected()) {
 				generated += ""+(this.corpus.getSubcorpora().size()+1); //$NON-NLS-1$
 			} else if (assistedSelected) {
@@ -250,8 +250,8 @@
 		// test if a query has been set
 		if ((isAdvancedSelected()) && queryText.getText().length() == 0) {
 			MessageDialog.openError(getShell(),
-					Messages.CreateSubcorpusDialog_13,
-					Messages.CreateSubcorpusDialog_14);
+					RCPMessages.CreateSubcorpusDialog_13,
+					RCPMessages.CreateSubcorpusDialog_14);
 			return;
 		}
 
@@ -267,8 +267,8 @@
 				//System.out.println("3 "+queryString);
 				if (queryString == null || queryString.trim().length() == 0) {
 					MessageDialog.openError(getShell(),
-							Messages.CreateSubcorpusDialog_13,
-							Messages.CreateSubcorpusDialog_14);
+							RCPMessages.CreateSubcorpusDialog_13,
+							RCPMessages.CreateSubcorpusDialog_14);
 					return;
 				}
 			}
@@ -304,7 +304,7 @@
 	public StructuralUnit getStructuralUnit() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					Messages.Cannot_ask_simple_when_advance);
+					RCPMessages.Cannot_ask_simple_when_advance);
 		return simplePanel.selectedStructuralUnit;
 	}
 
@@ -316,7 +316,7 @@
 	public StructuralUnitProperty getStructuralUnitProperty() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					Messages.Cannot_ask_simple_when_advance);
+					RCPMessages.Cannot_ask_simple_when_advance);
 		return simplePanel.selectedStructuralUnitProperty;
 	}
 
@@ -328,7 +328,7 @@
 	public List<String> getValues() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					Messages.Cannot_ask_simple_when_advance);
+					RCPMessages.Cannot_ask_simple_when_advance);
 		return simplePanel.selectedValues;
 	}
 
@@ -340,7 +340,7 @@
 	public String getQuery() {
 		if (isAdvancedSelected() == false && isAssistedSelected() == false)
 			throw new IllegalStateException(
-					Messages.Cannot_ask_simple_when_advance);
+					RCPMessages.Cannot_ask_simple_when_advance);
 		return queryString;
 	}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java	(revision 513)
@@ -52,7 +52,7 @@
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.TxmPreferences;
 import org.txm.rcp.commands.EditFile;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -149,7 +149,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(NLS.bind(Messages.ImportDialog_0, loadername)); 
+		newShell.setText(NLS.bind(RCPMessages.ImportDialog_0, loadername)); 
 		newShell.setMinimumSize(300, 200);
 	}
 
@@ -172,7 +172,7 @@
 
 			// directory
 			Label dirLabel = new Label(mainPanel, SWT.NONE);
-			dirLabel.setText(Messages.ImportDialog_1);
+			dirLabel.setText(RCPMessages.ImportDialog_1);
 			dirLabel.setAlignment(SWT.CENTER);
 			dirLabel.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 					false, false));
@@ -203,7 +203,7 @@
 						if (new File(srcdir, "html").exists() && new File(srcdir, "data").exists() && new File(srcdir, "registry").exists()) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
 						{	
 							TXMMessageBox.show(parent
-									.getShell(), Messages.AddBase_19, Messages.ImportDialog_13, SWT.ICON_WARNING);
+									.getShell(), RCPMessages.AddBase_19, RCPMessages.ImportDialog_13, SWT.ICON_WARNING);
 						}
 						
 						directory = new File(path);
@@ -243,26 +243,26 @@
 
 			// encoding
 			Group encodingGroup = new Group(optionsPanel, SWT.SHADOW_ETCHED_IN);
-			encodingGroup.setText(Messages.ImportDialog_4);
+			encodingGroup.setText(RCPMessages.ImportDialog_4);
 			encodingGroup.setLayout(new GridLayout(2, false));
 			encodingGroup.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, false, 3, 1));
 
 			btnDefaultEncoding = new Button(encodingGroup, SWT.RADIO);
-			btnDefaultEncoding.setText(Messages.ImportDialog_14
+			btnDefaultEncoding.setText(RCPMessages.ImportDialog_14
 					+ System.getProperty("file.encoding")); //$NON-NLS-1$
 			btnDefaultEncoding.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, false, 2, 1));
 			btnDefaultEncoding.setSelection(true);
 
 			btnGuessEncoding = new Button(encodingGroup, SWT.RADIO);
-			btnGuessEncoding.setText(Messages.ImportDialog_16);
+			btnGuessEncoding.setText(RCPMessages.ImportDialog_16);
 
 			btnGuess2Encoding = new Button(encodingGroup, SWT.PUSH);
 			btnGuess2Encoding.setText("??"); //$NON-NLS-1$
 
 			btnSelectEncoding = new Button(encodingGroup, SWT.RADIO);
-			btnSelectEncoding.setText(Messages.ImportDialog_22);
+			btnSelectEncoding.setText(RCPMessages.ImportDialog_22);
 
 			encodingCombo = new Combo(encodingGroup, SWT.BORDER);
 			encodingCombo.setLayoutData(new GridData(GridData.FILL,
@@ -294,26 +294,26 @@
 
 			// lang
 			Group langGroup = new Group(optionsPanel, SWT.SHADOW_ETCHED_IN);
-			langGroup.setText(Messages.ImportDialog_5);
+			langGroup.setText(RCPMessages.ImportDialog_5);
 			langGroup.setLayout(new GridLayout(2, false));
 			langGroup.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 					true, false, 3, 1));
 
 			btnDefaultLang = new Button(langGroup, SWT.RADIO);
-			btnDefaultLang.setText(Messages.ImportDialog_19
+			btnDefaultLang.setText(RCPMessages.ImportDialog_19
 					+ Locale.getDefault().getLanguage());
 			btnDefaultLang.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, false, 2, 1));
 			btnDefaultLang.setSelection(true);
 
 			btnGuessLang = new Button(langGroup, SWT.RADIO);
-			btnGuessLang.setText(Messages.ImportDialog_16); 
+			btnGuessLang.setText(RCPMessages.ImportDialog_16); 
 
 			btnGuess2Lang = new Button(langGroup, SWT.PUSH);
 			btnGuess2Lang.setText("??"); //$NON-NLS-1$
 
 			btnSelectLang = new Button(langGroup, SWT.RADIO);
-			btnSelectLang.setText(Messages.ImportDialog_22);
+			btnSelectLang.setText(RCPMessages.ImportDialog_22);
 
 			langcombo = new Combo(langGroup, SWT.BORDER);
 			langcombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
@@ -350,7 +350,7 @@
 			selectTokenizerPanel.setLayout(new GridLayout(4, false));
 			selectTokenizerPanel.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, false, 3, 1));
-			selectTokenizerPanel.setText(Messages.ImportDialog_6);
+			selectTokenizerPanel.setText(RCPMessages.ImportDialog_6);
 
 			final Text tokenizerValue = new Text(selectTokenizerPanel,
 					SWT.SINGLE | SWT.BORDER);
@@ -387,7 +387,7 @@
 			tokenizerButton = new Button(selectTokenizerPanel, SWT.PUSH);
 			// tokenizerButton.setLayoutData(new GridData(GridData.FILL,
 			// GridData.FILL, false, false));
-			tokenizerButton.setText(Messages.PropertiesSelector_2);
+			tokenizerButton.setText(RCPMessages.PropertiesSelector_2);
 			tokenizerButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -405,7 +405,7 @@
 			});
 
 			final ExpandItem item0 = new ExpandItem(bar, SWT.NONE, 0);
-			item0.setText(Messages.ImportDialog_23);
+			item0.setText(RCPMessages.ImportDialog_23);
 			item0.setHeight(optionsPanel.computeSize(SWT.DEFAULT,SWT.DEFAULT).y);
 			item0.setControl(optionsPanel);
 						
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreatePartitionDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreatePartitionDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreatePartitionDialog.java	(revision 513)
@@ -55,7 +55,7 @@
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Text;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.widget.PartitionComposer;
 import org.txm.rcp.swt.widget.QueryWidget;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -150,7 +150,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(Messages.CreatePartitionDialog_0);
+		newShell.setText(RCPMessages.CreatePartitionDialog_0);
 		newShell.setMinimumSize(400, 400);
 	}
 
@@ -170,7 +170,7 @@
 		FontData defaultFont = f.getFontData()[0];
 		defaultFont.setStyle(SWT.BOLD);
 		Font newf = new Font(nameLabel.getDisplay(), defaultFont);
-		nameLabel.setText(Messages.CreatePartitionDialog_6);
+		nameLabel.setText(RCPMessages.CreatePartitionDialog_6);
 		nameLabel.setLayoutData(new GridData(GridData.FILL, GridData.CENTER,
 				false, false));
 		nameLabel.setFont(newf);
@@ -188,7 +188,7 @@
 
 		TabItem simpleTab = new TabItem(tabFolder, SWT.NONE);
 
-		simpleTab.setText(Messages.CreatePartitionDialog_1);
+		simpleTab.setText(RCPMessages.CreatePartitionDialog_1);
 
 		Composite composite = new Composite(tabFolder, SWT.NONE);
 		simpleTab.setControl(composite);
@@ -200,7 +200,7 @@
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 		Label structureLabel = new Label(composite, SWT.NONE);
-		structureLabel.setText(Messages.CreatePartitionDialog_2);
+		structureLabel.setText(RCPMessages.CreatePartitionDialog_2);
 		structureLabel.setLayoutData(new GridData(GridData.END,
 				GridData.CENTER, false, false));
 
@@ -212,7 +212,7 @@
 		try {
 			structuralUnits = corpus.getOrderedStructuralUnits();
 		} catch (CqiClientException e) {
-			Log.severe(Messages.ObjectExplorer_9
+			Log.severe(RCPMessages.ObjectExplorer_9
 					+ Log.toString(e));
 			return null;
 		}
@@ -255,7 +255,7 @@
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 		Label propertyLabel = new Label(composite, SWT.NONE);
-		propertyLabel.setText(Messages.CreatePartitionDialog_4);
+		propertyLabel.setText(RCPMessages.CreatePartitionDialog_4);
 		propertyLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 				false, false));
 
@@ -300,7 +300,7 @@
 		// Second Tab : assisted mode
 		TabItem assistedTab = new TabItem(tabFolder, SWT.NONE);
 
-		assistedTab.setText(Messages.CreatePartitionDialog_3);
+		assistedTab.setText(RCPMessages.CreatePartitionDialog_3);
 
 		compositeForAssisted = new PartitionComposer(tabFolder, SWT.NONE,
 				this.corpus);
@@ -310,7 +310,7 @@
 		// --------------------------------------------------------
 
 		TabItem advancedTab = new TabItem(tabFolder, SWT.NONE);
-		advancedTab.setText(Messages.CreatePartitionDialog_5);
+		advancedTab.setText(RCPMessages.CreatePartitionDialog_5);
 
 		Composite advanceContainer = new Composite(tabFolder, SWT.NONE);
 		GridLayout advanceLayout = new GridLayout(1, true);
@@ -450,7 +450,7 @@
 	 */
 	private void addQueryField(final Composite composite) {
 		final Text advancedPartLabel = new Text(composite, SWT.NONE);
-		advancedPartLabel.setText(Messages.CreatePartitionDialog_7
+		advancedPartLabel.setText(RCPMessages.CreatePartitionDialog_7
 				+ (partNames.size() + 1)); 
 		advancedPartLabel.setLayoutData(new GridData(GridData.END,
 				GridData.CENTER, false, false));
@@ -498,21 +498,21 @@
 			{
 				String name = "partition"+(this.corpus.getPartitions().size()+1); //$NON-NLS-1$
 				nameText.setText(name);
-				System.out.println(Messages.CreatePartitionDialog_9);
+				System.out.println(RCPMessages.CreatePartitionDialog_9);
 			}
 			else if (isAssistedSelected)
 			{
 				String name = this.corpus.getName()+"_"+compositeForAssisted.getProperty().getFullName(); //$NON-NLS-1$
 				nameText.setText(name);
-				System.out.println(Messages.CreatePartitionDialog_9);
+				System.out.println(RCPMessages.CreatePartitionDialog_9);
 			}
 			//return;
 		}
 
 		if (isAdvancedSelected() && noquery()) {
 			MessageDialog.openError(getShell(),
-					Messages.CreateSubcorpusDialog_13,
-					Messages.CreatePartitionDialog_16);
+					RCPMessages.CreateSubcorpusDialog_13,
+					RCPMessages.CreatePartitionDialog_16);
 			return;
 		}
 
@@ -549,7 +549,7 @@
 	public StructuralUnit getStructuralUnit() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					Messages.Cannot_ask_simple_when_advance);
+					RCPMessages.Cannot_ask_simple_when_advance);
 		return selectedStructuralUnit;
 	}
 
@@ -561,7 +561,7 @@
 	public StructuralUnitProperty getStructuralUnitProperty() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					Messages.Cannot_ask_simple_when_advance);
+					RCPMessages.Cannot_ask_simple_when_advance);
 		return selectedStructuralUnitProperty;
 	}
 
@@ -573,7 +573,7 @@
 	public List<String> getQueries() {
 		if (!isAdvancedSelected())
 			throw new IllegalStateException(
-					Messages.Cannot_ask_simple_when_advance);
+					RCPMessages.Cannot_ask_simple_when_advance);
 		return queriesString;
 	}
 
@@ -616,12 +616,12 @@
 		}
 
 		if (p == null) {
-			System.out.println(Messages.CreatePartitionDialog_8);
+			System.out.println(RCPMessages.CreatePartitionDialog_8);
 			return null;
 		}
 		
 		if (p.getParts().size() == 0) {
-			System.out.println(Messages.CreatePartitionDialog_10);
+			System.out.println(RCPMessages.CreatePartitionDialog_10);
 			return null;
 		}
 		
@@ -642,7 +642,7 @@
 		for (Text t: partNames) {
 			String name = t.getText().trim();
 			if (name.length() == 0)
-				name = Messages.CreatePartitionDialog_7+count++; 
+				name = RCPMessages.CreatePartitionDialog_7+count++; 
 			values.add(name);
 		}
 		return values;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java	(revision 513)
@@ -49,7 +49,7 @@
 import org.txm.importer.scripting.GroovyImportScriptRunner;
 import org.txm.rcp.Application;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.rcp.utils.JobHandler;
 
@@ -77,8 +77,8 @@
 	public RunGroovyScript(IWorkbenchWindow window) {
 		this.window = window;
 		setId(ID);
-		setText(Messages.RunGroovyScript_1);
-		setToolTipText(Messages.RunGroovyScript_2);
+		setText(RCPMessages.RunGroovyScript_1);
+		setToolTipText(RCPMessages.RunGroovyScript_2);
 		setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
 				Application.PLUGIN_ID, IImageKeys.ACTION_RUN_SCRIPT));
 	}
@@ -101,7 +101,7 @@
 	public void run() {
 
 		FileDialog dialog = new FileDialog(window.getShell(), SWT.OPEN);
-		dialog.setFilterExtensions(new String[] { Messages.RunGroovyScript_3 });
+		dialog.setFilterExtensions(new String[] { RCPMessages.RunGroovyScript_3 });
 		String scriptRootDir = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE)+ "/scripts";
 		String scriptCurrentDir = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE)+ "/scripts";
 		
@@ -121,18 +121,18 @@
 			classPath.add(new File(scriptRootDir));
 			gse = new GroovyImportScriptRunner(script, classPath);
 		} catch (IOException e) {
-			System.err.println(NLS.bind(Messages.RunGroovyScript_4, e));
+			System.err.println(NLS.bind(RCPMessages.RunGroovyScript_4, e));
 			System.err.println(e);
 		}
 
 		if (gse != null) {
-			JobHandler jobhandler = new JobHandler(Messages.RunGroovyScript_0,
+			JobHandler jobhandler = new JobHandler(RCPMessages.RunGroovyScript_0,
 					null) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					this.runInit(monitor);
 					try {
-						monitor.beginTask(Messages.RunGroovyScript_9, 100);
+						monitor.beginTask(RCPMessages.RunGroovyScript_9, 100);
 						new Binding();
 						// gse.run(binding);
 						monitor.worked(100);
@@ -140,7 +140,7 @@
 					} catch (ThreadDeath td) {
 						return Status.CANCEL_STATUS;
 					} catch (Exception e) {
-						System.out.println(NLS.bind(Messages.RunGroovyScript_8,
+						System.out.println(NLS.bind(RCPMessages.RunGroovyScript_8,
 								e));
 					} finally {
 						monitor.done();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java	(revision 513)
@@ -51,7 +51,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.Application;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.TxmPreferences;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.dialog.ComboDialog;
@@ -90,7 +90,7 @@
 		values.add("fr"); //$NON-NLS-1$
 		values.add("en"); //$NON-NLS-1$
 		values.add("ru"); //$NON-NLS-1$
-		ComboDialog d = new ComboDialog(shell, Messages.LanguageSwitchHandler_3, values,
+		ComboDialog d = new ComboDialog(shell, RCPMessages.LanguageSwitchHandler_3, values,
 				service.getString(Application.PLUGIN_ID,
 						RCPPreferences.UI_LOCALE, "fr", null)); //$NON-NLS-1$
 		if (d.open() == Window.OK) {
@@ -102,7 +102,7 @@
 		String locale = service.getString(Application.PLUGIN_ID,
 				RCPPreferences.UI_LOCALE, "fr", null); //$NON-NLS-1$
 		if (locale.length() == 0)
-			Log.warning(Messages.LanguageSwitchHandler_0);
+			Log.warning(RCPMessages.LanguageSwitchHandler_0);
 		// Does not work:
 		//System.getProperties().setProperty("eclipse.exitdata", "-nl " + locale);
 		//changeLocaleTXMIni(locale);
@@ -131,22 +131,22 @@
 			String path = System.getProperty("osgi.instance.area"); //$NON-NLS-1$
 			location = new URL(path + "TXM.ini"); //$NON-NLS-1$
 		} catch (MalformedURLException e) {
-			System.err.println(NLS.bind(Messages.LanguageSwitchHandler_5, location));
+			System.err.println(NLS.bind(RCPMessages.LanguageSwitchHandler_5, location));
 			return;
 		}
 		
 		String fileName = location.getFile();
 		File file = new File(fileName);
 		if (!file.exists()) {
-			MessageBox.error(NLS.bind(Messages.LanguageSwitchHandler_1, file.getAbsolutePath()));
+			MessageBox.error(NLS.bind(RCPMessages.LanguageSwitchHandler_1, file.getAbsolutePath()));
 			return;
 		}
 		fileName += ".bak"; //$NON-NLS-1$
 		file.renameTo(new File(fileName));
 		
 		// update TXM.ini
-		System.out.println(Messages.LanguageSwitchHandler_7+location);
-		Log.severe(Messages.LanguageSwitchHandler_7+location);
+		System.out.println(RCPMessages.LanguageSwitchHandler_7+location);
+		Log.severe(RCPMessages.LanguageSwitchHandler_7+location);
 		try {
 
 			BufferedReader in = new BufferedReader(new FileReader(fileName));
@@ -234,7 +234,7 @@
 
 		File file = new File(fileName);
 		if (!file.exists()) {
-			MessageBox.error(NLS.bind(Messages.LanguageSwitchHandler_1, file.getAbsolutePath()));
+			MessageBox.error(NLS.bind(RCPMessages.LanguageSwitchHandler_1, file.getAbsolutePath()));
 			return;
 		}
 		String fileNameBackup = fileName + ".bak"; //$NON-NLS-1$
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java	(revision 513)
@@ -35,7 +35,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.utils.logger.Log;
 
@@ -227,22 +227,22 @@
 		if (!this.canBeInterrupted) // Prevent thread system interruption (ThreadDeath not handled by the programmer)
 			return;
 		
-		Log.info(this.getName() + Messages.JobHandler_2);
+		Log.info(this.getName() + RCPMessages.JobHandler_2);
 		
 		try {
-			System.out.println(Messages.JobHandler_1 + " " + this.getName()); //$NON-NLS-1$
+			System.out.println(RCPMessages.JobHandler_1 + " " + this.getName()); //$NON-NLS-1$
 			this.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					StatusLine.setMessage(Messages.JobHandler_0);
+					StatusLine.setMessage(RCPMessages.JobHandler_0);
 				}
 			});
-			if (currentMonitor != null) this.currentMonitor.setTaskName(Messages.JobHandler_0);
+			if (currentMonitor != null) this.currentMonitor.setTaskName(RCPMessages.JobHandler_0);
 			this.mySemaphore.acquire();
 			this.myThread.stop();
 		} catch (Exception e) {
 			org.txm.rcp.utils.Logger.printStackTrace(e);
-			Log.severe(Messages.JobHandler_3 + this.getName());
+			Log.severe(RCPMessages.JobHandler_3 + this.getName());
 		}
 	}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java	(revision 513)
@@ -32,7 +32,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -57,7 +57,7 @@
 	protected IStatus run(final IProgressMonitor monitor) {
 		this.runInit(monitor);
 		//this.setCurrentMonitor(monitor);
-		monitor.beginTask(Messages.DownloadJobHandler_0, contentLength);
+		monitor.beginTask(RCPMessages.DownloadJobHandler_0, contentLength);
 		long size = file.length();
 		while (!done) {
 			try {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/Commands.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/Commands.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/Commands.java	(revision 513)
@@ -10,7 +10,7 @@
 
 //import practicallymacro.commands.EclipseCommand;
 
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 public class Commands {
 	
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/OpenURI.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/OpenURI.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/OpenURI.java	(revision 513)
@@ -31,7 +31,7 @@
 import java.io.IOException;
 
 import org.eclipse.osgi.util.NLS;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 // TODO: Auto-generated Javadoc
 /**
@@ -50,7 +50,7 @@
 		try
 		{
 			if ( !java.awt.Desktop.isDesktopSupported() ) {
-				System.err.println( Messages.OpenURI_0 );
+				System.err.println( RCPMessages.OpenURI_0 );
 				return false;
 			}
 
@@ -75,7 +75,7 @@
 		catch(Exception e)
 		{
 			System.out.println(e.getLocalizedMessage());
-			StatusLine.error(NLS.bind(Messages.OpenURI_1, file));
+			StatusLine.error(NLS.bind(RCPMessages.OpenURI_1, file));
 		}
 		return false;
 	}
@@ -88,7 +88,7 @@
 	 */
 	public static boolean browse(File file) {
 		if ( !java.awt.Desktop.isDesktopSupported() ) {
-			System.err.println( Messages.OpenURI_0 );
+			System.err.println( RCPMessages.OpenURI_0 );
 			return false;
 		}
 		
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateMacro.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateMacro.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateMacro.java	(revision 513)
@@ -44,7 +44,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.rcp.views.fileexplorer.MacroExplorer;
 import org.txm.utils.AsciiUtils;
@@ -94,7 +94,7 @@
 		
 		//ask new file name
 		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event).getShell();
-		InputDialog dialog = new InputDialog(shell, Messages.CreateMacro_0, Messages.CreateMacro_1, "", null); //$NON-NLS-1$
+		InputDialog dialog = new InputDialog(shell, RCPMessages.CreateMacro_0, RCPMessages.CreateMacro_1, "", null); //$NON-NLS-1$
 		
 		dialog.open();
 		String name = dialog.getValue();
@@ -136,7 +136,7 @@
 		if (!newfile.exists() && newfile.getParentFile().canWrite()) {
 			try {
 				if (newfile.createNewFile()) {
-					System.out.println(NLS.bind(Messages.CreateFile_1, newfile.getAbsolutePath()));
+					System.out.println(NLS.bind(RCPMessages.CreateFile_1, newfile.getAbsolutePath()));
 					
 					PrintWriter writer = IOUtils.getWriter(newfile, "UTF-8"); //$NON-NLS-1$
 					writer.println("// STANDARD DECLARATIONS"); //$NON-NLS-1$
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java	(revision 513)
@@ -48,7 +48,7 @@
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.objects.BaseParameters;
 import org.txm.objects.Project;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.corpus.CorpusManager;
 import org.txm.utils.LangDetector;
 import org.txm.utils.xml.DomUtils;
@@ -76,18 +76,18 @@
 			System.out.println("No copied text. Aborting.");
 			return null;
 		}
-		System.out.println(Messages.ImportSelectedText_0);
+		System.out.println(RCPMessages.ImportSelectedText_0);
 		Project projet;
 		try {
 			projet = Toolbox.workspace.getProject("default"); //$NON-NLS-1$
 		} catch (Exception e) {
-			System.out.println(Messages.ImportSelectedText_6+e);
+			System.out.println(RCPMessages.ImportSelectedText_6+e);
 			return null;
 		}
 		try {
-			String corpusName = Messages.ImportSelectedText_1+(nextclipcorpus++);
+			String corpusName = RCPMessages.ImportSelectedText_1+(nextclipcorpus++);
 			while (projet.getBase(corpusName) != null)
-				corpusName = Messages.ImportSelectedText_1+(nextclipcorpus++);
+				corpusName = RCPMessages.ImportSelectedText_1+(nextclipcorpus++);
 			importText(result, corpusName);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -109,7 +109,7 @@
 	public static Object importText(String text, String basename) throws IOException, ParserConfigurationException, SAXException {
 				
 		if (text.length() == 0) {
-			System.err.println(Messages.ImportSelectedText_2);
+			System.err.println(RCPMessages.ImportSelectedText_2);
 			return null;
 		}
 		String txmhome = Toolbox.getParam(TBXPreferences.USER_TXM_HOME);
@@ -119,8 +119,8 @@
 		if (CorpusManager.getCorpusManager().hasCorpus(clipboardDirectory.getName())) {
 			Shell shell = new Shell();
 			boolean b = MessageDialog.openConfirm(shell,
-					Messages.ImportSelectedText_3,
-					NLS.bind(Messages.ImportSelectedText_4, clipboardDirectory.getName()));
+					RCPMessages.ImportSelectedText_3,
+					NLS.bind(RCPMessages.ImportSelectedText_4, clipboardDirectory.getName()));
 			if (!b)
 				return null;
 		}
@@ -166,10 +166,10 @@
 		if ("??".equals(lang)) { //$NON-NLS-1$
 			LangDetector detector = new LangDetector(quicksrc);
 			lang = detector.getLang();
-			System.out.println(Messages.ImportSelectedText_10+lang);
+			System.out.println(RCPMessages.ImportSelectedText_10+lang);
 		}
 		corpusElem.setAttribute("lang", lang); //$NON-NLS-1$
-		System.out.println(Messages.ImportSelectedText_12+corpusElem.getAttribute("lang")); //$NON-NLS-1$
+		System.out.println(RCPMessages.ImportSelectedText_12+corpusElem.getAttribute("lang")); //$NON-NLS-1$
 		
 		DomUtils.save(params.root.getOwnerDocument(), params.paramFile);
 		new ExecuteImportScript().executeScript(scriptfile.getAbsolutePath(), params.paramFile); 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java	(revision 513)
@@ -36,7 +36,7 @@
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * show informations of the selected TxmObject @ author mdecorde.
@@ -56,7 +56,7 @@
 			
 			if (elem instanceof File) {
 				File f = (File)elem;
-				System.out.println(Messages.ShowSelected_0);
+				System.out.println(RCPMessages.ShowSelected_0);
 				System.out.println(" path="+f.getAbsolutePath());
 				System.out.println(" size="+f.length()/1000+" kb");
 				System.out.println(" rights: read="+f.canRead()+" write="+f.canWrite()+" execute="+f.canExecute());
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/base/DeleteObject.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/base/DeleteObject.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/base/DeleteObject.java	(revision 513)
@@ -55,7 +55,7 @@
 import org.txm.core.results.TXMResult;
 import org.txm.functions.TXMCommand;
 import org.txm.objects.TxmObject;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.RestartTXM;
 import org.txm.rcp.editors.TXMEditorPart;
@@ -113,7 +113,7 @@
 				public void run() {
 					MessageBox messageBox = new MessageBox(Display.getDefault().getActiveShell(), SWT.ICON_QUESTION
 							| SWT.YES | SWT.NO);
-					messageBox.setMessage(NLS.bind(Messages.DeleteObject_0, selection.toList()));
+					messageBox.setMessage(NLS.bind(RCPMessages.DeleteObject_0, selection.toList()));
 					int response = messageBox.open();
 					if (response != SWT.YES) {
 						StatusLine.setMessage(""); //$NON-NLS-1$
@@ -148,7 +148,7 @@
 	 * @return 
 	 */
 	public synchronized static HashSet<Object> delete(final List<Object> objects) {
-		StatusLine.setMessage(NLS.bind(Messages.DeleteObject_5, objects));
+		StatusLine.setMessage(NLS.bind(RCPMessages.DeleteObject_5, objects));
 		
 		final HashSet<Object> allObjectDeleted = new HashSet<Object>();
 		shouldRestartToolbox = false;
@@ -158,14 +158,14 @@
 				List<Object> deleted = delete(o);
 				allObjectDeleted.addAll(deleted);
 				if (deleted.size() == 0) {
-					StatusLine.setMessage(Messages.DeleteObject_3+" : "+o);
+					StatusLine.setMessage(RCPMessages.DeleteObject_3+" : "+o);
 					return new HashSet<Object>();
 				}
 				// remove results already deleted
 				objects.removeAll(deleted);
 			} catch(Exception e) {
-				Log.info(NLS.bind(Messages.DeleteObject_4, o, e)); 
-				StatusLine.error(NLS.bind(Messages.DeleteObject_4, o, e)); 
+				Log.info(NLS.bind(RCPMessages.DeleteObject_4, o, e)); 
+				StatusLine.error(NLS.bind(RCPMessages.DeleteObject_4, o, e)); 
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 				return new HashSet<Object>();
 			}
@@ -177,8 +177,8 @@
 				org.txm.Toolbox.restartWorkspace();
 				Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
 				
-				System.err.println(Messages.AddBase_10);
-				StatusLine.setMessage(Messages.AddBase_10);
+				System.err.println(RCPMessages.AddBase_10);
+				StatusLine.setMessage(RCPMessages.AddBase_10);
 			}
 			
 			Display.getDefault().syncExec(new Runnable() {
@@ -210,7 +210,7 @@
 	public static List<Object> delete(Object o) {
 		ArrayList<Object> deleted = new ArrayList<Object>();
 		if (o instanceof TxmObject) {
-			Log.info(NLS.bind(Messages.DeleteObject_10, ((TxmObject) o).getName()));
+			Log.info(NLS.bind(RCPMessages.DeleteObject_10, ((TxmObject) o).getName()));
 
 			try {
 				if (o instanceof Corpus) {
@@ -223,7 +223,7 @@
 					deleted.addAll(c.getPartitions());
 
 					if (!((TxmObject) o).delete()) {
-						Log.info(Messages.DeleteObject_3);
+						Log.info(RCPMessages.DeleteObject_3);
 						return new ArrayList<Object>(0);
 					}
 				} else if (o instanceof Partition) {
@@ -233,7 +233,7 @@
 						i--;
 					}
 					if (!((TxmObject) o).delete()) {
-						Log.info(Messages.DeleteObject_3);
+						Log.info(RCPMessages.DeleteObject_3);
 						return new ArrayList<Object>(0);
 					}
 				}
@@ -312,12 +312,12 @@
 		// FIXME: when TXMResult will be implemented, only this code must be left
 		else if (o instanceof TXMResult) {
 			((TXMResult) o).delete();
-			System.out.println(NLS.bind(Messages.DeleteObject_10, ((TXMResult) o).getName()));
+			System.out.println(NLS.bind(RCPMessages.DeleteObject_10, ((TXMResult) o).getName()));
 		}
 		else if (o instanceof TXMCommand) {
 			TXMCommand l = (TXMCommand) o;
 			l.delete();
-			System.out.println(NLS.bind(Messages.DeleteObject_10, l));
+			System.out.println(NLS.bind(RCPMessages.DeleteObject_10, l));
 		}
 
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java	(revision 513)
@@ -9,7 +9,7 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.handlers.IHandlerService;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.utils.logger.Log;
 
 public class CleanPerspective extends AbstractHandler {
@@ -42,11 +42,11 @@
 			try {
 				handlerService.executeCommand("org.eclipse.ui.window.resetPerspective", null); //$NON-NLS-1$
 			} catch (Exception e) {
-				System.out.println(Messages.CleanPerspective_1+e);
+				System.out.println(RCPMessages.CleanPerspective_1+e);
 				Log.printStackTrace(e);
 			}
 		} else {
-			System.out.println(Messages.CleanPerspective_2);
+			System.out.println(RCPMessages.CleanPerspective_2);
 		}
 		
 		return null;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/DeleteFile.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/DeleteFile.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/DeleteFile.java	(revision 513)
@@ -39,7 +39,7 @@
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.views.fileexplorer.Explorer;
 import org.txm.rcp.views.fileexplorer.MacroExplorer;
 import org.txm.utils.DeleteDir;
@@ -72,15 +72,15 @@
 
 		Shell shell = new Shell();
 		MessageBox dialog = new MessageBox(shell, SWT.YES | SWT.NO);
-		dialog.setMessage(Messages.DeleteFile_0+file+" ? ");  //$NON-NLS-1$
+		dialog.setMessage(RCPMessages.DeleteFile_0+file+" ? ");  //$NON-NLS-1$
 
 		int buttonID = dialog.open();
 		switch(buttonID) {
 		case SWT.YES:
 			if (file.isFile()) {
-				if (!file.delete()) System.out.println(Messages.DeleteFile_2+file);
+				if (!file.delete()) System.out.println(RCPMessages.DeleteFile_2+file);
 			} else if (file.isDirectory()) {
-				if (!DeleteDir.deleteDirectory(file)) System.out.println(Messages.DeleteFile_2+file);
+				if (!DeleteDir.deleteDirectory(file)) System.out.println(RCPMessages.DeleteFile_2+file);
 			}
 			Explorer.refresh();
 			MacroExplorer.refresh();
@@ -95,7 +95,7 @@
 	public static void delete(List files) {
 		Shell shell = new Shell();
 		MessageBox dialog = new MessageBox(shell, SWT.YES | SWT.NO);
-		dialog.setMessage(Messages.DeleteFile_0+files+" ? ");  //$NON-NLS-1$
+		dialog.setMessage(RCPMessages.DeleteFile_0+files+" ? ");  //$NON-NLS-1$
 		
 		int buttonID = dialog.open();
 		switch(buttonID) {
@@ -105,9 +105,9 @@
 					File file = (File) o;
 					if (file.exists())
 					if (file.isFile()) {
-						if (!file.delete()) System.out.println(Messages.DeleteFile_2+file);
+						if (!file.delete()) System.out.println(RCPMessages.DeleteFile_2+file);
 					} else if (file.isDirectory()) {
-						if (!DeleteDir.deleteDirectory(file)) System.out.println(Messages.DeleteFile_2+file);
+						if (!DeleteDir.deleteDirectory(file)) System.out.println(RCPMessages.DeleteFile_2+file);
 					}
 				}
 			}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenSVGGraph.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenSVGGraph.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenSVGGraph.java	(revision 513)
@@ -41,7 +41,7 @@
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.SVGGraphicEditor;
 import org.txm.rcp.editors.input.SVGGraphicEditorInput;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -86,7 +86,7 @@
 	 * @return the sVG graphic editor
 	 */
 	public static SVGGraphicEditor OpenSVGFile(String filepath) {
-		return OpenSVGFile(filepath, Messages.OpenSVGGraph_0);
+		return OpenSVGFile(filepath, RCPMessages.OpenSVGGraph_0);
 	}
 
 	/**
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenBrowser.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenBrowser.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenBrowser.java	(revision 513)
@@ -46,7 +46,7 @@
 import org.eclipse.ui.internal.browser.WebBrowserEditorInput;
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TXMBrowser;
 import org.txm.rcp.editors.TXMWebBrowserEditor;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -179,8 +179,8 @@
 			editor.setPartName(editorname);
 			return editor;
 		} catch (Exception e) {
-			Log.severe(Messages.OpenBrowser_0+e.toString()+Messages.OpenBrowser_1+filepath);
-			System.out.println(Messages.OpenBrowser_0+e.toString()+Messages.OpenBrowser_1+filepath);
+			Log.severe(RCPMessages.OpenBrowser_0+e.toString()+RCPMessages.OpenBrowser_1+filepath);
+			System.out.println(RCPMessages.OpenBrowser_0+e.toString()+RCPMessages.OpenBrowser_1+filepath);
 		}
 		return null;
 	}
@@ -215,8 +215,8 @@
 
 			return editor;
 		} catch (Exception e) {
-			Log.severe(Messages.OpenBrowser_0+e.toString()+Messages.OpenBrowser_1+filepath);
-			System.out.println(Messages.OpenBrowser_0+e.toString()+Messages.OpenBrowser_1+filepath);
+			Log.severe(RCPMessages.OpenBrowser_0+e.toString()+RCPMessages.OpenBrowser_1+filepath);
+			System.out.println(RCPMessages.OpenBrowser_0+e.toString()+RCPMessages.OpenBrowser_1+filepath);
 		}
 		return null;
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ComputeDiagnostic.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ComputeDiagnostic.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ComputeDiagnostic.java	(revision 513)
@@ -47,7 +47,7 @@
 import org.txm.core.results.TXMParameters;
 import org.txm.functions.diagnostic.Diagnostic;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.OpenBrowser;
 import org.txm.rcp.editors.TXMWebBrowserEditor;
 import org.txm.rcp.preferences.RCPPreferences;
@@ -86,13 +86,13 @@
 		
 		Object sel = HandlerUtil.getCurrentSelection(event);
 		if (!(sel instanceof IStructuredSelection)) {
-			Log.warning(Messages.ComputeDiagnostic_0);
+			Log.warning(RCPMessages.ComputeDiagnostic_0);
 			return null;
 		}
 		
 		selection = (IStructuredSelection) sel;
 		if (!(selection.getFirstElement() instanceof Corpus)) {
-			System.out.println(Messages.ComputeDiagnostic_1+selection.getFirstElement());
+			System.out.println(RCPMessages.ComputeDiagnostic_1+selection.getFirstElement());
 			return null;
 		}
 		
@@ -111,18 +111,18 @@
 			Shell s = new Shell();
 			MessageBox messageBox = new MessageBox(s, SWT.ICON_QUESTION
 					| SWT.YES | SWT.NO);
-			messageBox.setMessage(NLS.bind(Messages.Diagnostique_1, diagfile.getName()));
+			messageBox.setMessage(NLS.bind(RCPMessages.Diagnostique_1, diagfile.getName()));
 			response = messageBox.open();
 		}
 
-		JobHandler jobhandler = new JobHandler(NLS.bind(Messages.Diagnostique_0, corpus.getName())) {
+		JobHandler jobhandler = new JobHandler(NLS.bind(RCPMessages.Diagnostique_0, corpus.getName())) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
 				try {
 					JobsTimer.start();
 					//this.setCurrentMonitor(monitor);
-					monitor.beginTask(NLS.bind(Messages.Diagnostique_0, corpus.getName()), 100);
+					monitor.beginTask(NLS.bind(RCPMessages.Diagnostique_0, corpus.getName()), 100);
 					final int maxvalue = TXMPreferences.getInt(RCPPreferences.MAXVALUE, RCPPreferences.PREFERENCES_NODE);
 					diagfile.getParentFile().mkdir();
 					
@@ -132,7 +132,7 @@
 					if (response == SWT.YES) {
 						diagfile.delete();
 						
-						monitor.subTask(Messages.Diagnostique_7);
+						monitor.subTask(RCPMessages.Diagnostique_7);
 						Diagnostic diag = new Diagnostic(corpus);
 						TXMParameters params = new TXMParameters();
 						params.put("maxvalue", maxvalue);
@@ -144,7 +144,7 @@
 							return Status.CANCEL_STATUS;
 						}
 						
-						monitor.subTask(Messages.Diagnostique_8);
+						monitor.subTask(RCPMessages.Diagnostique_8);
 						diag.stepGeneralInfos();
 						monitor.worked(10);
 						if(monitor.isCanceled()) {
@@ -152,7 +152,7 @@
 							return Status.CANCEL_STATUS;
 						}
 						
-						monitor.subTask(Messages.Diagnostique_9);
+						monitor.subTask(RCPMessages.Diagnostique_9);
 						diag.stepLexicalProperties();
 						monitor.worked(20);
 						if (monitor.isCanceled()) {
@@ -160,7 +160,7 @@
 							return Status.CANCEL_STATUS;
 						}
 						
-						monitor.subTask(Messages.Diagnostique_10);
+						monitor.subTask(RCPMessages.Diagnostique_10);
 						diag.stepStructuralUnits();
 						monitor.worked(50);
 						if (monitor.isCanceled()) {
@@ -174,13 +174,13 @@
 						//if(diagfile.exists() && diagfile.canRead())
 						diag.toHTML(diagfile);
 						if (!diagfile.exists() || !diagfile.canRead()) {
-							System.out.println(Messages.Diagnostique_2+corpus+": "+diagfile);  //$NON-NLS-1$
+							System.out.println(RCPMessages.Diagnostique_2+corpus+": "+diagfile);  //$NON-NLS-1$
 							monitor.done();
 							return Status.CANCEL_STATUS;
 						}
 					}
 
-					monitor.subTask(Messages.Diagnostique_11);
+					monitor.subTask(RCPMessages.Diagnostique_11);
 					monitor.worked(5);
 					syncExec(new Runnable() {
 						@Override
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ExportSVG.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ExportSVG.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ExportSVG.java	(revision 513)
@@ -39,7 +39,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.utils.io.FileCopy;
 
@@ -176,9 +176,9 @@
 		}
 
 		if (outfile.exists()) {
-			System.out.println(NLS.bind(Messages.ExportSVG_1, outfile, ""));  //$NON-NLS-1$
+			System.out.println(NLS.bind(RCPMessages.ExportSVG_1, outfile, ""));  //$NON-NLS-1$
 		} else {
-			System.out.println(NLS.bind(Messages.ExportSVG_3 + outfile, "")); //$NON-NLS-1$
+			System.out.println(NLS.bind(RCPMessages.ExportSVG_3 + outfile, "")); //$NON-NLS-1$
 		}
 	}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/OpenParaBrowser.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/OpenParaBrowser.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/OpenParaBrowser.java	(revision 513)
@@ -38,7 +38,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.input.ParaBrowserEditorInput;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
@@ -86,7 +86,7 @@
 		IWorkbenchPage page = window.getActivePage();
 		try {
 			StatusLine
-					.setMessage(Messages.OpenParaBrowser_0);
+					.setMessage(RCPMessages.OpenParaBrowser_0);
 			page
 					.openEditor(editorInput,
 							"org.txm.rcp.editors.parabrowser.ParaBrowserEditor"); //$NON-NLS-1$
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ExportResult.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ExportResult.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ExportResult.java	(revision 513)
@@ -46,7 +46,7 @@
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.functions.TXMCommand;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.EditFile;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -92,7 +92,7 @@
 		}
 
 		if (dialog.open() != null) {
-			StatusLine.setMessage(Messages.ExportResult_0);
+			StatusLine.setMessage(RCPMessages.ExportResult_0);
 			String filepath = dialog.getFilterPath()
 					+ "/" + dialog.getFileName(); //$NON-NLS-1$
 			if (!(filepath.endsWith(extensions[0].substring(1))))
@@ -103,10 +103,10 @@
 			try {
 				outfile.createNewFile();
 			} catch (IOException e1) {
-				System.err.println(NLS.bind(Messages.ExportResult_3, outfile, e1));
+				System.err.println(NLS.bind(RCPMessages.ExportResult_3, outfile, e1));
 			}
 			if (!outfile.canWrite()) {
-				System.out.println(NLS.bind(Messages.ExportResult_5, outfile));
+				System.out.println(NLS.bind(RCPMessages.ExportResult_5, outfile));
 				return null;
 			}
 			if (!outfile.isFile()) {
@@ -120,12 +120,12 @@
 			String _txtseparator = TXMPreferences.getString(TBXPreferences.EXPORT_TXTSEPARATOR, TBXPreferences.PREFERENCES_NODE);
 			final String txtseparator = _txtseparator;
 
-			JobHandler jobhandler = new JobHandler(Messages.ExportResult_0) {
+			JobHandler jobhandler = new JobHandler(RCPMessages.ExportResult_0) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						this.runInit(monitor);
-						monitor.beginTask(Messages.ExportResult_1, 100);
+						monitor.beginTask(RCPMessages.ExportResult_1, 100);
 
 						if (s instanceof TXMCommand) {
 							((TXMCommand)s).setCurrentMonitor(this); // Allows Functions to protect themselves from interruption
@@ -148,14 +148,14 @@
 
 							System.out.println(NLS.bind("", outfile.getAbsolutePath())); //$NON-NLS-1$
 						} else {
-							System.out.println(NLS.bind(Messages.ExportResult_6, outfile.getAbsolutePath()));
+							System.out.println(NLS.bind(RCPMessages.ExportResult_6, outfile.getAbsolutePath()));
 						}
 					} catch (ThreadDeath td) {
 						if (s instanceof TXMCommand)
 							((TXMCommand)s).clean();
 						return Status.CANCEL_STATUS;
 					} catch (Exception e) {
-						System.out.println(NLS.bind(Messages.ExportResult_6, s, e));
+						System.out.println(NLS.bind(RCPMessages.ExportResult_6, s, e));
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 						return Status.CANCEL_STATUS;
 					} finally {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/RenameFile.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/RenameFile.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/RenameFile.java	(revision 513)
@@ -38,7 +38,7 @@
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.views.fileexplorer.Explorer;
 import org.txm.rcp.views.fileexplorer.MacroExplorer;
 // TODO: Auto-generated Javadoc
@@ -68,15 +68,15 @@
 	public static void rename(File file) {
 		String newname = file.getName();
 		InputDialog dlg = new InputDialog(new Shell(),
-				Messages.RenameFile_0, Messages.RenameFile_0+newname, newname, null);
+				RCPMessages.RenameFile_0, RCPMessages.RenameFile_0+newname, newname, null);
 		if (dlg.open() == Window.OK) {
 			newname = dlg.getValue();
-			System.out.println(Messages.RenameFile_2+newname);
+			System.out.println(RCPMessages.RenameFile_2+newname);
 			if (newname.equals(file.getName())) return; // nothing to do
 			if (newname == null || newname.trim().length() == 0) return; // error
 			
 			if (!file.renameTo(new File(file.getParentFile(), newname)))
-				System.out.println(Messages.RenameFile_3+file+Messages.ApplicationWorkbenchAdvisor_37+newname);
+				System.out.println(RCPMessages.RenameFile_3+file+RCPMessages.ApplicationWorkbenchAdvisor_37+newname);
 			Explorer.refresh();
 			MacroExplorer.refresh();
 		}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenTestEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenTestEditor.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenTestEditor.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TestEditor;
 import org.txm.rcp.editors.input.TestEditorInput;
@@ -69,13 +69,13 @@
 
 		IWorkbenchPage page = window.getActivePage();
 		try {
-			StatusLine.setMessage(Messages.ComputeConcordance_0);
+			StatusLine.setMessage("Open...");
 			TestEditor testEditor = (TestEditor) page
 					.openEditor(editorInput,
 							"org.txm.rcp.editors.TestEditor"); //$NON-NLS-1$
 			//conceditor.setFocus(""); //$NON-NLS-1$
 		} catch (PartInitException e) {
-			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
+			System.err.println("Error: "+e.getLocalizedMessage());
 		}
 
 		return null;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/PasteFile.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/PasteFile.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/PasteFile.java	(revision 513)
@@ -39,7 +39,7 @@
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.utils.IOClipboard;
 import org.txm.rcp.views.fileexplorer.Explorer;
 import org.txm.rcp.views.fileexplorer.MacroExplorer;
@@ -80,9 +80,9 @@
 				}
 				try {
 					if (!org.txm.utils.io.FileCopy.copy(source, dest))
-						System.out.println(Messages.PasteFile_1+source+Messages.ApplicationWorkbenchAdvisor_37+dest);
+						System.out.println(RCPMessages.PasteFile_1+source+RCPMessages.ApplicationWorkbenchAdvisor_37+dest);
 				} catch (IOException e) {
-					System.out.println(Messages.PasteFile_1+source+Messages.ApplicationWorkbenchAdvisor_37+dest+Messages.PasteFile_4+e);
+					System.out.println(RCPMessages.PasteFile_1+source+RCPMessages.ApplicationWorkbenchAdvisor_37+dest+RCPMessages.PasteFile_4+e);
 				}
 			} else if (CutFile.toCut != null) {
 				File source = CutFile.toCut;
@@ -93,12 +93,12 @@
 				}
 				try {
 					if (!org.txm.utils.io.FileCopy.copy(source, dest))
-						System.out.println(Messages.PasteFile_1+source+Messages.ApplicationWorkbenchAdvisor_37+dest);
+						System.out.println(RCPMessages.PasteFile_1+source+RCPMessages.ApplicationWorkbenchAdvisor_37+dest);
 					if (!source.delete()) 
-						System.out.println(Messages.PasteFile_3+source);
+						System.out.println(RCPMessages.PasteFile_3+source);
 					CutFile.toCut = null;
 				} catch (IOException e) {
-					System.out.println(Messages.PasteFile_1+source+Messages.ApplicationWorkbenchAdvisor_37+dest+Messages.PasteFile_4+e);
+					System.out.println(RCPMessages.PasteFile_1+source+RCPMessages.ApplicationWorkbenchAdvisor_37+dest+RCPMessages.PasteFile_4+e);
 				}
 			} else {
 				// check clipboard content
@@ -117,11 +117,11 @@
 							org.txm.utils.io.FileCopy.copyFiles(source, dest);
 						} else {
 							if (!org.txm.utils.io.FileCopy.copy(source, dest))
-								System.out.println(Messages.PasteFile_1+source+Messages.ApplicationWorkbenchAdvisor_37+dest);
+								System.out.println(RCPMessages.PasteFile_1+source+RCPMessages.ApplicationWorkbenchAdvisor_37+dest);
 						}
 						
 					} catch (IOException e) {
-						System.out.println(Messages.PasteFile_1+source+Messages.ApplicationWorkbenchAdvisor_37+dest+Messages.PasteFile_4+e);
+						System.out.println(RCPMessages.PasteFile_1+source+RCPMessages.ApplicationWorkbenchAdvisor_37+dest+RCPMessages.PasteFile_4+e);
 					}
 				}
 			}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteLastGroovyScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteLastGroovyScript.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteLastGroovyScript.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * Handler: execute a Macro (Groovy script that opens an UI for parameters)
@@ -77,9 +77,9 @@
 	public static void execute(IWorkbenchPart page, ISelection selection) {
 		if (lastScript == null) return; // no last script
 		if (macro)
-			System.out.println(Messages.ExecuteLastGroovyScript_0+lastScript);
+			System.out.println(RCPMessages.ExecuteLastGroovyScript_0+lastScript);
 		else 
-			System.out.println(Messages.ExecuteLastGroovyScript_1+lastScript);
+			System.out.println(RCPMessages.ExecuteLastGroovyScript_1+lastScript);
 		
 		//IPreferencesService service = Platform.getPreferencesService();
 		String scriptRootDir = Toolbox.getParam(TBXPreferences.USER_TXM_HOME) + "/scripts"; //$NON-NLS-1$
@@ -91,7 +91,7 @@
 		}
 		
 		if (!currentRootDir.exists()) {
-			System.out.println(Messages.ExecuteLastGroovyScript_3+currentRootDir);
+			System.out.println(RCPMessages.ExecuteLastGroovyScript_3+currentRootDir);
 			return;
 		}
 		
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteImportScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteImportScript.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteImportScript.java	(revision 513)
@@ -57,7 +57,7 @@
 import org.txm.objects.Base;
 import org.txm.objects.BaseParameters;
 import org.txm.rcp.Application;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.workspace.LoadBinaryCorpus;
 import org.txm.rcp.utils.GSERunner;
@@ -139,20 +139,20 @@
 
 		// We could not found the script in the Toolbox plugin files
 		if (!script.exists()) {
-			System.err.println(NLS.bind(Messages.ExecuteScriptImport_1, scriptFilePath));
+			System.err.println(NLS.bind(RCPMessages.ExecuteScriptImport_1, scriptFilePath));
 			return null;
 		}
 
 		Display.getDefault().syncExec(new Runnable() {
-			public void run() {	StatusLine.setMessage(Messages.ExecuteScriptImport_0); }
+			public void run() {	StatusLine.setMessage(RCPMessages.ExecuteScriptImport_0); }
 		});
 
 		final String txmhome = Toolbox.getParam(TBXPreferences.USER_TXM_HOME);
 		final File corporadir = new File(txmhome,"corpora"); //$NON-NLS-1$
 		corporadir.mkdir(); // the binary corpus are stored here
 		if (!corporadir.exists()) {
-			System.out.println(Messages.ExecuteScriptImport_2+corporadir);
-			Log.severe(Messages.ExecuteScriptImport_2+corporadir);
+			System.out.println(RCPMessages.ExecuteScriptImport_2+corporadir);
+			Log.severe(RCPMessages.ExecuteScriptImport_2+corporadir);
 			return null;
 		}
 
@@ -185,7 +185,7 @@
 		if (!updatingCorpus) { 
 			if (basedir.exists()) {
 				Shell shell = new Shell(); // ask user if he's sure
-				boolean b = MessageDialog.openConfirm(shell, Messages.AddBase_19, NLS.bind(Messages.AddBase_20, basedir.getName().toUpperCase()));
+				boolean b = MessageDialog.openConfirm(shell, RCPMessages.AddBase_19, NLS.bind(RCPMessages.AddBase_20, basedir.getName().toUpperCase()));
 				if (b) {
 					// shutdown TBX (and cwb) to free index files
 					Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
@@ -196,14 +196,14 @@
 				}
 			}
 			if (basedir.exists()) {
-				System.out.println(Messages.bind(Messages.ExecuteScriptImport_3, basedir));
+				System.out.println(RCPMessages.bind(RCPMessages.ExecuteScriptImport_3, basedir));
 				return null;
 			}
 		}
 		
 		if (CQPEngine.isInitialized()) Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
 		final BaseParameters p = params;
-		JobHandler jobhandler = new JobHandler(Messages.RunGroovyScript_0
+		JobHandler jobhandler = new JobHandler(RCPMessages.RunGroovyScript_0
 				+ script.getAbsolutePath()) { //$NON-NLS-1$
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
@@ -211,7 +211,7 @@
 				Base base = null;
 				try {
 					//this.setCurrentMonitor(monitor);
-					monitor.beginTask(Messages.RunGroovyScript_10 + p.rootDir, 100); //$NON-NLS-1$
+					monitor.beginTask(RCPMessages.RunGroovyScript_10 + p.rootDir, 100); //$NON-NLS-1$
 
 					//org.txm.Toolbox.shutdownSearchEngine();
 					monitor.worked(5);
@@ -232,7 +232,7 @@
 					Element tokenizerElement = p.getTokenizerElement(corpusElem);
 					TokenizerClasses.reset();
 					if (!TokenizerClasses.loadFromNode(tokenizerElement)) {
-						System.out.println(Messages.ExecuteScriptImport_5);
+						System.out.println(RCPMessages.ExecuteScriptImport_5);
 						monitor.done();
 						if (basedir.exists()) basedir.renameTo(errorBinDirectory);
 						if (tempBinDirectory.exists()) tempBinDirectory.renameTo(basedir);
@@ -240,9 +240,9 @@
 					}
 
 					ExecTimer.start();
-					Log.info(Messages.RunGroovyScript_0 + script.getAbsolutePath()); //$NON-NLS-1$
+					Log.info(RCPMessages.RunGroovyScript_0 + script.getAbsolutePath()); //$NON-NLS-1$
 					gse.run(script.getName(), binding); // run the groovy import script
-					System.out.println("\n"+Messages.ExecuteScriptImport_7+ExecTimer.stop()); //$NON-NLS-1$
+					System.out.println("\n"+RCPMessages.ExecuteScriptImport_7+ExecTimer.stop()); //$NON-NLS-1$
 					monitor.worked(90);
 					
 					TokenizerClasses.reset();
@@ -254,7 +254,7 @@
 						if (readyToLoad) {
 							base = LoadBinaryCorpus.loadBinaryCorpus(basedir);
 							if (base == null) {
-								System.out.println(Messages.ExecuteScriptImport_8);
+								System.out.println(RCPMessages.ExecuteScriptImport_8);
 								if (basedir.exists()) basedir.renameTo(errorBinDirectory);
 								if (tempBinDirectory.exists()) tempBinDirectory.renameTo(basedir);
 								return Status.CANCEL_STATUS;
@@ -271,15 +271,15 @@
 								public void run() {
 									RestartTXM.reloadViews();
 									CorporaView.select(base2.getResults(MainCorpus.class));
-									System.out.println(Messages.AddBase_10);
-									StatusLine.setMessage(Messages.AddBase_10);
+									System.out.println(RCPMessages.AddBase_10);
+									StatusLine.setMessage(RCPMessages.AddBase_10);
 								}
 							});
 							this.releaseSemaphore();
 
 							DeleteDir.deleteDirectory(tempBinDirectory);
 						} else {
-							System.out.println(Messages.ExecuteScriptImport_6);
+							System.out.println(RCPMessages.ExecuteScriptImport_6);
 							if (basedir.exists()) basedir.renameTo(errorBinDirectory);
 							if (tempBinDirectory.exists()) tempBinDirectory.renameTo(basedir);
 						}
@@ -287,7 +287,7 @@
 				} catch (ThreadDeath td) {
 					return Status.CANCEL_STATUS;
 				} catch (Exception e) {
-					System.out.println(NLS.bind(Messages.RunGroovyScript_8, e));
+					System.out.println(NLS.bind(RCPMessages.RunGroovyScript_8, e));
 					org.txm.rcp.utils.Logger.printStackTrace(e);
 				} finally {
 					if (!CQPEngine.isInitialized()) { // the import failed
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenGraph.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenGraph.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenGraph.java	(revision 513)
@@ -39,7 +39,7 @@
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.SVGGraphicEditor;
 import org.txm.rcp.editors.TXMWebBrowserEditor;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -147,7 +147,7 @@
 		else
 		{
 			if (!OpenURI.open(graphfile))
-				System.out.println(NLS.bind(Messages.OpenGraph_8, graphfile.getAbsolutePath()));
+				System.out.println(NLS.bind(RCPMessages.OpenGraph_8, graphfile.getAbsolutePath()));
 			return null;
 		}
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteScript.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteScript.java	(revision 513)
@@ -49,7 +49,7 @@
 import org.eclipse.ui.ide.FileStoreEditorInput;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TxtEditor;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -122,15 +122,15 @@
 				boolean doit = TXMPreferences.getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION, RCPPreferences.PREFERENCES_NODE);
 				//System.out.println("Save file? "+doit);
 				if (!doit) { // ask user
-					MessageDialog dialog = new MessageDialog(shell, Messages.ExecuteScript_0+result, null,
-							Messages.ExecuteScript_1, MessageDialog.QUESTION, new String[] {Messages.ExecuteScript_2, Messages.ExecuteScript_4,
-							Messages.ExecuteScript_5}, 0) {
+					MessageDialog dialog = new MessageDialog(shell, RCPMessages.ExecuteScript_0+result, null,
+							RCPMessages.ExecuteScript_1, MessageDialog.QUESTION, new String[] {RCPMessages.ExecuteScript_2, RCPMessages.ExecuteScript_4,
+							RCPMessages.ExecuteScript_5}, 0) {
 						Button checkDefault;
 						 @Override
 						  protected Control createDialogArea(Composite parent) {
 						    Composite container = (Composite) super.createDialogArea(parent);
 						    checkDefault = new Button(container, SWT.CHECK);
-						    checkDefault.setText(Messages.ExecuteScript_6);
+						    checkDefault.setText(RCPMessages.ExecuteScript_6);
 						    boolean b = TXMPreferences.getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION, RCPPreferences.PREFERENCES_NODE);
 						    checkDefault.setSelection(b);
 						    
@@ -150,7 +150,7 @@
 					};
 					int c = dialog.open();
 					if (c == 1) {
-						System.out.println(Messages.ExecuteScript_7);
+						System.out.println(RCPMessages.ExecuteScript_7);
 						return null;
 					} else if (c == 2) {
 						//System.out.println("Don't save and run.");
@@ -188,7 +188,7 @@
 			System.out.println("ExecuteScript with R not implemented");
 			//ExecuteRScript.executeScript(scriptpath);
 		} else {
-			System.out.println(Messages.ExecuteScript_3+script.getName());
+			System.out.println(RCPMessages.ExecuteScript_3+script.getName());
 		}
 	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteGroovyScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteGroovyScript.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteGroovyScript.java	(revision 513)
@@ -60,7 +60,7 @@
 import org.osgi.framework.BundleContext;
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.TXMClassLoader;
 import org.txm.rcp.editors.TxtEditor;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -177,7 +177,7 @@
 		// check script
 		final File scriptfile = new File(scriptpath);
 		if (!scriptfile.exists()) {
-			System.err.println(NLS.bind(Messages.ExecuteScriptImport_1, scriptpath));
+			System.err.println(NLS.bind(RCPMessages.ExecuteScriptImport_1, scriptpath));
 			return;
 		}
 		ExecuteLastGroovyScript.setLastScript(scriptfile, currentRootDir.getName().equals("macro")); // register last groovy script //$NON-NLS-1$
@@ -206,7 +206,7 @@
 		String dir = currentRootDir.getAbsolutePath();
 		String path = scriptfile.getAbsolutePath();
 		if (!path.startsWith(dir)) {
-			System.out.println(Messages.bind(Messages.ExecuteGroovyScriptFromFile_2, dir));
+			System.out.println(RCPMessages.bind(RCPMessages.ExecuteGroovyScriptFromFile_2, dir));
 			return;
 		}
 		final String relativepath = path.substring(dir.length()+1);
@@ -219,12 +219,12 @@
 			}
 		}
 
-		JobHandler jobhandler = new JobHandler(NLS.bind(Messages.ExecuteRScript_1,scriptfile.getName())) {
+		JobHandler jobhandler = new JobHandler(NLS.bind(RCPMessages.ExecuteRScript_1,scriptfile.getName())) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
 				//this.setCurrentMonitor(monitor);
-				monitor.beginTask(NLS.bind(Messages.ExecuteRScript_1, scriptfile.getName()), 100);
+				monitor.beginTask(NLS.bind(RCPMessages.ExecuteRScript_1, scriptfile.getName()), 100);
 
 				try {
 					Binding binding = new Binding();
@@ -236,21 +236,21 @@
 					binding.setProperty("monitor", this); //$NON-NLS-1$
 					binding.setProperty("gse", gse);
 					
-					System.out.println(NLS.bind(Messages.ExecuteRScript_1, scriptfile.getName()));
+					System.out.println(NLS.bind(RCPMessages.ExecuteRScript_1, scriptfile.getName()));
 					long time = System.currentTimeMillis();
 					gse.run(relativepath, binding);
 					
-					System.out.println(Messages.ExecuteRScript_2+(System.currentTimeMillis()-time)+Messages.ExecuteGroovyScript_0);
+					System.out.println(RCPMessages.ExecuteRScript_2+(System.currentTimeMillis()-time)+RCPMessages.ExecuteGroovyScript_0);
 				} catch (ThreadDeath td) {
 					return Status.CANCEL_STATUS;
 				} catch (UIParameterException e) {
 					if (e.isError()) {
-						System.out.println(Messages.ExecuteGroovyScript_1);
+						System.out.println(RCPMessages.ExecuteGroovyScript_1);
 					} else {
-						System.out.println(Messages.ExecuteGroovyScript_2);
+						System.out.println(RCPMessages.ExecuteGroovyScript_2);
 					}
 				} catch (Exception e) {
-					System.out.println(Messages.ExecuteGroovyScript_9+e);
+					System.out.println(RCPMessages.ExecuteGroovyScript_9+e);
 					org.txm.rcp.utils.Logger.printStackTrace(e);
 				} finally {
 					monitor.done();			
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateFolder.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateFolder.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateFolder.java	(revision 513)
@@ -42,7 +42,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.rcp.views.fileexplorer.Explorer;
 import org.txm.rcp.views.fileexplorer.MacroExplorer;
@@ -99,7 +99,7 @@
 		LastOpened.set(ID, newfile.getParent(), newfile.getName());
 		if (!newfile.exists() && newfile.getParentFile().canWrite()) {
 			if (newfile.mkdir())
-				System.out.println(NLS.bind(Messages.CreateFolder_1, newfile.getAbsolutePath()));
+				System.out.println(NLS.bind(RCPMessages.CreateFolder_1, newfile.getAbsolutePath()));
 
 		}
 		Explorer.refresh();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateFile.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateFile.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CreateFile.java	(revision 513)
@@ -44,7 +44,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.rcp.views.fileexplorer.Explorer;
 import org.txm.rcp.views.fileexplorer.MacroExplorer;
@@ -108,7 +108,7 @@
 		if (!newfile.exists() && newfile.getParentFile().canWrite()) {
 			try {
 				if (newfile.createNewFile()) {
-					System.out.println(NLS.bind(Messages.CreateFile_1, newfile.getAbsolutePath()));
+					System.out.println(NLS.bind(RCPMessages.CreateFile_1, newfile.getAbsolutePath()));
 					//OpenFile.openfile(newfile);
 				}
 			} catch (IOException e) {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SaveAs.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SaveAs.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SaveAs.java	(revision 513)
@@ -39,7 +39,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.EditFile;
 import org.txm.rcp.editors.TxtEditor;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -89,7 +89,7 @@
 					EditFile.openfile(resultFile);
 					Explorer.refresh();
 				} catch (Exception e) {
-					System.out.println(Messages.SaveAs_2+resultFile+Messages.PasteFile_4+e);
+					System.out.println(RCPMessages.SaveAs_2+resultFile+RCPMessages.PasteFile_4+e);
 				}
 			}
 		}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java	(revision 513)
@@ -36,7 +36,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.editors.text.IEncodingSupport;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TxtEditor;
 
 /**
@@ -68,7 +68,7 @@
 			if (currentEncoding == null) currentEncoding = defaultEncoding;
 			Shell sh = new Shell();
 			InputDialog dlg = new InputDialog(sh,
-					Messages.SetEncoding_0, Messages.SetEncoding_1+currentEncoding+Messages.SetEncoding_2+defaultEncoding, currentEncoding, null);
+					RCPMessages.SetEncoding_0, RCPMessages.SetEncoding_1+currentEncoding+RCPMessages.SetEncoding_2+defaultEncoding, currentEncoding, null);
 			if (dlg.open() == Window.OK) {
 				String newEncoding = dlg.getValue();
 				if (newEncoding != null && newEncoding.trim().length() > 0 && !newEncoding.trim().equals(currentEncoding)) {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteText.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteText.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteText.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TxtEditor;
 
 // TODO: Auto-generated Javadoc
@@ -88,7 +88,7 @@
 			System.out.println("Execute R text selection not implemented");
 			//ExecuteRText.executeText(text);
 		} else {
-			System.out.println(Messages.ExecuteScript_3+script.getName());
+			System.out.println(RCPMessages.ExecuteScript_3+script.getName());
 		}
 		return null;
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java	(revision 513)
@@ -36,7 +36,7 @@
 import org.eclipse.osgi.util.NLS;
 import org.txm.Toolbox;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.TxmPreferences;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.SummaryView;
@@ -64,7 +64,7 @@
 			protected IStatus run(IProgressMonitor monitor) {
 				JobsTimer.start();
 				try {
-					monitor.beginTask(Messages.RestartTXM_1, 100);
+					monitor.beginTask(RCPMessages.RestartTXM_1, 100);
 					//Toolbox.updateProperties(TxmPreferences.getProperties());
 					Toolbox.restart();
 
@@ -77,7 +77,7 @@
 					});
 
 				} catch (Exception e) {
-					System.out.println(NLS.bind(Messages.RunGroovyScript_8, e));
+					System.out.println(NLS.bind(RCPMessages.RunGroovyScript_8, e));
 					org.txm.rcp.utils.Logger.printStackTrace(e);
 				} finally {
 					monitor.done();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteGroovyText.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteGroovyText.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ExecuteGroovyText.java	(revision 513)
@@ -53,7 +53,7 @@
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.Application;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TxtEditor;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.corpora.CorporaView;
@@ -106,7 +106,7 @@
 	 */
 	public static Object executeText(final String text, final String scriptfile) {
 		if (!new File(scriptfile).exists()) {
-			System.err.println(NLS.bind(Messages.ExecuteScriptImport_1,
+			System.err.println(NLS.bind(RCPMessages.ExecuteScriptImport_1,
 					scriptfile));
 			return null;
 		}
@@ -159,7 +159,7 @@
 					long time = System.currentTimeMillis();
 					shell.evaluate(text);
 					System.out
-							.println("Done: " + (System.currentTimeMillis() - time) + Messages.ExecuteRScript_3); //$NON-NLS-1$
+							.println("Done: " + (System.currentTimeMillis() - time) + RCPMessages.ExecuteRScript_3); //$NON-NLS-1$
 				} catch (ThreadDeath td) { 
 					return Status.CANCEL_STATUS;
 				} catch (CompilationFailedException e) {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/ConvertCorpus.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/ConvertCorpus.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/ConvertCorpus.java	(revision 513)
@@ -18,7 +18,7 @@
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.importer.Convert5To6;
 import org.txm.objects.Base;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.RestartTXM;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.utils.DeleteDir;
@@ -55,11 +55,11 @@
 
 						Base base = LoadBinaryCorpus.loadBinaryCorpus(outdir);
 						if (base == null) {
-							System.out.println(Messages.ConvertCorpus_0);
+							System.out.println(RCPMessages.ConvertCorpus_0);
 							return Status.CANCEL_STATUS;
 						}
 					} catch (Throwable e) {
-						System.out.println(NLS.bind(Messages.RunGroovyScript_8,
+						System.out.println(NLS.bind(RCPMessages.RunGroovyScript_8,
 								e));
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 					} finally {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/AddProject.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/AddProject.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/AddProject.java	(revision 513)
@@ -27,7 +27,7 @@
 //
 package org.txm.rcp.commands.workspace;
 
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.views.BasesView;
 
 import java.util.Iterator;
@@ -72,7 +72,7 @@
 		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event)
 				.getShell();
 		InputDialog dlg = new InputDialog(shell,
-				"", Messages.AddProject_3, name, null); //$NON-NLS-1$
+				"", RCPMessages.AddProject_3, name, null); //$NON-NLS-1$
 		if (dlg.open() == Window.OK) {
 			// User clicked OK; update the label with the input
 			name = dlg.getValue();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java	(revision 513)
@@ -50,7 +50,7 @@
 import org.txm.objects.Base;
 import org.txm.objects.Project;
 import org.txm.objects.Workspace;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.RestartTXM;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -105,16 +105,16 @@
 	}
 
 	private void restoreCorpus(File backup, File basedir) {
-		System.out.println(Messages.LoadBinaryCorpus_10+basedir.getName()+Messages.LoadBinaryCorpus_11);
+		System.out.println(RCPMessages.LoadBinaryCorpus_10+basedir.getName()+RCPMessages.LoadBinaryCorpus_11);
 		if (backup.exists()) {
-			System.out.println(Messages.LoadBinaryCorpus_12);
+			System.out.println(RCPMessages.LoadBinaryCorpus_12);
 			DeleteDir.deleteDirectory(basedir);
 			if (basedir.exists()) {
-				System.out.println(Messages.LoadBinaryCorpus_13+basedir+Messages.LoadBinaryCorpus_14+backup);
+				System.out.println(RCPMessages.LoadBinaryCorpus_13+basedir+RCPMessages.LoadBinaryCorpus_14+backup);
 				return;
 			}
 			if (!backup.renameTo(basedir)) {
-				System.out.println(Messages.LoadBinaryCorpus_15+backup);
+				System.out.println(RCPMessages.LoadBinaryCorpus_15+backup);
 				return;
 			}
 			org.txm.Toolbox.restartWorkspace();
@@ -138,13 +138,13 @@
 		corporaDir.mkdir();
 
 		if (!filename.endsWith(".txm") && !filename.endsWith(".zip")) { //$NON-NLS-1$ //$NON-NLS-2$
-			System.out.println(Messages.AddBase_25);
-			System.out.println(NLS.bind(Messages.AddBase_22, zipFile));
+			System.out.println(RCPMessages.AddBase_25);
+			System.out.println(NLS.bind(RCPMessages.AddBase_22, zipFile));
 			return false;
 		}
 
 		if (!zipFile.canRead()) {
-			System.out.println(NLS.bind(Messages.AddBase_17, zipFile));
+			System.out.println(NLS.bind(RCPMessages.AddBase_17, zipFile));
 			return false;
 		}
 
@@ -153,7 +153,7 @@
 		corpusdir = new File(corporaDir, basedirname);
 
 		if (corpusdir.exists()) {
-			boolean b = MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), Messages.AddBase_19, NLS.bind(Messages.AddBase_20, corpusdir.getName().toUpperCase()));
+			boolean b = MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), RCPMessages.AddBase_19, NLS.bind(RCPMessages.AddBase_20, corpusdir.getName().toUpperCase()));
 			if (b) {
 				//TODO: to enable backup of binary corpus I need to be able to reload correctly a corpus in CQP corpus manager
 //				backup = new File(corpusdir.getParentFile(), corpusdir.getName()+"-back"); //$NON-NLS-1$
@@ -178,33 +178,33 @@
 
 		// scan dir
 		JobHandler jobhandler = new JobHandler(
-				NLS.bind(Messages.AddBase_1, corpusdir.getName())) {
+				NLS.bind(RCPMessages.AddBase_1, corpusdir.getName())) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
 				try {
 					//ZIPPED FILE
-					monitor.beginTask(Messages.AddBase_27, 100);
-					monitor.subTask(Messages.AddBase_28);
+					monitor.beginTask(RCPMessages.AddBase_27, 100);
+					monitor.subTask(RCPMessages.AddBase_28);
 					try {
 						//System.out.println(NLS.bind(Messages.AddBase_29, zipFile, corporaDir));
 						Zip.decompress(zipFile.getAbsolutePath(), corporaDir.getAbsolutePath(), false, this);
 					} catch (Exception e) {
-						System.out.println(NLS.bind(Messages.AddBase_31, e));
+						System.out.println(NLS.bind(RCPMessages.AddBase_31, e));
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 						return Status.CANCEL_STATUS;
 					}
 					monitor.worked(50);
 
-					monitor.subTask(Messages.AddBase_32);
+					monitor.subTask(RCPMessages.AddBase_32);
 					Base base = loadBinaryCorpus(new File(corporaDir, basedirname));
 					if (base == null) {
-						System.out.println(Messages.AddBase_4);
+						System.out.println(RCPMessages.AddBase_4);
 						return Status.CANCEL_STATUS;
 					}
 					//System.out.println("fin load base");
 					monitor.worked(40);
-					monitor.subTask(Messages.AddBase_33);
+					monitor.subTask(RCPMessages.AddBase_33);
 
 					this.acquireSemaphore();
 					//Toolbox.updateProperties(ApplicationWorkbenchAdvisor.getProperties());
@@ -214,7 +214,7 @@
 
 					final Base base2 = Toolbox.workspace.getDefaultProject().getBase(base.getName()); //$NON-NLS-1$
 					if (base2 == null) {
-						System.out.println(Messages.LoadBinaryCorpus_4);
+						System.out.println(RCPMessages.LoadBinaryCorpus_4);
 						return null;
 					}
 
@@ -250,8 +250,8 @@
 							RestartTXM.reloadViews();
 							//System.out.println("Select newly loaded corpus: "+base2.getCorpora().values());
 							CorporaView.select(base2.getResults(MainCorpus.class));
-							System.err.println(Messages.AddBase_10);
-							StatusLine.setMessage(Messages.AddBase_10);
+							System.err.println(RCPMessages.AddBase_10);
+							StatusLine.setMessage(RCPMessages.AddBase_10);
 						}
 					});
 				} catch (ThreadDeath td) { 
@@ -285,8 +285,8 @@
 	 */
 	public static Base loadBinaryCorpus(File binCorpusDirectory) throws Exception {
 		if (!(binCorpusDirectory.exists() && binCorpusDirectory.isDirectory())) {
-			Log.severe(NLS.bind(Messages.AddBase_24, binCorpusDirectory.getAbsolutePath()));
-			System.out.println(NLS.bind(Messages.AddBase_24, binCorpusDirectory.getAbsolutePath()));
+			Log.severe(NLS.bind(RCPMessages.AddBase_24, binCorpusDirectory.getAbsolutePath()));
+			System.out.println(NLS.bind(RCPMessages.AddBase_24, binCorpusDirectory.getAbsolutePath()));
 			return null; 
 		}
 
@@ -297,17 +297,17 @@
 
 		Workspace w = org.txm.Toolbox.workspace;
 		if (w == null) {
-			System.out.println(Messages.AddBase_34);
+			System.out.println(RCPMessages.AddBase_34);
 			return null;
 		}
 		Project p = w.getProject("default"); //$NON-NLS-1$
 		if (p == null) {
-			System.out.println(Messages.AddBase_34);
+			System.out.println(RCPMessages.AddBase_34);
 			return null;
 		}
 		Base base = p.scanDirectory(binCorpusDirectory);
 		if (base == null) {
-			Log.severe(NLS.bind(Messages.AddBase_2, binCorpusDirectory)); 
+			Log.severe(NLS.bind(RCPMessages.AddBase_2, binCorpusDirectory)); 
 			return null;
 		}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/PurgeCorpora.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/PurgeCorpora.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/PurgeCorpora.java	(revision 513)
@@ -20,7 +20,7 @@
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.objects.Workspace;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.RestartTXM;
 import org.txm.rcp.utils.JobHandler;
@@ -37,11 +37,11 @@
 		try {
 			List<MainCorpus> input = CorpusManager.getCorpusManager().getCorpora();
 			ListSelectionDialog corporaDialogs = new ListSelectionDialog(s, input,
-					new ArrayContentProvider(), new LabelProvider(), Messages.PurgeCorpora_0);
+					new ArrayContentProvider(), new LabelProvider(), RCPMessages.PurgeCorpora_0);
 
 			corporaDialogs.open();
 			Object[] toRemove = corporaDialogs.getResult();
-			System.out.println(Messages.PurgeCorpora_1+ Arrays.toString(toRemove));
+			System.out.println(RCPMessages.PurgeCorpora_1+ Arrays.toString(toRemove));
 			if (toRemove.length == input.size()) {
 				deleteAll(s);
 			} else {
@@ -56,7 +56,7 @@
 				RestartTXM.reloadViews();
 			}
 		} catch (CqiClientException e1) {
-			System.out.println(Messages.PurgeCorpora_2+e1);
+			System.out.println(RCPMessages.PurgeCorpora_2+e1);
 			deleteAll(s);
 		}
 
@@ -66,7 +66,7 @@
 	public void deleteAll(Shell s) {
 
 		MessageBox messageBox = new MessageBox(s, SWT.ICON_QUESTION | SWT.YES | SWT.NO);
-		messageBox.setMessage(Messages.PurgeCorpora_3);
+		messageBox.setMessage(RCPMessages.PurgeCorpora_3);
 		int response = messageBox.open();
 		if (response != SWT.YES) {
 			StatusLine.setMessage(""); //$NON-NLS-1$
@@ -75,7 +75,7 @@
 		
 		String path = Toolbox.getParam(TBXPreferences.USER_TXM_HOME);
 		if (path == null || path.trim().length() == 0) {
-			System.out.println(Messages.PurgeCorpora_4);
+			System.out.println(RCPMessages.PurgeCorpora_4);
 			return;
 		}
 
@@ -86,25 +86,25 @@
 				protected IStatus run(IProgressMonitor monitor) {
 					this.runInit(monitor);
 					try {
-						System.out.println(Messages.PurgeCorpora_5);
+						System.out.println(RCPMessages.PurgeCorpora_5);
 						File corpora = new File(workspace, "corpora"); //$NON-NLS-1$
 						if (!DeleteDir.deleteDirectory(corpora)) {
-							System.out.println(Messages.PurgeCorpora_7);
+							System.out.println(RCPMessages.PurgeCorpora_7);
 						}
 						corpora.mkdir();
 
 						File registry = new File(workspace, "registry"); //$NON-NLS-1$
 						if (!DeleteDir.deleteDirectory(registry)) {
-							System.out.println(Messages.PurgeCorpora_9);
+							System.out.println(RCPMessages.PurgeCorpora_9);
 						}
 						registry.mkdir();
-						System.out.println(Messages.PurgeCorpora_10);
+						System.out.println(RCPMessages.PurgeCorpora_10);
 						File xmlfile = new File(workspace, "workspaces/default.xml"); //$NON-NLS-1$
 						this.acquireSemaphore();
 						Toolbox.workspace = Workspace.createEmptyWorkspace(xmlfile);
 						this.releaseSemaphore();
 						
-						System.out.println(Messages.PurgeCorpora_12);
+						System.out.println(RCPMessages.PurgeCorpora_12);
 
 						syncExec(new Runnable() {
 							@Override
@@ -115,7 +115,7 @@
 					} catch (ThreadDeath td) {
 						return Status.CANCEL_STATUS;
 					} catch (Exception e) {
-						System.out.println(NLS.bind(Messages.RunGroovyScript_8, e));
+						System.out.println(NLS.bind(RCPMessages.RunGroovyScript_8, e));
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 					} finally {
 						monitor.done();
@@ -126,7 +126,7 @@
 			};
 			jobhandler.startJob();
 		} else {
-			System.out.println(Messages.PurgeCorpora_13+workspace.getAbsolutePath());
+			System.out.println(RCPMessages.PurgeCorpora_13+workspace.getAbsolutePath());
 		}
 	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DiagnosticPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DiagnosticPreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DiagnosticPreferencePage.java	(revision 513)
@@ -31,7 +31,7 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.txm.rcp.Application;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * This class represents a preference page that is contributed to the
@@ -54,7 +54,7 @@
 	 */
 	public DiagnosticPreferencePage() {
 		super();
-		setTitle(Messages.DiagnosticPreferencePage_1);
+		setTitle(RCPMessages.DiagnosticPreferencePage_1);
 	}
 
 	/**
@@ -65,7 +65,7 @@
 	@Override
 	public void createFieldEditors() {
 		
-		diag_maxvalue = new IntegerFieldEditor(RCPPreferences.MAXVALUE, Messages.DiagnosticPreferencePage_2, getFieldEditorParent());
+		diag_maxvalue = new IntegerFieldEditor(RCPPreferences.MAXVALUE, RCPMessages.DiagnosticPreferencePage_2, getFieldEditorParent());
 		diag_maxvalue.setValidRange(20, 9999);
 		addField(diag_maxvalue);
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TreeTaggerPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TreeTaggerPreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TreeTaggerPreferencePage.java	(revision 513)
@@ -31,7 +31,7 @@
 import org.eclipse.jface.preference.DirectoryFieldEditor;
 import org.eclipse.jface.preference.StringFieldEditor;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * This class represents a preference page that is contributed to the
@@ -75,24 +75,24 @@
 	@Override
 	public void createFieldEditors() {
 		treetagger_install_path = new DirectoryFieldEditor(
-				TBXPreferences.TREETAGGER_INSTALL_PATH, Messages.TreeTaggerPreferencePage_1,
+				TBXPreferences.TREETAGGER_INSTALL_PATH, RCPMessages.TreeTaggerPreferencePage_1,
 				getFieldEditorParent());
 		addField(treetagger_install_path);
 
 		treetagger_models_path = new DirectoryFieldEditor(
-				TBXPreferences.TREETAGGER_MODELS_PATH, Messages.TreeTaggerPreferencePage_2,
+				TBXPreferences.TREETAGGER_MODELS_PATH, RCPMessages.TreeTaggerPreferencePage_2,
 				getFieldEditorParent());
 		addField(treetagger_models_path);
 		
 		treetagger_options = new StringFieldEditor(
-				TBXPreferences.TREETAGGER_OPTIONS, Messages.TreeTaggerPreferencePage_3,
+				TBXPreferences.TREETAGGER_OPTIONS, RCPMessages.TreeTaggerPreferencePage_3,
 				getFieldEditorParent());
 		addField(treetagger_options);
 		
 		
 		
 		treetagger_apostrophe = new BooleanFieldEditor(
-				TBXPreferences.TREETAGGER_APOSTROPHE, Messages.TreeTaggerPreferencePage_0,
+				TBXPreferences.TREETAGGER_APOSTROPHE, RCPMessages.TreeTaggerPreferencePage_0,
 				getFieldEditorParent());
 		addField(treetagger_apostrophe);
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/LocalePreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/LocalePreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/LocalePreferencePage.java	(revision 513)
@@ -34,7 +34,7 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.txm.rcp.Application;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * The Class LocalePreferencePage.
@@ -55,7 +55,7 @@
 	 */
 	public LocalePreferencePage() {
 		super();
-		setTitle(Messages.LocalePreferencePage_1);
+		setTitle(RCPMessages.LocalePreferencePage_1);
 	}
 
 	/* (non-Javadoc)
@@ -65,7 +65,7 @@
 	protected void createFieldEditors() {
 		String[][] values = { { "français", "fr" }, { "english", "en" } }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		locale = new RadioGroupFieldEditor(RCPPreferences.UI_LOCALE,
-				Messages.LocalePreferencePage_2, 1, values,
+				RCPMessages.LocalePreferencePage_2, 1, values,
 				getFieldEditorParent());
 		addField(locale);
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/FileExplorerPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/FileExplorerPreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/FileExplorerPreferencePage.java	(revision 513)
@@ -38,7 +38,7 @@
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.Application;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.views.fileexplorer.Explorer;
 // TODO: Auto-generated Javadoc
 /**
@@ -60,7 +60,7 @@
 	 */
 	public FileExplorerPreferencePage() {
 		super();
-		setTitle(Messages.ExportPreferencePage_1);
+		setTitle(RCPMessages.ExportPreferencePage_1);
 	}
 
 	/* (non-Javadoc)
@@ -70,11 +70,11 @@
 	protected void createFieldEditors() {
 
 		files_to_hide = new StringFieldEditor(RCPPreferences.FILES_TO_HIDE,
-				Messages.FileExplorerPreferencePage_0, getFieldEditorParent());
+				RCPMessages.FileExplorerPreferencePage_0, getFieldEditorParent());
 		addField(files_to_hide);
 
 		show_hidden_files = new BooleanFieldEditor(RCPPreferences.SHOW_HIDDEN_FILES,
-				Messages.FileExplorerPreferencePage_1, getFieldEditorParent());
+				RCPMessages.FileExplorerPreferencePage_1, getFieldEditorParent());
 		addField(show_hidden_files);
 
 		//show_folders = new BooleanFieldEditor(SHOW_FOLDERS, Messages.FileExplorerPreferencePage_2, getFieldEditorParent());
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancePreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancePreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancePreferencePage.java	(revision 513)
@@ -39,7 +39,7 @@
 import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.views.fileexplorer.MacroExplorer;
 
 // TODO: Auto-generated Javadoc
@@ -90,15 +90,15 @@
 	@Override
 	protected void createFieldEditors() {
 		installDirField = new DirectoryFieldEditor(TBXPreferences.INSTALL_DIR,
-				Messages.AdvancePreferencePage_1, getFieldEditorParent());
+				RCPMessages.AdvancePreferencePage_1, getFieldEditorParent());
 		addField(installDirField);
 		
 		txmhomeDirField = new DirectoryFieldEditor(TBXPreferences.USER_TXM_HOME,
-				Messages.AdvancePreferencePage_2, getFieldEditorParent());
+				RCPMessages.AdvancePreferencePage_2, getFieldEditorParent());
 		addField(txmhomeDirField);
 		
 		Group updateGroup = new Group(getFieldEditorParent(), SWT.NONE);
-		updateGroup.setText(Messages.AdvancePreferencePage_6);
+		updateGroup.setText(RCPMessages.AdvancePreferencePage_6);
 		GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData2.horizontalSpan = 3;
 		gridData2.verticalIndent = 10;
@@ -118,20 +118,20 @@
 		choices[7][0] = choices[7][1] = "FINEST"; //$NON-NLS-1$
 		choices[8][0] = choices[8][1] = "ALL"; //$NON-NLS-1$
 		logLevelField = new ComboFieldEditor(TBXPreferences.LOG_LEVEL,
-				Messages.AdvancePreferencePage_12, choices,
+				RCPMessages.AdvancePreferencePage_12, choices,
 				updateGroup);
 		addField(logLevelField);
 
 		logTimingsField = new BooleanFieldEditor(TBXPreferences.SHOW_TIMINGS,
-				Messages.AdvancePreferencePage_3, updateGroup);
+				RCPMessages.AdvancePreferencePage_3, updateGroup);
 		addField(logTimingsField);
 		
 		logStackTraceField = new BooleanFieldEditor(TBXPreferences.LOG_STACKTRACE, 
-				Messages.AdvancePreferencePage_0, updateGroup);
+				RCPMessages.AdvancePreferencePage_0, updateGroup);
 		addField(logStackTraceField);
 		
 		logConsoleField = new BooleanFieldEditor(TBXPreferences.ADD_TECH_LOGS,
-				Messages.AdvancePreferencePage_13, updateGroup);
+				RCPMessages.AdvancePreferencePage_13, updateGroup);
 		addField(logConsoleField);
 		
 		severeDialogField = new BooleanFieldEditor(RCPPreferences.SHOW_SEVERE_DIALOG,
@@ -139,7 +139,7 @@
 		addField(severeDialogField);
 
 		logFileField = new BooleanFieldEditor(TBXPreferences.LOG_IN_FILE,
-				Messages.AdvancePreferencePage_14, updateGroup);
+				RCPMessages.AdvancePreferencePage_14, updateGroup);
 		addField(logFileField);
 		
 		String[][] choices2 = new String[4][2];
@@ -148,11 +148,11 @@
 		choices2[2][0] = choices2[2][1] = "ALPHA"; //$NON-NLS-1$
 		choices2[3][0] = choices2[3][1] = "DEV"; //$NON-NLS-1$
 		updateLevelField = new ComboFieldEditor(RCPPreferences.UPDATE_LEVEL,
-				Messages.AdvancePreferencePage_7,choices2, getFieldEditorParent());
+				RCPMessages.AdvancePreferencePage_7,choices2, getFieldEditorParent());
 		addField(updateLevelField);
 		
 		expertField = new BooleanFieldEditor(TBXPreferences.EXPERT_USER,
-				Messages.AdvancePreferencePage_4, getFieldEditorParent());
+				RCPMessages.AdvancePreferencePage_4, getFieldEditorParent());
 		addField(expertField);
 	}
 
@@ -175,7 +175,7 @@
 //			PlatformUI.getWorkbench().getPreferenceManager().
 //				find("org.txm.rcp.preferences.TextometriePreferencePage/" + AdvancePreferencePage.ID + "/" + ChartsEnginePreferencePage.ID).createPage();
 		} catch (Exception e) {
-			System.err.println(Messages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(RCPMessages.FAILED_TO_SAVE_PREFERENCES + e);
 		}
 		return true;
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ScriptPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ScriptPreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ScriptPreferencePage.java	(revision 513)
@@ -29,7 +29,7 @@
 
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * The Class ScriptPreferencePage.
@@ -55,11 +55,11 @@
 	protected void createFieldEditors() {
 		
 		save_before_execution = new BooleanFieldEditor(RCPPreferences.SAVE_BEFORE_EXECUTION,
-				Messages.ScriptPreferencePage_1, getFieldEditorParent());
+				RCPMessages.ScriptPreferencePage_1, getFieldEditorParent());
 		addField(save_before_execution);
 		
 		nosession = new IntegerFieldEditor(RCPPreferences.NO_SESSION,
-				Messages.ScriptPreferencePage_0, getFieldEditorParent());
+				RCPMessages.ScriptPreferencePage_0, getFieldEditorParent());
 		addField(nosession);
 	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMPreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMPreferencePage.java	(revision 513)
@@ -82,7 +82,7 @@
 			super.performOk();
 			((ScopedPreferenceStore) this.getPreferenceStore()).save();
 		} catch (Exception e) {
-			System.err.println(org.txm.rcp.Messages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(org.txm.rcp.RCPMessages.FAILED_TO_SAVE_PREFERENCES + e);
 		}
 		return true;
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java	(revision 513)
@@ -46,7 +46,7 @@
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.Application;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.TxmPreferences;
 import org.txm.searchengine.cqp.CQPPreferences;
 // TODO: Auto-generated Javadoc
@@ -73,7 +73,7 @@
 	 */
 	public ImportPreferencePage() {
 		super();
-		setTitle(Messages.ExportPreferencePage_1);
+		setTitle(RCPMessages.ExportPreferencePage_1);
 	}
 
 	/* (non-Javadoc)
@@ -100,7 +100,7 @@
 //		}
 
 		Group csvMetadataGroup = new Group(getFieldEditorParent(), SWT.NONE);
-		csvMetadataGroup.setText(Messages.ImportPreferencePage_2);
+		csvMetadataGroup.setText(RCPMessages.ImportPreferencePage_2);
 		GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData2.horizontalSpan = 3;
 		gridData2.verticalIndent = 10;
@@ -116,19 +116,19 @@
 		csvMetadataGroup.setLayout(gridlayout);
 		
 		
-		encoding = new ComboFieldEditor(TBXPreferences.METADATA_ENCODING, Messages.ImportPreferencePage_0, values, csvMetadataGroup);
+		encoding = new ComboFieldEditor(TBXPreferences.METADATA_ENCODING, RCPMessages.ImportPreferencePage_0, values, csvMetadataGroup);
 		addField(encoding);
 		
 		String[][] cols = {{"TAB","\t"}, {",", ","}, {";", ";"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 		String txts[][] = {{"none", ""}, {"\"", "\""}, {"'", "'"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-		colseparators = new ComboFieldEditor(TBXPreferences.METADATA_COLSEPARATOR, Messages.ExportPreferencePage_18, cols, csvMetadataGroup);
+		colseparators = new ComboFieldEditor(TBXPreferences.METADATA_COLSEPARATOR, RCPMessages.ExportPreferencePage_18, cols, csvMetadataGroup);
 		addField(colseparators);
 
-		txtseparators = new ComboFieldEditor(TBXPreferences.METADATA_TXTSEPARATOR, Messages.ExportPreferencePage_19, txts, csvMetadataGroup);
+		txtseparators = new ComboFieldEditor(TBXPreferences.METADATA_TXTSEPARATOR, RCPMessages.ExportPreferencePage_19, txts, csvMetadataGroup);
 		addField(txtseparators);
 		
 		Group langGroup = new Group(getFieldEditorParent(), SWT.NONE);
-		langGroup.setText(Messages.ImportPreferencePage_3);
+		langGroup.setText(RCPMessages.ImportPreferencePage_3);
 		gridData2 = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData2.horizontalSpan = 3;
 		gridData2.verticalIndent = 10;
@@ -137,11 +137,11 @@
 		rlayout.marginHeight = 5;
 		langGroup.setLayout(rlayout);
 		
-		defaultlang = new StringFieldEditor(TBXPreferences.IMPORT_DEFAULT_LANG, Messages.ImportPreferencePage_4, langGroup);
+		defaultlang = new StringFieldEditor(TBXPreferences.IMPORT_DEFAULT_LANG, RCPMessages.ImportPreferencePage_4, langGroup);
 		defaultlang.setEmptyStringAllowed(false);
 		
 		Label l = new Label(langGroup, SWT.NONE);
-		l.setText(Messages.ImportPreferencePage_5);
+		l.setText(RCPMessages.ImportPreferencePage_5);
 		GridData ldata = new GridData(SWT.FILL, SWT.FILL, true, false);
 		ldata.horizontalSpan = 3;
 		l.setLayoutData(ldata);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMMainPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMMainPreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMMainPreferencePage.java	(revision 513)
@@ -56,7 +56,7 @@
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.TxmPreferences;
 import org.txm.rcp.swt.dialog.LastOpened;
 // TODO: Auto-generated Javadoc
@@ -96,7 +96,7 @@
 	@Override
 	protected void createFieldEditors() {
 		Group generalGroup = new Group(getFieldEditorParent(), SWT.NONE);
-		generalGroup.setText(Messages.TextometriePreferencePage_1);
+		generalGroup.setText(RCPMessages.TextometriePreferencePage_1);
 		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData.horizontalSpan = 2;
 		generalGroup.setLayoutData(gridData);
@@ -207,7 +207,7 @@
 		// disable if expert user
 		if (!TXMPreferences.getBoolean(TBXPreferences.EXPERT_USER, TBXPreferences.PREFERENCES_NODE)) {
 			Group updateGroup = new Group(getFieldEditorParent(), SWT.NONE);
-			updateGroup.setText(Messages.TextometriePreferencePage_2);
+			updateGroup.setText(RCPMessages.TextometriePreferencePage_2);
 			GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, false);
 			gridData2.horizontalSpan = 2;
 			gridData2.verticalIndent = 10;
@@ -217,7 +217,7 @@
 			//System.out.println(AutomaticUpdatePlugin.getDefault().getStateLocation());
 			final IPreferenceStore updatePrefStore = AutomaticUpdatePlugin.getDefault().getPreferenceStore();
 			update = new BooleanFieldEditor(TBXPreferences.FETCH_UPDATES_AT_STARTUP,
-					Messages.TextometriePreferencePage_0, updateGroup);
+					RCPMessages.TextometriePreferencePage_0, updateGroup);
 			
 			//update.setPreferenceStore(updatePrefStore);
 			//boolean enabled = updatePrefStore.getBoolean(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java	(revision 513)
@@ -31,7 +31,7 @@
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * The Class UserPreferencePage.
@@ -55,12 +55,12 @@
 	@Override
 	protected void createFieldEditors() {
 		alert_delete = new BooleanFieldEditor(RCPPreferences.USER_ALERT_DELETE,
-				Messages.UserPreferencePage_3,
+				RCPMessages.UserPreferencePage_3,
 				BooleanFieldEditor.SEPARATE_LABEL, getFieldEditorParent());
 		addField(alert_delete);
 		
 		auto_update_editor = new BooleanFieldEditor(RCPPreferences.AUTO_UPDATE_EDITOR,
-				Messages.UserPreferencePage_1,
+				RCPMessages.UserPreferencePage_1,
 				BooleanFieldEditor.SEPARATE_LABEL, getFieldEditorParent());
 		addField(auto_update_editor);
 		
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java	(revision 513)
@@ -32,7 +32,7 @@
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.ComboFieldEditor;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * The Class ExportPreferencePage.
@@ -56,7 +56,7 @@
 	 */
 	public ExportPreferencePage() {
 		super();
-		setTitle(Messages.ExportPreferencePage_1);
+		setTitle(RCPMessages.ExportPreferencePage_1);
 	}
 
 	/* (non-Javadoc)
@@ -74,22 +74,22 @@
 		}
 
 		encoding = new ComboFieldEditor(TBXPreferences.EXPORT_ENCODING,
-				Messages.ExportPreferencePage_3, values, getFieldEditorParent());
+				RCPMessages.ExportPreferencePage_3, values, getFieldEditorParent());
 		addField(encoding);
 		
 		String[][] cols = {{"\t","\t"}, {",", ","}, {";", ";"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 		String txts[][] = {{"", ""}, {"\"", "\""}, {"'", "'"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 		colseparators = new ComboFieldEditor(TBXPreferences.EXPORT_COLSEPARATOR,
-				Messages.ExportPreferencePage_18, cols, getFieldEditorParent());
+				RCPMessages.ExportPreferencePage_18, cols, getFieldEditorParent());
 		addField(colseparators);
 		
 		
 		txtseparators = new ComboFieldEditor(TBXPreferences.EXPORT_TXTSEPARATOR,
-				Messages.ExportPreferencePage_19, txts, getFieldEditorParent());
+				RCPMessages.ExportPreferencePage_19, txts, getFieldEditorParent());
 		addField(txtseparators);
 
 		show_export = new BooleanFieldEditor(TBXPreferences.EXPORT_SHOW,
-				Messages.ExportPreferencePage_4,
+				RCPMessages.ExportPreferencePage_4,
 				BooleanFieldEditor.SEPARATE_LABEL, getFieldEditorParent());
 		
 		
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages.properties	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages.properties	(revision 513)
@@ -336,7 +336,7 @@
 ConcordancesEditor_5                          = Concordance of <{0}> in corpus {1}
 ConcordancesEditor_50                         = Opening corpus edition
 ConcordancesEditor_51                         = Annotating concordance...
-ConcordancesEditor_52                         = Done: one result
+ONE_RESULT                         = Done: one result.
 ConcordancesEditor_53                         = Error while annotating concordance: 
 ConcordancesEditor_54                         = Error while deleting annotation: 
 ConcordancesEditor_55                         = Opening property dialog
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java	(revision 513)
@@ -88,10 +88,10 @@
 		configurer.setShowFastViewBars(false);
 		configurer.setShowProgressIndicator(true);
 		configurer.setShowPerspectiveBar(true);
-		configurer.setTitle(Messages.Explorer_3);
+		configurer.setTitle(RCPMessages.Explorer_3);
 
 		// This is a patch to remove the Quick Search Field and spacers from the Main toolbar
-		Log.warning(Messages.ApplicationWorkbenchWindowAdvisor_0);
+		Log.warning(RCPMessages.ApplicationWorkbenchWindowAdvisor_0);
 		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		if (window instanceof WorkbenchWindow) {
 			MWindow model = ((WorkbenchWindow) window).getModel();
@@ -130,7 +130,7 @@
 	 */
 	@Override
 	public void postWindowOpen() {
-		Log.warning(Messages.ApplicationWorkbenchWindowAdvisor_9);
+		Log.warning(RCPMessages.ApplicationWorkbenchWindowAdvisor_9);
 		StatusLine.set(getWindowConfigurer().getActionBarConfigurer().getStatusLineManager());
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		page.hideActionSet("org.eclipse.ui.edit.text.actionSet.navigation"); //$NON-NLS-1$
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages_ru.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages_ru.properties	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages_ru.properties	(revision 513)
@@ -289,7 +289,7 @@
 ConcordancesEditor_48           = Сортировка правого контекста
 ConcordancesEditor_5            = Конкорданс мотива <{0}> в корпусе {1}
 ConcordancesEditor_50           = Открытие издания
-ConcordancesEditor_52           = Готово: один результат
+ONE_RESULT           = Готово: один результат
 ConcordancesEditor_55           = Открытие диалогового окна свойств
 ConcordancesEditor_56           = Начало расчета конкордансов
 ConcordancesEditor_6            = Сортировка...
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorToolBar.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorToolBar.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorToolBar.java	(revision 513)
@@ -34,9 +34,6 @@
 	
 	private HashMap<String, Group> groups = new HashMap<String, Group>();
 
-	private Composite parametersGroupsComposite;
-
-
 	/**
 	 * 
 	 * the parent layout must be a GridLayout
@@ -55,14 +52,6 @@
 		ToolBarManager manager = new ToolBarManager(this);
 		IMenuService menuService = (IMenuService) this.editorPart.getSite().getService(IMenuService.class);
 		menuService.populateContributionManager(manager, "toolbar:" + toolbar_local_id); //$NON-NLS-1$
-		
-		parametersGroupsComposite = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(1, true);
-		gl.marginBottom = gl.marginHeight = gl.marginWidth = gl.marginTop = 0;
-		parametersGroupsComposite.setLayout(gl);
-		if (parent.getLayout() instanceof GridLayout)
-		parametersGroupsComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
-		
 	}
 
 	@Override
@@ -110,7 +99,7 @@
 			return groups.get(groupTitle);
 		}
 		
-		final Group group = new Group(parametersGroupsComposite, SWT.NONE);
+		final Group group = new Group(editorPart.getParametersGroupsComposite(), SWT.NONE);
 		group.setText(groupTitle);
 		
 		RowLayout layout = new RowLayout();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java	(revision 513)
@@ -39,7 +39,7 @@
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.txm.core.results.TXMResult;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.svg.SVGComposite;
 
 /**
@@ -166,7 +166,7 @@
 				}
 				
 			} else {
-				throw new IllegalArgumentException(Messages.SVGGraphicEditor_1);
+				throw new IllegalArgumentException(RCPMessages.SVGGraphicEditor_1);
 			}
 		}
 		svgComp.resetZoom();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorPart.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorPart.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorPart.java	(revision 513)
@@ -103,6 +103,14 @@
 		
 		this.topToolBar = new TXMEditorToolBar(topToolBarContainer, SWT.FLAT | SWT.RIGHT, "top", this);
 		
+		parametersGroupsComposite = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(1, true);
+		gl.marginBottom = gl.marginHeight = gl.marginWidth = gl.marginTop = 0;
+		parametersGroupsComposite.setLayout(gl);
+		if (parent.getLayout() instanceof GridLayout)
+		parametersGroupsComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
+		
+		
 		computingParametersGroup = topToolBar.installGroup("Computing parameters", "Show/Hide command parameters", "icons/show_computing_parameters.png");
 		
 		displayArea = new Composite(parent, SWT.NONE);
@@ -438,4 +446,12 @@
 	public void setPartName(String partName) {
 		super.setPartName(partName);
 	}
+
+	/**
+	 * 
+	 * @return the composite that contains the TXMEditorToolBar parameters panels
+	 */
+	public Composite getParametersGroupsComposite() {
+		return parametersGroupsComposite;
+	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableKeyListener.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableKeyListener.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableKeyListener.java	(revision 513)
@@ -12,7 +12,7 @@
 import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.utils.logger.Log;
 
 public class TableKeyListener implements KeyListener {
@@ -46,7 +46,7 @@
 		//System.out.println("search in tablein items: "+Arrays.toString(items));
 
 		TableColumn[] cols = viewer.getTable().getColumns();
-		InputDialog dialog = new InputDialog(viewer.getTable().getShell(), "Compute", Messages.TableKeyListener_1, "", null);  //$NON-NLS-1$
+		InputDialog dialog = new InputDialog(viewer.getTable().getShell(), "Compute", RCPMessages.TableKeyListener_1, "", null);  //$NON-NLS-1$
 		if (dialog.open() == Window.OK) {
 			String reg = dialog.getValue();
 			Pattern p = Pattern.compile(reg);
@@ -64,7 +64,7 @@
 					}
 				}
 			}
-			Log.info(Messages.TableKeyListener_0 + matchingIndexes);
+			Log.info(RCPMessages.TableKeyListener_0 + matchingIndexes);
 
 			// TODO: useless ?
 //			int[] indexes = new int[matchingIndexes.size()];
@@ -110,6 +110,6 @@
 			}
 		}
 		org.txm.rcp.utils.IOClipboard.write(str);
-		System.out.println(Messages.TableKeyListener_6+str);
+		System.out.println(RCPMessages.TableKeyListener_6+str);
 	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/objectexplorer/ObjectExplorer.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/objectexplorer/ObjectExplorer.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/objectexplorer/ObjectExplorer.java	(revision 513)
@@ -53,7 +53,7 @@
 import org.eclipse.ui.part.EditorPart;
 import org.txm.core.results.TXMResult;
 import org.txm.objects.TxmObject;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TXMEditorPart;
 import org.txm.rcp.editors.TableKeyListener;
 import org.txm.rcp.editors.input.ObjectExplorerEditorInput;
@@ -144,11 +144,11 @@
 
 		this.parent = parent;
 		parent.setLayout(new GridLayout(2, true));
-		this.setPartName(NLS.bind(Messages.ObjectExplorer_0, txmObject.getName())); 
+		this.setPartName(NLS.bind(RCPMessages.ObjectExplorer_0, txmObject.getName())); 
 
 		// headers
 		Button addcolumnObject = new Button(parent, SWT.PUSH);
-		addcolumnObject.setText(Messages.ObjectExplorer_3);
+		addcolumnObject.setText(RCPMessages.ObjectExplorer_3);
 		addcolumnObject.addSelectionListener(new SelectionListener() {
 
 			@Override
@@ -158,15 +158,15 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				InputDialog dlg = new InputDialog(Display.getCurrent()
-						.getActiveShell(), Messages.ObjectExplorer_4,
-						Messages.ObjectExplorer_5, Messages.ObjectExplorer_7,
+						.getActiveShell(), RCPMessages.ObjectExplorer_4,
+						RCPMessages.ObjectExplorer_5, RCPMessages.ObjectExplorer_7,
 						null);
 				if (dlg.open() == Window.OK) {
 					if (!dlg.getValue().matches("")) //$NON-NLS-1$
 					{
 						// System.out.println("add ok");
 						txmObject.setAttribute(dlg.getValue(),
-								Messages.ObjectExplorer_9);
+								RCPMessages.ObjectExplorer_9);
 						/*
 						 * objectviewer.getTable().dispose(); objectviewer =
 						 * null; createObjectTableViewer();
@@ -179,7 +179,7 @@
 		});
 
 		Button rmvcolumnObject = new Button(parent, SWT.PUSH);
-		rmvcolumnObject.setText(Messages.ObjectExplorer_10);
+		rmvcolumnObject.setText(RCPMessages.ObjectExplorer_10);
 		rmvcolumnObject.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
@@ -188,8 +188,8 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				InputDialog dlg = new InputDialog(Display.getCurrent()
-						.getActiveShell(), Messages.ObjectExplorer_10,
-						Messages.ObjectExplorer_12, "", null); //$NON-NLS-1$ 
+						.getActiveShell(), RCPMessages.ObjectExplorer_10,
+						RCPMessages.ObjectExplorer_12, "", null); //$NON-NLS-1$ 
 				if (dlg.open() == Window.OK) {
 					if (!dlg.getValue().matches("")) //$NON-NLS-1$
 					{
@@ -211,7 +211,7 @@
 		separator.setLayoutData(griddata);
 
 		Button addcolumn = new Button(parent, SWT.PUSH);
-		addcolumn.setText(Messages.ObjectExplorer_15);
+		addcolumn.setText(RCPMessages.ObjectExplorer_15);
 		addcolumn.addSelectionListener(new SelectionListener() {
 
 			@Override
@@ -221,8 +221,8 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				InputDialog dlg = new InputDialog(Display.getCurrent()
-						.getActiveShell(), Messages.ObjectExplorer_4,
-						Messages.ObjectExplorer_5, Messages.ObjectExplorer_7,
+						.getActiveShell(), RCPMessages.ObjectExplorer_4,
+						RCPMessages.ObjectExplorer_5, RCPMessages.ObjectExplorer_7,
 						null);
 				if (dlg.open() == Window.OK) {
 					if (!dlg.getValue().matches("")) //$NON-NLS-1$
@@ -231,7 +231,7 @@
 						for (TXMResult o : txmObject.getResults()) {
 							if (!((TxmObject) o).getMetadatas().keySet().contains(dlg.getValue()))
 								((TxmObject) o).setAttribute(dlg.getValue(),
-										Messages.ObjectExplorer_9);
+										RCPMessages.ObjectExplorer_9);
 						}
 
 						viewer.getTable().dispose();
@@ -244,7 +244,7 @@
 		});
 
 		Button rmvcolumn = new Button(parent, SWT.PUSH);
-		rmvcolumn.setText(Messages.ObjectExplorer_21);
+		rmvcolumn.setText(RCPMessages.ObjectExplorer_21);
 		rmvcolumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
@@ -253,8 +253,8 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				InputDialog dlg = new InputDialog(Display.getCurrent()
-						.getActiveShell(), Messages.ObjectExplorer_10,
-						Messages.ObjectExplorer_12, "", null); //$NON-NLS-1$ 
+						.getActiveShell(), RCPMessages.ObjectExplorer_10,
+						RCPMessages.ObjectExplorer_12, "", null); //$NON-NLS-1$ 
 				if (dlg.open() == Window.OK) {
 					if (!dlg.getValue().matches("")) //$NON-NLS-1$
 					{
@@ -306,7 +306,7 @@
 			return;
 
 		columnsName = new ArrayList<String>();
-		columnsName.add(Messages.ObjectExplorer_26);
+		columnsName.add(RCPMessages.ObjectExplorer_26);
 
 		TxmObject o = (TxmObject) txmObject.getResults().get(0);
 		for (String key : o.getMetadatas().keySet()) {
@@ -366,8 +366,8 @@
 	private void createObjectColumns(TableViewer objectviewer) {
 
 		columnsName = new ArrayList<String>();
-		columnsName.add(Messages.ObjectExplorer_27);
-		columnsName.add(Messages.ObjectExplorer_2);
+		columnsName.add(RCPMessages.ObjectExplorer_27);
+		columnsName.add(RCPMessages.ObjectExplorer_2);
 
 		for (int i = 0; i < columnsName.size(); i++) {
 			TableViewerColumn column = new TableViewerColumn(objectviewer,
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/adaptableDataStructure/TablableVector.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/adaptableDataStructure/TablableVector.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/adaptableDataStructure/TablableVector.java	(revision 513)
@@ -31,7 +31,7 @@
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.ui.IPersistableElement;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.Tablable;
 // TODO: Auto-generated Javadoc
 /**
@@ -58,7 +58,7 @@
 		this.columnTitles = columnTitles;
 		this.columnTypes = columnTypes;
 		if (columnTitles.length != columnTypes.length)
-			throw new IllegalArgumentException(Messages.TablableVector_0);
+			throw new IllegalArgumentException(RCPMessages.TablableVector_0);
 	}
 
 	/* (non-Javadoc)
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java	(revision 513)
@@ -55,7 +55,7 @@
 import org.txm.objects.Page;
 import org.txm.objects.Text;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.searchengine.cqp.corpus.Corpus;
 
@@ -206,7 +206,7 @@
 			String editionName = corpus.getDefaultEdition();
 			currentPage = firstText.getEdition(editionName).getFirstPage(); 
 			if (currentPage == null) {
-				StatusLine.setMessage(Messages.TxmBrowser_11);
+				StatusLine.setMessage(RCPMessages.TxmBrowser_11);
 				return;
 			}
 			this.setEdition(firstText.getEdition(editionName)); 
@@ -226,7 +226,7 @@
 		if (lastText != null) {
 			currentPage = lastText.getEdition(b.getDefaultEdition()).getFirstPage(); 
 			if (currentPage == null) {
-				StatusLine.setMessage(Messages.TxmBrowser_12);
+				StatusLine.setMessage(RCPMessages.TxmBrowser_12);
 				return;
 			}
 			this.setEdition(lastText.getEdition(b.getDefaultEdition())); 
@@ -313,7 +313,7 @@
 				currentPage = previousText.getEdition(editionName).getFirstPage();
 			}
 			if (currentPage == null) {
-				StatusLine.setMessage(Messages.TxmBrowser_11);
+				StatusLine.setMessage(RCPMessages.TxmBrowser_11);
 				return;
 			}
 			this.setEdition(previousText.getEdition(editionName)); 
@@ -334,7 +334,7 @@
 		if (nextText != null) {
 			currentPage = nextText.getEdition(b.getDefaultEdition()).getFirstPage(); 
 			if (currentPage == null) {
-				StatusLine.setMessage(Messages.TxmBrowser_12);
+				StatusLine.setMessage(RCPMessages.TxmBrowser_12);
 				return;
 			}
 			this.setEdition(nextText.getEdition(b.getDefaultEdition())); 
@@ -352,7 +352,7 @@
 		try {
 			super.createPartControl(parent);
 		} catch (Exception e) {
-			System.err.println(Messages.TxmBrowser_10);
+			System.err.println(RCPMessages.TxmBrowser_10);
 			return;
 		}
 		
@@ -397,17 +397,17 @@
 		firstText.setImage(IImageKeys.getImage(IImageKeys.CTRLREWINDSTART));
 		firstText.setToolTipText("|<<");
 		previousText.setImage(IImageKeys.getImage(IImageKeys.CTRLREWIND));
-		previousText.setToolTipText(Messages.TxmBrowser_9);
+		previousText.setToolTipText(RCPMessages.TxmBrowser_9);
 		first.setImage(IImageKeys.getImage(IImageKeys.CTRLSTART)); 
-		first.setToolTipText(Messages.TxmBrowser_0);
+		first.setToolTipText(RCPMessages.TxmBrowser_0);
 		previous.setImage(IImageKeys.getImage(IImageKeys.CTRLREVERSE));
-		previous.setToolTipText(Messages.TxmBrowser_5);
+		previous.setToolTipText(RCPMessages.TxmBrowser_5);
 		next.setImage(IImageKeys.getImage(IImageKeys.CTRLPLAY));
-		next.setToolTipText(Messages.TxmBrowser_6);
+		next.setToolTipText(RCPMessages.TxmBrowser_6);
 		last.setImage(IImageKeys.getImage(IImageKeys.CTRLEND));
-		last.setToolTipText(Messages.TxmBrowser_7);
+		last.setToolTipText(RCPMessages.TxmBrowser_7);
 		nextText.setImage(IImageKeys.getImage(IImageKeys.CTRLFASTFORWARD));
-		nextText.setToolTipText(Messages.TxmBrowser_8);
+		nextText.setToolTipText(RCPMessages.TxmBrowser_8);
 		lastText.setImage(IImageKeys.getImage(IImageKeys.CTRLFASTFORWARDEND));
 		lastText.setToolTipText(">>|");
 		
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java	(revision 513)
@@ -57,7 +57,7 @@
 import org.txm.metadatas.Metadata;
 import org.txm.metadatas.Metadatas;
 import org.txm.metadatas.TextInjection;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TableKeyListener;
 // TODO: Auto-generated Javadoc
 /**
@@ -167,7 +167,7 @@
 	 * @param main 
 	 */
 	public MetadataPage(FormEditor editor, CorpusPage main) {
-		super(editor, Messages.MainPage_0, Messages.MetadataPage_1);
+		super(editor, RCPMessages.MainPage_0, RCPMessages.MetadataPage_1);
 		this.main = main;
 	}
 	int index = 0;
@@ -178,11 +178,11 @@
 	protected void createFormContent(final IManagedForm managedForm) {
 		form = managedForm.getForm();
 		toolkit = managedForm.getToolkit();
-		form.setText(Messages.MetadataPage_2);
+		form.setText(RCPMessages.MetadataPage_2);
 		GridLayout layout = new GridLayout(2, false);
 		form.getBody().setLayout(layout);
 
-		scanmetadatafile = toolkit.createButton(form.getBody(), Messages.MetadataPage_3, SWT.PUSH);
+		scanmetadatafile = toolkit.createButton(form.getBody(), RCPMessages.MetadataPage_3, SWT.PUSH);
 		scanmetadatafile.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 1,1));
 		scanmetadatafile.addSelectionListener(new SelectionListener() {
 			
@@ -431,7 +431,7 @@
 				if (inputElement instanceof Metadatas) {
 					Metadatas m = (Metadatas) inputElement;
 					ArrayList<String> header = m.getHeadersList();
-					System.out.println(Messages.MetadataPage_4+header);
+					System.out.println(RCPMessages.MetadataPage_4+header);
 
 					Object[] elems = new Object[m.keySet().size()];
 					int i = 0;
@@ -455,7 +455,7 @@
 
 		displayColumn2 = new TableViewerColumn(viewer2, SWT.NONE);
 		displayColumn2.getColumn().setWidth(120);
-		displayColumn2.getColumn().setText(Messages.MetadataPage_5);
+		displayColumn2.getColumn().setText(RCPMessages.MetadataPage_5);
 		displayColumn2.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -495,7 +495,7 @@
 				temp = new Metadatas(metadataFile);
 			}
 		} else {
-			System.out.println(NLS.bind(Messages.MetadataPage_7, metadataFile));
+			System.out.println(NLS.bind(RCPMessages.MetadataPage_7, metadataFile));
 			return;
 		}
 				
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportFormEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportFormEditor.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportFormEditor.java	(revision 513)
@@ -45,7 +45,7 @@
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.results.TXMResult;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.ExecuteImportScript;
 import org.txm.rcp.editors.input.ImportFormEditorInput;
 import org.txm.searchengine.cqp.corpus.Corpus;
@@ -135,7 +135,7 @@
 		ExecuteImportScript.getImportScriptFromToolboxPlugin(getGroovyscript()); // always update if script from Toolbox is more recent
 		
 		if (!getGroovyscript().exists()) // just a warning message
-			System.out.println(NLS.bind(Messages.ImportFormEditor_0, getGroovyscript()));
+			System.out.println(NLS.bind(RCPMessages.ImportFormEditor_0, getGroovyscript()));
 	}
 
 	/**
@@ -190,7 +190,7 @@
 	 */
 	@Override
 	public String getPartName() {
-		String name = Messages.bind(Messages.ImportFormEditor_1,ImportModuleCustomization.getName(groovyscript.getName()));
+		String name = RCPMessages.bind(RCPMessages.ImportFormEditor_1,ImportModuleCustomization.getName(groovyscript.getName()));
 		return name;
 	}
 	
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java	(revision 513)
@@ -17,7 +17,7 @@
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 import org.txm.objects.BaseParameters;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.imports.ImportModuleCustomization;
 import org.txm.tokenizer.TokenizerClasses;
 import org.w3c.dom.Element;
@@ -40,7 +40,7 @@
 	public TokenizerSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style, HashMap<String, Boolean> moduleParams) {
 		super(toolkit2, form2, parent, style);
 		this.moduleParams = moduleParams;
-		this.section.setText(Messages.MainPage_19);
+		this.section.setText(RCPMessages.MainPage_19);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -86,13 +86,13 @@
 			public void widgetDefaultSelected(SelectionEvent e) { }
 		});
 		
-		Label l0 = toolkit.createLabel(sectionClient, Messages.CorpusPage_16a, SWT.WRAP);
+		Label l0 = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_16a, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 3;
 		gdata.indent = 10;
 		l0.setLayoutData(gdata);
 		
-		Label l1 = toolkit.createLabel(sectionClient, Messages.CorpusPage_5, SWT.WRAP);
+		Label l1 = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_5, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 20;
@@ -102,7 +102,7 @@
 		gdata = getLongTextGridData();
 		textWhiteSpaces.setLayoutData(gdata);
 		
-		Label l2 = toolkit.createLabel(sectionClient, Messages.CorpusPage_16, SWT.WRAP);
+		Label l2 = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_16, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 20;
@@ -112,7 +112,7 @@
 		gdata = getLongTextGridData();
 		textPuncts.setLayoutData(gdata);
 
-		Label l4 = toolkit.createLabel(sectionClient, Messages.CorpusPage_19, SWT.WRAP);
+		Label l4 = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_19, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 10;
@@ -122,7 +122,7 @@
 		gdata = getLongTextGridData();
 		textElisions.setLayoutData(gdata);
 
-		Label l3 = toolkit.createLabel(sectionClient, Messages.CorpusPage_22, SWT.WRAP);
+		Label l3 = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_22, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 10;
@@ -132,7 +132,7 @@
 		gdata = getLongTextGridData();
 		textPunctsStrong.setLayoutData(gdata);
 
-		Button defaultBtn = toolkit.createButton(sectionClient, Messages.CorpusPage_49, SWT.PUSH);
+		Button defaultBtn = toolkit.createButton(sectionClient, RCPMessages.CorpusPage_49, SWT.PUSH);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 10;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java	(revision 513)
@@ -20,7 +20,7 @@
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.objects.BaseParameters;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.imports.ImportModuleCustomization;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.w3c.dom.Element;
@@ -48,7 +48,7 @@
 	public EditionSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style, HashMap<String, Boolean> moduleParams, String scriptName) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(Messages.CorpusPage_0);
+		this.section.setText(RCPMessages.CorpusPage_0);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		layout.numColumns = 1;
@@ -70,7 +70,7 @@
 
 
 		// build text edition or not button
-		buildEditionCheckButton = toolkit.createButton(sectionClient, Messages.CorpusPage_44, SWT.CHECK);
+		buildEditionCheckButton = toolkit.createButton(sectionClient, RCPMessages.CorpusPage_44, SWT.CHECK);
 		buildEditionCheckButton.setSelection(true);
 		TableWrapData gdata2 = getButtonLayoutData();
 		gdata2.colspan = 4; // one line
@@ -79,7 +79,7 @@
 		// words per page -> pageSize
 		Label tmpLabel = null;
 		if (moduleParams.get(ImportModuleCustomization.EDITIONS_WORDSPERPAGE)) {
-			tmpLabel = toolkit.createLabel(sectionClient, Messages.CorpusPage_36);
+			tmpLabel = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_36);
 			tmpLabel.setLayoutData(getLabelGridData());
 
 			wordsPerPageText = toolkit.createText(sectionClient, "500", SWT.BORDER); //$NON-NLS-1$
@@ -89,7 +89,7 @@
 
 		if (moduleParams.get(ImportModuleCustomization.EDITIONS_PAGEELEMENT)) {
 			// page break tag
-			tmpLabel = toolkit.createLabel(sectionClient, Messages.CorpusPage_41);
+			tmpLabel = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_41);
 			tmpLabel.setLayoutData(getLabelGridData());
 			pageBreakText = toolkit.createText(sectionClient, "pb", SWT.BORDER); //$NON-NLS-1$
 			TableWrapData gdata = getTextGridData();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/UISection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/UISection.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/UISection.java	(revision 513)
@@ -11,7 +11,7 @@
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 import org.txm.objects.BaseParameters;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.w3c.dom.Element;
 
 public class UISection extends ImportEditorSection {
@@ -22,7 +22,7 @@
 	public UISection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(Messages.CorpusPage_63);
+		this.section.setText(RCPMessages.CorpusPage_63);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -40,8 +40,8 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 
-		Label tmpLabel = toolkit.createLabel(sectionClient, Messages.CorpusPage_64);
-		tmpLabel.setToolTipText(Messages.CorpusPage_65);
+		Label tmpLabel = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_64);
+		tmpLabel.setToolTipText(RCPMessages.CorpusPage_65);
 		tmpLabel.setLayoutData(getLabelGridData());
 
 		structLimitsText = toolkit.createText(sectionClient, "text", SWT.BORDER); //$NON-NLS-1$
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java	(revision 513)
@@ -14,7 +14,7 @@
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 import org.txm.objects.BaseParameters;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.utils.logger.Log;
 import org.w3c.dom.Element;
 
@@ -29,7 +29,7 @@
 		super(toolkit2, form2, parent, style);
 		
 		//this = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE);
-		this.section.setText(Messages.CorpusPage_7);
+		this.section.setText(RCPMessages.CorpusPage_7);
 		section.setExpanded(true);
 		
 		TableWrapLayout layout = new TableWrapLayout();
@@ -48,11 +48,11 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 
-		corpusNameLabel = toolkit.createLabel(sectionClient, Messages.CorpusPage_8, SWT.WRAP);
+		corpusNameLabel = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_8, SWT.WRAP);
 		TableWrapData gdata = new TableWrapData();
 		corpusNameLabel.setLayoutData(gdata);
 
-		Label label = toolkit.createLabel(sectionClient, Messages.CorpusPage_9, SWT.WRAP);
+		Label label = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_9, SWT.WRAP);
 		gdata = new TableWrapData();
 		label.setLayoutData(gdata);
 
@@ -69,7 +69,7 @@
 
 	@Override
 	public void update(BaseParameters params) {
-		section.setText(Messages.MainPage_3+" "+params.rootDir); //$NON-NLS-1$
+		section.setText(RCPMessages.MainPage_3+" "+params.rootDir); //$NON-NLS-1$
 		
 		corpusText.setText(params.getCorpusName());
 		
@@ -85,13 +85,13 @@
 	@Override
 	public boolean save(BaseParameters params) {
 		if (corpusText.getText().trim().length() == 0) {
-			System.out.println(Messages.CorpusPage_53);
+			System.out.println(RCPMessages.CorpusPage_53);
 			return false;
 		}
 		params.description = "<pre><br/>"+descText.getText().replace("\n", "<br/>")+"</pre>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		//System.out.println("SAVE DESC WITH: '"+params.description+"'");
 		if (!corpusText.getText().matches("[A-Z][-A-Z0-9]{1,20}")) { //$NON-NLS-1$
-			System.out.println(Messages.CorpusPage_93+corpusText.getText());
+			System.out.println(RCPMessages.CorpusPage_93+corpusText.getText());
 			return false;
 		}
 		
@@ -114,7 +114,7 @@
 		String corpusname = corpusText.getText();
 		Log.warning("Checking corpus name validity with '[A-Z][-A-Z0-9]+': "+corpusname);
 		if (!corpusname.matches("[A-Z][-A-Z0-9]+")) { //$NON-NLS-1$
-			System.out.println(Messages.CorpusPage_93+corpusname);
+			System.out.println(RCPMessages.CorpusPage_93+corpusname);
 
 			Device device = Display.getCurrent ();
 			Color red = new Color (device, 255, 0, 0);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java	(revision 513)
@@ -27,7 +27,7 @@
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.objects.BaseParameters;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.EditFile;
 import org.txm.rcp.editors.TableKeyListener;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -53,7 +53,7 @@
 		super(toolkit2, form2, parent, style);
 		this.params = params2;
 
-		this.section.setText(Messages.MainPage_18);
+		this.section.setText(RCPMessages.MainPage_18);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -104,7 +104,7 @@
 			}
 		});
 
-		Button editXSLTButton = toolkit.createButton(sectionClient, Messages.CorpusPage_61, SWT.PUSH);
+		Button editXSLTButton = toolkit.createButton(sectionClient, RCPMessages.CorpusPage_61, SWT.PUSH);
 		editXSLTButton.setLayoutData(getButtonLayoutData());
 		editXSLTButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -122,7 +122,7 @@
 		Label l = toolkit.createLabel(sectionClient, ""); // empty cell //$NON-NLS-1$
 		l.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.MIDDLE));
 
-		Button addButton = toolkit.createButton(sectionClient, Messages.CorpusPage_4, SWT.PUSH);
+		Button addButton = toolkit.createButton(sectionClient, RCPMessages.CorpusPage_4, SWT.PUSH);
 		addButton.setLayoutData(getButtonLayoutData());
 		addButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -135,7 +135,7 @@
 				LinkedHashMap<String, String> values = new LinkedHashMap<String, String>();
 				values.put("name", ""); //$NON-NLS-1$ //$NON-NLS-2$
 				values.put("value", "");			 //$NON-NLS-1$ //$NON-NLS-2$
-				MultipleValueDialog dlg = new MultipleValueDialog(form.getShell(), Messages.CorpusPage_4, values);
+				MultipleValueDialog dlg = new MultipleValueDialog(form.getShell(), RCPMessages.CorpusPage_4, values);
 				if (dlg.open() == Window.OK) {
 					params.addXsltParameter(params.getCorpusElement(), values.get("name"), values.get("value")); //$NON-NLS-1$ //$NON-NLS-2$
 					update(params);
@@ -143,7 +143,7 @@
 			}
 		});
 
-		Button removeButton = toolkit.createButton(sectionClient, Messages.CorpusPage_6, SWT.PUSH);
+		Button removeButton = toolkit.createButton(sectionClient, RCPMessages.CorpusPage_6, SWT.PUSH);
 		TableWrapData td = getButtonLayoutData();
 		td.colspan = 3;
 		removeButton.setLayoutData(td);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java	(revision 513)
@@ -15,7 +15,7 @@
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 import org.txm.objects.BaseParameters;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 public class LangSection extends ImportEditorSection {
 	
@@ -30,7 +30,7 @@
 	public LangSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(Messages.MainPage_20);
+		this.section.setText(RCPMessages.MainPage_20);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -50,13 +50,13 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 
-		btnSelectAnnotate = toolkit.createButton(sectionClient, Messages.CorpusPage_26, SWT.CHECK); 
+		btnSelectAnnotate = toolkit.createButton(sectionClient, RCPMessages.CorpusPage_26, SWT.CHECK); 
 		toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
 
-		btnGuessLang = toolkit.createButton(sectionClient, Messages.ImportDialog_16, SWT.RADIO);
+		btnGuessLang = toolkit.createButton(sectionClient, RCPMessages.ImportDialog_16, SWT.RADIO);
 		toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
 
-		btnSelectLang = toolkit.createButton(sectionClient, Messages.ImportDialog_22, SWT.RADIO);
+		btnSelectLang = toolkit.createButton(sectionClient, RCPMessages.ImportDialog_22, SWT.RADIO);
 
 		langcombo = new Combo(sectionClient, SWT.BORDER);
 		TableWrapData gdata = getTextGridData();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TextualPlansSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TextualPlansSection.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TextualPlansSection.java	(revision 513)
@@ -11,7 +11,7 @@
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 import org.txm.objects.BaseParameters;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.w3c.dom.Element;
 
 public class TextualPlansSection extends ImportEditorSection {
@@ -25,7 +25,7 @@
 	public TextualPlansSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(Messages.TextualPlansSection_title);
+		this.section.setText(RCPMessages.TextualPlansSection_title);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -43,16 +43,16 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 		
-		Label tmpLabel = toolkit.createLabel(sectionClient, Messages.TextualPlansSection_outsidetext_label);
-		tmpLabel.setToolTipText(Messages.TextualPlansSection_outsidetext_tooltip);
+		Label tmpLabel = toolkit.createLabel(sectionClient, RCPMessages.TextualPlansSection_outsidetext_label);
+		tmpLabel.setToolTipText(RCPMessages.TextualPlansSection_outsidetext_tooltip);
 		tmpLabel.setLayoutData(getLabelGridData());
 		
 		outsideTextElementsText = toolkit.createText(sectionClient, "teiHeader", SWT.BORDER); //$NON-NLS-1$
 		TableWrapData gdata = getTextGridData();
 		outsideTextElementsText.setLayoutData(gdata);
 		
-		Label tmpLabel2 = toolkit.createLabel(sectionClient, Messages.TextualPlansSection_outsidetexttoedit_label);
-		tmpLabel2.setToolTipText(Messages.TextualPlansSection_outsidetexttoedit_tooltip);
+		Label tmpLabel2 = toolkit.createLabel(sectionClient, RCPMessages.TextualPlansSection_outsidetexttoedit_label);
+		tmpLabel2.setToolTipText(RCPMessages.TextualPlansSection_outsidetexttoedit_tooltip);
 		tmpLabel2.setLayoutData(getLabelGridData());
 
 		outsideTextElementsToEditText = toolkit.createText(sectionClient, "", SWT.BORDER); //$NON-NLS-1$
@@ -67,8 +67,8 @@
 		gdata = getTextGridData();
 		noteElementsText.setLayoutData(gdata);
 		
-		Label tmpLabel4 = toolkit.createLabel(sectionClient, Messages.TextualPlansSection_milestone_label);
-		tmpLabel4.setToolTipText(Messages.TextualPlansSection_milestone_tooltip);
+		Label tmpLabel4 = toolkit.createLabel(sectionClient, RCPMessages.TextualPlansSection_milestone_label);
+		tmpLabel4.setToolTipText(RCPMessages.TextualPlansSection_milestone_tooltip);
 		tmpLabel4.setLayoutData(getLabelGridData());
 
 		milestoneElementsText = toolkit.createText(sectionClient, "", SWT.BORDER); //$NON-NLS-1$
@@ -96,7 +96,7 @@
 			if (milestonesElement != null)
 				milestoneElementsText.setText(milestonesElement.getTextContent());
 		} else {
-			System.out.println(Messages.TextualPlansSection_update_error);
+			System.out.println(RCPMessages.TextualPlansSection_update_error);
 		}
 	}
 
@@ -120,7 +120,7 @@
 				Element milestonesElement = params.getMilestonesElement();
 				milestonesElement.setTextContent(milestoneElementsText.getText().trim());
 			} else {
-				System.out.println(Messages.TextualPlansSection_save_error);
+				System.out.println(RCPMessages.TextualPlansSection_save_error);
 				return false;
 			}
 			return true;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EncodingSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EncodingSection.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EncodingSection.java	(revision 513)
@@ -16,7 +16,7 @@
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 import org.txm.objects.BaseParameters;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 public class EncodingSection extends ImportEditorSection {
 	
@@ -29,7 +29,7 @@
 	public EncodingSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 		
-		this.section.setText(Messages.MainPage_23);
+		this.section.setText(RCPMessages.MainPage_23);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		layout.numColumns = 1;
@@ -52,12 +52,12 @@
 		btnGuessEncoding = toolkit.createButton(sectionClient, "", SWT.RADIO); //$NON-NLS-1$
 		TableWrapData td = getButtonLayoutData();
 		btnGuessEncoding.setLayoutData(td);
-		btnGuessEncoding.setText(Messages.ImportDialog_16);
+		btnGuessEncoding.setText(RCPMessages.ImportDialog_16);
 		toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
 
 		btnSelectEncoding = toolkit.createButton(sectionClient, "", SWT.RADIO); //$NON-NLS-1$
 		btnSelectEncoding.setLayoutData(getButtonLayoutData());
-		btnSelectEncoding.setText(Messages.ImportDialog_22);
+		btnSelectEncoding.setText(RCPMessages.ImportDialog_22);
 
 		encodingCombo = new Combo(sectionClient, SWT.BORDER);
 		TableWrapData gdata = getTextGridData();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FontSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FontSection.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FontSection.java	(revision 513)
@@ -13,7 +13,7 @@
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 import org.txm.objects.BaseParameters;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 public class FontSection extends ImportEditorSection {
 	
@@ -25,7 +25,7 @@
 	public FontSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(Messages.CorpusPage_3);
+		this.section.setText(RCPMessages.CorpusPage_3);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -45,7 +45,7 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 
-		Label l = toolkit.createLabel(sectionClient, Messages.CorpusPage_57, SWT.WRAP);
+		Label l = toolkit.createLabel(sectionClient, RCPMessages.CorpusPage_57, SWT.WRAP);
 		l.setLayoutData(new TableWrapData(TableWrapData.LEFT, TableWrapData.MIDDLE));
 
 		fontCombo = new Combo(sectionClient, SWT.BORDER);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java	(revision 513)
@@ -61,7 +61,7 @@
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.objects.BaseParameters;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.ExecuteImportScript;
 import org.txm.rcp.editors.imports.sections.EditionSection;
 import org.txm.rcp.editors.imports.sections.EncodingSection;
@@ -131,7 +131,7 @@
 	 * @param corpusname 
 	 */
 	public CorpusPage(ImportFormEditor editor) {
-		super(editor, Messages.CorpusPage_30, Messages.CorpusPage_30); 
+		super(editor, RCPMessages.CorpusPage_30, RCPMessages.CorpusPage_30); 
 		this.editor = editor;
 	}
 	
@@ -225,7 +225,7 @@
 		gdata.colspan = 2;
 		separatorLabel.setLayoutData(gdata);
 
-		Label mandatoryLabel = toolkit.createLabel(form.getBody(), Messages.CorpusPage_40, SWT.WRAP);
+		Label mandatoryLabel = toolkit.createLabel(form.getBody(), RCPMessages.CorpusPage_40, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.FILL, TableWrapData.MIDDLE, 2,1);
 		gdata.colspan = 2;
 		mandatoryLabel.setLayoutData(gdata);
@@ -712,7 +712,7 @@
 
 		Label titleLabel = toolkit.createLabel(hyperlinks,"", SWT.WRAP); //$NON-NLS-1$
 		titleLabel.setLayoutData(new TableWrapData(TableWrapData.FILL, TableWrapData.TOP));
-		titleLabel.setText(NLS.bind(Messages.MainPage_2, 
+		titleLabel.setText(NLS.bind(RCPMessages.MainPage_2, 
 				ImportModuleCustomization.getName(editor.getGroovyScript().getName())));
 		FontData[] fD = titleLabel.getFont().getFontData();
 		fD[0].setHeight(16);
@@ -735,7 +735,7 @@
 						startImport();
 					}
 				} else 
-					System.out.println(Messages.CorpusPage_66);
+					System.out.println(RCPMessages.CorpusPage_66);
 			}
 		};
 
@@ -757,9 +757,9 @@
 		RowLayout hLayout = new RowLayout();
 		hLayout.center = true;
 		line1.setLayout(hLayout);
-		toolkit.createLabel(line1, Messages.CorpusPage_35, SWT.WRAP);
+		toolkit.createLabel(line1, RCPMessages.CorpusPage_35, SWT.WRAP);
 
-		Hyperlink hyperlink1 = toolkit.createHyperlink(line1, Messages.CorpusPage_37, SWT.WRAP);
+		Hyperlink hyperlink1 = toolkit.createHyperlink(line1, RCPMessages.CorpusPage_37, SWT.WRAP);
 		hyperlink1.addHyperlinkListener(selectDirHListener);
 
 		ImageHyperlink openImportLink2 = toolkit.createImageHyperlink(line1, SWT.WRAP);
@@ -773,8 +773,8 @@
 		hLayout = new RowLayout();
 		hLayout.center = true;
 		line2.setLayout(hLayout);
-		toolkit.createLabel(line2, Messages.CorpusPage_38, SWT.WRAP);
-		toolkit.createLabel(line2, Messages.CorpusPage_39, SWT.WRAP);
+		toolkit.createLabel(line2, RCPMessages.CorpusPage_38, SWT.WRAP);
+		toolkit.createLabel(line2, RCPMessages.CorpusPage_39, SWT.WRAP);
 
 		Composite line4 = toolkit.createComposite(form.getBody());
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL, 2, 1);
@@ -783,8 +783,8 @@
 		hLayout = new RowLayout();
 		hLayout.center = true;
 		line4.setLayout(hLayout);
-		toolkit.createLabel(line4, Messages.CorpusPage_42);
-		Hyperlink hyperlink3 = toolkit.createHyperlink(line4, Messages.CorpusPage_43, SWT.WRAP);
+		toolkit.createLabel(line4, RCPMessages.CorpusPage_42);
+		Hyperlink hyperlink3 = toolkit.createHyperlink(line4, RCPMessages.CorpusPage_43, SWT.WRAP);
 		hyperlink3.addHyperlinkListener(startImportListener);
 		ImageHyperlink startImportLink2 = toolkit.createImageHyperlink(line4, SWT.NULL);
 		startImportLink2.setImage(IImageKeys.getImage(IImageKeys.START));
@@ -811,15 +811,15 @@
 			String basename = srcDir.getName();
 			basename = AsciiUtils.buildId(basename).toUpperCase(); // force binary corpus name to uppercase
 			if (basename.length() == 0) {
-				System.out.println(Messages.CorpusPage_92+basename);
+				System.out.println(RCPMessages.CorpusPage_92+basename);
 				return;
 			}
 			
-			Log.warning(Messages.CorpusPage_46);
+			Log.warning(RCPMessages.CorpusPage_46);
 			BaseParameters.createEmptyParams(paramFile, basename);
 		}
 		if (!paramFile.exists()) {
-			System.out.println(Messages.CorpusPage_47);
+			System.out.println(RCPMessages.CorpusPage_47);
 			return;
 		}
 		params = new BaseParameters(paramFile);
@@ -829,14 +829,14 @@
 		// force root directory to the selected source directory, see the #1263 ticket
 		params.rootDir = srcDir.getAbsolutePath(); 
 		
-		System.out.println(Messages.CorpusPage_48 + paramFile);
+		System.out.println(RCPMessages.CorpusPage_48 + paramFile);
 		Log.info("Params: "+params); //$NON-NLS-1$
 
 		File metadataFile = new File(params.rootDir, "metadata.csv"); //$NON-NLS-1$
 		if (metadataFile.exists())
 			this.editor.getMetaPage().setMetadataFile(metadataFile);
 
-		Log.info(Messages.CorpusPage_50+moduleParams);
+		Log.info(RCPMessages.CorpusPage_50+moduleParams);
 		this.setPartName(params.getCorpusName());
 
 		if (infosSection != null && !infosSection.isDisposed()) {
@@ -906,7 +906,7 @@
 	 * @return
 	 */
 	public boolean saveConfig() {
-		System.out.println(Messages.CorpusPage_52);
+		System.out.println(RCPMessages.CorpusPage_52);
 		
 		params.rootDir = srcDir.getAbsolutePath();
 		params.scriptFile = editor.getGroovyScript().getName();
@@ -1019,12 +1019,12 @@
 			srcDir = new File(path);
 
 			if (!srcDir.isDirectory()) {
-				System.out.println(Messages.CorpusPage_90+srcDir);
+				System.out.println(RCPMessages.CorpusPage_90+srcDir);
 				return;
 			}
 
 			if (!(srcDir.canRead() && srcDir.canExecute())) {
-				System.out.println(Messages.CorpusPage_91+srcDir);
+				System.out.println(RCPMessages.CorpusPage_91+srcDir);
 				return;
 			}
 			
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/AbstractSVGGraphicable.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/AbstractSVGGraphicable.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/AbstractSVGGraphicable.java	(revision 513)
@@ -34,7 +34,7 @@
 import org.eclipse.core.runtime.Path;
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.SVGGraphicable;
 import org.txm.utils.logger.Log;
 
@@ -71,14 +71,14 @@
 				resultDir.mkdirs();
 				tmp = File.createTempFile("txm", ".svg", resultDir); //$NON-NLS-1$ //$NON-NLS-2$
 			} catch (IOException e) {
-				Log.severe(Messages.CANT_CREATE_GRAPHIC + e);
+				Log.severe(RCPMessages.CANT_CREATE_GRAPHIC + e);
 			}
 			// System.out.println(tmp.getAbsolutePath());
 			doSVGGraphic(tmp);
 			try {
 				this.path = Path.fromOSString(tmp.getCanonicalPath());
 			} catch (IOException e) {
-				Log.severe(Messages.CANT_CREATE_GRAPHIC + e);
+				Log.severe(RCPMessages.CANT_CREATE_GRAPHIC + e);
 			}
 		}
 		return this.path;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TxtEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TxtEditor.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TxtEditor.java	(revision 513)
@@ -43,7 +43,7 @@
 import org.eclipse.ui.editors.text.TextEditor;
 import org.eclipse.ui.ide.FileStoreEditorInput;
 import org.txm.core.results.TXMResult;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.utils.CharsetDetector;
 
@@ -113,7 +113,7 @@
 			if (encoding != null && encodingSupport != null) {
 				try {
 					encodingSupport.setEncoding(encoding);
-					System.out.println(Messages.TxtEditor_0+f+Messages.TxtEditor_1+encoding);
+					System.out.println(RCPMessages.TxtEditor_0+f+RCPMessages.TxtEditor_1+encoding);
 				} catch(Throwable e) { }
 
 			}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableSorter.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableSorter.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableSorter.java	(revision 513)
@@ -32,7 +32,7 @@
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * copied from
@@ -95,7 +95,7 @@
 			direction = DESCENDING;
 		}
 		if (columnTypes != null && column >= columnTypes.length) {
-			throw new IllegalArgumentException(Messages.TableSorter_0);
+			throw new IllegalArgumentException(RCPMessages.TableSorter_0);
 		}
 	}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMMultiPageEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMMultiPageEditor.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMMultiPageEditor.java	(revision 513)
@@ -36,7 +36,7 @@
 import org.eclipse.ui.part.EditorPart;
 import org.eclipse.ui.part.MultiPageEditorPart;
 import org.txm.core.results.TXMResult;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.input.IProvidingMultiPageEditorInput;
 
 /**
@@ -80,7 +80,7 @@
 		IEditorInput input = getEditorInput();
 		if (!(input instanceof IProvidingMultiPageEditorInput)) {
 			throw new IllegalArgumentException(NLS.bind(
-					Messages.GenericMultiPageEditor_1, input.getName()));
+					RCPMessages.GenericMultiPageEditor_1, input.getName()));
 		}
 
 		editors = ((IProvidingMultiPageEditorInput) input).getEditors();
@@ -89,7 +89,7 @@
 
 		if (editors.size() != inputs.size()) {
 			throw new IllegalArgumentException(NLS.bind(
-					Messages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
+					RCPMessages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
 		}
 
 		for (int i = 0; i < editors.size(); i++) {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/provider/ElementTreeLabelProvider.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/provider/ElementTreeLabelProvider.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/provider/ElementTreeLabelProvider.java	(revision 513)
@@ -3,7 +3,7 @@
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.graphics.Image;
 import org.w3c.dom.Element;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 public class ElementTreeLabelProvider extends ColumnLabelProvider {
 	
@@ -31,11 +31,11 @@
 			} else if (elem.getNodeName().equals(childName)) {
 				return show(elem, index, childAttrs);
 			} else {
-				return Messages.ElementTreeLabelProvider_0;
+				return RCPMessages.ElementTreeLabelProvider_0;
 			}
 			
 		}
-		return Messages.ElementTreeLabelProvider_1;
+		return RCPMessages.ElementTreeLabelProvider_1;
 	}
 
 	private String show(Element elem, int index, String[] attrs) {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/PropertySelector.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/PropertySelector.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/PropertySelector.java	(revision 513)
@@ -40,7 +40,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
@@ -79,8 +79,8 @@
 		super(parentShell);
 		try {
 			this.properties = new ArrayList<Property>(corpus.getOrderedProperties());
-			this.title = Messages.PropertySelector_0;
-			this.mess = Messages.PropertySelector_0;
+			this.title = RCPMessages.PropertySelector_0;
+			this.mess = RCPMessages.PropertySelector_0;
 		} catch (CqiClientException e) {
 			// TODO Auto-generated catch block
 			org.txm.rcp.utils.Logger.printStackTrace(e);
@@ -115,7 +115,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(Messages.PropertySelector_0);
+		newShell.setText(RCPMessages.PropertySelector_0);
 		if (title != null)
 			newShell.setText(title);
 	}
@@ -137,7 +137,7 @@
 			anaPropLabel.setText(mess);
 		else
 			anaPropLabel
-					.setText(Messages.Property);
+					.setText(RCPMessages.Property);
 		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 				false, false));
 
@@ -165,8 +165,8 @@
 		int propIndex = anaPropCombo.getSelectionIndex();
 		if (propIndex == -1) {
 			MessageDialog.openError(getShell(),
-					Messages.Invalid_analysis_property,
-					Messages.Structure_field_not_empty);
+					RCPMessages.Invalid_analysis_property,
+					RCPMessages.Structure_field_not_empty);
 			return;
 		}
 		property = properties.get(propIndex);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ViewPropertySelectionDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ViewPropertySelectionDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ViewPropertySelectionDialog.java	(revision 513)
@@ -42,7 +42,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
 
@@ -135,7 +135,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(Messages.ViewPropertySelectionDialog_0);
+		newShell.setText(RCPMessages.ViewPropertySelectionDialog_0);
 		newShell.setMinimumSize(300, 200);
 	}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueTreeDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueTreeDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueTreeDialog.java	(revision 513)
@@ -45,7 +45,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -136,7 +136,7 @@
 		//		});
 
 		Button addButton = new Button(p, SWT.PUSH);
-		addButton.setText(Messages.MultipleValueTreeDialog_0+itemSubName);
+		addButton.setText(RCPMessages.MultipleValueTreeDialog_0+itemSubName);
 		addButton.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ObjectSelectionDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ObjectSelectionDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ObjectSelectionDialog.java	(revision 513)
@@ -46,7 +46,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -104,7 +104,7 @@
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		newShell
-				.setText(Messages.ObjectSelectionDialog_0);
+				.setText(RCPMessages.ObjectSelectionDialog_0);
 		newShell.setMinimumSize(300, 260);
 
 	}
@@ -341,9 +341,9 @@
 					availablesView.select(i);
 					count++;
 				}
-			System.out.println(NLS.bind(Messages.ObjectSelectionDialog_3, count));
+			System.out.println(NLS.bind(RCPMessages.ObjectSelectionDialog_3, count));
 		} catch (Exception ex) {
-			System.out.println(NLS.bind(Messages.ObjectSelectionDialog_5, ex.getMessage()));
+			System.out.println(NLS.bind(RCPMessages.ObjectSelectionDialog_5, ex.getMessage()));
 		}
 	}
 
@@ -363,9 +363,9 @@
 					selectedsView.select(i);
 					count++;
 				}
-			System.out.println(NLS.bind(Messages.ObjectSelectionDialog_3, count));
+			System.out.println(NLS.bind(RCPMessages.ObjectSelectionDialog_3, count));
 		} catch (Exception ex) {
-			System.out.println(NLS.bind(Messages.ObjectSelectionDialog_5, ex.getMessage()));
+			System.out.println(NLS.bind(RCPMessages.ObjectSelectionDialog_5, ex.getMessage()));
 		}
 	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java	(revision 513)
@@ -54,7 +54,7 @@
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnit;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * build a query with the help of simple questions @ author mdecorde.
@@ -126,7 +126,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(Messages.QueryAssistDialog_0);
+		newShell.setText(RCPMessages.QueryAssistDialog_0);
 		newShell.setMinimumSize(300, 300);
 	}
 
@@ -149,7 +149,7 @@
 			chercheLabel = new Label(mainPanel, SWT.NONE);
 			chercheLabel.setAlignment(SWT.CENTER);
 			chercheLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.FILL, true, false));
-			chercheLabel.setText(Messages.QueryAssistDialog_2);
+			chercheLabel.setText(RCPMessages.QueryAssistDialog_2);
 			
 			scrollComposite = new ScrolledComposite(mainPanel, SWT.V_SCROLL);
 			scrollComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
@@ -197,7 +197,7 @@
 			
 			Button addwordButton = new Button(mainPanel, SWT.PUSH);
 			addwordButton.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
-			addwordButton.setText(Messages.QueryAssistDialog_1);
+			addwordButton.setText(RCPMessages.QueryAssistDialog_1);
 			addwordButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -311,7 +311,7 @@
 			this.setLayout(new GridLayout(5, false));
 
 			Label titleL = new Label(this, SWT.NONE);
-			titleL.setText(NLS.bind(Messages.QueryAssistDialog_8, no));
+			titleL.setText(NLS.bind(RCPMessages.QueryAssistDialog_8, no));
 			GridData datalayout = new GridData(GridData.FILL, GridData.CENTER,
 					true, false);
 			titleL.setLayoutData(datalayout);
@@ -324,10 +324,10 @@
 			}
 
 			testCombo = new Combo(this, SWT.READ_ONLY | SWT.SINGLE);
-			testCombo.add(Messages.QueryAssistDialog_10);
-			testCombo.add(Messages.QueryAssistDialog_11);
-			testCombo.add(Messages.QueryAssistDialog_12);
-			testCombo.add(Messages.QueryAssistDialog_13);
+			testCombo.add(RCPMessages.QueryAssistDialog_10);
+			testCombo.add(RCPMessages.QueryAssistDialog_11);
+			testCombo.add(RCPMessages.QueryAssistDialog_12);
+			testCombo.add(RCPMessages.QueryAssistDialog_13);
 			testCombo.select(0);
 
 			valueT = new Text(this, SWT.SINGLE | SWT.BORDER);
@@ -408,9 +408,9 @@
 			this.setLayout(new RowLayout());
 
 			linkCombo = new Combo(this, SWT.READ_ONLY | SWT.SINGLE);
-			linkCombo.add(Messages.QueryAssistDialog_32);
-			linkCombo.add(Messages.QueryAssistDialog_33);
-			linkCombo.add(Messages.QueryAssistDialog_34);
+			linkCombo.add(RCPMessages.QueryAssistDialog_32);
+			linkCombo.add(RCPMessages.QueryAssistDialog_33);
+			linkCombo.add(RCPMessages.QueryAssistDialog_34);
 
 			linkCombo.select(0);
 		}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/EmpantWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/EmpantWidget.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/EmpantWidget.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Spinner;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.StructuralUnit;
@@ -108,10 +108,10 @@
 		
 		
 		Label l = new Label(line1, SWT.NONE);
-		l.setText(Messages.EmpantWidget_0);
+		l.setText(RCPMessages.EmpantWidget_0);
 
 		wordType = new Button(line1, SWT.RADIO);
-		wordType.setText(Messages.EmpantWidget_1);
+		wordType.setText(RCPMessages.EmpantWidget_1);
 		wordType.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -126,7 +126,7 @@
 		wordType.setSelection(true);
 
 		structType = new Button(line1, SWT.RADIO);
-		structType.setText(Messages.EmpantWidget_2);
+		structType.setText(RCPMessages.EmpantWidget_2);
 		structType.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -146,7 +146,7 @@
 
 		checkLeft = new Button(line1, SWT.CHECK);
 		checkLeft.setSelection(true);
-		checkLeft.setText(Messages.EmpantWidget_8);
+		checkLeft.setText(RCPMessages.EmpantWidget_8);
 		checkLeft.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -161,7 +161,7 @@
 		
 		checkRight = new Button(line1, SWT.CHECK);
 		checkRight.setSelection(true);
-		checkRight.setText(Messages.EmpantWidget_9);
+		checkRight.setText(RCPMessages.EmpantWidget_9);
 		checkRight.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -175,12 +175,12 @@
 		});
 		
 		checkXword = new Button(line1, SWT.CHECK);
-		checkXword.setText(Messages.EmpantWidget_7);
+		checkXword.setText(RCPMessages.EmpantWidget_7);
 
 		
 		// LINE 2
 		l = new Label(line2, SWT.NONE);
-		l.setText(Messages.EmpantWidget_3);
+		l.setText(RCPMessages.EmpantWidget_3);
 
 		// | [ ] [ ] [ |v] [ ] [ ] |
 		maxLeft = new Spinner(line2, SWT.BORDER);
@@ -200,7 +200,7 @@
 		});
 
 		l = new Label(line2, SWT.NONE);
-		l.setText(Messages.EmpantWidget_4);
+		l.setText(RCPMessages.EmpantWidget_4);
 
 		minLeft = new Spinner(line2, SWT.BORDER);
 		minLeft.setMinimum(0);
@@ -219,7 +219,7 @@
 		});
 				
 		l = new Label(line2, SWT.NONE);
-		l.setText(Messages.EmpantWidget_5);
+		l.setText(RCPMessages.EmpantWidget_5);
 
 		// [>]
 		minRight = new Spinner(line2, SWT.BORDER);
@@ -239,7 +239,7 @@
 		});
 
 		l = new Label(line2, SWT.NONE);
-		l.setText(Messages.EmpantWidget_6);
+		l.setText(RCPMessages.EmpantWidget_6);
 
 		// [>|]
 		maxRight = new Spinner(line2, SWT.BORDER);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java	(revision 513)
@@ -47,7 +47,7 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.utils.Logger;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
@@ -132,20 +132,20 @@
 		}
 
 		Group andorGroup = new Group(this, SWT.SHADOW_ETCHED_IN);
-		andorGroup.setText(Messages.ComplexSubcorpusPanel_0);
+		andorGroup.setText(RCPMessages.ComplexSubcorpusPanel_0);
 		andorGroup.setLayout(new GridLayout(2, false));
 		andorGroup.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
 
 		andBtn = new Button(andorGroup, SWT.RADIO);
-		andBtn.setText(Messages.ComplexSubcorpusPanel_1);
+		andBtn.setText(RCPMessages.ComplexSubcorpusPanel_1);
 		andBtn.setSelection(true);
 
 		Button orBtn = new Button(andorGroup, SWT.RADIO);
-		orBtn.setText(Messages.ComplexSubcorpusPanel_2);
+		orBtn.setText(RCPMessages.ComplexSubcorpusPanel_2);
 		
 		//structure choice
 		Label l = new Label(this, SWT.None);
-		l.setText(Messages.ParaBrowserEditor_5);
+		l.setText(RCPMessages.ParaBrowserEditor_5);
 		structCombo = new Combo(this, SWT.READ_ONLY);
 		structCombo.addSelectionListener(new SelectionListener() {
 			@Override
@@ -178,11 +178,11 @@
 		// Add/Rmv contrainte
 		// affichage requete
 		l = new Label(this, SWT.NONE);
-		l.setText(Messages.ComplexSubcorpusPanel_4);
+		l.setText(RCPMessages.ComplexSubcorpusPanel_4);
 		queryField = new Text(this, SWT.BORDER);
 		queryField.setLayoutData(new GridData(GridData.FILL,GridData.FILL,true, false));
 		Button refreshBtn = new Button(this, SWT.PUSH);
-		refreshBtn.setText(Messages.ComplexSubcorpusPanel_5);
+		refreshBtn.setText(RCPMessages.ComplexSubcorpusPanel_5);
 		refreshBtn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -379,8 +379,8 @@
 			testCombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 			testCombo.add("is"); //$NON-NLS-1$
 			testCombo.add("is not"); //$NON-NLS-1$
-			testCombo.add(Messages.QueryAssistDialog_13);
-			testCombo.add(Messages.ComplexSubcorpusPanel_16);
+			testCombo.add(RCPMessages.QueryAssistDialog_13);
+			testCombo.add(RCPMessages.ComplexSubcorpusPanel_16);
 			testCombo.select(0);
 
 			valueCombo = new ListViewer(this, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER | SWT.VIRTUAL);
@@ -414,7 +414,7 @@
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					if (queryItems.size() > 1) {
-						System.out.println(Messages.ObjectExplorer_9);
+						System.out.println(RCPMessages.ObjectExplorer_9);
 						QueryItem.this.dispose();
 						queryItems.remove(QueryItem.this);
 						ComplexSubcorpusPanel.this.layout();
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java	(revision 513)
@@ -39,7 +39,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.ViewPropertySelectionDialog;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
@@ -87,7 +87,7 @@
 
 		// = properties
 		propLabel = new Label(this, SWT.NONE);
-		propLabel.setText(Messages.PropertiesSelector_1);
+		propLabel.setText(RCPMessages.PropertiesSelector_1);
 		propLabel
 				.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true));
 
@@ -99,7 +99,7 @@
 		openeditdialog = new Button(this, SWT.PUSH);
 		openeditdialog.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false,
 				true));
-		openeditdialog.setText(Messages.PropertiesSelector_2);
+		openeditdialog.setText(RCPMessages.PropertiesSelector_2);
 
 		openeditdialog.addSelectionListener(new SelectionListener() {
 			@Override
@@ -207,7 +207,7 @@
 				}
 			}
 		} catch (CqiClientException e) {
-			Log.severe(NLS.bind(Messages.PropertiesSelector_0, e.getMessage()));
+			Log.severe(NLS.bind(RCPMessages.PropertiesSelector_0, e.getMessage()));
 		}
 	}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NavigationWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NavigationWidget.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NavigationWidget.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -79,13 +79,13 @@
 
 		// [|<]
 		first = new Button(this, SWT.PUSH);
-		first.setText(Messages.ConcordancesEditor_11);
+		first.setText("|<"); //$NON-NLS-1$
 		first.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 		first.setEnabled(false);
 
 		// [<]
 		prev = new Button(this, SWT.PUSH);
-		prev.setText(Messages.ConcordancesEditor_12);
+		prev.setText("<"); //$NON-NLS-1$
 		prev.setEnabled(false);
 
 		// [current]
@@ -105,12 +105,12 @@
 
 		// [>]
 		next = new Button(this, SWT.PUSH);
-		next.setText(Messages.ConcordancesEditor_13);
+		next.setText(">"); //$NON-NLS-1$
 		next.setEnabled(false);
 
 		// [>|]
 		last = new Button(this, SWT.PUSH);
-		last.setText(Messages.ConcordancesEditor_14);
+		last.setText(">|"); //$NON-NLS-1$
 		last.setEnabled(false);
 	}
 
@@ -210,7 +210,7 @@
 		try {
 			ret = Integer.parseInt(currentPosition.getText());
 		} catch(Exception e) {
-			System.out.println(Messages.NavigationWidget_0+e);
+			System.out.println(RCPMessages.NavigationWidget_0+e);
 		}
 		return ret;
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ObjectSelector.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ObjectSelector.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ObjectSelector.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.ObjectSelectionDialog;
 // TODO: Auto-generated Javadoc
 /**
@@ -80,7 +80,7 @@
 		this.setLayout(new GridLayout(3, false));
 
 		propLabel = new Label(this, SWT.NONE);
-		propLabel.setText(Messages.ObjectSelector_0);
+		propLabel.setText(RCPMessages.ObjectSelector_0);
 		propLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true));
 
 		// word_pos
@@ -91,7 +91,7 @@
 		openeditdialog = new Button(this, SWT.PUSH);
 		openeditdialog.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false,
 				true));
-		openeditdialog.setText(Messages.ObjectSelector_1);
+		openeditdialog.setText(RCPMessages.ObjectSelector_1);
 
 		openeditdialog.addSelectionListener(new SelectionListener() {
 			@Override
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedQueryWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedQueryWidget.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedQueryWidget.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.QueryAssistDialog;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.query.Query;
@@ -71,7 +71,7 @@
 		magicstick.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 				false, true));
 		magicstick.setImage(IImageKeys.getImage(IImageKeys.ACTION_ASSISTQUERY));
-		magicstick.setToolTipText(Messages.AssistedQueryWidget_0);
+		magicstick.setToolTipText(RCPMessages.AssistedQueryWidget_0);
 		magicstick.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java	(revision 513)
@@ -40,7 +40,7 @@
 import org.eclipse.swt.widgets.Text;
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.QueryAssistDialog;
 import org.txm.searchengine.cqp.corpus.Corpus;
 
@@ -84,7 +84,7 @@
 		magicstick = new Button(this, SWT.PUSH);
 		magicstick.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, true));
 		magicstick.setImage(IImageKeys.getImage(IImageKeys.ACTION_ASSISTQUERY));
-		magicstick.setToolTipText(Messages.AssistedQueryWidget_0);
+		magicstick.setToolTipText(RCPMessages.AssistedQueryWidget_0);
 		magicstick.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/SimpleSubcorpusPanel.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/SimpleSubcorpusPanel.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/SimpleSubcorpusPanel.java	(revision 513)
@@ -17,7 +17,7 @@
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.actions.CreateSubcorpusDialog;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
@@ -50,14 +50,14 @@
 		this.setLayout(layout);
 
 		Label structureLabel = new Label(this, SWT.NONE);
-		structureLabel.setText(Messages.CreatePartitionDialog_2);
+		structureLabel.setText(RCPMessages.CreatePartitionDialog_2);
 		structureLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
 
 		structuralUnitsCombo = new Combo(this, SWT.READ_ONLY);
 		structuralUnitsCombo.setLayoutData(new GridData(GridData.FILL,GridData.FILL, true, false));
 
 		Label propertyLabel = new Label(this, SWT.NONE);
-		propertyLabel.setText(Messages.CreatePartitionDialog_4);
+		propertyLabel.setText(RCPMessages.CreatePartitionDialog_4);
 		propertyLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 				false, false));
 
@@ -65,7 +65,7 @@
 		propertyCombo.setLayoutData(new GridData(GridData.FILL,GridData.FILL, true, false));
 
 		Label valuesLabel = new Label(this, SWT.NONE);
-		valuesLabel.setText(Messages.CreateSubcorpusDialog_6);
+		valuesLabel.setText(RCPMessages.CreateSubcorpusDialog_6);
 		valuesLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
 
 		valueCombo = new ListViewer(this, SWT.MULTI |SWT.V_SCROLL | SWT.BORDER | SWT.VIRTUAL);
@@ -89,7 +89,7 @@
 		try {
 			structuralUnits = corpus.getOrderedStructuralUnits();
 		} catch (Exception e) {
-			Log.severe(Messages.ObjectExplorer_9
+			Log.severe(RCPMessages.ObjectExplorer_9
 					+ Log.toString(e));
 			return;
 		}
@@ -130,7 +130,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent event) {
-				System.out.println(Messages.SimpleSubcorpusPanel_0);
+				System.out.println(RCPMessages.SimpleSubcorpusPanel_0);
 				reloadProperties();
 			}
 		});
@@ -199,7 +199,7 @@
 			values = selectedStructuralUnitProperty.getOrderedValues(corpus);
 			Collections.sort(values);
 		} catch (CqiClientException e) {
-			Log.severe(Messages.ObjectExplorer_9
+			Log.severe(RCPMessages.ObjectExplorer_9
 					+ Log.toString(e));
 			return;
 		}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java	(revision 513)
@@ -48,7 +48,7 @@
 import org.eclipse.swt.widgets.Text;
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Partition;
@@ -131,7 +131,7 @@
 		layout.center = true;
 		firstArea.setLayout(layout);
 		Label structLabel = new Label(firstArea, SWT.NONE);
-		structLabel.setText(Messages.PartitionComposer_0);
+		structLabel.setText(RCPMessages.PartitionComposer_0);
 		structCombo = new Combo(firstArea, SWT.READ_ONLY | SWT.SINGLE);
 		try {
 			List<StructuralUnit> sus = corpus.getOrderedStructuralUnits();
@@ -191,7 +191,7 @@
 		GridLayout layout2 = new GridLayout(2, false);
 		dispoArea.setLayout(layout2);
 		Label dispoLabel = new Label(dispoArea, SWT.NONE);
-		dispoLabel.setText(Messages.PartitionComposer_2);
+		dispoLabel.setText(RCPMessages.PartitionComposer_2);
 		dispoLabel.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 				false, false));
 		availableList = new org.eclipse.swt.widgets.List(dispoArea, SWT.MULTI
@@ -204,7 +204,7 @@
 		// btn
 		btnArea.setLayout(new RowLayout());
 		Button addPart = new Button(btnArea, SWT.PUSH);
-		addPart.setText(Messages.PartitionComposer_3);
+		addPart.setText(RCPMessages.PartitionComposer_3);
 		addPart.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -213,7 +213,7 @@
 				GridData gdata = new GridData(GridData.FILL, GridData.FILL, true, true);
 				gdata.minimumHeight = 200;
 				p.setLayoutData(gdata);
-				p.setTitle(Messages.PartitionComposer_5 + (parts.size() + 1));
+				p.setTitle(RCPMessages.PartitionComposer_5 + (parts.size() + 1));
 				parts.add(p);
 				partArea.layout(true);
 				updateDisplay();
@@ -225,7 +225,7 @@
 			}
 		});
 		Button rmvPart = new Button(btnArea, SWT.PUSH);
-		rmvPart.setText(Messages.PartitionComposer_6);
+		rmvPart.setText(RCPMessages.PartitionComposer_6);
 		rmvPart.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -250,7 +250,7 @@
 		GridData gdata = new GridData(GridData.FILL, GridData.FILL, true, true);
 		gdata.minimumHeight = 200;
 		p.setLayoutData(gdata);
-		p.setTitle(Messages.PartitionComposer_5 + (parts.size() + 1));
+		p.setTitle(RCPMessages.PartitionComposer_5 + (parts.size() + 1));
 		parts.add(p);
 
 	}
@@ -443,7 +443,7 @@
 			Label titleLabel = new Label(this, SWT.NONE);
 			titleLabel.setLayoutData(new GridData(GridData.FILL,
 					GridData.CENTER, false, false, 1, 1));
-			titleLabel.setText(Messages.PartitionComposer_8);
+			titleLabel.setText(RCPMessages.PartitionComposer_8);
 			Font f = titleLabel.getFont();
 			FontData defaultFont = f.getFontData()[0];
 			defaultFont.setStyle(SWT.BOLD);
@@ -479,7 +479,7 @@
 			Button add = new Button(this, SWT.PUSH);
 			add.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 					false, 2, 1));
-			add.setText(Messages.PartitionComposer_9);
+			add.setText(RCPMessages.PartitionComposer_9);
 			add.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -502,7 +502,7 @@
 			Button rmv = new Button(this, SWT.PUSH);
 			rmv.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 					false, 2, 1));
-			rmv.setText(Messages.PartitionComposer_11);
+			rmv.setText(RCPMessages.PartitionComposer_11);
 			rmv.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -583,7 +583,7 @@
 	 */
 	public Partition getPartition() {
 		if (this.parts.size() == 0) {
-			System.out.println(Messages.PartitionComposer_1);
+			System.out.println(RCPMessages.PartitionComposer_1);
 			return null;
 		}
 		
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java	(revision 513)
@@ -31,7 +31,7 @@
 import org.kohsuke.args4j.spi.OptionHandler;
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.utils.logger.Log;
 
@@ -148,7 +148,7 @@
 			} else if ("Boolean".equals(widgetName)) { //$NON-NLS-1$
 				value = Boolean.parseBoolean(stringValue);
 			} else {
-				System.out.println(Messages.ParametersDialog_10+widgetName+Messages.FileTreeContentProvider_4);
+				System.out.println(RCPMessages.ParametersDialog_10+widgetName+RCPMessages.FileTreeContentProvider_4);
 			}
 		}
 	}
@@ -162,7 +162,7 @@
 		super.configureShell(newShell);
 		int idx2 = script.lastIndexOf("Macro");
 		if (idx2 < 0) idx2 = script.length();
-		title = Messages.bind(Messages.ParametersDialog_0,script.substring(script.lastIndexOf(".")+1, idx2));
+		title = RCPMessages.bind(RCPMessages.ParametersDialog_0,script.substring(script.lastIndexOf(".")+1, idx2));
 		newShell.setText(title);
 	}
 
@@ -184,7 +184,7 @@
 		if (numberOfParameters == 0) button.setEnabled(false);
 
 		super.createButtonsForButtonBar(parent);
-		this.getButton(IDialogConstants.OK_ID).setText(Messages.ParametersDialog_1);
+		this.getButton(IDialogConstants.OK_ID).setText(RCPMessages.ParametersDialog_1);
 	}
 
 	protected Control createButtonBar(Composite parent) {
@@ -259,7 +259,7 @@
 			} else if ("Boolean".equals(widgetName)) { //$NON-NLS-1$
 				widget = new BooleanField(composite, SWT.NONE, option);
 			} else {
-				System.out.println(Messages.ParametersDialog_10+widgetName+Messages.FileTreeContentProvider_4);
+				System.out.println(RCPMessages.ParametersDialog_10+widgetName+RCPMessages.FileTreeContentProvider_4);
 			}
 
 			if (widget != null) {
@@ -273,7 +273,7 @@
 			}
 			//			}
 		}
-		new Label(composite, SWT.NONE).setText(Messages.ParametersDialog_11);
+		new Label(composite, SWT.NONE).setText(RCPMessages.ParametersDialog_11);
 
 		return composite;
 	}
@@ -291,7 +291,7 @@
 			Object value = w.getWidgetValue();
 
 			if (w.isWidgetMandatory() && value == null) {
-				System.out.println(Messages.ParametersDialog_12+field);
+				System.out.println(RCPMessages.ParametersDialog_12+field);
 				error = true;
 			} else if (value != null) {
 				values.put(field, value);
@@ -354,7 +354,7 @@
 				field.setAccessible(true);
 				field.set(bean, value);
 			}  catch (Exception e) {
-				System.out.println(Messages.ParametersDialog_14+e.getMessage());
+				System.out.println(RCPMessages.ParametersDialog_14+e.getMessage());
 				Log.printStackTrace(e);
 				error = true;
 			}
@@ -423,7 +423,7 @@
 							c.getDeclaredField(option.name());
 						}
 					}  catch (NoSuchFieldException e) {
-						System.out.println(Messages.ParametersDialog_14+e.getMessage());
+						System.out.println(RCPMessages.ParametersDialog_14+e.getMessage());
 						okNames = false;
 					}
 				}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/UIParameterException.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/UIParameterException.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/UIParameterException.java	(revision 513)
@@ -1,6 +1,6 @@
 package org.txm.rcp.swt.widget.parameters;
 
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 public class UIParameterException extends IllegalArgumentException {
 	/**
@@ -14,7 +14,7 @@
 	private boolean error;
 
 	public UIParameterException(boolean error) {
-		super(Messages.UIParameterException_0+true);
+		super(RCPMessages.UIParameterException_0+true);
 		this.error = error;
 	}
 	
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/FloatField.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/FloatField.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/FloatField.java	(revision 513)
@@ -5,7 +5,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 import org.kohsuke.args4j.NamedOptionDef;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 public class FloatField extends LabelField {
 	Text dt;
@@ -21,7 +21,7 @@
 		try {
 			return Float.parseFloat(dt.getText());
 		} catch (Exception e) { 
-			System.out.println(Messages.ApplicationWorkbenchAdvisor_29+e.getMessage());
+			System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_29+e.getMessage());
 		}
 		return null;
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java	(revision 513)
@@ -32,18 +32,18 @@
 	private static String setMessage() {
 		t = time;
 		if (t < 1000) {
-			message = ""+((int)t)+Messages.JobsTimer_2; //$NON-NLS-1$
+			message = ""+((int)t)+RCPMessages.JobsTimer_2; //$NON-NLS-1$
 		} else {
 			t = t/1000;
 			if (t < 3) {
 				message = ""+t; //$NON-NLS-1$
-				message = ""+(message.substring(0, 3))+Messages.JobsTimer_5; //$NON-NLS-1$
+				message = ""+(message.substring(0, 3))+RCPMessages.JobsTimer_5; //$NON-NLS-1$
 			} else if (t < 60) 
-				message = ""+((int)t)+Messages.JobsTimer_5; //$NON-NLS-1$
+				message = ""+((int)t)+RCPMessages.JobsTimer_5; //$NON-NLS-1$
 			else if (t < 3600) {
-				message = ""+((int)t/60)+Messages.JobsTimer_9+((int)t%60)+Messages.JobsTimer_5; //$NON-NLS-1$
+				message = ""+((int)t/60)+RCPMessages.JobsTimer_9+((int)t%60)+RCPMessages.JobsTimer_5; //$NON-NLS-1$
 			} else { 
-				message = ""+((int)t/3600)+Messages.JobsTimer_12+((int)(t%3600)/60)+Messages.JobsTimer_13+((int)(t%3600)%60)+ Messages.JobsTimer_5; //$NON-NLS-1$
+				message = ""+((int)t/3600)+RCPMessages.JobsTimer_12+((int)(t%3600)/60)+RCPMessages.JobsTimer_13+((int)(t%3600)%60)+ RCPMessages.JobsTimer_5; //$NON-NLS-1$
 			}
 		}
 		return message;
@@ -55,8 +55,8 @@
 	
 	public static void stopAndPrint() {
 		if (TXMPreferences.getBoolean(TBXPreferences.SHOW_TIMINGS, TBXPreferences.PREFERENCES_NODE)) {
-			if (time <= 1000) System.out.println(NLS.bind(Messages.JobsTimer_15, stop(),(int)time));
-			else System.out.println(NLS.bind(Messages.JobsTimer_19, stop()));
+			if (time <= 1000) System.out.println(NLS.bind(RCPMessages.JobsTimer_15, stop(),(int)time));
+			else System.out.println(NLS.bind(RCPMessages.JobsTimer_19, stop()));
 		}
 	}
 
@@ -65,7 +65,7 @@
 		Thread.sleep(1000);
 		JobsTimer.start();
 		Thread.sleep(1000);
-		System.out.println(Messages.JobsTimer_20+JobsTimer.stop());
-		System.out.println(Messages.JobsTimer_21+ExecTimer.stop());
+		System.out.println(RCPMessages.JobsTimer_20+JobsTimer.stop());
+		System.out.println(RCPMessages.JobsTimer_21+ExecTimer.stop());
 	}
 }
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 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 513)
@@ -192,7 +192,7 @@
 		try {			
 			// create the Toolbox initialization job
 			JobHandler jobhandler = new JobHandler(
-					Messages.ApplicationWorkbenchAdvisor_1, true) {
+					RCPMessages.ApplicationWorkbenchAdvisor_1, true) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					JobsTimer.start();
@@ -209,11 +209,11 @@
 									//Display.getCurrent() works because this code is run during the splash screen
 									String[] dialogButtonLabels = {"OK", "Cancel"};
 									CGUMessageDialog dialog = new CGUMessageDialog(Display.getCurrent().getActiveShell(), 
-											Messages.CGU_TITLE, 
+											RCPMessages.CGU_TITLE, 
 											IImageKeys.getImage(IImageKeys.TXM_ICON), 
-											Messages.CGU_MESSAGE, 
+											RCPMessages.CGU_MESSAGE, 
 											IImageKeys.getImage(IImageKeys.TXM), 
-											Messages.CGU_CHECKMESSAGE, 
+											RCPMessages.CGU_CHECKMESSAGE, 
 											dialogButtonLabels, 0) {
 									};
 									boolean ret = (dialog.open() == MessageDialog.OK) && dialog.hasCheckBeenPressed();
@@ -241,28 +241,28 @@
 						//fixUpdateProfile();
 
 						// SET PREFERENCES IF THIS IS THE FIRST RUN
-						monitor.setTaskName(Messages.ApplicationWorkbenchAdvisor_2);
-						Log.warning(Messages.ApplicationWorkbenchAdvisor_72);
+						monitor.setTaskName(RCPMessages.ApplicationWorkbenchAdvisor_2);
+						Log.warning(RCPMessages.ApplicationWorkbenchAdvisor_72);
 						if (!loadInstallPreferences(this)) {
 							monitor.done();
-							System.err.println(Messages.ApplicationWorkbenchAdvisor_init_failed);
+							System.err.println(RCPMessages.ApplicationWorkbenchAdvisor_init_failed);
 							return Status.CANCEL_STATUS;
 						}
 						monitor.worked(10);
 
 						// CHECK IF THIS IS THE FIRST RUN
-						monitor.setTaskName(Messages.ApplicationWorkbenchAdvisor_3);
-						Log.warning(Messages.ApplicationWorkbenchAdvisor_73);
+						monitor.setTaskName(RCPMessages.ApplicationWorkbenchAdvisor_3);
+						Log.warning(RCPMessages.ApplicationWorkbenchAdvisor_73);
 						if (!checkTXMHOME(this, monitor)) {
 							monitor.done();
-							System.err.println(Messages.ApplicationWorkbenchAdvisor_init_failed);
+							System.err.println(RCPMessages.ApplicationWorkbenchAdvisor_init_failed);
 							return Status.CANCEL_STATUS;
 						}
 						monitor.worked(30);
 
 						//INITIALIZE TBX AND UI
-						monitor.setTaskName(Messages.ApplicationWorkbenchAdvisor_0);
-						Log.warning(Messages.ApplicationWorkbenchAdvisor_74);
+						monitor.setTaskName(RCPMessages.ApplicationWorkbenchAdvisor_0);
+						Log.warning(RCPMessages.ApplicationWorkbenchAdvisor_74);
 						if (!initializeUI(this)) {
 							monitor.done();
 							return Status.CANCEL_STATUS;
@@ -275,18 +275,18 @@
 
 						monitor.done();
 					} catch (Exception e) {
-						System.out.println(Messages.ApplicationWorkbenchAdvisor_75+e);
+						System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_75+e);
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 					} catch(ThreadDeath td) {
 						System.out.println("TXM initialization has been canceled by user. Please restart TXM.");
 					}
 					
 					if (Toolbox.isInitialized()) {
-						StatusLine.setMessage(Messages.ApplicationWorkbenchAdvisor_ready);
-						System.out.println(Messages.ApplicationWorkbenchAdvisor_ready);
+						StatusLine.setMessage(RCPMessages.ApplicationWorkbenchAdvisor_ready);
+						System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_ready);
 					} else {
-						StatusLine.setMessage(Messages.ApplicationWorkbenchAdvisor_init_failed);
-						System.out.println(Messages.ApplicationWorkbenchAdvisor_init_failed);
+						StatusLine.setMessage(RCPMessages.ApplicationWorkbenchAdvisor_init_failed);
+						System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_init_failed);
 					}
 					
 					JobsTimer.stopAndPrint();
@@ -299,8 +299,8 @@
 			startUpdateLookUpJob();
 
 		} catch (Exception e) {
-			Log.severe(Messages.ApplicationWorkbenchAdvisor_init_failed+" "+e.getMessage());
-			System.out.println(Messages.ApplicationWorkbenchAdvisor_init_failed+" "+e.getMessage());
+			Log.severe(RCPMessages.ApplicationWorkbenchAdvisor_init_failed+" "+e.getMessage());
+			System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_init_failed+" "+e.getMessage());
 			Log.printStackTrace(e);
 		}
 	}
@@ -333,7 +333,7 @@
 		// build the properties given to the Toolbox
 		String version =  Activator.getDefault().getBundle().getVersion().toString(); // "0.7.7.201412160925";
 		version = version.replaceAll("(.\\..\\..)\\.(....)(..)(..)(..)(..)", "$1 ($2-$3-$4 $5h$6)"); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(NLS.bind(Messages.ApplicationWorkbenchAdvisor_init, version));
+		System.out.println(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_init, version));
 
 	}
 //
@@ -384,7 +384,7 @@
 		PreferenceManager pm = PlatformUI.getWorkbench().getPreferenceManager();
 
 		// Remove RCP Update preference page
-		Log.warning(Messages.ApplicationWorkbenchAdvisor_21);
+		Log.warning(RCPMessages.ApplicationWorkbenchAdvisor_21);
 		if (!TXMPreferences.getBoolean(TBXPreferences.EXPERT_USER, TBXPreferences.PREFERENCES_NODE)) {
 			pm.remove("org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage"); //$NON-NLS-1$
 
@@ -435,7 +435,7 @@
 				return;
 			}
 
-			Log.warning(Messages.ApplicationWorkbenchAdvisor_77);
+			Log.warning(RCPMessages.ApplicationWorkbenchAdvisor_77);
 
 			Display.getDefault().syncExec(new Runnable() {
 				@Override
@@ -447,11 +447,11 @@
 							e.display = Display.getDefault();
 							handlerService.executeCommand(TXMUpdateHandler.ID, e);
 						} catch (Exception e) {
-							System.out.println(Messages.ApplicationWorkbenchAdvisor_78+e);
+							System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_78+e);
 							Log.printStackTrace(e);
 						}
 					} else {
-						System.out.println(Messages.ApplicationWorkbenchAdvisor_79);
+						System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_79);
 					}
 				}
 			});
@@ -528,7 +528,7 @@
 	 */
 	private void InitializeLogger() {
 		IOConsole console = new IOConsole(
-				Messages.ApplicationWorkbenchAdvisor_5, null);
+				RCPMessages.ApplicationWorkbenchAdvisor_5, null);
 		ConsolePlugin.getDefault().getConsoleManager().addConsoles(
 				new IConsole[] { console });
 
@@ -592,7 +592,7 @@
 
 				File preferenceFile = new File(installDirectory, "install.prefs"); //$NON-NLS-1$
 				if (preferenceFile.exists()) {
-					System.out.println(NLS.bind(Messages.ApplicationWorkbenchAdvisor_25, preferenceFile));
+					System.out.println(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_25, preferenceFile));
 					if (Util.isWindows()) //NSIS has generated ISO-8859-1 preference file
 						TxmPreferences.importFromFile(preferenceFile, "ISO-8859-1", false); //$NON-NLS-1$
 					else
@@ -630,7 +630,7 @@
 				return true;
 			}
 		} catch (Exception e) {
-			System.err.println(Messages.ApplicationWorkbenchAdvisor_9+ " " +e.getLocalizedMessage());
+			System.err.println(RCPMessages.ApplicationWorkbenchAdvisor_9+ " " +e.getLocalizedMessage());
 			Log.printStackTrace(e);
 			return false;
 		}
@@ -716,9 +716,9 @@
 		System.setProperty("org.txm.rcp.wasfirstrun", Boolean.toString(needToRestoreTXMHOME || installPreferenceRestored)); //$NON-NLS-1$
 		if (needToRestoreTXMHOME || installPreferenceRestored) {
 			
-			System.out.println(Messages.ApplicationWorkbenchAdvisor_7);
+			System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_7);
 			try {
-				Log.info(Messages.ApplicationWorkbenchAdvisor_68);
+				Log.info(RCPMessages.ApplicationWorkbenchAdvisor_68);
 				Display.getDefault().syncExec(new Runnable() {
 					@Override
 					public void run() {
@@ -726,7 +726,7 @@
 					}
 				});
 			} catch(Exception e) {
-				Log.warning(Messages.ApplicationWorkbenchAdvisor_69+e);
+				Log.warning(RCPMessages.ApplicationWorkbenchAdvisor_69+e);
 				Log.printStackTrace(e);
 			}
 
@@ -751,7 +751,7 @@
 					Log.severe("Error: The provided install directory does not exists. Aborting.");
 					return false;
 				}
-				Log.info(NLS.bind(Messages.ApplicationWorkbenchAdvisor_8, TXMPreferences.getString(TBXPreferences.INSTALL_DIR, TBXPreferences.PREFERENCES_NODE)));
+				Log.info(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_8, TXMPreferences.getString(TBXPreferences.INSTALL_DIR, TBXPreferences.PREFERENCES_NODE)));
 
 				Log.info("Checking TXM user directory.");
 				if (TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE).trim().isEmpty()) {
@@ -763,7 +763,7 @@
 				txmhomedir.mkdirs(); // creates the directory if needed
 				
 				if (!txmhomedir.exists()) { // the TXM user directory could not be created !! :o
-					Log.warning(NLS.bind(Messages.ApplicationWorkbenchAdvisor_12, txmhomedir));
+					Log.warning(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_12, txmhomedir));
 					Display.getDefault().syncExec(new Runnable() {
 						@Override
 						public void run() {
@@ -794,22 +794,22 @@
 						public void run() {
 							Display display = Display.getDefault();
 							Shell shell = display.getActiveShell();
-							go = MessageDialog.openConfirm(shell, Messages.ApplicationWorkbenchAdvisor_28, NLS.bind(Messages.ApplicationWorkbenchAdvisor_27, txmhomedir));
+							go = MessageDialog.openConfirm(shell, RCPMessages.ApplicationWorkbenchAdvisor_28, NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_27, txmhomedir));
 						}
 					});
 
 					if (go) {
-						monitor.setTaskName(Messages.bind(Messages.ApplicationWorkbenchAdvisor_30, backup.getAbsolutePath()));
+						monitor.setTaskName(RCPMessages.bind(RCPMessages.ApplicationWorkbenchAdvisor_30, backup.getAbsolutePath()));
 						backup.mkdir();
 
 						if (!backup.exists()) {
-							System.out.println(Messages.ApplicationWorkbenchAdvisor_34 + backup);
+							System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_34 + backup);
 							return false;
 						}
 
 						//$NON-NLS-1$
 						if (oldbackup.exists()) {
-							Log.info(Messages.bind(Messages.ApplicationWorkbenchAdvisor_16, oldbackup));
+							Log.info(RCPMessages.bind(RCPMessages.ApplicationWorkbenchAdvisor_16, oldbackup));
 							DeleteDir.deleteDirectory(oldbackup); // ]8)
 						}
 
@@ -819,7 +819,7 @@
 
 						if (corpDirs != null) {
 							Arrays.sort(corpDirs);
-							System.out.print(Messages.bind(Messages.ApplicationWorkbenchAdvisor_30, backup.getAbsolutePath()));
+							System.out.print(RCPMessages.bind(RCPMessages.ApplicationWorkbenchAdvisor_30, backup.getAbsolutePath()));
 							for (File corpusdir : corpDirs) {
 								File backCorpus = new File(backup, corpusdir.getName());
 								if (corpusdir.canRead() && corpusdir.isDirectory()) {
@@ -838,24 +838,24 @@
 							System.out.println();
 						}
 						if (moved.size() > 0) {
-							Log.info(Messages.bind(Messages.ApplicationWorkbenchAdvisor_18,oldbackup,StringUtils.join(moved,", "))); //$NON-NLS-1$
+							Log.info(RCPMessages.bind(RCPMessages.ApplicationWorkbenchAdvisor_18,oldbackup,StringUtils.join(moved,", "))); //$NON-NLS-1$
 						}
 						if (failed.size() > 0) {
-							System.out.println(Messages.ApplicationWorkbenchAdvisor_44+failed+Messages.ApplicationWorkbenchAdvisor_37+backup);
+							System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_44+failed+RCPMessages.ApplicationWorkbenchAdvisor_37+backup);
 						}
 					}
 				}
 			} catch (Exception e) {
 				org.txm.rcp.utils.Logger.printStackTrace(e);
-				System.out.println(Messages.ApplicationWorkbenchAdvisor_47+" "+e.getLocalizedMessage()); //$NON-NLS-1$
-				Log.severe(Messages.ApplicationWorkbenchAdvisor_47+e.getLocalizedMessage());
+				System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_47+" "+e.getLocalizedMessage()); //$NON-NLS-1$
+				Log.severe(RCPMessages.ApplicationWorkbenchAdvisor_47+e.getLocalizedMessage());
 				return false;
 			}
 
 			try {
 				txmhomedir.mkdir();
 				if (!txmhomedir.exists()) {
-					System.out.println(NLS.bind(Messages.ApplicationWorkbenchAdvisor_13, txmhomedir));
+					System.out.println(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_13, txmhomedir));
 					return false;
 				}
 
@@ -880,7 +880,7 @@
 
 				// test
 				if (Toolbox.workspace == null) {
-					System.out.println(Messages.ApplicationWorkbenchAdvisor_31);
+					System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_31);
 					return false;
 				}
 
@@ -889,15 +889,15 @@
 				for (String folder : copyfolders) {
 					File ffile = new File(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.INSTALL_DIR), folder);
 					if (!ffile.exists()) {
-						System.out.println(NLS.bind(Messages.ApplicationWorkbenchAdvisor_39, ffile));
+						System.out.println(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_39, ffile));
 						continue;
 					}
 
 					FileCopy.copyFiles(ffile, new File(txmhomedir, folder));
 				}
 			} catch (Exception e) {
-				Log.severe(NLS.bind(Messages.ApplicationWorkbenchAdvisor_40, e.getLocalizedMessage()));
-				System.err.println(NLS.bind(Messages.ApplicationWorkbenchAdvisor_40, e.getLocalizedMessage()));
+				Log.severe(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_40, e.getLocalizedMessage()));
+				System.err.println(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_40, e.getLocalizedMessage()));
 				return false;
 			}
 
@@ -907,8 +907,8 @@
 				TXMPreferences.putString(TBXPreferences.PREFERENCES_NODE, 
 						TBXPreferences.WORKSPACE_LOCATION, new File(txmhomedir,	"workspaces/default.xml").getAbsolutePath()); //$NON-NLS-1$
 			} catch (Exception e) {
-				Log.severe(NLS.bind(Messages.ApplicationWorkbenchAdvisor_41, e.getLocalizedMessage()));
-				System.out.println(NLS.bind(Messages.ApplicationWorkbenchAdvisor_41, e.getLocalizedMessage()));
+				Log.severe(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_41, e.getLocalizedMessage()));
+				System.out.println(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_41, e.getLocalizedMessage()));
 				return false;
 			}
 
@@ -916,8 +916,8 @@
 				ArrayList<String> basenames = new ArrayList<String>();
 				ArrayList<String> sampleCorpusLoaded = new ArrayList<String>();
 				if (new File(txmhomedir, "samples").exists()) { //$NON-NLS-1$
-					Log.info(Messages.ApplicationWorkbenchAdvisor_11);
-					monitor.setTaskName(Messages.ApplicationWorkbenchAdvisor_11);
+					Log.info(RCPMessages.ApplicationWorkbenchAdvisor_11);
+					monitor.setTaskName(RCPMessages.ApplicationWorkbenchAdvisor_11);
 					//File corporaDir = new File(txmhomedir.getAbsolutePath(), "corpora"); //$NON-NLS-1$
 					corporaDir.mkdir();
 
@@ -930,7 +930,7 @@
 							String basedirname;
 							if (filename.endsWith(".txm") || filename.endsWith(".zip")) { //$NON-NLS-1$ //$NON-NLS-2$
 								if (!zipFile.canRead()) {
-									System.out.println(NLS.bind(Messages.ApplicationWorkbenchAdvisor_45, zipFile));
+									System.out.println(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_45, zipFile));
 									continue; // go to next binary file
 								}
 
@@ -941,13 +941,13 @@
 								try {
 									Zip.decompress(zipFile.getAbsolutePath(), corporaDir.getAbsolutePath(), false);
 								} catch (IOException e) {
-									System.out.println(NLS.bind(Messages.AddBase_31, e));
+									System.out.println(NLS.bind(RCPMessages.AddBase_31, e));
 								}
 							} else if (zipFile.isDirectory()) {
 								basedir = zipFile;
 							} else {
-								System.out.println(NLS.bind(Messages.AddBase_22, zipFile));
-								System.out.println(Messages.AddBase_25);
+								System.out.println(NLS.bind(RCPMessages.AddBase_22, zipFile));
+								System.out.println(RCPMessages.AddBase_25);
 								continue;
 							}
 
@@ -957,15 +957,15 @@
 								sampleCorpusLoaded.add(base.getName());
 							}
 						} catch (Exception e) {
-							System.out.println(Messages.ApplicationWorkbenchAdvisor_51+zipFile);
+							System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_51+zipFile);
 							org.txm.rcp.utils.Logger.printStackTrace(e);
 						}
 					}
 				}
 
 				if (backup.exists()) {
-					System.out.print(NLS.bind(Messages.ApplicationWorkbenchAdvisor_53, backup));
-					monitor.setTaskName(NLS.bind(Messages.ApplicationWorkbenchAdvisor_53, backup));
+					System.out.print(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_53, backup));
+					monitor.setTaskName(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_53, backup));
 
 					File[] corpusDirs = backup.listFiles();
 
@@ -998,9 +998,9 @@
 								Convert5To6 converter = new Convert5To6(corpusDir, outdir);
 								if (converter.is5(true)) {
 									if (!converter.start()) {
-										System.out.println(Messages.ApplicationWorkbenchAdvisor_22+corpusDir+Messages.ApplicationWorkbenchAdvisor_23);
-										System.out.println(Messages.ApplicationWorkbenchAdvisor_54+corpusDir+Messages.ApplicationWorkbenchAdvisor_55);
-										System.out.println(Messages.ApplicationWorkbenchAdvisor_56);
+										System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_22+corpusDir+RCPMessages.ApplicationWorkbenchAdvisor_23);
+										System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_54+corpusDir+RCPMessages.ApplicationWorkbenchAdvisor_55);
+										System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_56);
 										broken.add(corpusDir);
 									} else {
 										//System.out.println(Messages.ApplicationWorkbenchAdvisor_57+outdir);
@@ -1012,40 +1012,40 @@
 										if (corpusDir.renameTo(outdir)) {
 											Base base = LoadBinaryCorpus.loadBinaryCorpus(outdir);
 											if (base == null) {
-												System.out.println(Messages.ApplicationWorkbenchAdvisor_58+outdir);
-												System.out.println(Messages.ApplicationWorkbenchAdvisor_59+corpusDir);
+												System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_58+outdir);
+												System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_59+corpusDir);
 												outdir.renameTo(corpusDir);
 												broken.add(corpusDir);
 											} else {
 												basenames.add(base.getName());
 											}
 										} else {
-											System.out.println(Messages.ApplicationWorkbenchAdvisor_24+corpusDir+Messages.ApplicationWorkbenchAdvisor_26+outdir);
+											System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_24+corpusDir+RCPMessages.ApplicationWorkbenchAdvisor_26+outdir);
 											broken.add(corpusDir);
 										}
 									} else {
-										System.out.println(Messages.ApplicationWorkbenchAdvisor_60+corpusDir+Messages.ApplicationWorkbenchAdvisor_61);
+										System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_60+corpusDir+RCPMessages.ApplicationWorkbenchAdvisor_61);
 										broken.add(corpusDir);
 									}
 								}
 							} catch (Throwable e) {
-								System.out.println(Messages.ApplicationWorkbenchAdvisor_59+corpusDir);
-								System.out.println(Messages.ApplicationWorkbenchAdvisor_29+e);
+								System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_59+corpusDir);
+								System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_29+e);
 								outdir.renameTo(corpusDir);
 							}
 						}
 						System.out.println();
 						if (sampleCorpusLoaded.size() > 0) {
 							if (sampleCorpusLoaded.size() == 1) {
-								System.out.println(Messages.bind(Messages.ApplicationWorkbenchAdvisor_43_single, StringUtils.join(sampleCorpusLoaded, ", "))); //$NON-NLS-1$
+								System.out.println(RCPMessages.bind(RCPMessages.ApplicationWorkbenchAdvisor_43_single, StringUtils.join(sampleCorpusLoaded, ", "))); //$NON-NLS-1$
 							} else {
-								System.out.println(Messages.bind(Messages.ApplicationWorkbenchAdvisor_43, StringUtils.join(sampleCorpusLoaded, ", "))); //$NON-NLS-1$
+								System.out.println(RCPMessages.bind(RCPMessages.ApplicationWorkbenchAdvisor_43, StringUtils.join(sampleCorpusLoaded, ", "))); //$NON-NLS-1$
 							}
 						}
 
 						if (broken.size() > 0) {
 							errorbackup.mkdir();
-							System.out.println(Messages.bind(Messages.ApplicationWorkbenchAdvisor_48, StringUtils.join(broken, ", "), errorbackup)); //$NON-NLS-1$
+							System.out.println(RCPMessages.bind(RCPMessages.ApplicationWorkbenchAdvisor_48, StringUtils.join(broken, ", "), errorbackup)); //$NON-NLS-1$
 							for(File corpusDir : broken) {
 								if (corpusDir.exists())
 									corpusDir.renameTo(new File(errorbackup, corpusDir.getName()));
@@ -1058,9 +1058,9 @@
 
 				// init with properties
 				if (Toolbox.initialize(TBXPreferences.class, monitor)) {
-					System.out.println(Messages.ApplicationWorkbenchAdvisor_ready);
+					System.out.println(RCPMessages.ApplicationWorkbenchAdvisor_ready);
 				} else {
-					System.err.println(Messages.ApplicationWorkbenchAdvisor_init_failed);
+					System.err.println(RCPMessages.ApplicationWorkbenchAdvisor_init_failed);
 					return false;
 				}
 
@@ -1073,8 +1073,8 @@
 					return false;
 				}
 			} catch (Exception e) {
-				Log.severe(NLS.bind(Messages.ApplicationWorkbenchAdvisor_52, e.getLocalizedMessage()));
-				System.err.println(NLS.bind(Messages.ApplicationWorkbenchAdvisor_52, e.getLocalizedMessage()));
+				Log.severe(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_52, e.getLocalizedMessage()));
+				System.err.println(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_52, e.getLocalizedMessage()));
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 				return false;
 			}
@@ -1129,11 +1129,11 @@
 			boolean showTTHelp = false;
 			if (ttdir != null || ttmodeldir != null) {
 				if (!(new File(ttdir).exists() && new File(ttmodeldir).exists())) {
-					System.err.println(Messages.ApplicationWorkbenchAdvisor_32);
+					System.err.println(RCPMessages.ApplicationWorkbenchAdvisor_32);
 					showTTHelp = true;
 				}
 			} else {
-				System.err.println(Messages.ApplicationWorkbenchAdvisor_33);
+				System.err.println(RCPMessages.ApplicationWorkbenchAdvisor_33);
 				//TxmPreferences.set(TreeTaggerPreferencePage.TREETAGGER_INSTALL_PATH, TxmPreferences.get(AdvancePreferencePage.TXMHOME)+"/treetagger"); //$NON-NLS-1$
 				//TxmPreferences.set(TreeTaggerPreferencePage.TREETAGGER_MODELS_PATH, TxmPreferences.get(AdvancePreferencePage.TXMHOME)+"/treetagger/models"); //$NON-NLS-1$
 				showTTHelp = true;
@@ -1164,7 +1164,7 @@
 			}
 		} catch (Exception e) {
 			Log.severe(e.getLocalizedMessage());
-			System.out.println(NLS.bind(Messages.ApplicationWorkbenchAdvisor_19, e));
+			System.out.println(NLS.bind(RCPMessages.ApplicationWorkbenchAdvisor_19, e));
 			return false;
 		}
 		return true;
@@ -1252,13 +1252,13 @@
 		Display.getDefault().syncExec(new Runnable() {
 			@Override
 			public void run() {
-				Log.warning(Messages.ApplicationWorkbenchAdvisor_88);
+				Log.warning(RCPMessages.ApplicationWorkbenchAdvisor_88);
 				RestartTXM.reloadViews();
 				
 				if (Toolbox.isInitialized()) {
-					StatusLine.setMessage(Messages.ApplicationWorkbenchAdvisor_ready);
+					StatusLine.setMessage(RCPMessages.ApplicationWorkbenchAdvisor_ready);
 				} else {
-					StatusLine.setMessage(Messages.ApplicationWorkbenchAdvisor_init_failed);
+					StatusLine.setMessage(RCPMessages.ApplicationWorkbenchAdvisor_init_failed);
 				}
 			}
 		});
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java	(revision 513)
@@ -82,12 +82,12 @@
 		Map args = context.getArguments();
 		
 		List<String> argsList = Arrays.asList((String[])(args.get("application.args")));
-		System.out.println(Messages.Application_0+argsList);
+		System.out.println(RCPMessages.Application_0+argsList);
 		if (argsList.contains("-log")) { //$NON-NLS-1$
-			System.out.println(Messages.Application_1);
+			System.out.println(RCPMessages.Application_1);
 			Log.setPrintInConsole(true);
 			Log.setLevel(Level.ALL);
-			Log.severe(Messages.Application_2);
+			Log.severe(RCPMessages.Application_2);
 			TXMPreferences.putBoolean(TBXPreferences.PREFERENCES_NODE, TBXPreferences.ADD_TECH_LOGS, true);
 			TXMPreferences.putString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.LOG_LEVEL, "ALL"); //$NON-NLS-1$
 			TXMPreferences.putBoolean(TBXPreferences.PREFERENCES_NODE, TBXPreferences.LOG_STACKTRACE, true);
@@ -96,9 +96,9 @@
 			//System.out.println("Running TXM");
 		} else {
 			System.out.println("TXM must be launch with the argument '-run' to start."); //$NON-NLS-1$
-			System.out.println(Messages.Application_4);
+			System.out.println(RCPMessages.Application_4);
 
-			javax.swing.JOptionPane.showMessageDialog(null, Messages.Application_4);
+			javax.swing.JOptionPane.showMessageDialog(null, RCPMessages.Application_4);
 			return IApplication.EXIT_OK;
 		}
 		// test if Java 1.6 is installed
@@ -114,7 +114,7 @@
 		//display.addListener(SWT.OpenDocument, openDocProcessor);
 		
 		//Lock the RCP workspace, thus there is only one TXM instance running
-		Log.warning(Messages.Application_8);
+		Log.warning(RCPMessages.Application_8);
 		if (!Platform.getInstanceLocation().lock()){
 			//Shell shell = display.getActiveShell();
 			System.out.println("TXM is already running. Exiting...");
@@ -122,10 +122,10 @@
 		}
 
 		try {
-			Log.warning(Messages.Application_9);
+			Log.warning(RCPMessages.Application_9);
 			activateProxyService();
 		} catch (Exception e) {
-			Log.warning(Messages.Application_10+e);
+			Log.warning(RCPMessages.Application_10+e);
 		}
 
 		try {
@@ -237,7 +237,7 @@
 			cl = parser.parse(options, Platform.getCommandLineArgs());
 		} catch (ParseException e) {
 
-			System.err.println(NLS.bind(Messages.FAILED_TO_PARSE_OPTIONS,
+			System.err.println(NLS.bind(RCPMessages.FAILED_TO_PARSE_OPTIONS,
 					StringUtils.join(Platform.getCommandLineArgs(), " "), e)); //$NON-NLS-1$
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 			exit = true;
@@ -255,7 +255,7 @@
 			preferences.save();
 		} catch (IOException e) {
 			System.err.println(NLS.bind(
-					Messages.FAILED_TO_SAVE_PREFERENCES, e));
+					RCPMessages.FAILED_TO_SAVE_PREFERENCES, e));
 			exit = true;
 			return exit;
 		}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages_fr.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages_fr.properties	(revision 512)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages_fr.properties	(revision 513)
@@ -297,7 +297,7 @@
 ConcordancesEditor_49           = toutes les lignes
 ConcordancesEditor_5            = Concordance de <{0}> dans le corpus {1}
 ConcordancesEditor_50           = Ouverture de l'édition
-ConcordancesEditor_52           = Terminé : un résultat
+ONE_RESULT           = Terminé : un résultat.
 ConcordancesEditor_55           = Ouverture de la boite de dialogue des propriétés
 ConcordancesEditor_56           = Début du calcul des concordances
 ConcordancesEditor_6            = Tri...
Index: tmp/org.txm.rcp/plugin.xml
===================================================================
--- tmp/org.txm.rcp/plugin.xml	(revision 512)
+++ tmp/org.txm.rcp/plugin.xml	(revision 513)
@@ -2665,11 +2665,6 @@
             name="%command.name.17">
       </command>
       <command
-            defaultHandler="org.txm.rcp.commands.workspace.SetSearchEngine"
-            id="org.txm.rcp.commands.workspace.SetSearchEngine"
-            name="%command.name.20">
-      </command>
-      <command
             defaultHandler="org.txm.rcp.commands.queryview.Copy"
             id="org.txm.rcp.commands.queryview.Copy"
             name="%command.name.55">
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 512)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 513)
@@ -84,7 +84,7 @@
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.core.results.TXMParameters;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TXMEditorPart;
 import org.txm.rcp.editors.TXMResultEditorInput;
@@ -109,52 +109,52 @@
  * @author mdecorde
  */
 public class CooccurrencesEditor extends TXMEditorPart {
-	
+
 	/** The Constant ID. */
 	public static final String ID = CooccurrencesEditor.class.getName(); //$NON-NLS-1$
 
 	/** The cooc. */
 	Cooccurrence cooc;
-	
+
 	/** The self. */
 	CooccurrencesEditor self;
 	// params
 	/** The query widget. */
 	AssistedQueryWidget queryWidget;
-	
+
 	/** The props area. */
 	PropertiesSelector propsArea;
-	
+
 	/** The empant panel. */
 	EmpantWidget empantPanel;
-	
+
 	/** The T score. */
 	Text TScore;
-	
+
 	/** The T count. */
 	Spinner TCount;
-	
+
 	/** The T freq. */
 	Spinner TFreq;
 
 	/** The line table viewer. */
 	TableViewer viewer;
-	
+
 	/** The n column. */
 	TableColumn nColumn;
-	
+
 	/** The occ column. */
 	TableColumn occColumn;
-	
+
 	/** The freq column. */
 	TableColumn freqColumn;
-	
+
 	/** The nbocc column. */
 	TableColumn nboccColumn;
-	
+
 	/** The score column. */
 	TableColumn scoreColumn;
-	
+
 	/** The dist column. */
 	TableColumn distColumn;
 
@@ -197,10 +197,10 @@
 	 */
 	@Override
 	public void createPartControl(final Composite parent) {
-		
+
 		// FIXME: to do
 		//super.createPartControl(parent);
-		
+
 		FormLayout parentLayout = new FormLayout();
 		parent.setLayout(parentLayout);
 
@@ -347,21 +347,21 @@
 		TCount.setMaximum(99999);
 		TCount.setIncrement(1);
 		TCount.setPageIncrement(100);
-		
+
 		seuilLabel = new Label(filtercontrols, SWT.NONE);
 		seuilLabel.setText(CooccurrenceUIMessages.CooccurrencesEditor_6);
 		TScore = new Text(filtercontrols, SWT.BORDER);
-		
+
 		// empant
 		empantPanel = new EmpantWidget(paramArea, SWT.NONE, this.getCorpus());
-		
+
 		FormData empantLayoutData = new FormData();
 		empantLayoutData.top = new FormAttachment(filtercontrols, 0);
 		empantLayoutData.bottom = new FormAttachment(100);
 		empantLayoutData.left = new FormAttachment(0);
 		empantLayoutData.right = new FormAttachment(100);
 		empantPanel.setLayoutData(empantLayoutData);
-		
+
 		// result
 		Composite resultArea = new Composite(parent, SWT.NONE);
 		FormData resultLayoutData = new FormData();
@@ -379,7 +379,7 @@
 		viewer.getTable().addKeyListener(new TableKeyListener(viewer));
 		viewer.getTable().setLinesVisible(true);
 		viewer.getTable().setHeaderVisible(true);
-		
+
 		String fontName = cooc.getCorpus().getFont();
 		if (fontName != null && fontName.length() > 0) {
 			Font old = viewer.getTable().getFont();
@@ -389,23 +389,23 @@
 			viewer.getTable().setFont(font);
 		}
 
-//TODO replace this with a command+menucontribution		
-//		viewer.getTable().addMouseListener(new MouseAdapter() {
-//			@Override
-//			public void mouseDoubleClick(MouseEvent e) {
-//				Point mouseposition = new Point(e.x
-//						+ viewer.getTable().getHorizontalBar()
-//						.getSelection(), e.y);
-//				int col = getPointedColumn(mouseposition);
-//				//System.out.println("col "+col);
-//				switch(col)
-//				{
-//				default:
-//					IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
-//					CooccurrencesToConcordances.link(CooccurrencesEditor.this, selection);
-//				}
-//			}
-//		});
+		//TODO replace this with a command+menucontribution		
+		//		viewer.getTable().addMouseListener(new MouseAdapter() {
+		//			@Override
+		//			public void mouseDoubleClick(MouseEvent e) {
+		//				Point mouseposition = new Point(e.x
+		//						+ viewer.getTable().getHorizontalBar()
+		//						.getSelection(), e.y);
+		//				int col = getPointedColumn(mouseposition);
+		//				//System.out.println("col "+col);
+		//				switch(col)
+		//				{
+		//				default:
+		//					IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+		//					CooccurrencesToConcordances.link(CooccurrencesEditor.this, selection);
+		//				}
+		//			}
+		//		});
 
 		FormData tableLayoutData = new FormData();
 		tableLayoutData.top = new FormAttachment(0);
@@ -438,8 +438,8 @@
 		});
 
 		freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
-		freqColumn.setText(Messages.FrequencyListEditorInput_4);
-		freqColumn.setToolTipText(Messages.FrequencyListEditorInput_4);
+		freqColumn.setText(RCPMessages.FrequencyListEditorInput_4);
+		freqColumn.setToolTipText(RCPMessages.FrequencyListEditorInput_4);
 		freqColumn.setWidth(100);
 		freqColumn.addSelectionListener(new SelectionListener() {
 			@Override
@@ -561,7 +561,7 @@
 	 * @return
 	 */
 	public TXMParameters getWidgetsParameters()	{
-		
+
 		TXMParameters parameters = new TXMParameters();
 		parameters.put(CooccurrencePreferences.QUERY, this.queryWidget.getQueryString());
 		parameters.put(CooccurrencePreferences.PROPERTIES, this.propsArea.getProperties());
@@ -574,7 +574,7 @@
 		parameters.put(CooccurrencePreferences.MIN_COUNT, this.TCount.getSelection());
 		parameters.put(CooccurrencePreferences.INCLUDE_X_PIVOT, this.empantPanel.getXPivot());
 		parameters.put(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE,this.getBooleanParameterValue(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE));
-		
+
 		Double minScore = 0.0;
 		try {
 			Double d = Double.parseDouble(this.TScore.getText());
@@ -582,9 +582,9 @@
 		} catch (Exception e) {
 			System.out.println(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_18, this.TScore.getText()));
 		}
-		
+
 		parameters.put(CooccurrencePreferences.MIN_SCORE, minScore);
-		
+
 		return parameters;
 	}
 
@@ -594,7 +594,7 @@
 		if (this.queryWidget.getQueryString().trim().length() == 0 || this.queryWidget.getQueryString().trim().equals("\"\"")) //$NON-NLS-1$
 			return;
 		queryWidget.memorize();
-		
+
 		if (this.empantPanel.getMinLeft() == -1 && this.empantPanel.getMinRight() == -1) {
 			if (this.empantPanel.getStruct() == null) {
 				System.out.println(CooccurrenceUIMessages.CooccurrencesEditor_16);
@@ -604,10 +604,10 @@
 				return;
 			}
 		}
-		
+
 		// FIXME: method using TXMCommandParameters
 		final TXMParameters parameters = this.getWidgetsParameters();
-		
+
 		JobHandler jobhandler = new JobHandler(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_12, cooc.getCorpus())) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
@@ -618,16 +618,16 @@
 					//FIXME: Debug
 					//System.out.println("cooc: "+corpus+" "+query+" "+properties+" "+structure+" "+leftmax+" "+leftmin+" "+rightmin+" "+rightmax+" "+minfreq+" "+mincount+" "+minscore+" "+includeXpivot);
 					//monitor.worked(5);
-					
+
 					cooc.setParameters(parameters);
 					if (cooc.validateParameters() && cooc.isDirty()) {
 						cooc.compute(this);
 					}
-					
+
 					//FIXME: DEbug
-//					parameters.dump();
-//					TXMPreferences.dump(CooccurrencePreferences.PREFERENCES_NODE, cooc);
-					
+					//					parameters.dump();
+					//					TXMPreferences.dump(CooccurrencePreferences.PREFERENCES_NODE, cooc);
+
 					// FIXME: this code should be move in Cooccurrence.getDetails() or getName(), etc?
 					final String message;
 					if (cooc.getLines().size() == 0) {
@@ -639,7 +639,7 @@
 					else {
 						message = (CooccurrenceUIMessages.bind(CooccurrenceUIMessages.CooccurrencesEditor_34, cooc.getNumberOfKeyword(), cooc.getNumberOfDifferentCooccurrents()));
 					}
-					
+
 					System.out.println(message);
 					this.syncExec(new Runnable() {
 						@Override
@@ -648,7 +648,7 @@
 							try { txt += ", T "+cooc.getCorpus().getSize();} //$NON-NLS-1$
 							catch(Exception e) {System.out.println(CooccurrenceUIMessages.CooccurrencesEditor_25);}
 							String tooltip = "- " + txt.replaceAll(", ", "\n- "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-							
+
 							empantPanel.setInfo(txt, tooltip);
 							StatusLine.setMessage(message);
 						}
@@ -665,13 +665,13 @@
 					Logger.severe(CooccurrenceUIMessages.CooccurrencesEditor_1  + " " + Logger.toString(e)); //$NON-NLS-1$
 					e.printStackTrace();
 					try {
-						Logger.info(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
+						Logger.info(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
 					}
 					catch (Exception e2) {
-						Logger.severe(Messages.ConcordancesEditor_7+e2);
+						Logger.severe("Error: "+e2.getLocalizedMessage()); //$NON-NLS-1$
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 					}
-					
+
 					return Status.CANCEL_STATUS;
 				}
 				monitor.worked(5);
@@ -697,11 +697,11 @@
 						viewer.getControl().setRedraw(true);
 
 						refresh();
-						
+
 						//FIXME: need to be done in another way with after the plugin split
 						QueriesView.refresh();
 						RVariablesView.refresh();
-						
+
 						viewer.getTable().setFocus();
 					}
 				});
@@ -720,7 +720,7 @@
 	 */
 	protected void initializeFields() {
 		queryWidget.setText(this.getStringParameterValue(CooccurrencePreferences.QUERY));
-		
+
 		if (this.cooc.getProperties() != null) {
 			List<Property> available;
 			try {
@@ -732,12 +732,12 @@
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 			}
 		}
-		
+
 		TFreq.setSelection(this.getIntParameterValue(CooccurrencePreferences.MIN_FREQ));
 		TCount.setSelection(this.getIntParameterValue(CooccurrencePreferences.MIN_COUNT));
 
 		TScore.setText(""+this.getDoubleParameterValue(CooccurrencePreferences.MIN_SCORE));
-		
+
 		empantPanel.setMinLeft(this.getIntParameterValue(CooccurrencePreferences.MIN_LEFT)-1);
 		empantPanel.setMaxLeft(this.getIntParameterValue(CooccurrencePreferences.MAX_LEFT)-1);
 		empantPanel.setMinRight(this.getIntParameterValue(CooccurrencePreferences.MIN_RIGHT)-1);
@@ -800,7 +800,7 @@
 	public Cooccurrence getCooc() {
 		return this.cooc;
 	}
-	
+
 	/**
 	 * Do save.
 	 *
@@ -822,8 +822,8 @@
 
 	}
 
-	
-	
+
+
 	/**
 	 * Checks if is dirty.
 	 *
@@ -859,19 +859,17 @@
 						new IRunnableWithProgress() {
 							@Override
 							public void run(IProgressMonitor monitor)
-							throws InvocationTargetException,
-							InterruptedException {
+									throws InvocationTargetException,
+									InterruptedException {
 								try {
 									cooc.sort(currentComparator);
 								} catch (CqiClientException e) {
-									System.err.println(NLS.bind(
-										Messages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
+									System.err.println("Error: "+e.getLocalizedMessage());
 								}
 							}
 						});
 			} catch (Exception e) {
-				System.err.println(NLS.bind(
-						Messages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
+				System.err.println("Error: "+e.getLocalizedMessage());
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 			}
 			viewer.refresh();
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java	(revision 512)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
 import org.txm.cooccurrence.rcp.editors.CooccurrencesEditor;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TXMEditorPart;
 import org.txm.rcp.editors.TXMResultEditorInput;
@@ -129,12 +129,12 @@
 		} else if (selection instanceof Cooccurrence) { // reopening an existing result
 			cooc = (Cooccurrence)selection;
 		} else {
-			System.out.println(Messages.ComputeCooccurrences_1 + selection);
+			System.out.println(RCPMessages.ComputeCooccurrences_1 + selection);
 			return null;
 		}
 		
 		try {
-			StatusLine.setMessage(Messages.ComputeCooccurrences_0);
+			StatusLine.setMessage(RCPMessages.ComputeCooccurrences_0);
 
 			//System.out.println("DEBUG: opening cooc: "+cooc+" corpus="+cooc.getCorpus());
 			editorInput = new TXMResultEditorInput(cooc);
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java	(revision 512)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java	(revision 513)
@@ -51,7 +51,7 @@
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.TXMWindows;
 import org.txm.rcp.utils.JobHandler;
@@ -111,7 +111,7 @@
 					return null;
 				}
 				//ask property and Fmins and Vmax
-				String title = Messages.bind(CAUIMessages.ComputeCorrespondanceAnalysisDialog_0, partition.getName());
+				String title = RCPMessages.bind(CAUIMessages.ComputeCorrespondanceAnalysisDialog_0, partition.getName());
 				LexicalTableDialog d = new LexicalTableDialog(
 						window.getShell(), partition.getCorpus(), title);
 				if (d.open() == LexicalTableDialog.OK) {
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java	(revision 512)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java	(revision 513)
@@ -67,7 +67,7 @@
 import org.txm.chartsengine.rcp.editors.ChartEditorInput;
 import org.txm.chartsengine.rcp.editors.ChartEditorPart;
 import org.txm.core.results.TXMResult;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.SplitedGenericMultiPageEditor;
 import org.txm.rcp.editors.TXMMultiPageEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
@@ -186,7 +186,7 @@
 
 
 		if (editors.size() != inputs.size()) {
-			throw new IllegalArgumentException(NLS.bind(Messages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
+			throw new IllegalArgumentException(NLS.bind(RCPMessages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
 		}
 
 		// put first editor in the left panel and set is as "main" editor
@@ -220,7 +220,7 @@
 		}
 		catch (Exception e1) {
 			org.txm.rcp.utils.Logger.printStackTrace(e1);
-			System.out.println(Messages.CaEditor_0+e1);
+			System.out.println(RCPMessages.CaEditor_0+e1);
 			return;
 		}
 
@@ -231,7 +231,7 @@
 				editorIndex = addPage(editors.get(i), inputs.get(i));
 			} catch (PartInitException e) {
 				org.txm.rcp.utils.Logger.printStackTrace(e);
-				System.out.println(Messages.CaEditor_0+e);
+				System.out.println(RCPMessages.CaEditor_0+e);
 				return;
 			}
 			setPageText(editorIndex, names.get(i));
@@ -352,7 +352,7 @@
 			@Override
 			public String[] getColumnTypes() {
 				return new String[] {
-						Messages.FrequencyListEditorInput_6,
+						RCPMessages.FrequencyListEditorInput_6,
 						COL_TYPE,
 						COL_TYPE,
 						COL_TYPE,
@@ -417,7 +417,7 @@
 			@Override
 			public String[] getColumnTypes() {
 				coltypes = new ArrayList<String>();
-				coltypes.add(Messages.FrequencyListEditorInput_6);
+				coltypes.add(RCPMessages.FrequencyListEditorInput_6);
 				coltypes.add(SEPARATOR);
 				coltypes.add(COL_TYPE);
 				coltypes.add(COL_TYPE);
@@ -501,7 +501,7 @@
 			@Override
 			public String[] getColumnTypes() {
 				coltypes = new ArrayList<String>();
-				coltypes.add(Messages.FrequencyListEditorInput_6);
+				coltypes.add(RCPMessages.FrequencyListEditorInput_6);
 				coltypes.add(SEPARATOR);
 				coltypes.add(COL_TYPE);
 				coltypes.add(COL_TYPE);
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java	(revision 512)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java	(revision 513)
@@ -48,7 +48,7 @@
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.Tablable;
 import org.txm.rcp.editors.TableKeyListener;
@@ -132,7 +132,7 @@
 		parent.setLayout(new FillLayout());
 
 		if (!(iEditorInput instanceof Tablable)) {
-			throw new IllegalArgumentException(Messages.SingularValuesEditor_0);
+			throw new IllegalArgumentException(RCPMessages.SingularValuesEditor_0);
 		}
 		tableInput = (Tablable) iEditorInput;
 
@@ -168,7 +168,7 @@
 				@Override
 				public void widgetSelected(SelectionEvent e)
 				{
-					StatusLine.setMessage(Messages.SORT_COLUMN);
+					StatusLine.setMessage(RCPMessages.SORT_COLUMN);
 					tableSorter.setColumn(index);
 					int dir = viewer.getTable().getSortDirection();
 					if (viewer.getTable().getSortColumn() == column.getColumn()) {
@@ -179,7 +179,7 @@
 					viewer.getTable().setSortDirection(dir);
 					viewer.getTable().setSortColumn(column.getColumn());
 					viewer.refresh();
-					StatusLine.setMessage(Messages.SORT_DONE);
+					StatusLine.setMessage(RCPMessages.SORT_DONE);
 				}
 			});
 		}
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColRowInfosLabelProvider.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColRowInfosLabelProvider.java	(revision 512)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColRowInfosLabelProvider.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.txm.ca.core.preferences.CAPreferences;
 import org.txm.ca.rcp.messages.CAUIMessages;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * The Class ColRowInfosLabelProvider.
@@ -82,7 +82,7 @@
 				String pattern = TXMPreferences.getString(CAPreferences.MASS_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
 			if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
 					masspattern = new DecimalFormat(pattern);
-			} else if (names[i].startsWith(Messages.ColRowInfosLabelProvider_9)) {
+			} else if (names[i].startsWith(RCPMessages.ColRowInfosLabelProvider_9)) {
 				String pattern = TXMPreferences.getString(CAPreferences.CHI_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
 				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
 					chipattern = new DecimalFormat(pattern);
@@ -103,7 +103,7 @@
 				String pattern = TXMPreferences.getString(CAPreferences.CONTRIB_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
 				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
 					contribpattern = new DecimalFormat(pattern);
-			} else if (names[i].startsWith(Messages.ColRowInfosLabelProvider_19) && names[i].length() == 3) {
+			} else if (names[i].startsWith(RCPMessages.ColRowInfosLabelProvider_19) && names[i].length() == 3) {
 				String pattern = TXMPreferences.getString(CAPreferences.QUALITY_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
 				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
 					qualitypattern = new DecimalFormat(pattern);
@@ -135,7 +135,7 @@
 			f = new DecimalFormat("###.00"); //$NON-NLS-1$
 			if (name.startsWith(CACoreMessages.mass)) {
 				f = masspattern;
-			} else if (name.startsWith(Messages.ColRowInfosLabelProvider_9)) {
+			} else if (name.startsWith(RCPMessages.ColRowInfosLabelProvider_9)) {
 				f = chipattern;
 			} else if (name.startsWith(CACoreMessages.dist)) {
 				f = distpattern;
@@ -146,7 +146,7 @@
 				f = coordpattern;
 			} else if (name.startsWith(CACoreMessages.cont)) {
 				f = contribpattern;
-			} else if (name.startsWith(Messages.ColRowInfosLabelProvider_19)
+			} else if (name.startsWith(RCPMessages.ColRowInfosLabelProvider_19)
 					&& name.length() == 3) {
 				f = qualitypattern;
 			}
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java	(revision 512)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java	(revision 513)
@@ -45,7 +45,7 @@
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.Tablable;
 import org.txm.rcp.editors.TableKeyListener;
@@ -126,7 +126,7 @@
 		parent.setLayout(new FillLayout());
 
 		if (!(iEditorInput instanceof Tablable)) {
-			throw new IllegalArgumentException(Messages.ColsRowsInfosEditor_0);
+			throw new IllegalArgumentException(RCPMessages.ColsRowsInfosEditor_0);
 		}
 		tableInput = (Tablable) iEditorInput;
 		viewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL
@@ -156,7 +156,7 @@
 			column.getColumn().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(Messages.SORT_COLUMN );
+					StatusLine.setMessage(RCPMessages.SORT_COLUMN );
 					tableSorter.setColumn(index);
 					int dir = viewer.getTable().getSortDirection();
 					if (viewer.getTable().getSortColumn() == column.getColumn()) {
@@ -167,7 +167,7 @@
 					viewer.getTable().setSortDirection(dir);
 					viewer.getTable().setSortColumn(column.getColumn());
 					viewer.refresh();
-					StatusLine.setMessage(Messages.SORT_DONE);
+					StatusLine.setMessage(RCPMessages.SORT_DONE);
 				}
 			});
 		}
@@ -180,7 +180,7 @@
 		tableSorter.setColumnTypes(tableInput.getColumnTypes());
 		viewer.setSorter(tableSorter);
 
-		this.setContentDescription(NLS.bind(Messages.ColsRowsInfosEditor_2, titles[0]));
+		this.setContentDescription(NLS.bind(RCPMessages.ColsRowsInfosEditor_2, titles[0]));
 		createContextMenu(viewer);
 		viewer.refresh();
 		for (TableColumn col : viewer.getTable().getColumns())
Index: tmp/org.txm.core.tests/.classpath
===================================================================
--- tmp/org.txm.core.tests/.classpath	(revision 512)
+++ tmp/org.txm.core.tests/.classpath	(revision 513)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java	(revision 512)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java	(revision 513)
@@ -47,7 +47,7 @@
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.OpenGraph;
 import org.txm.rcp.handlers.BaseAbstractHandler;
@@ -120,28 +120,28 @@
 			try {
 				file.createNewFile();
 			} catch (IOException e1) {
-				System.err.println(NLS.bind(Messages.ExportResult_3, file, e1));
+				System.err.println(NLS.bind(RCPMessages.ExportResult_3, file, e1));
 			}
 			if (!file.canWrite()) {
-				System.err.println(NLS.bind(Messages.ExportResult_5, file));
+				System.err.println(NLS.bind(RCPMessages.ExportResult_5, file));
 			}
 			if (!file.isFile()) {
 				System.err.println("Error: " + file + " is not a file"); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 
-			JobHandler jobhandler = new JobHandler(Messages.ExportResult_0) {
+			JobHandler jobhandler = new JobHandler(RCPMessages.ExportResult_0) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						this.runInit(monitor);
-						monitor.beginTask(Messages.ExportResult_1, 100);
+						monitor.beginTask(RCPMessages.ExportResult_1, 100);
 
 						String outputFormat = SWTChartsComponentsProvider.getCurrent().getChartsEngineSupportedExportFileFormats().get(dialog.getFilterIndex());
 						ChartsEngine.getCurrent().createChartFile(chartResult, file, outputFormat);
 
 						if (file.exists()) {
 
-							System.out.println(NLS.bind(Messages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
+							System.out.println(NLS.bind(RCPMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
 
 							// Open internal editor in the UI thread
 							if (TXMPreferences.getBoolean(TBXPreferences.EXPORT_SHOW, TBXPreferences.PREFERENCES_NODE))	{
@@ -153,7 +153,7 @@
 								});
 							}
 						} else {
-							System.out.println(NLS.bind(Messages.ExportResult_4, file.getAbsolutePath(), outputFormat));
+							System.out.println(NLS.bind(RCPMessages.ExportResult_4, file.getAbsolutePath(), outputFormat));
 						}
 					} catch (ThreadDeath td) {
 						return Status.CANCEL_STATUS;
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java	(revision 512)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java	(revision 513)
@@ -49,7 +49,7 @@
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.OpenGraph;
 import org.txm.rcp.swt.dialog.LastOpened;
@@ -115,28 +115,28 @@
 				file.createNewFile();
 			}
 			catch(IOException e1) {
-				System.err.println(NLS.bind(Messages.ExportResult_3, file, e1));
+				System.err.println(NLS.bind(RCPMessages.ExportResult_3, file, e1));
 			}
 			if(!file.canWrite()) {
-				System.err.println(NLS.bind(Messages.ExportResult_5, file));
+				System.err.println(NLS.bind(RCPMessages.ExportResult_5, file));
 			}
 			if(!file.isFile()) {
 				System.err.println("Error: " + file + " is not a file"); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 
-			JobHandler jobhandler = new JobHandler(Messages.ExportResult_0) {
+			JobHandler jobhandler = new JobHandler(RCPMessages.ExportResult_0) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						this.runInit(monitor);
-						monitor.beginTask(Messages.ExportResult_1, 100);
+						monitor.beginTask(RCPMessages.ExportResult_1, 100);
 
 						String outputFormat = chartEditorPart.getSWTChartsComponentsProvider().getEditorSupportedExportFileFormats().get(dialog.getFilterIndex());
 						chartEditorPart.exportView(file, outputFormat);
 
 						if(file.exists()) {
 
-							System.out.println(NLS.bind(Messages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
+							System.out.println(NLS.bind(RCPMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
 
 							// Open internal editor in the UI thread
 							if(TXMPreferences.getBoolean(TBXPreferences.EXPORT_SHOW, TBXPreferences.PREFERENCES_NODE))	{
@@ -149,7 +149,7 @@
 							}
 						}
 						else {
-							System.out.println(NLS.bind(Messages.ExportResult_4, file.getAbsolutePath(), outputFormat));
+							System.out.println(NLS.bind(RCPMessages.ExportResult_4, file.getAbsolutePath(), outputFormat));
 						}
 					}
 					catch(ThreadDeath td) {
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/commands/ComputeReferencer.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/commands/ComputeReferencer.java	(revision 512)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/commands/ComputeReferencer.java	(revision 513)
@@ -35,7 +35,7 @@
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.functions.referencer.Referencer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.TXMWindows;
 import org.txm.rcp.editors.TXMResultEditorInput;
@@ -89,11 +89,11 @@
 		IWorkbenchWindow window = TXMWindows.getActiveWindow();
 		IWorkbenchPage page = window.getActivePage();
 		try {
-			StatusLine.setMessage(Messages.ComputeReferencer_0);
+			StatusLine.setMessage(RCPMessages.ComputeReferencer_0);
 			page.openEditor(editorInput, ReferencerEditor.ID); //$NON-NLS-1$
 			return true;
 		} catch (PartInitException e) {
-			System.err.println(Messages.CorporaView_6+ e);
+			System.err.println(RCPMessages.CorporaView_6+ e);
 		}
 		return false;
 	}
Index: tmp/org.txm.referencer.rcp/src/org/txm/references/rcp/preferences/ReferencerPreferencePage.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/references/rcp/preferences/ReferencerPreferencePage.java	(revision 512)
+++ tmp/org.txm.referencer.rcp/src/org/txm/references/rcp/preferences/ReferencerPreferencePage.java	(revision 513)
@@ -28,7 +28,7 @@
 package org.txm.references.rcp.preferences;
 
 import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.preferences.RCPPreferencesPage;
 
@@ -53,7 +53,7 @@
 	 */
 	public ReferencerPreferencePage() {
 		super();
-		setTitle(Messages.ReferencerPreferencePage_2);
+		setTitle(RCPMessages.ReferencerPreferencePage_2);
 	}
 
 	/**
@@ -65,7 +65,7 @@
 	public void createFieldEditors() {
 
 		referencer_sorttype = new BooleanFieldEditor(RCPPreferences.SORTBYFREQ,
-				Messages.ReferencerPreferencePage_3, getFieldEditorParent());
+				RCPMessages.ReferencerPreferencePage_3, getFieldEditorParent());
 		
 		addField(referencer_sorttype);
 
Index: tmp/org.txm.referencer.rcp/src/org/txm/rcp/commands/link/ReferencerToConc.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/rcp/commands/link/ReferencerToConc.java	(revision 512)
+++ tmp/org.txm.referencer.rcp/src/org/txm/rcp/commands/link/ReferencerToConc.java	(revision 513)
@@ -42,7 +42,7 @@
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
 import org.txm.functions.referencer.Referencer;
 import org.txm.functions.referencer.Referencer.Line;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.referencer.ReferencerEditor;
 import org.txm.searchengine.cqp.ReferencePattern;
@@ -99,7 +99,7 @@
 			ConcordanceEditor conceditor = (ConcordanceEditor) page.openEditor(editorInput,
 					ConcordanceEditor.class.getName()); //$NON-NLS-1$
 		} catch (PartInitException e) {
-			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
+			System.err.println("Error: "+e.getLocalizedMessage());
 		}
 
 		return null;
Index: tmp/org.txm.referencer.rcp/src/org/txm/rcp/editors/referencer/ReferencerEditor.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/rcp/editors/referencer/ReferencerEditor.java	(revision 512)
+++ tmp/org.txm.referencer.rcp/src/org/txm/rcp/editors/referencer/ReferencerEditor.java	(revision 513)
@@ -62,7 +62,7 @@
 import org.txm.functions.referencer.Referencer;
 import org.txm.functions.referencer.Referencer.Line;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.link.ReferencerToConc;
 import org.txm.rcp.editors.TXMEditorPart;
@@ -207,11 +207,11 @@
 		final List<Property> queryprops = propsArea.getProperties();
 		final List<Property> refs = patternArea.getProperties();
 		
-		mess = NLS.bind(Messages.ReferencerEditor_0, 
+		mess = NLS.bind(RCPMessages.ReferencerEditor_0, 
 				new Object[]{query, corpus, queryprops, 
 				refs})+ "\n"; //$NON-NLS-1$
 		
-		System.out.println(NLS.bind(Messages.ReferencerEditor_5, query));
+		System.out.println(NLS.bind(RCPMessages.ReferencerEditor_5, query));
 		JobHandler jobhandler = new JobHandler(mess) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
@@ -258,23 +258,23 @@
 					}
 
 					try  {
-						monitor.subTask(Messages.ReferencerEditor_8);
+						monitor.subTask(RCPMessages.ReferencerEditor_8);
 						if (!referencer.getQueryMatches()) {
-							System.out.println(Messages.ReferencerEditor_7);
+							System.out.println(RCPMessages.ReferencerEditor_7);
 							return Status.CANCEL_STATUS;
 						}
 						
 						if (monitor.isCanceled())
 							return Status.CANCEL_STATUS;
 						
-						monitor.subTask(Messages.ReferencerEditor_10);
+						monitor.subTask(RCPMessages.ReferencerEditor_10);
 						if (!referencer.getQueryindexes())
 							return Status.CANCEL_STATUS;
 						
 						if (monitor.isCanceled())
 							return Status.CANCEL_STATUS;
 						
-						monitor.subTask(Messages.ReferencerEditor_12);
+						monitor.subTask(RCPMessages.ReferencerEditor_12);
 						if (!referencer.groupPositionsbyId())
 							return Status.CANCEL_STATUS;
 						
@@ -292,7 +292,7 @@
 					
 					monitor.worked(50);
 
-					monitor.subTask(Messages.ReferencerEditor_13);
+					monitor.subTask(RCPMessages.ReferencerEditor_13);
 					syncExec(new Runnable() {
 						@Override
 						public void run() {
@@ -304,7 +304,7 @@
 							//setPartName(referencer.getName()); //$NON-NLS-1$
 							
 							viewer.getTable().setFocus();
-							System.out.println(NLS.bind(Messages.CreatePartition_5, referencer.getNLines(), referencer.getV()));
+							System.out.println(NLS.bind(RCPMessages.CreatePartition_5, referencer.getNLines(), referencer.getV()));
 						}
 					});
 
@@ -365,7 +365,7 @@
 
 		// [Search]
 		Button go = new Button(paramArea, SWT.PUSH);
-		go.setText(Messages.SEARCH);
+		go.setText(RCPMessages.SEARCH);
 		go.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 				false, false));
 		Font f = go.getFont();
@@ -389,7 +389,7 @@
 		patternArea = new PropertiesSelector(paramArea, SWT.NONE);
 		patternArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false,3,1));
 		patternArea.setLayout(new GridLayout(3, false));
-		patternArea.setText(Messages.ReferencerEditor_6);
+		patternArea.setText(RCPMessages.ReferencerEditor_6);
 
 		//pagination
 		navigationArea = new NavigationWidget(paramArea, SWT.None);
@@ -402,7 +402,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.ReferencerEditor_17);
+				StatusLine.setMessage(RCPMessages.ReferencerEditor_17);
 				fillDisplayArea(0, lineperpage);
 				viewer.getTable().select(0);
 				viewer.getTable().showSelection();
@@ -416,7 +416,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.ReferencerEditor_19);
+				StatusLine.setMessage(RCPMessages.ReferencerEditor_19);
 				fillDisplayArea(referencer.getNLines()
 						- lineperpage, referencer.getNLines());
 				viewer.getTable().select(0);
@@ -431,7 +431,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.ReferencerEditor_21);
+				StatusLine.setMessage(RCPMessages.ReferencerEditor_21);
 				fillDisplayArea(topLine + lineperpage,
 						bottomLine + lineperpage);
 				viewer.getTable().select(0);
@@ -446,7 +446,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.ReferencerEditor_23);
+				StatusLine.setMessage(RCPMessages.ReferencerEditor_23);
 				fillDisplayArea(topLine - lineperpage,
 						bottomLine - lineperpage);
 				viewer.getTable().select(0);
@@ -486,7 +486,7 @@
 						.getSelection(), e.y);
 				int col = getPointedColumn(mouseposition);
 				if (col == 1) {
-					StatusLine.setMessage(Messages.ReferencerEditor_25);
+					StatusLine.setMessage(RCPMessages.ReferencerEditor_25);
 					sendSelectionToConc();
 				} else if (col == 2) {
 					//System.out.println("Send to edition ?"); //$NON-NLS-1$
@@ -499,8 +499,8 @@
 		nColumn.pack();
 
 		unitColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
-		unitColumn.setText(Messages.ReferencerEditor_9);
-		unitColumn.setToolTipText(Messages.ReferencerEditor_9);
+		unitColumn.setText(RCPMessages.ReferencerEditor_9);
+		unitColumn.setToolTipText(RCPMessages.ReferencerEditor_9);
 		unitColumn.setWidth(200);
 		unitColumn.addSelectionListener(new SelectionListener() {
 			@Override
@@ -514,8 +514,8 @@
 		});
 
 		freqColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
-		freqColumn.setText(Messages.ReferencerEditor_11);
-		freqColumn.setToolTipText(Messages.ReferencerEditor_11);
+		freqColumn.setText(RCPMessages.ReferencerEditor_11);
+		freqColumn.setToolTipText(RCPMessages.ReferencerEditor_11);
 		freqColumn.setWidth(100);
 		freqColumn.addSelectionListener(new SelectionListener() {
 			@Override
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java	(revision 512)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java	(revision 513)
@@ -35,7 +35,7 @@
 import org.txm.partition.rcp.messages.PartitionUIMessages;
 import org.txm.rcp.preferences.TXMPreferencePage;
 import org.txm.rcp.preferences.TXMPreferenceStore;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 /**
  * Partition preference page.
@@ -76,7 +76,7 @@
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(PartitionDimensionsPreferences.PREFERENCES_NODE));
 		//this.setDescription(Messages.DiagnosticPreferencePage_1);
-		this.setTitle(Messages.DiagnosticPreferencePage_1);
+		this.setTitle(RCPMessages.DiagnosticPreferencePage_1);
 	}
 
 
Index: tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java
===================================================================
--- tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java	(revision 512)
+++ tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java	(revision 513)
@@ -109,7 +109,7 @@
 			
 			
 		} catch (Exception e) {
-			System.err.println(org.txm.rcp.Messages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(org.txm.rcp.RCPMessages.FAILED_TO_SAVE_PREFERENCES + e);
 		}
 		return true;
 	}
Index: tmp/org.txm.index.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.index.core/META-INF/MANIFEST.MF	(revision 512)
+++ tmp/org.txm.index.core/META-INF/MANIFEST.MF	(revision 513)
@@ -14,6 +14,7 @@
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.index.core.functions,
  org.txm.index.core.messages,
+ org.txm.index.core.preferences,
  org.txm.macro.r,
  org.txm.test
 Bundle-Vendor: Textometrie.org
Index: tmp/org.txm.internalview.core/.classpath
===================================================================
--- tmp/org.txm.internalview.core/.classpath	(revision 512)
+++ tmp/org.txm.internalview.core/.classpath	(revision 513)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: tmp/org.txm.searchengine.cqp.rcp/.classpath
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/.classpath	(revision 512)
+++ tmp/org.txm.searchengine.cqp.rcp/.classpath	(revision 513)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java	(revision 512)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java	(revision 513)
@@ -45,7 +45,7 @@
 import org.osgi.service.prefs.Preferences;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.rcp.Application;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.preferences.TXMPreferencePage;
 import org.txm.rcp.preferences.TXMPreferenceStore;
 import org.txm.searchengine.cqp.CQPPreferences;
@@ -110,38 +110,38 @@
 	public void createFieldEditors() {
 
 		cqi_use_network = new BooleanFieldEditor(CQPPreferences.CQI_NETWORK_MODE,
-				Messages.CQPPreferencePage_1,
+				RCPMessages.CQPPreferencePage_1,
 				BooleanFieldEditor.DEFAULT, getFieldEditorParent());
 		cqi_server_path_to_cqplib = new DirectoryFieldEditor(
-				CQPPreferences.CQI_SERVER_PATH_TO_CQPLIB, Messages.CQPPreferencePage_0,
+				CQPPreferences.CQI_SERVER_PATH_TO_CQPLIB, RCPMessages.CQPPreferencePage_0,
 				getFieldEditorParent());
 		cqi_server_is_remote = new BooleanFieldEditor(CQPPreferences.CQI_SERVER_IS_REMOTE,
-				Messages.CQPPreferencePage_10,
+				RCPMessages.CQPPreferencePage_10,
 				BooleanFieldEditor.DEFAULT, getFieldEditorParent());
 		cqi_server_host = new StringFieldEditor(CQPPreferences.CQI_SERVER_HOST,
-				Messages.CQPPreferencePage_11, getFieldEditorParent());
+				RCPMessages.CQPPreferencePage_11, getFieldEditorParent());
 
 		cqi_server_port = new IntegerFieldEditor(CQPPreferences.CQI_SERVER_PORT,
-				Messages.CQPPreferencePage_12, getFieldEditorParent());
+				RCPMessages.CQPPreferencePage_12, getFieldEditorParent());
 
 		cqi_server_user = new StringFieldEditor(CQPPreferences.CQI_SERVER_LOGIN,
-				Messages.CQPPreferencePage_13, getFieldEditorParent());
+				RCPMessages.CQPPreferencePage_13, getFieldEditorParent());
 
 		cqi_server_password = new StringFieldEditor(CQPPreferences.CQI_SERVER_PASSWORD,
-				Messages.CQPPreferencePage_14, getFieldEditorParent());
+				RCPMessages.CQPPreferencePage_14, getFieldEditorParent());
 
 		cqi_server_path_to_executable = new FileFieldEditor(
-				CQPPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, Messages.CQPPreferencePage_15,
+				CQPPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, RCPMessages.CQPPreferencePage_15,
 				getFieldEditorParent());
 
 //		cqi_server_path_to_registry = new DirectoryFieldEditor(
 //				CQI_SERVER_PATH_TO_REGISTRY, Messages.CQPPreferencePage_16,
 //				getFieldEditorParent());
 		cqi_server_path_to_init_file = new FileFieldEditor(
-				CQPPreferences.CQI_SERVER_PATH_TO_INIT_FILE, Messages.CQPPreferencePage_17,
+				CQPPreferences.CQI_SERVER_PATH_TO_INIT_FILE, RCPMessages.CQPPreferencePage_17,
 				getFieldEditorParent());
 		cqi_server_additional_options = new StringFieldEditor(
-				CQPPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, Messages.CQPPreferencePage_18,
+				CQPPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, RCPMessages.CQPPreferencePage_18,
 				getFieldEditorParent());
 
 		addField(cqi_use_network);
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/CreateSubCorpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/CreateSubCorpus.java	(revision 512)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/CreateSubCorpus.java	(revision 513)
@@ -41,7 +41,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.Toolbox;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.actions.CreateSubcorpusDialog;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.corpora.CorporaView;
@@ -69,13 +69,13 @@
 		
 		selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
 		if (selection == null) {
-			System.out.println(Messages.CreateSubCorpus_1+HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActiveEditor());
+			System.out.println(RCPMessages.CreateSubCorpus_1+HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActiveEditor());
 			return null;
 		}
 		Object firstElement = selection.getFirstElement();
 		
 		if (!(firstElement instanceof Corpus)) {
-			System.out.println(Messages.CreateSubCorpus_3+firstElement);
+			System.out.println(RCPMessages.CreateSubCorpus_3+firstElement);
 			return null;
 		}
 		
@@ -86,23 +86,23 @@
 		int code = d.open();
 		if (code == Window.OK) {
 			JobHandler jobhandler = new JobHandler(NLS.bind(
-					Messages.CreateSubCorpus_create, corpus.getName())) {
+					RCPMessages.CreateSubCorpus_create, corpus.getName())) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {		
 					this.runInit(monitor);
 					JobsTimer.start();
 					try {
-						monitor.beginTask(Messages.CreateSubCorpus_begin, 100);
+						monitor.beginTask(RCPMessages.CreateSubCorpus_begin, 100);
 						final Subcorpus subcorpus;
 
 						if (d.isAdvancedSelected() || d.isAssistedSelected()) {
 							Query q = new Query(d.getQuery());
-							System.out.println(NLS.bind(Messages.CreateSubcorpus_9,
+							System.out.println(NLS.bind(RCPMessages.CreateSubcorpus_9,
 								corpus.getName(), q.getQueryString())); 
 							subcorpus = corpus.createSubcorpus(q, d.getName());
 						} 
 						else {
-							System.out.println(NLS.bind(Messages.CreateSubcorpus_7,
+							System.out.println(NLS.bind(RCPMessages.CreateSubcorpus_7,
 							new Object[]{corpus.getName(), d.getStructuralUnit(),
 									d.getStructuralUnitProperty(), d.getValues()}));
 							
@@ -121,15 +121,15 @@
 						if(subcorpus == null)
 						{
 							monitor.done();
-							System.out.println(Messages.CreateSubCorpus_0);
+							System.out.println(RCPMessages.CreateSubCorpus_0);
 							return Status.CANCEL_STATUS;
 						}
 						
-						System.out.println(NLS.bind(Messages.CreateSubcorpus_8
+						System.out.println(NLS.bind(RCPMessages.CreateSubcorpus_8
 								, subcorpus.getName()));
 						monitor.worked(50);
 
-						monitor.subTask(Messages.RefreshingCorporaView);
+						monitor.subTask(RCPMessages.RefreshingCorporaView);
 						syncExec(new Runnable() {
 							@Override
 							public void run() {
@@ -147,9 +147,9 @@
 						Log.severe(e.toString());
 						
 						try {
-							System.out.println(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
+							System.out.println(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
 						} catch (Exception e1) {
-							System.out.println(Messages.CreateSubCorpus_2+e1);
+							System.out.println(RCPMessages.CreateSubCorpus_2+e1);
 							org.txm.rcp.utils.Logger.printStackTrace(e1);
 						}
 					} finally {
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/CreatePartition.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/CreatePartition.java	(revision 512)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/CreatePartition.java	(revision 513)
@@ -40,7 +40,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.actions.CreatePartitionDialog;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.corpora.CorporaView;
@@ -78,30 +78,30 @@
 		if (code == Window.OK) {
 			try {
 				JobHandler jobhandler = new JobHandler(NLS.bind(
-						Messages.CreatePartition_0, corpus.getName())) {
+						RCPMessages.CreatePartition_0, corpus.getName())) {
 					@Override
 					protected IStatus run(IProgressMonitor monitor) {
 						this.runInit(monitor);
 						try {
 							JobsTimer.start();
 							monitor.beginTask(
-									NLS.bind(Messages.CreatePartition_0,
+									NLS.bind(RCPMessages.CreatePartition_0,
 											corpus.getName()), 100);
 							System.out.println(NLS.bind(
-									Messages.CreatePartition_0,
+									RCPMessages.CreatePartition_0,
 									corpus.getName()));
 							final Partition partition = d.getPartition();
 							if (partition == null) {
 								monitor.done();
-								System.out.println(Messages.CreatePartition_2);
+								System.out.println(RCPMessages.CreatePartition_2);
 								return Status.CANCEL_STATUS;
 							}
 							System.out.println(NLS.bind(
-									Messages.CreatePartition_6,
+									RCPMessages.CreatePartition_6,
 									partition.getNPart()));
 							monitor.worked(95);
 
-							monitor.subTask(Messages.RefreshingCorporaView);
+							monitor.subTask(RCPMessages.RefreshingCorporaView);
 							syncExec(new Runnable() {
 								@Override
 								public void run() {
@@ -122,7 +122,7 @@
 				jobhandler.startJob();
 
 			} catch (Exception e) {
-				System.err.println(NLS.bind(Messages.Error_creating_partition,
+				System.err.println(NLS.bind(RCPMessages.Error_creating_partition,
 						e));
 			}
 		}
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/ExportCorpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/ExportCorpus.java	(revision 512)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/ExportCorpus.java	(revision 513)
@@ -44,7 +44,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.Toolbox;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
@@ -112,22 +112,22 @@
 			lastopenedfile = filepath;
 			final File outfile = new File(filepath);
 			JobHandler jobhandler = new JobHandler(NLS.bind(
-					Messages.ExportCorpus_3, corpus.getName())) {
+					RCPMessages.ExportCorpus_3, corpus.getName())) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					this.runInit(monitor);
 					try {
 						monitor.beginTask(
-								NLS.bind(Messages.ExportCorpus_3,
+								NLS.bind(RCPMessages.ExportCorpus_3,
 										corpus.getName()), 100);
 						
 
 						if (!corpus.export(outfile, this)) {
 							System.out.println(NLS.bind(
-									Messages.ExportCorpus_0, corpus.getName()));
+									RCPMessages.ExportCorpus_0, corpus.getName()));
 						}
 
-						System.out.println(Messages.bind(Messages.ExportCorpus_4,outfile.getAbsolutePath()));
+						System.out.println(RCPMessages.bind(RCPMessages.ExportCorpus_4,outfile.getAbsolutePath()));
 						monitor.worked(100);
 					} catch (ThreadDeath td) {
 						return Status.CANCEL_STATUS;
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/OpenBiblio.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/OpenBiblio.java	(revision 512)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/rcp/commands/base/OpenBiblio.java	(revision 513)
@@ -38,7 +38,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.objects.Text;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.OpenBrowser;
 import org.txm.rcp.editors.TXMBrowser;
 import org.txm.rcp.swt.dialog.ComboDialog;
@@ -79,11 +79,11 @@
 			textids = new ArrayList<String>(corpus.getTextsID());
 			if (textids.size() == 0)
 			{
-				System.out.println(NLS.bind(Messages.OpenBiblio_1, corpus.getName()));
+				System.out.println(NLS.bind(RCPMessages.OpenBiblio_1, corpus.getName()));
 				return null;
 			}
 
-			ComboDialog dialog = new ComboDialog(shell, Messages.OpenBiblio_2, textids, textids.get(0));
+			ComboDialog dialog = new ComboDialog(shell, RCPMessages.OpenBiblio_2, textids, textids.get(0));
 			if (dialog.open() == Window.OK)
 			{
 				String textid = dialog.getSelectedValue();
@@ -109,7 +109,7 @@
 
 		Text text = corpus.getMainCorpus().getText(textid);
 		if (text == null) {
-			System.out.println(NLS.bind(Messages.OpenBiblio_7, textid, corpus.getName()));
+			System.out.println(NLS.bind(RCPMessages.OpenBiblio_7, textid, corpus.getName()));
 			return null;
 		}
 
@@ -129,12 +129,12 @@
 			return null;
 		}
 		if (text.getBiblioPath() == null) {
-			System.out.println(NLS.bind(Messages.OpenBiblio_9, text.getName()));
+			System.out.println(NLS.bind(RCPMessages.OpenBiblio_9, text.getName()));
 			return null;
 		}
 		String url = text.getBiblioPath().toString();
 		if (url.trim().length() == 0) {
-			System.out.println(NLS.bind(Messages.OpenBiblio_9, text.getName()));
+			System.out.println(NLS.bind(RCPMessages.OpenBiblio_9, text.getName()));
 			return null;
 		}
 		TXMBrowser attachedBrowserEditor = OpenBrowser.openEdition(url);
Index: tmp/org.txm.synopticeditor.rcp/src/org/txm/rcp/synoptic/commands/OpenEdition.java
===================================================================
--- tmp/org.txm.synopticeditor.rcp/src/org/txm/rcp/synoptic/commands/OpenEdition.java	(revision 512)
+++ tmp/org.txm.synopticeditor.rcp/src/org/txm/rcp/synoptic/commands/OpenEdition.java	(revision 513)
@@ -45,7 +45,7 @@
 import org.txm.rcp.synoptic.editor.EditionSelectorDialog;
 import org.txm.rcp.synoptic.editor.SynopticEditionEditor;
 import org.txm.rcp.synoptic.editor.SynopticEditorInput;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
 import org.txm.searchengine.cqp.corpus.Property;
Index: tmp/org.txm.links.rcp/.classpath
===================================================================
--- tmp/org.txm.links.rcp/.classpath	(revision 512)
+++ tmp/org.txm.links.rcp/.classpath	(revision 513)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: tmp/org.txm.links.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.links.rcp/META-INF/MANIFEST.MF	(revision 512)
+++ tmp/org.txm.links.rcp/META-INF/MANIFEST.MF	(revision 513)
@@ -33,5 +33,6 @@
  org.txm.rcp,
  org.txm.index.rcp,
  org.txm.progression.rcp,
- org.txm.lexicaltable.rcp
+ org.txm.lexicaltable.rcp,
+ org.txm.libs.batik
 Export-Package: org.txm.rcp.commands.link
Index: tmp/org.txm.links.rcp/src/ComputeIndexFromLines.java
===================================================================
--- tmp/org.txm.links.rcp/src/ComputeIndexFromLines.java	(revision 512)
+++ tmp/org.txm.links.rcp/src/ComputeIndexFromLines.java	(revision 513)
@@ -33,7 +33,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.link.ConcordanceToIndex;
 
 // TODO: Auto-generated Javadoc
@@ -62,8 +62,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.ComputeIndexFromLines_0);
-		setToolTipText(Messages.ComputeIndexFromLines_0);
+		setText(RCPMessages.ComputeIndexFromLines_0);
+		setToolTipText(RCPMessages.ComputeIndexFromLines_0);
 	}
 
 	/* (non-Javadoc)
Index: tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/CooccurrencesToConcordances.java
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/CooccurrencesToConcordances.java	(revision 512)
+++ tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/CooccurrencesToConcordances.java	(revision 513)
@@ -44,7 +44,7 @@
 import org.txm.cooccurrence.core.functions.Cooccurrence;
 import org.txm.cooccurrence.core.functions.Cooccurrence.CLine;
 import org.txm.cooccurrence.rcp.editors.CooccurrencesEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
@@ -130,7 +130,7 @@
 			ConcordanceEditor conceditor = (ConcordanceEditor) page
 					.openEditor(editorInput, ConcordanceEditor.ID); //$NON-NLS-1$
 		} catch (PartInitException e) {
-			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
+			System.err.println("Error: "+e.getLocalizedMessage());
 		}
 	}
 }
Index: tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToLexicalTable.java
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToLexicalTable.java	(revision 512)
+++ tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToLexicalTable.java	(revision 513)
@@ -48,7 +48,7 @@
 import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
 import org.txm.lexicaltable.rcp.editors.LexicalTableEditorInput;
 import org.txm.rcp.handlers.BaseAbstractHandler;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.statsengine.r.core.data.QuantitativeDataStructureImpl;
 import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
@@ -95,18 +95,18 @@
 
 		if (!voc.isComputedWithPartition()) {
 			
-			System.out.println(Messages.IndexToLexicalTable_0);
-			StatusLine.setMessage(Messages.IndexToLexicalTable_0);
+			System.out.println(RCPMessages.IndexToLexicalTable_0);
+			StatusLine.setMessage(RCPMessages.IndexToLexicalTable_0);
 			return false;
 		}
 
-		System.out.println(Messages.ComputeLexicalTable_3);
+		System.out.println(RCPMessages.ComputeLexicalTable_3);
 		ArrayList<String> choices = new ArrayList<String>();
-		choices.add(Messages.ComputeLexicalTable_16);
-		choices.add(Messages.ComputeLexicalTable_12);
+		choices.add(RCPMessages.ComputeLexicalTable_16);
+		choices.add(RCPMessages.ComputeLexicalTable_12);
 		ListSelectionDialog dialog = new ListSelectionDialog(shell, 
 				choices, new ArrayContentProvider(), new LabelProvider(), 
-				Messages.ComputeLexicalTable_13);
+				RCPMessages.ComputeLexicalTable_13);
 		
 		int ret = dialog.open();
 		//System.out.println("ret= "+ret);
@@ -130,7 +130,7 @@
 					.getActiveWorkbenchWindow();
 			IWorkbenchPage page = window.getActivePage();
 			LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
-			StatusLine.setMessage(Messages.ComputeLexicalTable_10);
+			StatusLine.setMessage(RCPMessages.ComputeLexicalTable_10);
 			page.openEditor(editorInput, "org.txm.rcp.editors.lexicaltable.LexicalTableEditor"); //$NON-NLS-1$
 		} catch (PartInitException e) {
 			org.txm.rcp.utils.Logger.printStackTrace(e);
Index: tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/TextToConcordance.java
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/TextToConcordance.java	(revision 512)
+++ tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/TextToConcordance.java	(revision 513)
@@ -38,7 +38,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.concordance.core.functions.Concordance;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.IEditionEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.searchengine.cqp.corpus.Corpus;
@@ -86,7 +86,7 @@
 				ConcordanceEditor conceditor = (ConcordanceEditor) page
 						.openEditor(editorInput, "ConcordanceEditor"); //$NON-NLS-1$
 			} catch (PartInitException e) {
-				System.err.println(NLS.bind(Messages.GetConcordances_4, e));
+				System.err.println("Error: "+e.getLocalizedMessage());
 			}
 		}
 		return null;
Index: tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/ConcordanceToIndex.java
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/ConcordanceToIndex.java	(revision 512)
+++ tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/ConcordanceToIndex.java	(revision 513)
@@ -41,7 +41,7 @@
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
 import org.txm.index.core.functions.Index;
 import org.txm.index.rcp.editors.IndexEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
@@ -90,7 +90,7 @@
 			voceditor.setFocus(query);
 			voceditor.computeResult();
 		} catch (PartInitException e) {
-			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
+			System.err.println("Error: "+e.getLocalizedMessage());
 		}
 
 		return null;
Index: tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToConcordance.java
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToConcordance.java	(revision 512)
+++ tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToConcordance.java	(revision 513)
@@ -42,7 +42,7 @@
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
 import org.txm.index.core.functions.Line;
 import org.txm.index.rcp.editors.IndexEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
@@ -84,7 +84,7 @@
 			ConcordanceEditor conceditor = (ConcordanceEditor) page
 					.openEditor(editorInput, ConcordanceEditor.ID); //$NON-NLS-1$
 		} catch (PartInitException e) {
-			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
+			System.err.println("Error: "+e.getLocalizedMessage());
 		}
 
 		return null;
@@ -145,7 +145,7 @@
 			ConcordanceEditor conceditor = (ConcordanceEditor) page
 					.openEditor(editorInput, ConcordanceEditor.ID); //$NON-NLS-1$
 		} catch (PartInitException e) {
-			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
+			System.err.println("Error: "+e.getLocalizedMessage());
 		}
 
 		return null;
Index: tmp/org.txm.links.rcp/src/org/txm/links/rcp/ComputeIndexFromLines.java
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/links/rcp/ComputeIndexFromLines.java	(revision 512)
+++ tmp/org.txm.links.rcp/src/org/txm/links/rcp/ComputeIndexFromLines.java	(revision 513)
@@ -33,7 +33,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.link.ConcordanceToIndex;
 
 // TODO: Auto-generated Javadoc
@@ -62,8 +62,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.ComputeIndexFromLines_0);
-		setToolTipText(Messages.ComputeIndexFromLines_0);
+		setText(RCPMessages.ComputeIndexFromLines_0);
+		setToolTipText(RCPMessages.ComputeIndexFromLines_0);
 	}
 
 	/* (non-Javadoc)
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor2.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor2.java	(revision 512)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor2.java	(revision 513)
@@ -66,7 +66,7 @@
 import org.txm.lexicaltable.core.statsengine.data.ILexicalTable;
 import org.txm.lexicaltable.rcp.handlers.MergeLines;
 import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TXMEditorPart;
 import org.txm.rcp.editors.TableKeyListener;
@@ -161,7 +161,7 @@
 		} else if (index == -1) { // freqs
 			try {
 				itable.sortByFreqs(reverse);
-				StatusLine.setMessage(Messages.SORT_DONE);
+				StatusLine.setMessage(RCPMessages.SORT_DONE);
 			} catch (Exception e2) {
 				org.txm.rcp.utils.Logger.printStackTrace(e2);
 			}
@@ -205,7 +205,7 @@
 				System.out.println(NLS.bind(LexicalTableUIMessages.LexicalTableEditor_5, nLinesSpinner.getSelection(), minfreqspinner.getSelection()));
 
 				MessageBox messageBox = new MessageBox(e.display.getActiveShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO);
-				messageBox.setMessage(Messages.DeleteLines_1);
+				messageBox.setMessage(RCPMessages.DeleteLines_1);
 				int response = messageBox.open();
 				if (response != SWT.YES)
 					return;
@@ -411,7 +411,7 @@
 		formColumn.setLabelProvider(clp);
 		
 		freqColumn = new TableViewerColumn(viewer, SWT.LEFT);
-		freqColumn.getColumn().setText(Messages.FrequencyListEditorInput_4); 
+		freqColumn.getColumn().setText(RCPMessages.FrequencyListEditorInput_4); 
 		freqColumn.getColumn().setWidth(200);
 		freqColumn.getColumn().addSelectionListener(new ColumnSelectionListener(freqColumn, -1));
 		freqColumn.setLabelProvider(clp);
@@ -609,7 +609,7 @@
 		 */
 		@Override
 		public void widgetSelected(SelectionEvent e) {
-			StatusLine.setMessage(Messages.SORT_COLUMN);
+			StatusLine.setMessage(RCPMessages.SORT_COLUMN);
 			sort(col, index);
 			StatusLine.setMessage(""); //$NON-NLS-1$
 		}
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java	(revision 512)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java	(revision 513)
@@ -36,7 +36,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.ObjectSelectionDialog;
 // TODO: Auto-generated Javadoc
 /**
@@ -79,7 +79,7 @@
 	@Override
 	protected void configureShell(Shell shell) {
 	      super.configureShell(shell);
-	      shell.setText(Messages.MergeDeleteDialog_1);
+	      shell.setText(RCPMessages.MergeDeleteDialog_1);
 	   }
 
 
@@ -91,18 +91,18 @@
 		super.createDialogArea(parent);
 
 		mergeRadio = new Button(mainArea, SWT.RADIO);
-		mergeRadio.setText(Messages.MergeDeleteDialog_0);
+		mergeRadio.setText(RCPMessages.MergeDeleteDialog_0);
 		mergeRadio.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false,
 				2, 1));
 		mergeRadio.setSelection(true);
 		
 		deleteRadio = new Button(mainArea, SWT.RADIO);
-		deleteRadio.setText(Messages.ProgressionDialog_5);
+		deleteRadio.setText(RCPMessages.ProgressionDialog_5);
 		deleteRadio.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false,
 				2, 1));
 		
 		newname = new Text(mainArea, SWT.SINGLE | SWT.BORDER);
-		newname.setText(Messages.MergeDeleteDialog_4);
+		newname.setText(RCPMessages.MergeDeleteDialog_4);
 		newname.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 4,
 				1));
 
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableDialog.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableDialog.java	(revision 512)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableDialog.java	(revision 513)
@@ -45,7 +45,7 @@
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
@@ -158,7 +158,7 @@
 			anaPropLabel.setText(mess);
 		else
 			anaPropLabel
-					.setText(Messages.Property);
+					.setText(RCPMessages.Property);
 		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 				false, false));
 
@@ -176,7 +176,7 @@
 		anaPropCombo.select(iword);
 
 		maxlinesLabel = new Label(composite, SWT.NONE);
-		maxlinesLabel.setText(Messages.NumberOfLines);
+		maxlinesLabel.setText(RCPMessages.NumberOfLines);
 		maxlinesLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 				true, false));
 		maxlinesSpinner = new Spinner(composite, SWT.BORDER);
@@ -207,8 +207,8 @@
 		int propIndex = anaPropCombo.getSelectionIndex();
 		if (propIndex == -1) {
 			MessageDialog.openError(getShell(),
-					Messages.Invalid_analysis_property,
-					Messages.Structure_field_not_empty);
+					RCPMessages.Invalid_analysis_property,
+					RCPMessages.Structure_field_not_empty);
 			return;
 		}
 		property = properties.get(propIndex);
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/TableEditor.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/TableEditor.java	(revision 512)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/TableEditor.java	(revision 513)
@@ -42,7 +42,7 @@
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.Tablable;
 import org.txm.rcp.editors.TableKeyListener;
 import org.txm.rcp.editors.TableSorter;
@@ -132,7 +132,7 @@
 		table.setLinesVisible(true);
 
 		if (!(iEditorInput instanceof Tablable)) {
-			throw new IllegalArgumentException(Messages.TableEditor_0);
+			throw new IllegalArgumentException(RCPMessages.TableEditor_0);
 		}
 
 		Tablable tableInput = (Tablable) iEditorInput;
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditorInput.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditorInput.java	(revision 512)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditorInput.java	(revision 513)
@@ -40,7 +40,7 @@
 import org.eclipse.ui.part.EditorPart;
 import org.txm.lexicaltable.core.functions.LexicalTable;
 import org.txm.rcp.editors.TXMResultEditorInput;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.Tablable;
 import org.txm.rcp.editors.input.AbstractTablable;
 import org.txm.searchengine.cqp.corpus.Property;
@@ -94,14 +94,14 @@
 
 			@Override
 			public String[] getColumnTitles() {
-				return new String[] { Messages.FrequencyListEditorInput_3,
-						Messages.FrequencyListEditorInput_4 };
+				return new String[] { RCPMessages.FrequencyListEditorInput_3,
+						RCPMessages.FrequencyListEditorInput_4 };
 			}
 
 			@Override
 			public String[] getColumnTypes() {
-				return new String[] { Messages.FrequencyListEditorInput_5,
-						Messages.FrequencyListEditorInput_6 };
+				return new String[] { RCPMessages.FrequencyListEditorInput_5,
+						RCPMessages.FrequencyListEditorInput_6 };
 			}
 
 			@Override
@@ -117,7 +117,7 @@
 								v = res.getRow(i).asIntArray();
 							} catch (StatException e) {
 								System.err.println(NLS.bind(
-										Messages.GraphicalLogger_0, e));
+										RCPMessages.GraphicalLogger_0, e));
 							}
 							row.add(v);
 						}
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java	(revision 512)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java	(revision 513)
@@ -41,7 +41,7 @@
 import org.txm.lexicaltable.core.functions.LexicalTable;
 import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
 import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 // TODO: Auto-generated Javadoc
 /**
@@ -68,8 +68,8 @@
 				return null;
 
 			String newname = ""; //$NON-NLS-1$
-			InputDialog d = new InputDialog(shell, Messages.MergeCols_1,
-					Messages.MergeLines_2, "", null); //$NON-NLS-1$ 
+			InputDialog d = new InputDialog(shell, RCPMessages.MergeCols_1,
+					RCPMessages.MergeLines_2, "", null); //$NON-NLS-1$ 
 			if (d.open() == Window.OK)
 				newname = d.getValue();
 			else
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java	(revision 512)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java	(revision 513)
@@ -37,7 +37,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 /**
  * Allow the user to delete lines in a Lexical Table.
  * 
@@ -72,7 +72,7 @@
 			return;
 
 		if (selection.length == LTeditor.getLexicalTable().getNRows()) {
-			System.out.println(Messages.DeleteLines_0);
+			System.out.println(RCPMessages.DeleteLines_0);
 			return;
 		}
 
@@ -81,7 +81,7 @@
 			Shell shell = d.getActiveShell();
 			MessageBox messageBox = new MessageBox(shell, SWT.ICON_QUESTION
 					| SWT.YES | SWT.NO);
-			messageBox.setMessage(Messages.DeleteLines_1);
+			messageBox.setMessage(RCPMessages.DeleteLines_1);
 			int response = messageBox.open();
 			if (response != SWT.YES)
 				return;
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java	(revision 512)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java	(revision 513)
@@ -41,7 +41,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.lexicaltable.core.functions.LexicalTable;
 import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.statsengine.core.StatException;
 /**
  * The Class MergeCols.
@@ -67,8 +67,8 @@
 				return null;
 
 			String newname = ""; //$NON-NLS-1$
-			InputDialog d = new InputDialog(shell, Messages.MergeCols_1,
-					Messages.MergeCols_2, "", null); //$NON-NLS-1$ 
+			InputDialog d = new InputDialog(shell, RCPMessages.MergeCols_1,
+					RCPMessages.MergeCols_2, "", null); //$NON-NLS-1$ 
 			if (d.open() == Window.OK)
 				newname = d.getValue();
 			else
@@ -102,14 +102,14 @@
 			// reset col name
 			table.getColNames().setString(selectedCols[0], newname);
 			try {
-				System.out.println(NLS.bind(Messages.MergeCols_5
+				System.out.println(NLS.bind(RCPMessages.MergeCols_5
 						, Arrays.toString(table.getRowNames().asStringsArray())));
 			} catch (StatException e1) {
 				// TODO Auto-generated catch block
 				org.txm.rcp.utils.Logger.printStackTrace(e1);
 			}
 			;
-			System.out.println(Messages.MergeCols_6);
+			System.out.println(RCPMessages.MergeCols_6);
 			LTeditor.refreshTable();
 		}
 		return null;
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java	(revision 512)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java	(revision 513)
@@ -57,7 +57,7 @@
 import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
 import org.txm.lexicaltable.rcp.editors.LexicalTableEditorInput;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.utils.JobHandler;
@@ -116,15 +116,15 @@
 		if (s instanceof Index) {
 			List<Index> vocabularies = selection.toList();
 
-			System.out.println(Messages.ComputeLexicalTable_3);
+			System.out.println(RCPMessages.ComputeLexicalTable_3);
 			ArrayList<String> choices = new ArrayList<String>();
-			choices.add(Messages.ComputeLexicalTable_16);
-			choices.add(Messages.ComputeLexicalTable_12);
+			choices.add(RCPMessages.ComputeLexicalTable_16);
+			choices.add(RCPMessages.ComputeLexicalTable_12);
 			ListDialog dialog = new ListDialog(window.getShell());
 			dialog.setInput(choices);
 			dialog.setLabelProvider(new LabelProvider());
 			dialog.setContentProvider(new ArrayContentProvider());
-			dialog.setTitle(Messages.ComputeLexicalTable_13);
+			dialog.setTitle(RCPMessages.ComputeLexicalTable_13);
 
 			int ret = dialog.open();
 			boolean useAllOccurrences = false;
@@ -134,7 +134,7 @@
 				if(dialog.getResult().length == 0)
 					return null;
 				String sel = (String) dialog.getResult()[0];
-				if(sel.equals(Messages.ComputeLexicalTable_16))
+				if(sel.equals(RCPMessages.ComputeLexicalTable_16))
 					useAllOccurrences = true;
 			} else {
 				//System.out.println("cancel");
@@ -165,13 +165,13 @@
 	private void computeWithLexicalTableAble(final LexicalTable lexicalTableAble) {
 
 		JobHandler jobhandler = new JobHandler(
-				Messages.ComputeLexicalTable_0) {
+				RCPMessages.ComputeLexicalTable_0) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
 				try {
 					JobsTimer.start();
-					monitor.beginTask(NLS.bind(Messages.ComputeLexicalTable_1, lexicalTableAble.getName(), "none"), 100);
+					monitor.beginTask(NLS.bind(RCPMessages.ComputeLexicalTable_1, lexicalTableAble.getName(), "none"), 100);
 
 					this.acquireSemaphore();
 					//table = lexicalTableAble.toLexicalTable();
@@ -191,7 +191,7 @@
 							IWorkbenchPage page = window.getActivePage();
 							LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
 							try {
-								StatusLine.setMessage(Messages.ComputeLexicalTable_10);
+								StatusLine.setMessage(RCPMessages.ComputeLexicalTable_10);
 								page.openEditor(editorInput, LexicalTableEditor2.ID);
 							} catch (PartInitException e) {
 								org.txm.rcp.utils.Logger.printStackTrace(e);
@@ -242,7 +242,7 @@
 		final int Fmin;
 		final int vmax;
 		
-		String title = Messages.bind(Messages.ComputeLexicalTable_0, partition.getName());
+		String title = RCPMessages.bind(RCPMessages.ComputeLexicalTable_0, partition.getName());
 		LexicalTableDialog d = new LexicalTableDialog(window.getShell(), partition.getCorpus(), title);
 		
 		d.setFminAndVMax(TXMPreferences.getInt(LexicalTablePreferences.F_MIN, LexicalTablePreferences.PREFERENCES_NODE), 
@@ -254,13 +254,13 @@
 			vmax = d.getMaxLines();
 			// PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(CorporaView.ID);
 			JobHandler jobhandler = new JobHandler(
-					Messages.bind(Messages.ComputeLexicalTable_0, partition.getName())) {
+					RCPMessages.bind(RCPMessages.ComputeLexicalTable_0, partition.getName())) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					this.runInit(monitor);
 					try {
 						JobsTimer.start();
-						monitor.beginTask(NLS.bind(Messages.ComputeLexicalTable_1, partition.getName(), property), 100);
+						monitor.beginTask(NLS.bind(RCPMessages.ComputeLexicalTable_1, partition.getName(), property), 100);
 
 						this.acquireSemaphore();
 						table = LexicalTableFactory.getLexicalTable(partition, property, Fmin);
@@ -286,7 +286,7 @@
 								IWorkbenchPage page = window.getActivePage();
 								LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
 								try {
-									StatusLine.setMessage(Messages.ComputeLexicalTable_10);
+									StatusLine.setMessage(RCPMessages.ComputeLexicalTable_10);
 									page.openEditor(editorInput, LexicalTableEditor2.ID); //$NON-NLS-1$
 								} catch (PartInitException e) {
 									org.txm.rcp.utils.Logger.printStackTrace(e);
@@ -435,8 +435,8 @@
 		final List<Index> vocabularies = fullvocabularies.subList(0, 1);
 		for (Index voc : vocabularies) {
 			if (!voc.isComputedWithPartition()) {
-				System.out.println(Messages.ComputeLexicalTable_5);
-				StatusLine.setMessage(Messages.ComputeLexicalTable_5);
+				System.out.println(RCPMessages.ComputeLexicalTable_5);
+				StatusLine.setMessage(RCPMessages.ComputeLexicalTable_5);
 				return false;
 			}
 		}
@@ -444,7 +444,7 @@
 		List<Property> properties = vocabularies.get(0).getProperties();
 		for (Index voc : vocabularies) {
 			if (!properties.equals(voc.getProperties())) {
-				Log.warning(NLS.bind(Messages.ComputeLexicalTable_6, properties));
+				Log.warning(NLS.bind(RCPMessages.ComputeLexicalTable_6, properties));
 				return false;
 			}
 		}
@@ -453,14 +453,14 @@
 		Partition firstPartition = firstIndex.getPartition();
 		for (Index voc : vocabularies) {
 			if (!firstPartition.equals(voc.getPartition())) {
-				Log.warning(NLS.bind(Messages.ComputeLexicalTable_7, firstPartition));
+				Log.warning(NLS.bind(RCPMessages.ComputeLexicalTable_7, firstPartition));
 				return false;
 			}
 		}
 		
 		final Property property = properties.get(0);
 
-		JobHandler jobhandler = new JobHandler(Messages.bind(Messages.ComputeLexicalTable_0, firstIndex.getName())) {
+		JobHandler jobhandler = new JobHandler(RCPMessages.bind(RCPMessages.ComputeLexicalTable_0, firstIndex.getName())) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
@@ -476,14 +476,14 @@
 					firstIndex.addResult(table);
 					monitor.worked(5);
 
-					monitor.subTask(Messages.ComputeLexicalTable_10);
+					monitor.subTask(RCPMessages.ComputeLexicalTable_10);
 					syncExec(new Runnable() {
 						@Override
 						public void run() {
 							IWorkbenchPage page = window.getActivePage();
 							LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
 							try {
-								StatusLine.setMessage(Messages.ComputeLexicalTable_10);
+								StatusLine.setMessage(RCPMessages.ComputeLexicalTable_10);
 								page.openEditor(editorInput,
 										"org.txm.rcp.editors.lexicaltable.LexicalTableEditor"); //$NON-NLS-1$
 							} catch (PartInitException e) {
@@ -496,7 +496,7 @@
 					if (monitor.isCanceled())
 						return Status.CANCEL_STATUS;
 
-					monitor.subTask(Messages.ComputeSpecifities_2);
+					monitor.subTask(RCPMessages.ComputeSpecifities_2);
 					syncExec(new Runnable() {
 						@Override
 						public void run() {
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 512)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 513)
@@ -70,7 +70,7 @@
 import org.txm.index.core.preferences.IndexPreferences;
 import org.txm.index.rcp.messages.IndexUIMessages;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TXMEditorPart;
 import org.txm.rcp.editors.TXMResultEditorInput;
@@ -282,9 +282,9 @@
 
 						final String message;
 						if (index.getV() == 1)
-							message = (Messages.ConcordancesEditor_52);
+							message = (RCPMessages.ONE_RESULT);
 						else if (index.getV() > 0)
-							message = (Messages.bind(Messages.CreatePartition_55, index.getV(), index.getT()));
+							message = (RCPMessages.bind(RCPMessages.CreatePartition_55, index.getV(), index.getT()));
 						else
 							message = (TXMCoreMessages.COMPUTE_DONE_NO_RESULT);
 
@@ -320,7 +320,7 @@
 						e.printStackTrace();
 						System.out.println(e.getLocalizedMessage());
 						try {
-							System.out.println(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
+							System.out.println(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
 						} catch (Exception e1) {
 							System.out.println(IndexUIMessages.IndexEditor_10+e1);
 							org.txm.rcp.utils.Logger.printStackTrace(e1);
@@ -439,7 +439,7 @@
 
 		//propsArea
 		go = new Button(queryArea, SWT.BOLD);
-		go.setText(Messages.SEARCH);
+		go.setText(RCPMessages.SEARCH);
 
 		Font f = go.getFont();
 		FontData defaultFont = f.getFontData()[0];
@@ -679,13 +679,13 @@
 		nColumn.pack();
 
 		unitColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
-		unitColumn.setText(Messages.ReferencerEditor_9);
-		unitColumn.setToolTipText(Messages.ReferencerEditor_9);
+		unitColumn.setText(RCPMessages.ReferencerEditor_9);
+		unitColumn.setToolTipText(RCPMessages.ReferencerEditor_9);
 		unitColumn.setWidth(200);
 		unitColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.SORT_COLUMN);
+				StatusLine.setMessage(RCPMessages.SORT_COLUMN);
 				if (viewer.getTable().getSortColumn() != unitColumn) {
 					viewer.getTable().setSortColumn(unitColumn);
 					viewer.getTable().setSortDirection(SWT.UP);
@@ -700,7 +700,7 @@
 					}
 				}
 
-				StatusLine.setMessage(Messages.SORT_DONE);
+				StatusLine.setMessage(RCPMessages.SORT_DONE);
 				fillDisplayArea(topLine, bottomLine);
 			}
 
@@ -712,14 +712,14 @@
 		freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
 		try {
 			if (index.getPartition() != null)
-				freqColumn.setText(Messages.FrequencyListEditorInput_4+" T="+index.getPartition().getTotalSize()); //$NON-NLS-1$
+				freqColumn.setText(RCPMessages.FrequencyListEditorInput_4+" T="+index.getPartition().getTotalSize()); //$NON-NLS-1$
 			else
-				freqColumn.setText(Messages.FrequencyListEditorInput_4);
+				freqColumn.setText(RCPMessages.FrequencyListEditorInput_4);
 		} catch (CqiClientException e2) {
 			// TODO Auto-generated catch block
 			org.txm.rcp.utils.Logger.printStackTrace(e2);
 		}
-		freqColumn.setToolTipText(Messages.FrequencyListEditorInput_4);
+		freqColumn.setToolTipText(RCPMessages.FrequencyListEditorInput_4);
 		freqColumn.setWidth(100);
 		freqColumn.addSelectionListener(new SelectionListener() {
 			@Override
@@ -737,7 +737,7 @@
 						index.sortLines(SortMode.FREQUNIT, false);
 					}
 				}
-				StatusLine.setMessage(Messages.SORT_DONE);
+				StatusLine.setMessage(RCPMessages.SORT_DONE);
 				fillDisplayArea(topLine, bottomLine);
 			}
 
Index: tmp/org.txm.internalview.rcp/src/org/txm/rcp/internal/rcp/handler/ComputeInternalView.java
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/rcp/internal/rcp/handler/ComputeInternalView.java	(revision 512)
+++ tmp/org.txm.internalview.rcp/src/org/txm/rcp/internal/rcp/handler/ComputeInternalView.java	(revision 513)
@@ -70,11 +70,11 @@
 
 		IWorkbenchPage page = window.getActivePage();
 		try {
-			StatusLine.setMessage(org.txm.rcp.Messages.OK);
+			StatusLine.setMessage(org.txm.rcp.RCPMessages.OK);
 			page.openEditor(editorInput, InternalViewEditor.ID); //$NON-NLS-1$
 		
 		} catch (PartInitException e) {
-			System.err.println(org.txm.rcp.Messages.OK+ e);
+			System.err.println(org.txm.rcp.RCPMessages.OK+ e);
 		}
 
 		return null;
Index: tmp/org.txm.internalview.rcp/src/org/txm/internal/rcp/editors/InternalViewEditor.java
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/internal/rcp/editors/InternalViewEditor.java	(revision 512)
+++ tmp/org.txm.internalview.rcp/src/org/txm/internal/rcp/editors/InternalViewEditor.java	(revision 513)
@@ -263,7 +263,7 @@
 
 		Button ok = new Button(formPanel, SWT.PUSH);
 		ok.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
-		ok.setText(org.txm.rcp.Messages.REFRESH);
+		ok.setText(org.txm.rcp.RCPMessages.REFRESH);
 		ok.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
Index: tmp/org.txm.internalview.rcp/.classpath
===================================================================
--- tmp/org.txm.internalview.rcp/.classpath	(revision 512)
+++ tmp/org.txm.internalview.rcp/.classpath	(revision 513)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/___ProgressionEditorInput.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/___ProgressionEditorInput.java	(revision 512)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/___ProgressionEditorInput.java	(revision 513)
@@ -34,7 +34,7 @@
 import org.txm.progression.core.functions.Progression;
 import org.txm.rcp.Application;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * The Class ProgressionEditorInput.
@@ -87,7 +87,7 @@
 	 */
 	@Override
 	public String getName() {
-		return Messages.ProgressionEditorInput_0;
+		return RCPMessages.ProgressionEditorInput_0;
 	}
 
 	/**
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java	(revision 512)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java	(revision 513)
@@ -29,7 +29,7 @@
 import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
 import org.txm.progression.core.chartsengine.base.Utils;
 import org.txm.progression.core.functions.Progression;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.synoptic.commands.OpenEdition;
 import org.txm.rcp.synoptic.editor.EditionPanel.RGBA;
@@ -331,7 +331,7 @@
 			
 		}
 		catch (PartInitException e) {
-			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
+			System.err.println("Error: "+e.getLocalizedMessage());
 		}
 
 		linkedEditor.setQuery(query);
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java	(revision 512)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java	(revision 513)
@@ -50,7 +50,7 @@
 import org.txm.progression.rcp.dialogs.ProgressionDialog;
 import org.txm.progression.rcp.forms.ProgressionParametersComposite;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.utils.JobHandler;
@@ -274,7 +274,7 @@
 					}
 					monitor.worked(45);
 
-					monitor.subTask(Messages.RefreshingCorporaView);
+					monitor.subTask(RCPMessages.RefreshingCorporaView);
 					CorporaView.storeResult(corpus, progression);
 					
 					monitor.worked(5);
@@ -286,7 +286,7 @@
 					System.out.println(NLS.bind(ProgressionCoreMessages.ComputeProgression_13, e));
 					Log.severe(ProgressionCoreMessages.ComputeProgression_13 + Log.toString(e));
 					try {
-						System.out.println(Messages.LastCQPError + CQPEngine.getCqiClient().getLastCQPError());
+						System.out.println(RCPMessages.LastCQPError + CQPEngine.getCqiClient().getLastCQPError());
 					} catch (Exception e1) {
 						System.out.println(ProgressionCoreMessages.ComputeProgression_1 + e1);
 						Log.printStackTrace(e1);
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/dialogs/ProgressionDialog.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/dialogs/ProgressionDialog.java	(revision 512)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/dialogs/ProgressionDialog.java	(revision 513)
@@ -60,7 +60,7 @@
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.progression.core.preferences.ProgressionPreferences;
 import org.txm.rcp.preferences.TXMPreferenceStore;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.swt.widget.AssistedQueryWidget;
 import org.txm.searchengine.cqp.corpus.Corpus;
@@ -195,7 +195,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(Messages.ProgressionDialog_0);
+		newShell.setText(RCPMessages.ProgressionDialog_0);
 		newShell.setMinimumSize(300, 460);
 
 	}
@@ -258,20 +258,20 @@
 			// controls
 			// graph param
 			Label typeLabel = new Label(paramPanel, SWT.NONE);
-			typeLabel.setText(Messages.ProgressionDialog_1);
+			typeLabel.setText(RCPMessages.ProgressionDialog_1);
 			typeLabel.setAlignment(SWT.CENTER);
 
 			cumuButton = new Button(paramPanel, SWT.RADIO);
-			cumuButton.setText(Messages.ProgressionDialog_2);
+			cumuButton.setText(RCPMessages.ProgressionDialog_2);
 			cumuButton.setSelection(cumulative);
 
 			Button densityButton = new Button(paramPanel, SWT.RADIO);
-			densityButton.setText(Messages.ProgressionDialog_3);
+			densityButton.setText(RCPMessages.ProgressionDialog_3);
 			densityButton.setSelection(!cumulative);
 
 			//Bande size
 			typeLabel = new Label(paramPanel, SWT.NONE);
-			typeLabel.setText(Messages.ProgressionDialog_11);
+			typeLabel.setText(RCPMessages.ProgressionDialog_11);
 			typeLabel.setAlignment(SWT.CENTER);
 
 			bandeField = new Text(paramPanel, SWT.BORDER);
@@ -280,13 +280,13 @@
 					GridData.FILL, true, true, 2, 1));
 			// Structural units param
 			Group displayParam = new Group(paramPanel, SWT.BORDER);
-			displayParam.setText(Messages.ProgressionDialog_13);
+			displayParam.setText(RCPMessages.ProgressionDialog_13);
 			displayParam.setLayout(new GridLayout(3, true));
 			displayParam.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, true, 3, 1));
 
 			Label structLabel = new Label(displayParam, SWT.NONE);
-			structLabel.setText(Messages.ProgressionDialog_4);
+			structLabel.setText(RCPMessages.ProgressionDialog_4);
 			structLabel.setAlignment(SWT.CENTER);
 
 			structuralUnitsCombo = new Combo(displayParam, SWT.READ_ONLY);
@@ -311,7 +311,7 @@
 					structuralUnitsCombo.add(unit.getName());
 				}
 			} catch (Exception e) {
-				Log.severe(Messages.ObjectExplorer_9
+				Log.severe(RCPMessages.ObjectExplorer_9
 						+ Log.toString(e));
 				return null;
 			}
@@ -335,7 +335,7 @@
 
 			// property value field
 			Label regexLabel = new Label(displayParam, SWT.NONE);
-			regexLabel.setText(Messages.ProgressionDialog_7);
+			regexLabel.setText(RCPMessages.ProgressionDialog_7);
 			regexLabel.setAlignment(SWT.CENTER);
 
 			regexValue = new Text(displayParam, SWT.SINGLE | SWT.BORDER);
@@ -344,12 +344,12 @@
 
 			//spacer
 			styleButton = new Button(displayParam, SWT.CHECK);
-			styleButton.setText(Messages.ProgressionDialog_14);
+			styleButton.setText(RCPMessages.ProgressionDialog_14);
 			styleButton.setSelection(monostyle);
 
 			//Repeat options
 			repeatButton = new Button(displayParam, SWT.CHECK);
-			repeatButton.setText(Messages.ProgressionDialog_15);
+			repeatButton.setText(RCPMessages.ProgressionDialog_15);
 			repeatButton.setSelection(repeatvalues);
 
 			//Color options
@@ -359,13 +359,13 @@
 
 			// queries param
 			Label focusLabel = new Label(paramPanel, SWT.NONE);
-			focusLabel.setText(Messages.ProgressionDialog_8);
+			focusLabel.setText(RCPMessages.ProgressionDialog_8);
 			focusLabel.setAlignment(SWT.CENTER);
 
 			Button plusButton = new Button(paramPanel, SWT.NONE);
 			plusButton.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 					true, true));
-			plusButton.setText(Messages.ProgressionDialog_9);
+			plusButton.setText(RCPMessages.ProgressionDialog_9);
 			plusButton.addListener(SWT.Selection, new Listener() {
 				@Override
 				public void handleEvent(Event event) {
@@ -382,7 +382,7 @@
 			Button minusButton = new Button(paramPanel, SWT.NONE);
 			minusButton.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, true));
-			minusButton.setText(Messages.ProgressionDialog_5);
+			minusButton.setText(RCPMessages.ProgressionDialog_5);
 			minusButton.addListener(SWT.Selection, new Listener() {
 				@Override
 				public void handleEvent(Event event) {
@@ -466,7 +466,7 @@
 			if (regexpropertyValue.length() == 0)
 				regexpropertyValue = null;
 		} catch (PatternSyntaxException e) {
-			System.out.println(Messages.ProgressionDialog_10 + e);
+			System.out.println(RCPMessages.ProgressionDialog_10 + e);
 		}
 
 		cumulative = cumuButton.getSelection();
@@ -481,8 +481,8 @@
 
 			}catch(Exception e){
 				bandemultiplier = 1.0f;
-				System.out.println(Messages.ProgressionDialog_17+e);
-				StatusLine.error(Messages.ProgressionDialog_17+e);
+				System.out.println(RCPMessages.ProgressionDialog_17+e);
+				StatusLine.error(RCPMessages.ProgressionDialog_17+e);
 			}
 		}
 		else
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/forms/___ProgressionForm.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/forms/___ProgressionForm.java	(revision 512)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/forms/___ProgressionForm.java	(revision 513)
@@ -11,7 +11,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 
 public class ___ProgressionForm extends Composite {
@@ -58,34 +58,34 @@
 		GridData gd_label = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
 		gd_label.widthHint = 29;
 		label.setLayoutData(gd_label);
-		label.setText(Messages.ProgressionForm_0);
+		label.setText(RCPMessages.ProgressionForm_0);
 		
 		cumulBtn = new Button(composite, SWT.RADIO);
-		cumulBtn.setText(Messages.ProgressionForm_1);
+		cumulBtn.setText(RCPMessages.ProgressionForm_1);
 		cumulBtn.setSelection(true);
 		
 		densiBtn = new Button(composite, SWT.RADIO);
-		densiBtn.setText(Messages.ProgressionForm_2);
+		densiBtn.setText(RCPMessages.ProgressionForm_2);
 		
 		Label lblEchelle = new Label(composite, SWT.NONE);
 		lblEchelle.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		lblEchelle.setText(Messages.ProgressionForm_3);
+		lblEchelle.setText(RCPMessages.ProgressionForm_3);
 		
 		scaleTextEdit = new Text(composite, SWT.BORDER);
 		scaleTextEdit.setText("1.0"); //$NON-NLS-1$
 		
 		Label lblOptionsDaffichage = new Label(composite, SWT.NONE);
 		lblOptionsDaffichage.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 4, 1));
-		lblOptionsDaffichage.setText(Messages.ProgressionForm_5);
+		lblOptionsDaffichage.setText(RCPMessages.ProgressionForm_5);
 		new Label(composite, SWT.NONE);
 		
 		Label label_6 = new Label(composite, SWT.NONE);
-		label_6.setText(Messages.ProgressionForm_6);
+		label_6.setText(RCPMessages.ProgressionForm_6);
 		
 		structCombo = new Combo(composite, SWT.NONE);
 		
 		Label label_5 = new Label(composite, SWT.NONE);
-		label_5.setText(Messages.ProgressionForm_7);
+		label_5.setText(RCPMessages.ProgressionForm_7);
 		
 		propCombo = new Combo(composite, SWT.NONE);
 		propCombo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
@@ -93,21 +93,21 @@
 		new Label(composite, SWT.NONE);
 		
 		Label label_7 = new Label(composite, SWT.NONE);
-		label_7.setText(Messages.ProgressionForm_8);
+		label_7.setText(RCPMessages.ProgressionForm_8);
 		
 		regTextEdit = new Text(composite, SWT.BORDER);
 		regTextEdit.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
 		new Label(composite, SWT.NONE);
 		
 		styleRadio = new Button(composite, SWT.CHECK);
-		styleRadio.setText(Messages.ProgressionForm_9);
+		styleRadio.setText(RCPMessages.ProgressionForm_9);
 		styleRadio.setSelection(true);
 		
 		repeatRadio = new Button(composite, SWT.CHECK);
-		repeatRadio.setText(Messages.ProgressionForm_10);
+		repeatRadio.setText(RCPMessages.ProgressionForm_10);
 		
 		NBRadio = new Button(composite, SWT.CHECK);
-		NBRadio.setText(Messages.ProgressionForm_11);
+		NBRadio.setText(RCPMessages.ProgressionForm_11);
 		new Label(composite, SWT.NONE);
 	
 		Composite composite_2 = new Composite(composite_1, SWT.NONE);
@@ -118,13 +118,13 @@
 		composite_3.setLayout(new FillLayout(SWT.HORIZONTAL));
 		
 		Label lblRequetes = new Label(composite_3, SWT.NONE);
-		lblRequetes.setText(Messages.ProgressionForm_12);
+		lblRequetes.setText(RCPMessages.ProgressionForm_12);
 		
 		btnNewButton = new Button(composite_3, SWT.NONE);
-		btnNewButton.setText(Messages.ProgressionForm_13);
+		btnNewButton.setText(RCPMessages.ProgressionForm_13);
 		
 		btnSupprimer = new Button(composite_3, SWT.NONE);
-		btnSupprimer.setText(Messages.ProgressionForm_14);
+		btnSupprimer.setText(RCPMessages.ProgressionForm_14);
 		scrolledComposite_1.setContent(composite_1);
 		scrolledComposite_1.setMinSize(composite_1.computeSize(SWT.DEFAULT, SWT.DEFAULT));
 		
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/forms/ProgressionParametersComposite.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/forms/ProgressionParametersComposite.java	(revision 512)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/forms/ProgressionParametersComposite.java	(revision 513)
@@ -11,7 +11,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 
 public class ProgressionParametersComposite extends Composite {
@@ -67,34 +67,34 @@
 		GridData gd_label = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
 		gd_label.widthHint = 29;
 		label.setLayoutData(gd_label);
-		label.setText(Messages.ProgressionForm_0);
+		label.setText(RCPMessages.ProgressionForm_0);
 		
 		cumulBtn = new Button(composite, SWT.RADIO);
-		cumulBtn.setText(Messages.ProgressionForm_1);
+		cumulBtn.setText(RCPMessages.ProgressionForm_1);
 		cumulBtn.setSelection(true);
 		
 		densiBtn = new Button(composite, SWT.RADIO);
-		densiBtn.setText(Messages.ProgressionForm_2);
+		densiBtn.setText(RCPMessages.ProgressionForm_2);
 		
 		Label lblEchelle = new Label(composite, SWT.NONE);
 		lblEchelle.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		lblEchelle.setText(Messages.ProgressionForm_3);
+		lblEchelle.setText(RCPMessages.ProgressionForm_3);
 		
 		scaleTextEdit = new Text(composite, SWT.BORDER);
 		scaleTextEdit.setText("1.0"); //$NON-NLS-1$
 		
 		Label lblOptionsDaffichage = new Label(composite, SWT.NONE);
 		lblOptionsDaffichage.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 4, 1));
-		lblOptionsDaffichage.setText(Messages.ProgressionForm_5);
+		lblOptionsDaffichage.setText(RCPMessages.ProgressionForm_5);
 		new Label(composite, SWT.NONE);
 		
 		Label label_6 = new Label(composite, SWT.NONE);
-		label_6.setText(Messages.ProgressionForm_6);
+		label_6.setText(RCPMessages.ProgressionForm_6);
 		
 		structCombo = new Combo(composite, SWT.NONE);
 		
 		Label label_5 = new Label(composite, SWT.NONE);
-		label_5.setText(Messages.ProgressionForm_7);
+		label_5.setText(RCPMessages.ProgressionForm_7);
 		
 		propCombo = new Combo(composite, SWT.NONE);
 		propCombo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
@@ -102,21 +102,21 @@
 		new Label(composite, SWT.NONE);
 		
 		Label label_7 = new Label(composite, SWT.NONE);
-		label_7.setText(Messages.ProgressionForm_8);
+		label_7.setText(RCPMessages.ProgressionForm_8);
 		
 		regTextEdit = new Text(composite, SWT.BORDER);
 		regTextEdit.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
 		new Label(composite, SWT.NONE);
 		
 		styleRadio = new Button(composite, SWT.CHECK);
-		styleRadio.setText(Messages.ProgressionForm_9);
+		styleRadio.setText(RCPMessages.ProgressionForm_9);
 		styleRadio.setSelection(true);
 		
 		repeatRadio = new Button(composite, SWT.CHECK);
-		repeatRadio.setText(Messages.ProgressionForm_10);
+		repeatRadio.setText(RCPMessages.ProgressionForm_10);
 		
 		NBRadio = new Button(composite, SWT.CHECK);
-		NBRadio.setText(Messages.ProgressionForm_11);
+		NBRadio.setText(RCPMessages.ProgressionForm_11);
 		new Label(composite, SWT.NONE);
 	
 		Composite composite_2 = new Composite(composite_1, SWT.NONE);
@@ -127,13 +127,13 @@
 		composite_3.setLayout(new FillLayout(SWT.HORIZONTAL));
 		
 		Label lblRequetes = new Label(composite_3, SWT.NONE);
-		lblRequetes.setText(Messages.ProgressionForm_12);
+		lblRequetes.setText(RCPMessages.ProgressionForm_12);
 		
 		btnNewButton = new Button(composite_3, SWT.NONE);
-		btnNewButton.setText(Messages.ProgressionForm_13);
+		btnNewButton.setText(RCPMessages.ProgressionForm_13);
 		
 		btnSupprimer = new Button(composite_3, SWT.NONE);
-		btnSupprimer.setText(Messages.ProgressionForm_14);
+		btnSupprimer.setText(RCPMessages.ProgressionForm_14);
 		
 		scrolledComposite_1.setContent(composite_1);
 		scrolledComposite_1.setMinSize(composite_1.computeSize(SWT.DEFAULT, SWT.DEFAULT));
Index: tmp/org.txm.annotation.rcp/.classpath
===================================================================
--- tmp/org.txm.annotation.rcp/.classpath	(revision 512)
+++ tmp/org.txm.annotation.rcp/.classpath	(revision 513)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/views/knowledgerepositories/KRView.java
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/views/knowledgerepositories/KRView.java	(revision 512)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/views/knowledgerepositories/KRView.java	(revision 513)
@@ -78,7 +78,7 @@
 import org.txm.annotation.rcp.commands.krview.Informations;
 import org.txm.annotation.rcp.commands.krview.Reload;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.CorpusManager;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
@@ -238,7 +238,7 @@
 				return ((AnnotationType) element).getId()+((AnnotationType) element).getEffect().toSuffix();
 			else if (element instanceof TypedValue)
 				return ((TypedValue) element).getStandardName();
-			return NLS.bind(Messages.QueriesView_10, element);
+			return NLS.bind(RCPMessages.QueriesView_10, element);
 		}
 
 		/* (non-Javadoc)
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/ExportStandoff.java
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/ExportStandoff.java	(revision 512)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/ExportStandoff.java	(revision 513)
@@ -45,7 +45,7 @@
 import org.txm.annotation.core.AnnotationManager;
 import org.txm.annotation.core.KRAnnotationEngine;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.rcp.utils.JobHandler;
@@ -86,7 +86,7 @@
 		dialog.setFileName(corpus.getName()+"_annotations.zip");
 		dialog.setFilterExtensions(new String[]{"*.zip"});
 		if (dialog.open() != null) {
-			StatusLine.setMessage(Messages.ExportAnnotation_0);
+			StatusLine.setMessage(RCPMessages.ExportAnnotation_0);
 			String filepath = dialog.getFilterPath();
 			String filename = dialog.getFileName();
 
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/SaveAnnotations.java
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/SaveAnnotations.java	(revision 512)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/SaveAnnotations.java	(revision 513)
@@ -14,7 +14,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.annotation.core.AnnotationManager;
 import org.txm.annotation.core.KRAnnotationEngine;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.CloseEditorsUsing;
 import org.txm.rcp.commands.workspace.UpdateCorpus;
 import org.txm.rcp.utils.JobHandler;
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/preferences/AnnotationPreferencePage.java
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/preferences/AnnotationPreferencePage.java	(revision 512)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/preferences/AnnotationPreferencePage.java	(revision 513)
@@ -31,7 +31,7 @@
 import org.eclipse.ui.IWorkbench;
 import org.txm.annotation.core.preferences.AnnotationPreferences;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.preferences.RCPPreferencesPage;
 import org.txm.rcp.preferences.TXMPreferencePage;
@@ -72,10 +72,10 @@
 		addField(mode_expert);*/
 		
 		String[][] labelAndValues = {
-				{Messages.AnnotationPreferences_1, "simple"},
-				{Messages.AnnotationPreferences_2, "advanced"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				{RCPMessages.AnnotationPreferences_1, "simple"},
+				{RCPMessages.AnnotationPreferences_2, "advanced"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		
-		mode_annotation = new RadioGroupFieldEditor(AnnotationPreferences.ANNOTATION_MODE, Messages.AnnotationPreferences_0, 2, labelAndValues, getFieldEditorParent());
+		mode_annotation = new RadioGroupFieldEditor(AnnotationPreferences.ANNOTATION_MODE, RCPMessages.AnnotationPreferences_0, 2, labelAndValues, getFieldEditorParent());
 		addField(mode_annotation);
 		//mode_annotation.setPreferenceStore(store);
 	}
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/LineLabelProvider.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/LineLabelProvider.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/LineLabelProvider.java	(revision 513)
@@ -32,7 +32,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.txm.annotation.core.Annotation;
 import org.txm.concordance.core.functions.Line;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -93,7 +93,7 @@
 		case 4:
 			return line.rightContextToString();
 		default:
-			throw new RuntimeException(Messages.LineLabelProvider_1);
+			throw new RuntimeException(RCPMessages.LineLabelProvider_1);
 		}
 
 	}
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/SortPropertySelectionDialog.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/SortPropertySelectionDialog.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/SortPropertySelectionDialog.java	(revision 513)
@@ -42,7 +42,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
 
@@ -135,7 +135,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(Messages.SortPropertySelection_0);
+		newShell.setText(RCPMessages.SortPropertySelection_0);
 		newShell.setMinimumSize(300, 200);
 	}
 
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordancesEditorContributor.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordancesEditorContributor.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordancesEditorContributor.java	(revision 513)
@@ -31,7 +31,6 @@
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.ui.part.EditorActionBarContributor;
-import org.txm.rcp.Messages;
 // TODO: Auto-generated Javadoc
 /**
  * The Class ConcordancesEditorContributor.
@@ -53,12 +52,10 @@
 		super.contributeToMenu(menuManager);
 		// IMenuManager fileMenu = (IMenuManager)
 		// menubar.find(IWorkbenchActionConstants.M_FILE);
-		MenuManager viewMenu = new MenuManager(
-				Messages.ConcordancesEditorContributor_0);
+		MenuManager viewMenu = new MenuManager("org.txm.concordance.contributor"); //$NON-NLS-1$
 
 		viewMenu.add(new Separator());
 
 		menuManager.add(viewMenu);
-
 	}
 }
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 513)
@@ -131,6 +131,7 @@
 import org.txm.concordance.rcp.actions.ViewPropertySelection;
 import org.txm.concordance.rcp.handlers.BackToTextCommand;
 import org.txm.concordance.rcp.handlers.DeleteLines;
+import org.txm.concordance.rcp.messages.Messages;
 import org.txm.concordance.rcp.widgets.ComplexSortSelector;
 import org.txm.cooccurrence.rcp.messages.CooccurrenceUIMessages;
 import org.txm.core.messages.TXMCoreMessages;
@@ -141,7 +142,7 @@
 import org.txm.objects.Page;
 import org.txm.rcp.IImageKeys;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.TXMWindows;
 import org.txm.rcp.commands.OpenBrowser;
@@ -886,7 +887,7 @@
 							syncExec(new Runnable() {
 								@Override
 								public void run() {
-									StatusLine.setMessage(Messages.SORT_DONE);
+									StatusLine.setMessage(RCPMessages.SORT_DONE);
 									fillDisplayArea(topLine, topLine + nLinePerPage - 1);
 								}
 							});
@@ -1112,7 +1113,7 @@
 
 			annotationTypesCombo.getCombo().setLayoutData(gdata);
 			annotationTypesCombo.setInput(typesList);
-			if (advanced_annotation_mode.equals(Messages.AnnotationPreferences_2)) {
+			if (advanced_annotation_mode.equals(RCPMessages.AnnotationPreferences_2)) {
 				annotationTypesCombo.getCombo().select(0);
 			}
 
@@ -1263,7 +1264,7 @@
 		if (currentKnowledgeRepository instanceof LocalKnowledgeRepository) {
 			addTypedValueLink = new Button(annotationArea, SWT.PUSH);
 			addTypedValueLink.setText("..."); //$NON-NLS-1$
-			if (advanced_annotation_mode.equals(Messages.AnnotationPreferences_2)) {
+			if (advanced_annotation_mode.equals(RCPMessages.AnnotationPreferences_2)) {
 				addTypedValueLink.setToolTipText(Messages.ConcordancesEditor_79);
 			}else {
 				addTypedValueLink.setToolTipText(Messages.ConcordancesEditor_77);
@@ -1282,7 +1283,7 @@
 					LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
 
 					ListDialog dialog = new ListDialog(e.widget.getDisplay().getActiveShell());
-					if (advanced_annotation_mode.equals(Messages.AnnotationPreferences_2)) {
+					if (advanced_annotation_mode.equals(RCPMessages.AnnotationPreferences_2)) {
 						String title = currentKnowledgeRepository.getString(locale, "ConcordancesEditor_100");
 						if (title == null) title = Messages.ConcordancesEditor_100;
 						dialog.setTitle(Messages.bind(title, type.getName()));//+"valeurs de "+type.getName());
@@ -1472,7 +1473,7 @@
 			}
 		}
 
-		if (advanced_annotation_mode.equals(Messages.AnnotationPreferences_2)) {
+		if (advanced_annotation_mode.equals(RCPMessages.AnnotationPreferences_2)) {
 			if (infosAnnotTypeSelectedLink != null) infosAnnotTypeSelectedLink.setEnabled(getSelectedAnnotationType() != null);
 		}
 		if (addTypedValueLink != null) addTypedValueLink.setEnabled(getSelectedAnnotationType() != null);
@@ -1671,7 +1672,7 @@
 
 		// Query:
 		Label queryLabel = new Label(queryArea, SWT.NONE);
-		queryLabel.setText(Messages.CreateSubcorpusDialog_10);
+		queryLabel.setText(RCPMessages.CreateSubcorpusDialog_10);
 		queryLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false,
 				false));
 
@@ -1738,7 +1739,7 @@
 
 		// [Search]
 		Button go = new Button(queryArea, SWT.PUSH);
-		go.setText(Messages.SEARCH);
+		go.setText(RCPMessages.SEARCH);
 
 		Font f = go.getFont();
 		FontData defaultFont = f.getFontData()[0];
@@ -2023,12 +2024,12 @@
 			JobsTimer.stopAndPrint();
 
 		} catch (Exception e1) {
-			System.err.println(Messages.CorporaView_3+" "+Log.toString(e1)); //$NON-NLS-1$
+			System.err.println(RCPMessages.CorporaView_3+" "+Log.toString(e1)); //$NON-NLS-1$
 			//System.err.println(Messages.CorporaView_3);
 			org.txm.rcp.utils.Logger.printStackTrace(e1);
 			try {
-				System.out.println(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
-				Log.severe(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
+				System.out.println(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
+				Log.severe(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
 			} catch (Exception e2) {
 				System.out.println(Messages.ConcordancesEditor_7+e2);
 				org.txm.rcp.utils.Logger.printStackTrace(e1);
@@ -2837,7 +2838,7 @@
 
 			IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
 
-			StatusLine.setMessage(Messages.ComputeReferencer_0);
+			StatusLine.setMessage(RCPMessages.ComputeReferencer_0);
 			InternalViewEditor editor = (InternalViewEditor)page.openEditor(editorInput,InternalViewEditor.class.getName()); //$NON-NLS-1$
 			editor.backToText(line);
 			SWTEditorsUtils.addEditor(this, editor, EModelService.ABOVE);
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java	(revision 513)
@@ -46,7 +46,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.txm.concordance.core.functions.comparators.LineComparator;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -104,7 +104,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(Messages.ComplexSort_5);
+		newShell.setText(RCPMessages.ComplexSort_5);
 	}
 
 	/* (non-Javadoc)
@@ -117,7 +117,7 @@
 		mainArea.setLayout(layout);
 
 		Label nameLabel = new Label(mainArea, SWT.NONE);
-		nameLabel.setText(Messages.ComplexSort_6);
+		nameLabel.setText(RCPMessages.ComplexSort_6);
 
 		nameText = new Text(mainArea, SWT.NONE);
 		GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false);
@@ -209,15 +209,15 @@
 	protected void okPressed() {
 		if (nameText.getText().equals("")) { //$NON-NLS-1$
 			MessageDialog.openError(getShell(),
-					Messages.CreateSubcorpusDialog_11,
-					Messages.ComplexSort_9);
+					RCPMessages.CreateSubcorpusDialog_11,
+					RCPMessages.ComplexSort_9);
 			return;
 		}
 		name = nameText.getText();
 		if (selectedComparators.size() < 2) {
 			MessageDialog.openError(getShell(),
-					Messages.ComplexSort_10,
-					Messages.ComplexSort_11);
+					RCPMessages.ComplexSort_10,
+					RCPMessages.ComplexSort_11);
 			return;
 		}
 		super.okPressed();
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ReferenceLabelProvider.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ReferenceLabelProvider.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ReferenceLabelProvider.java	(revision 513)
@@ -32,7 +32,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 import org.txm.concordance.core.functions.Line;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -58,7 +58,7 @@
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
 		if (columnIndex != 0)
-			throw new RuntimeException(Messages.LineLabelProvider_1);
+			throw new RuntimeException(RCPMessages.LineLabelProvider_1);
 		Line line = (Line) element;
 		return line.getViewRef().toString();
 	}
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ViewPropertySelection.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ViewPropertySelection.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ViewPropertySelection.java	(revision 513)
@@ -38,7 +38,7 @@
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.swt.dialog.ViewPropertySelectionDialog;
 // TODO: Auto-generated Javadoc
 /**
@@ -69,8 +69,8 @@
 			ConcordanceEditor concordanceEditor, TableViewer tableViewer) {
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.ViewPropertySelection_0);
-		setToolTipText(Messages.ViewPropertySelection_0);
+		setText(RCPMessages.ViewPropertySelection_0);
+		setToolTipText(RCPMessages.ViewPropertySelection_0);
 	}
 
 	/* (non-Javadoc)
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/BackToText.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/BackToText.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/BackToText.java	(revision 513)
@@ -31,7 +31,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * action called to set the complex sort of the concordance @ author mdecorde.
@@ -58,8 +58,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.BackToText_0);
-		setToolTipText(Messages.BackToText_0);
+		setText(RCPMessages.BackToText_0);
+		setToolTipText(RCPMessages.BackToText_0);
 	}
 
 	/* (non-Javadoc)
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java	(revision 513)
@@ -44,7 +44,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.corpus.Property;
 
 // TODO: Auto-generated Javadoc
@@ -73,8 +73,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.SetSortProperty_1);
-		setToolTipText(Messages.SetSortProperty_2);
+		setText(RCPMessages.SetSortProperty_1);
+		setToolTipText(RCPMessages.SetSortProperty_2);
 	}
 
 	/**
@@ -176,7 +176,7 @@
 			mainArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 					true, true));
 			Group group = new Group(mainArea, SWT.SHADOW_IN);
-			group.setText(Messages.SetSortProperty_3);
+			group.setText(RCPMessages.SetSortProperty_3);
 			group.setLayout(new RowLayout(SWT.VERTICAL));
 			for (Property property : properties) {
 				Button button = new Button(group, SWT.RADIO);
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java	(revision 513)
@@ -40,7 +40,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * Action to set the contexts size @ author mdecorde.
@@ -67,8 +67,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.SetContextSize_1);
-		setToolTipText(Messages.SetContextSize_2);
+		setText(RCPMessages.SetContextSize_1);
+		setToolTipText(RCPMessages.SetContextSize_2);
 	}
 
 	/* (non-Javadoc)
@@ -147,12 +147,12 @@
 		protected Control createDialogArea(Composite parent) {
 			Composite mainArea = new Composite(parent, SWT.NONE);
 			mainArea.setLayout(new GridLayout(2, false));
-			new Label(mainArea, SWT.None).setText(Messages.SetContextSize_3);
+			new Label(mainArea, SWT.None).setText(RCPMessages.SetContextSize_3);
 			leftSpinner = new Spinner(mainArea, SWT.NONE);
 			leftSpinner.setMinimum(0);
 			leftSpinner.setMaximum(100);
 			leftSpinner.setSelection(concordanceEditor.getLeftContextSize());
-			new Label(mainArea, SWT.None).setText(Messages.SetContextSize_4);
+			new Label(mainArea, SWT.None).setText(RCPMessages.SetContextSize_4);
 			rightSpinner = new Spinner(mainArea, SWT.NONE);
 			rightSpinner.setMinimum(0);
 			rightSpinner.setMaximum(100);
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetLineNumber.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetLineNumber.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetLineNumber.java	(revision 513)
@@ -40,7 +40,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -68,8 +68,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.SetLineNumber_0);
-		setToolTipText(Messages.SetLineNumber_0);
+		setText(RCPMessages.SetLineNumber_0);
+		setToolTipText(RCPMessages.SetLineNumber_0);
 	}
 
 	/* (non-Javadoc)
@@ -133,7 +133,7 @@
 			Composite mainArea = new Composite(parent, SWT.NONE);
 			mainArea.setLayout(new GridLayout(2, false));
 
-			new Label(mainArea, SWT.None).setText(Messages.SetLineNumber_1);
+			new Label(mainArea, SWT.None).setText(RCPMessages.SetLineNumber_1);
 			rightSpinner = new Spinner(mainArea, SWT.NONE);
 			rightSpinner.setSelection(concordanceEditor.getLinePerPage());
 			rightSpinner.setMinimum(0);
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java	(revision 513)
@@ -52,7 +52,7 @@
 import org.txm.concordance.core.functions.comparators.CompositeComparator;
 import org.txm.concordance.core.functions.comparators.LineComparator;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 
 // TODO: Auto-generated Javadoc
@@ -81,8 +81,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.ComplexSort_1);
-		setToolTipText(Messages.ComplexSort_2);
+		setText(RCPMessages.ComplexSort_1);
+		setToolTipText(RCPMessages.ComplexSort_2);
 	}
 
 	/* (non-Javadoc)
@@ -139,7 +139,7 @@
 		@Override
 		protected void configureShell(Shell newShell) {
 			super.configureShell(newShell);
-			newShell.setText(Messages.ComplexSort_3);
+			newShell.setText(RCPMessages.ComplexSort_3);
 		}
 
 		/**
@@ -181,11 +181,11 @@
 			}
 			list.select(0);
 			Button newButton = new Button(mainArea, SWT.PUSH);
-			newButton.setText(Messages.ComplexSort_4);
+			newButton.setText(RCPMessages.ComplexSort_4);
 			newButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(Messages.ComplexSort_0);
+					StatusLine.setMessage(RCPMessages.ComplexSort_0);
 					CompositeSorterCreationDialog sorterCreationDialog = new CompositeSorterCreationDialog(
 							getShell());
 					int code = sorterCreationDialog.open();
@@ -272,7 +272,7 @@
 		@Override
 		protected void configureShell(Shell newShell) {
 			super.configureShell(newShell);
-			newShell.setText(Messages.ComplexSort_5);
+			newShell.setText(RCPMessages.ComplexSort_5);
 		}
 
 		/* (non-Javadoc)
@@ -285,7 +285,7 @@
 			mainArea.setLayout(layout);
 
 			Label nameLabel = new Label(mainArea, SWT.NONE);
-			nameLabel.setText(Messages.ComplexSort_6);
+			nameLabel.setText(RCPMessages.ComplexSort_6);
 
 			nameText = new Text(mainArea, SWT.NONE);
 			GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false);
@@ -319,7 +319,7 @@
 			select.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(Messages.ComplexSort_12);
+					StatusLine.setMessage(RCPMessages.ComplexSort_12);
 					int ind = availbleItems.getSelectionIndex();
 					selectedItems.add(availbleItems.getItem(ind));
 					availbleItems.remove(ind);
@@ -333,7 +333,7 @@
 			unselect.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(Messages.ComplexSort_14);
+					StatusLine.setMessage(RCPMessages.ComplexSort_14);
 					int ind = selectedItems.getSelectionIndex();
 					availbleItems.add(selectedItems.getItem(ind));
 					selectedItems.remove(ind);
@@ -347,7 +347,7 @@
 			up.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(Messages.ComplexSort_16);
+					StatusLine.setMessage(RCPMessages.ComplexSort_16);
 					int ind = selectedItems.getSelectionIndex();
 					if (ind > 0) {
 						selectedItems.add(selectedItems.getItem(ind), ind - 1);
@@ -364,7 +364,7 @@
 			down.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(Messages.ComplexSort_18);
+					StatusLine.setMessage(RCPMessages.ComplexSort_18);
 					int ind = selectedItems.getSelectionIndex();
 					if (ind < selectedItems.getItemCount() - 1) {
 						selectedItems.add(selectedItems.getItem(ind), ind + 2);
@@ -386,14 +386,14 @@
 		@Override
 		protected void okPressed() {
 			if (nameText.getText().equals("")) { //$NON-NLS-1$
-				MessageDialog.openError(getShell(), Messages.CreateSubcorpusDialog_11,
-						Messages.ComplexSort_9);
+				MessageDialog.openError(getShell(), RCPMessages.CreateSubcorpusDialog_11,
+						RCPMessages.ComplexSort_9);
 				return;
 			}
 			name = nameText.getText();
 			if (selectedComparators.size() < 2) {
-				MessageDialog.openError(getShell(), Messages.ComplexSort_10,
-						Messages.ComplexSort_11);
+				MessageDialog.openError(getShell(), RCPMessages.ComplexSort_10,
+						RCPMessages.ComplexSort_11);
 				return;
 			}
 			super.okPressed();
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineSortReferencePattern.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineSortReferencePattern.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineSortReferencePattern.java	(revision 513)
@@ -47,7 +47,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.ReferencePattern;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnit;
@@ -80,8 +80,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.DefineReferencePattern_3);
-		setToolTipText(Messages.DefineReferencePattern_4);
+		setText(RCPMessages.DefineReferencePattern_3);
+		setToolTipText(RCPMessages.DefineReferencePattern_4);
 	}
 
 	/* (non-Javadoc)
@@ -175,7 +175,7 @@
 		@Override
 		protected void configureShell(Shell shell) {
 		      super.configureShell(shell);
-		      shell.setText(Messages.DefineReferencePattern_5);
+		      shell.setText(RCPMessages.DefineReferencePattern_5);
 		      
 		      shell.setSize(400, 500);
 		      shell.setLocation(shell.getParent().getLocation());
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineViewReferencePattern.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineViewReferencePattern.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineViewReferencePattern.java	(revision 513)
@@ -47,7 +47,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.ReferencePattern;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnit;
@@ -80,8 +80,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.DefineReferencePattern_1);
-		setToolTipText(Messages.DefineReferencePattern_2);
+		setText(RCPMessages.DefineReferencePattern_1);
+		setToolTipText(RCPMessages.DefineReferencePattern_2);
 	}
 
 	/* (non-Javadoc)
@@ -174,7 +174,7 @@
 		@Override
 		protected void configureShell(Shell shell) {
 		      super.configureShell(shell);
-		      shell.setText(Messages.DefineReferencePattern_0);
+		      shell.setText(RCPMessages.DefineReferencePattern_0);
 		      
 		      shell.setSize(400, 500);
 		      shell.setLocation(shell.getParent().getLocation());
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SortPropertySelection.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SortPropertySelection.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SortPropertySelection.java	(revision 513)
@@ -39,7 +39,7 @@
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
 import org.txm.concordance.rcp.editors.SortPropertySelectionDialog;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * Action to define the view properties of each column @ author mdecorde.
@@ -69,8 +69,8 @@
 			ConcordanceEditor concordanceEditor, TableViewer tableViewer) {
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(Messages.SortPropertySelection_0);
-		setToolTipText(Messages.SortPropertySelection_0);
+		setText(RCPMessages.SortPropertySelection_0);
+		setToolTipText(RCPMessages.SortPropertySelection_0);
 	}
 
 	/* (non-Javadoc)
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 513)
@@ -36,7 +36,8 @@
 import org.eclipse.ui.PartInitException;
 import org.txm.concordance.core.functions.Concordance;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.concordance.rcp.messages.Messages;
+import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.TXMWindows;
 import org.txm.rcp.editors.TXMResultEditorInput;
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/preferences/ConcordancePreferencePage.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/preferences/ConcordancePreferencePage.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/preferences/ConcordancePreferencePage.java	(revision 513)
@@ -31,7 +31,7 @@
 import org.eclipse.ui.IWorkbench;
 import org.txm.concordance.core.preferences.ConcordancePreferences;
 import org.txm.concordance.rcp.adapters.ConcordanceAdapterFactory;
-import org.txm.rcp.Messages;
+import org.txm.concordance.rcp.messages.Messages;
 import org.txm.rcp.preferences.TXMPreferencePage;
 import org.txm.rcp.preferences.TXMPreferenceStore;
 
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java	(revision 512)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java	(revision 513)
@@ -44,7 +44,7 @@
 import org.txm.concordance.core.functions.comparators.CompositeComparator;
 import org.txm.concordance.core.functions.comparators.LineComparator;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.rcp.Messages;
+import org.txm.rcp.RCPMessages;
 // TODO: Auto-generated Javadoc
 /**
  * allow to build a Composite sorter of 1 to 4 keys @ author mdecorde.
@@ -99,7 +99,7 @@
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		};
-		new Label(this, SWT.NONE).setText(Messages.ComplexSortSelector_0);
+		new Label(this, SWT.NONE).setText(RCPMessages.ComplexSortSelector_0);
 		new Label(this, SWT.NONE).setText("#1"); //$NON-NLS-1$
 		firstKey = new Combo(this, SWT.NONE | SWT.READ_ONLY);
 		//firstKey.addSelectionListener(listener);
@@ -124,7 +124,7 @@
 		fourthKey.setLayoutData(griddata);
 		
 		Button sortButton = new Button(this, SWT.PUSH);
-		sortButton.setText(Messages.ComplexSortSelector_2);
+		sortButton.setText(RCPMessages.ComplexSortSelector_2);
 		sortButton.addSelectionListener(listener);
 		
 	}
@@ -140,12 +140,12 @@
 			comp.add(standardComparators.get(thirdKey.getText()));
 			comp.add(standardComparators.get(fourthKey.getText()));
 			defaultComparator.setComparators(comp);
-			System.out.println(Messages.ComplexSortSelector_1+comp);
+			System.out.println(RCPMessages.ComplexSortSelector_1+comp);
 			editor.resetSortedColumn(firstKey.getSelectionIndex());
 			editor.setCurrentComparator(defaultComparator);
 			editor.sort();
 		} catch (Exception e) {
-			System.err.println(NLS.bind(Messages.ComplexSortSelector_5, e));
+			System.err.println(NLS.bind(RCPMessages.ComplexSortSelector_5, e));
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 		}
 	}
@@ -191,7 +191,7 @@
 		List<LineComparator> userDefinedComparators = editor
 				.getUserDefinedComparators();
 		for (LineComparator c : userDefinedComparators) {
-			if (c.getName().equals(Messages.ComplexSortSelector_6)) {
+			if (c.getName().equals(RCPMessages.ComplexSortSelector_6)) {
 				defaultComparator = (CompositeComparator) c;
 				List<LineComparator> comp = defaultComparator.getComparators();
 				if (comp.size() >= 4) {
@@ -221,7 +221,7 @@
 
 		// no default comparator found -> create one
 		defaultComparator = new CompositeComparator(
-				Messages.ComplexSortSelector_6, standardComparatorslist);
+				RCPMessages.ComplexSortSelector_6, standardComparatorslist);
 		firstKey.select(0);
 		secondKey.select(0);
 		thirdKey.select(0);
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages.properties	(revision 0)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages.properties	(revision 513)
@@ -0,0 +1,125 @@
+ComputeConcordance_0 = Opening the Concordance result
+ComputeConcordance_1 = Failed to open concordance editor.
+
+ConcordancerPreferencePage_3 = Concordance Parameters
+ConcordancerPreferencePage_4 = Lines per &Page:
+ConcordancerPreferencePage_5 = &Left context length in words
+ConcordancerPreferencePage_6 = &Right context length in words
+
+ConcordancesEditorContributor_0 = Concordance
+
+ConcordancesEditor_0                          = Last CQI error:
+ConcordancesEditor_1                          = Reference
+ConcordancesEditor_10                         = . Aborting back to text.
+ConcordancesEditor_100                        = Available values for {0}
+ConcordancesEditor_101                        = Cancel
+ConcordancesEditor_108                        = \ elements. Continue ?
+ConcordancesEditor_11                         = |<
+ConcordancesEditor_110                        = New value {0} for category {1}  
+ConcordancesEditor_112                        = The value {0} is not associated with the category {1}. Associate it ?   
+ConcordancesEditor_115                        = Add a new category
+ConcordancesEditor_116                        = Proceed to annotation
+ConcordancesEditor_12                         = <
+ConcordancesEditor_13                         = >
+ConcordancesEditor_14                         = >|
+ConcordancesEditor_15                         = Category
+ConcordancesEditor_16                         = &Keyword:
+ConcordancesEditor_17                         = Keywords annotation
+ConcordancesEditor_18                         = &Edit
+ConcordancesEditor_19                         = Found {0} occurrences
+ConcordancesEditor_2                          = Left context
+ConcordancesEditor_20                         = Loading line informations...
+ConcordancesEditor_21                         = Could not instanciate one of the corpus Knowledge repository: 
+ConcordancesEditor_22                         = Affect
+ConcordancesEditor_23                         = to
+ConcordancesEditor_24                         = Delete
+ConcordancesEditor_25                         = of
+ConcordancesEditor_26                         = Project id {0} Corpus id {1} Text id {2}
+ConcordancesEditor_27                         = BackToText: Text {0} is missing
+ConcordancesEditor_28                         = the annotation
+ConcordancesEditor_29                         = No page found... for
+ConcordancesEditor_3                          = Keyword
+ConcordancesEditor_30                         = BackToText: default edition is missing
+ConcordancesEditor_31                         = =
+ConcordancesEditor_32                         = Enter a value for an id
+ConcordancesEditor_33                         = to
+ConcordancesEditor_34                         = Opening the Concordance
+ConcordancesEditor_35                         = selected lines
+ConcordancesEditor_36                         = Annotating concordance selection...
+ConcordancesEditor_37                         = Sorting reference column
+ConcordancesEditor_38                         = Hide settings
+ConcordancesEditor_39                         = Show settings
+ConcordancesEditor_4                          = Right context
+ConcordancesEditor_40                         = Error while annotating concordance selection: 
+ConcordancesEditor_41                         = Sorting left context column
+ConcordancesEditor_42                         = page lines
+ConcordancesEditor_43                         = The {0} corpus has no default references: {1}
+ConcordancesEditor_44                         = Annotating concordance page...
+ConcordancesEditor_45                         = Sorting keyword column
+ConcordancesEditor_46                         = Full text display failed: {0}
+ConcordancesEditor_47                         = Error while annotating concordance page: 
+ConcordancesEditor_48                         = Sorting right context column
+ConcordancesEditor_49                         = all lines
+ConcordancesEditor_5                          = Concordance of <{0}> in corpus {1}
+ConcordancesEditor_50                         = Opening corpus edition
+ConcordancesEditor_51                         = Annotating concordance...
+ConcordancesEditor_53                         = Error while annotating concordance: 
+ConcordancesEditor_54                         = Error while deleting annotation: 
+ConcordancesEditor_55                         = Opening property dialog
+ConcordancesEditor_56                         = Start computing concordance
+ConcordancesEditor_57                         = Looking for TypedValue with id=
+ConcordancesEditor_58                         = No value found with the {0} id.
+ConcordancesEditor_59                         = AFFECT 
+ConcordancesEditor_6                          = Sorting
+ConcordancesEditor_60                         = \ to SELECTION=
+ConcordancesEditor_61                         = Could not annotate the value '
+ConcordancesEditor_62                         = '.\n on certain sequences. \n
+ConcordancesEditor_63                         = \	- The sequence 
+ConcordancesEditor_64                         = \ is overlapping with \n
+ConcordancesEditor_65                         = \	\	- the end of a structure 
+ConcordancesEditor_66                         = , at [
+ConcordancesEditor_67                         = \ - 
+ConcordancesEditor_68                         = ]\n
+ConcordancesEditor_69                         = \	\	- the start of a structure 
+ConcordancesEditor_7                          = CQP error:
+ConcordancesEditor_70                         = , at [
+ConcordancesEditor_71                         = \ - 
+ConcordancesEditor_72                         = ]\n
+ConcordancesEditor_73                         = About annotations
+ConcordancesEditor_74                         = Error while affection annotation: 
+ConcordancesEditor_75                         = Annotate
+ConcordancesEditor_76                         = Save the annotations
+ConcordancesEditor_77                         = Open the list of categories
+ConcordancesEditor_78                         = class
+ConcordancesEditor_79                         = Select a value among the list
+ConcordancesEditor_8                          = The corpus has no text_id property
+ConcordancesEditor_80                         = value=
+ConcordancesEditor_81                         = Please enter the new type name
+ConcordancesEditor_82                         = New category
+ConcordancesEditor_83                         = with the category
+ConcordancesEditor_84                         = with the category
+ConcordancesEditor_85                         = OK
+ConcordancesEditor_86                         = Confirm annotation affectation
+ConcordancesEditor_87                         = You are about to annotate  
+ConcordancesEditor_88                         = Delete selected line(s)
+ConcordancesEditor_9                          = Error: could not retrieve line word id for edition 
+ConcordancesEditor_99                         = List of categories
+ConcordancesEditor_referenceColumn_text       = Reference
+ConcordancesEditor_xpndtmNewExpanditem_text   = New ExpandItem
+ConcordancesEditor_xpndtmNewExpanditem_text_1 = New ExpandItem
+ConcordancesEditor_xpndtmNewExpanditem_text_2 = New ExpandItem
+ConcordancesEditor_xpndtmNewParameters_text   = New Parameters
+
+ERROR_WHILE_LOADING_CONCORDANCE_LINE = An error occurred while retrieving the concordance lines: {0}
+
+GetConcordancesDialog_0  = ERROR_GetConcordancesDialog: {0}
+GetConcordancesDialog_1  = Compute specificities
+GetConcordancesDialog_13 = you must select a property.
+GetConcordancesDialog_14 = Invalid property
+GetConcordancesDialog_15 = you must select an property.
+GetConcordancesDialog_4  = &Property:
+GetConcordancesDialog_5  = &Left context size:
+GetConcordancesDialog_6  = &Right context size:
+GetConcordancesDialog_7  = &Reference:
+
+GetConcordances_4        = Error while computing concordances: {0}
\ No newline at end of file

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

Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/Messages.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/Messages.java	(revision 0)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/Messages.java	(revision 513)
@@ -0,0 +1,147 @@
+package org.txm.concordance.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+public class Messages extends NLS {
+	
+	// The Constant BUNDLE_NAME. 
+	private static final String BUNDLE_NAME = Messages.class.getPackage().getName()+".messages"; //$NON-NLS-1$
+
+	public static String ConcordancesEditor_referenceColumn_text;
+	public static String ConcordancesEditor_xpndtmNewExpanditem_text;
+	public static String ConcordancesEditor_xpndtmNewParameters_text;
+	public static String ConcordancesEditor_xpndtmNewExpanditem_text_1;
+	public static String ConcordancesEditor_xpndtmNewExpanditem_text_2;
+	
+	public static String GetConcordancesDialog_0;
+	public static String GetConcordancesDialog_1;
+	public static String GetConcordancesDialog_13;
+	public static String GetConcordancesDialog_14;
+	public static String GetConcordancesDialog_15;
+	public static String GetConcordancesDialog_4;
+	public static String GetConcordancesDialog_5;
+	public static String GetConcordancesDialog_6;
+	public static String GetConcordancesDialog_7;
+	
+	public static String GetConcordances_4;
+	
+	public static String ERROR_WHILE_LOADING_CONCORDANCE_LINE;
+	
+	public static String ComputeConcordance_0;
+	public static String ComputeConcordance_1;
+	
+	public static String ConcordancerPreferencePage_3;
+	public static String ConcordancerPreferencePage_4;
+	public static String ConcordancerPreferencePage_5;
+	public static String ConcordancerPreferencePage_6;
+	
+	public static String ConcordancesEditorContributor_0;
+	
+	public static String ConcordancesEditor_0;
+	public static String ConcordancesEditor_1;
+	public static String ConcordancesEditor_10;
+	public static String ConcordancesEditor_101;
+	public static String ConcordancesEditor_108;
+	public static String ConcordancesEditor_11;
+	public static String ConcordancesEditor_111;
+	public static String ConcordancesEditor_112;
+	public static String ConcordancesEditor_113;
+	public static String ConcordancesEditor_12;
+	public static String ConcordancesEditor_13;
+	public static String ConcordancesEditor_14;
+	public static String ConcordancesEditor_15;
+	public static String ConcordancesEditor_16;
+	public static String ConcordancesEditor_17;
+	public static String ConcordancesEditor_18;
+	public static String ConcordancesEditor_19;
+	public static String ConcordancesEditor_2;
+	public static String ConcordancesEditor_20;
+	public static String ConcordancesEditor_21;
+	public static String ConcordancesEditor_22;
+	public static String ConcordancesEditor_23;
+	public static String ConcordancesEditor_24;
+	public static String ConcordancesEditor_25;
+	public static String ConcordancesEditor_26;
+	public static String ConcordancesEditor_27;
+	public static String ConcordancesEditor_28;
+	public static String ConcordancesEditor_29;
+	public static String ConcordancesEditor_3;
+	public static String ConcordancesEditor_30;
+	public static String ConcordancesEditor_31;
+	public static String ConcordancesEditor_32;
+	public static String ConcordancesEditor_33;
+	public static String ConcordancesEditor_34;
+	public static String ConcordancesEditor_35;
+	public static String ConcordancesEditor_36;
+	public static String ConcordancesEditor_37;
+	public static String ConcordancesEditor_38;
+	public static String ConcordancesEditor_39;
+	public static String ConcordancesEditor_4;
+	public static String ConcordancesEditor_40;
+	public static String ConcordancesEditor_41;
+	public static String ConcordancesEditor_42;
+	public static String ConcordancesEditor_43;
+	public static String ConcordancesEditor_44;
+	public static String ConcordancesEditor_45;
+	public static String ConcordancesEditor_46;
+	public static String ConcordancesEditor_47;
+	public static String ConcordancesEditor_48;
+	public static String ConcordancesEditor_49;
+	public static String ConcordancesEditor_5;
+	public static String ConcordancesEditor_50;
+	public static String ConcordancesEditor_51;
+	public static String ConcordancesEditor_52;
+	public static String ConcordancesEditor_53;
+	public static String ConcordancesEditor_54;
+	public static String ConcordancesEditor_55;
+	public static String ConcordancesEditor_56;
+	public static String ConcordancesEditor_57;
+	public static String ConcordancesEditor_58;
+	public static String ConcordancesEditor_59;
+	public static String ConcordancesEditor_6;
+	public static String ConcordancesEditor_60;
+	public static String ConcordancesEditor_61;
+	public static String ConcordancesEditor_62;
+	public static String ConcordancesEditor_63;
+	public static String ConcordancesEditor_64;
+	public static String ConcordancesEditor_65;
+	public static String ConcordancesEditor_66;
+	public static String ConcordancesEditor_67;
+	public static String ConcordancesEditor_68;
+	public static String ConcordancesEditor_69;
+	public static String ConcordancesEditor_7;
+	public static String ConcordancesEditor_70;
+	public static String ConcordancesEditor_71;
+	public static String ConcordancesEditor_72;
+	public static String ConcordancesEditor_73;
+	public static String ConcordancesEditor_74;
+	public static String ConcordancesEditor_75;
+	public static String ConcordancesEditor_76;
+	public static String ConcordancesEditor_77;
+	public static String ConcordancesEditor_78;
+	public static String ConcordancesEditor_79;
+	public static String ConcordancesEditor_8;
+	public static String ConcordancesEditor_80;
+	public static String ConcordancesEditor_81;
+	public static String ConcordancesEditor_82;
+	public static String ConcordancesEditor_83;
+	public static String ConcordancesEditor_84;
+	public static String ConcordancesEditor_85;
+	public static String ConcordancesEditor_86;
+	public static String ConcordancesEditor_87;
+	public static String ConcordancesEditor_88;
+	public static String ConcordancesEditor_9;
+	public static String ConcordancesEditor_99;
+	public static String ConcordancesEditor_100;
+	public static String ConcordancesEditor_110;
+	public static String ConcordancesEditor_114;
+	public static String ConcordancesEditor_115;
+	public static String ConcordancesEditor_116;
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+	
+}

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

Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_ru.properties	(revision 0)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_ru.properties	(revision 513)
@@ -0,0 +1,58 @@
+
+ComputeConcordance_0 = Открытие окна конкорданса
+ComputeConcordance_1 = N/A_Failed to open concordance editor.
+
+ConcordancerPreferencePage_3 = Параметры конкордансов
+ConcordancerPreferencePage_4 = Количество строк на &Странице : 
+ConcordancerPreferencePage_5 = &Левый контекст (в словах)
+ConcordancerPreferencePage_6 = &Правый контекст (в словах)
+
+ConcordancesEditorContributor_0 = Конкорданс
+
+ConcordancesEditor_0            = Последняя ошибка CQi : 
+ConcordancesEditor_1            = Ссылка
+ConcordancesEditor_11           = |<
+ConcordancesEditor_12           = <
+ConcordancesEditor_13           = >
+ConcordancesEditor_14           = >|
+ConcordancesEditor_16           = &Мотив: 
+ConcordancesEditor_18           = &Редактировать
+ConcordancesEditor_19           = {0} употреблений
+ConcordancesEditor_2            = Левый контекст
+ConcordancesEditor_20           = Загрузка данных о строке...
+ConcordancesEditor_26           = идентификатор проекта {0} идентификатор корпуса {1} идентификатор текста {2}
+ConcordancesEditor_27           = Возврат к тексту: текст {0} отсутствует
+ConcordancesEditor_29           = Страница не найдена... для 
+ConcordancesEditor_3            = Мотив
+ConcordancesEditor_30           = Возврат к тексту: издание по умолчанию не найдено
+ConcordancesEditor_34           = Загрузка конкорданса
+ConcordancesEditor_37           = Сортировка ссылок
+ConcordancesEditor_38           = Скрыть параметры
+ConcordancesEditor_39           = Показать параметры
+ConcordancesEditor_4            = Правый контекст
+ConcordancesEditor_41           = Сортировка левого контекста
+ConcordancesEditor_43           = Корпус {0} не имеет ссылок по умолчанию: {1}
+ConcordancesEditor_45           = Сортировка мотива
+ConcordancesEditor_46           = ** Невозможно показать в тексте: {0}
+ConcordancesEditor_48           = Сортировка правого контекста
+ConcordancesEditor_5            = Конкорданс мотива <{0}> в корпусе {1}
+ConcordancesEditor_50           = Открытие издания
+ConcordancesEditor_55           = Открытие диалогового окна свойств
+ConcordancesEditor_56           = Начало расчета конкордансов
+ConcordancesEditor_6            = Сортировка...
+ConcordancesEditor_7            = N/A_Failed to get last CQP error: 
+ConcordancesEditor_8            = N/A_The corpus has no text_id property
+
+ERROR_WHILE_LOADING_CONCORDANCE_LINE = ** Ошибка во время загрузки строк конкорданса: {0}
+
+GetConcordancesDialog_0  = ** Диалоговое окно конкордансов: {0}
+GetConcordancesDialog_1  = Расчет специфичности 
+GetConcordancesDialog_13 = Вы должны выбрать одно свойство
+GetConcordancesDialog_14 = Некорректное свойство
+GetConcordancesDialog_15 = Вы должны выбрать одно свойство
+GetConcordancesDialog_4  = С&войство : 
+GetConcordancesDialog_5  = &Левый контекст (слова) : 
+GetConcordancesDialog_6  = &Правый контекст (слова) : 
+GetConcordancesDialog_7  = &Ссылка: 
+
+GetConcordances_4        = ** Ошибка при расчете конкордансов: {0}
\ No newline at end of file

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

Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_fr.properties	(revision 0)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_fr.properties	(revision 513)
@@ -0,0 +1,101 @@
+#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
+#Eclipse modern messages class
+#Mon Feb 10 10:26:04 CET 2014
+
+ComputeConcordance_0 = Ouverture de la fen�tre de concordance
+ComputeConcordance_1 = Erreur lors de l'ouverture de l'�diteur des concordances :
+
+ConcordancerPreferencePage_3 = Param�tres des Concordances 
+ConcordancerPreferencePage_4 = Lignes par &Page : 
+ConcordancerPreferencePage_5 = Contexte &Gauche (en mots)
+ConcordancerPreferencePage_6 = Contexte &Droit (en mots)
+
+ConcordancesEditorContributor_0 = Concordance
+
+ConcordancesEditor_0            = Derni�re erreur CQi : 
+ConcordancesEditor_1            = R�f�rence
+ConcordancesEditor_100          = Valeurs disponibles pour {0}
+ConcordancesEditor_108          = \ �l�ments. Continuez ?
+ConcordancesEditor_11           = |<
+ConcordancesEditor_110          = Nouvelle valeur {0} pour la cat�gorie {1}  
+ConcordancesEditor_112          = La valeur {0} n''est pas encore associ�e � la cat�gorie : {1}. Cr�er l''association ?
+ConcordancesEditor_115          = Ajouter une nouvelle categorie
+ConcordancesEditor_116          = Effectuer l'annotation
+ConcordancesEditor_12           = <
+ConcordancesEditor_13           = >
+ConcordancesEditor_14           = >|
+ConcordancesEditor_15           = Cat�gorie
+ConcordancesEditor_16           = &Pivot: 
+ConcordancesEditor_18           = &Editer
+ConcordancesEditor_19           = {0} occurrences
+ConcordancesEditor_2            = Contexte gauche
+ConcordancesEditor_20           = Chargement des informations sur la ligne...
+ConcordancesEditor_22           = Annoter
+ConcordancesEditor_24           = Retirer
+ConcordancesEditor_25           = de
+ConcordancesEditor_26           = id projet {0} id corpus {1} id texte {2}
+ConcordancesEditor_27           = Retour au texte : texte {0} manquant
+ConcordancesEditor_28           = l'annotation
+ConcordancesEditor_29           = Page non trouv�e... pour 
+ConcordancesEditor_3            = Pivot
+ConcordancesEditor_30           = Retour au texte : �dition par d�faut introuvable
+ConcordancesEditor_32           = Entrer une valeur correspondant � un id
+ConcordancesEditor_33           = �
+ConcordancesEditor_34           = Chargement de la concordance
+ConcordancesEditor_35           = lignes s�lection�es 
+ConcordancesEditor_37           = Tri des r�f�rences
+ConcordancesEditor_38           = Cacher param�tres
+ConcordancesEditor_39           = Afficher param�tres
+ConcordancesEditor_4            = Contexte droit
+ConcordancesEditor_41           = Tri du contexte gauche
+ConcordancesEditor_42           = lignes de la page
+ConcordancesEditor_43           = Le corpus {0} n''a pas de r�f�rences par d�faut : {1}
+ConcordancesEditor_45           = Tri du pivot
+ConcordancesEditor_46           = ** Impossible d''afficher en plein texte : {0}
+ConcordancesEditor_48           = Tri du contexte droit
+ConcordancesEditor_49           = toutes les lignes
+ConcordancesEditor_5            = Concordance de <{0}> dans le corpus {1}
+ConcordancesEditor_50           = Ouverture de l'�dition
+ONE_RESULT           = Termin� : un r�sultat.
+ConcordancesEditor_55           = Ouverture de la boite de dialogue des propri�t�s
+ConcordancesEditor_56           = D�but du calcul des concordances
+ConcordancesEditor_6            = Tri...
+ConcordancesEditor_61           = Impossible d'annoter avec la valeur '
+ConcordancesEditor_62           = '.\n sur certains segments. \n
+ConcordancesEditor_63           = \	- Le segment 
+ConcordancesEditor_64           = \ est � cheval sur \n
+ConcordancesEditor_65           = \	\	- la fin de la structure 
+ConcordancesEditor_66           = , aux positions [
+ConcordancesEditor_69           = \	\	- le d�but de la structure 
+ConcordancesEditor_7            = Erreur lors de la r�cup�ration de la derni�re erreur CQP :  
+ConcordancesEditor_73           = Information � propos des annotations
+ConcordancesEditor_74           = Erreur pendant l'affection des annotations: 
+ConcordancesEditor_75           = Annoter
+ConcordancesEditor_76           = Enregistrer les annotations
+ConcordancesEditor_77           = Ouvrir la liste des cat�gories
+ConcordancesEditor_79           = S�lectionner une valeur parmi la liste
+ConcordancesEditor_8            = Le corpus n'a pas de propri�t� "text_id"
+ConcordancesEditor_80           = valeur=
+ConcordancesEditor_81           = Veuillez entrer une nouvelle cat�gorie
+ConcordancesEditor_82           = Nouvelle cat�gorie
+ConcordancesEditor_83           = avec la cat�gorie
+ConcordancesEditor_84           = avec la cat�gorie
+ConcordancesEditor_85           = OK
+ConcordancesEditor_86           = Confirmer l'enregistrement des annotations
+ConcordancesEditor_87           = Vous vous appr�tez � annoter 
+ConcordancesEditor_88           = Supprimer le(s) ligne(s) s�lectionn�e(s)
+ConcordancesEditor_99           = Liste des cat�gories
+
+ERROR_WHILE_LOADING_CONCORDANCE_LINE = ** Une erreur est survenue lors du chargement des lignes de la concordance : {0}
+
+GetConcordancesDialog_0  = ** Fen�tre de dialogue de concordances : {0}
+GetConcordancesDialog_1  = Calcul des sp�cificit�s 
+GetConcordancesDialog_13 = Vous devez s�lectionner une propri�t�
+GetConcordancesDialog_14 = Propri�t� invalide
+GetConcordancesDialog_15 = Vous devez s�lectionner une propri�t�
+GetConcordancesDialog_4  = &Propri�t� : 
+GetConcordancesDialog_5  = Contexte &Gauche (mots) : 
+GetConcordancesDialog_6  = Contexte &Droit (mots) : 
+GetConcordancesDialog_7  = &R�f�rence : 
+
+GetConcordances_4        = ** Erreur lors du calcul des concordances : {0}
\ No newline at end of file

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

Index: tmp/org.txm.concordance.rcp/.settings/org.eclipse.core.resources.prefs
===================================================================
--- tmp/org.txm.concordance.rcp/.settings/org.eclipse.core.resources.prefs	(revision 0)
+++ tmp/org.txm.concordance.rcp/.settings/org.eclipse.core.resources.prefs	(revision 513)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//src/org/txm/concordance/rcp/messages/messages_ru.properties=UTF-8

Property changes on: tmp/org.txm.concordance.rcp/.settings/org.eclipse.core.resources.prefs
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java	(revision 512)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java	(revision 513)
@@ -283,7 +283,6 @@
 	public static  ArrayList<ChartsEngine> getChartsEngines()	{
 		return ChartsEngine.chartsEngines;
 	}
-	
 
 	/**
 	 * Populates the chart creators from loaded extensions according to the specified chars engine name.
