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 685)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java	(revision 686)
@@ -38,13 +38,14 @@
 import org.txm.ca.core.functions.CA;
 import org.txm.ca.rcp.editors.CAEditor;
 import org.txm.ca.rcp.messages.CAUIMessages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.lexicaltable.core.functions.LexicalTable;
 import org.txm.lexicaltable.rcp.editors.LexicalTableDialog;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.TXMWindows;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.handlers.BaseAbstractHandler;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.views.corpora.CorporaView;
 import org.txm.searchengine.cqp.corpus.Partition;
 import org.txm.searchengine.cqp.corpus.Property;
@@ -94,15 +95,16 @@
 
 				// warning to few parts
 				if (partition.getNPart() < 4) {
-					MessageDialog d = new MessageDialog(window.getShell(), CAUIMessages.ComputeCorrespondanceAnalysis_3, null, NLS.bind(CAUIMessages.ComputeCorrespondanceAnalysis_4, partition.getNPart()), 0, new String[] { CAUIMessages.ComputeCorrespondanceAnalysis_6 }, 0);
+					MessageDialog d = new MessageDialog(window.getShell(), CAUIMessages.ComputeCorrespondanceAnalysis_3, null,
+							NLS.bind(CAUIMessages.ComputeCorrespondanceAnalysis_4, partition.getNPart()), 0, new String[] { TXMCoreMessages.common_ok}, 0);
 					d.open();
 					return null;
 				}
 				// ask property and Fmins and Vmax
-				String title = RCPMessages.bind(CAUIMessages.ComputeCorrespondanceAnalysisDialog_0, partition.getName());
+				String title = TXMUIMessages.bind(CAUIMessages.ComputeCorrespondanceAnalysisDialog_0, partition.getName());
 				LexicalTableDialog d = new LexicalTableDialog(window.getShell(), partition.getCorpus(), title);
 
-				if (d.open() == LexicalTableDialog.OK) {
+				if (d.open() == MessageDialog.OK) {
 					Property property = d.getProperty();
 					int fMin = d.getFmin();
 					int vMax = d.getMaxLines();
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_ru.properties	(revision 685)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_ru.properties	(revision 686)
@@ -1,4 +1,10 @@
 
+ColRowInfosLabelProvider_19 = Qual
+ColRowInfosLabelProvider_9  = χ²
+
+ColsRowsInfosEditor_0 = Ошибочный ввод
+ColsRowsInfosEditor_2 = Информация: {0}
+
 ComputeCorrespondanceAnalysisDialog_0 = Факторный анализ соответствий {0}
 
 ComputeCorrespondanceAnalysis_0       = Расчет факторного анализа соответствий
@@ -10,7 +16,6 @@
 ComputeCorrespondanceAnalysis_17      = Расчет ФАС
 ComputeCorrespondanceAnalysis_3       = ** Ошибка
 ComputeCorrespondanceAnalysis_4       = ** Невозможно провести факторный анализ соответствий при наличии только 
-ComputeCorrespondanceAnalysis_6       = ОК
 ComputeCorrespondanceAnalysis_8       = Загрузка результатов факторного анализа
 
 CorrespondanceAnalysisEditorInput_0  = Собственные значения
@@ -18,7 +23,11 @@
 CorrespondanceAnalysisEditorInput_10 = ФАС
 CorrespondanceAnalysisEditorInput_11 = ∑
 CorrespondanceAnalysisEditorInput_2  = Гистограмма собственных значений
+CorrespondanceAnalysisEditorInput_26 = Масса
+CorrespondanceAnalysisEditorInput_27 = Дист
+CorrespondanceAnalysisEditorInput_29 = Конт
 CorrespondanceAnalysisEditorInput_3  = Результат анализа соответствий не может быть пустым 
+CorrespondanceAnalysisEditorInput_30 = Cos²
 CorrespondanceAnalysisEditorInput_4  = Фактор
 CorrespondanceAnalysisEditorInput_5  = Собственные значения
 CorrespondanceAnalysisEditorInput_8  = Инф Строчки
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java	(revision 685)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java	(revision 686)
@@ -35,7 +35,6 @@
 	public static String ComputeCorrespondanceAnalysis_1;
 	public static String ComputeCorrespondanceAnalysis_3;
 	public static String ComputeCorrespondanceAnalysis_4;
-	public static String ComputeCorrespondanceAnalysis_6;
 	public static String ComputeCorrespondanceAnalysis_8;
 	
 	public static String ComputeCorrespondanceAnalysisDialog_0;
@@ -52,4 +51,12 @@
 	public static String CorrespondanceAnalysisEditorInput_9;
 	
 	public static String PreferencePage_CHART_SHOW_POINT_SHAPES;
+	
+	public static String ColRowInfosLabelProvider_19;
+	public static String ColRowInfosLabelProvider_9;
+	public static String ColsRowsInfosEditor_0;
+	public static String ColsRowsInfosEditor_2;
+
+	public static String CaEditor_0;
+
 }
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_fr.properties	(revision 685)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_fr.properties	(revision 686)
@@ -1,72 +1,46 @@
 
 CHART_TOOLBAR_AXES_SELECTION_COMBO_BOX_LABEL = Axes : 
+CHART_TOOLBAR_BUTTON_SHOW_COLUMS_TOOLTIP     = Afficher/masquer les points-colonnes
+CHART_TOOLBAR_BUTTON_SHOW_HIDE_POINT_SHAPES  = Afficher/masquer le tracé des points
+CHART_TOOLBAR_BUTTON_SHOW_ROWS_TOOLTIP       = Afficher/masquer les points-lignes
 
-CHART_TOOLBAR_BUTTON_SHOW_COLUMS_TOOLTIP = Afficher/masquer les points-colonnes
+ColRowInfosLabelProvider_19 = Qual
+ColRowInfosLabelProvider_9  = χ²
 
-CHART_TOOLBAR_BUTTON_SHOW_HIDE_POINT_SHAPES = Afficher/masquer le tracé des points
+ColsRowsInfosEditor_0 = Entrée erronée
+ColsRowsInfosEditor_2 = Infos: {0}
 
-CHART_TOOLBAR_BUTTON_SHOW_ROWS_TOOLTIP = Afficher/masquer les points-lignes
-
 ComputeCorrespondanceAnalysisDialog_0 = Analyse factorielle des correspondances avec {0}
 
-ComputeCorrespondanceAnalysis_0 = Calcul de l'analyse factorielle des correspondances sur {0} avec la propriété {1}
+ComputeCorrespondanceAnalysis_0       = Calcul de l'analyse factorielle des correspondances sur {0} avec la propriété {1}
+ComputeCorrespondanceAnalysis_1       = ** Impossible de calculer l'analyse factorielle des correspondances avec moins de 4 colonnes dans la table
+ComputeCorrespondanceAnalysis_13      = ** Impossible de calculer l'analyse factorielle des correspondances avec moins de 4 colonnes 
+ComputeCorrespondanceAnalysis_14      = Ouverture des résultats de l'analyse factorielle des correspondances
+ComputeCorrespondanceAnalysis_15      = Création de la fenêtre de l'AFC
+ComputeCorrespondanceAnalysis_16      = Création de la table lexicale pour l'AFC
+ComputeCorrespondanceAnalysis_17      = Calcul de l'AFC
+ComputeCorrespondanceAnalysis_3       = ** Erreur
+ComputeCorrespondanceAnalysis_4       = ** Impossible de calculer l'analyse factorielle avec seulement {0} parties (minimum=4).
+ComputeCorrespondanceAnalysis_8       = Chargement des résultats de l'analyse factorielle
 
-ComputeCorrespondanceAnalysis_1 = ** Impossible de calculer l'analyse factorielle des correspondances avec moins de 4 colonnes dans la table
-
-ComputeCorrespondanceAnalysis_13 = ** Impossible de calculer l'analyse factorielle des correspondances avec moins de 4 colonnes 
-
-ComputeCorrespondanceAnalysis_14 = Ouverture des résultats de l'analyse factorielle des correspondances
-
-ComputeCorrespondanceAnalysis_15 = Création de la fenêtre de l'AFC
-
-ComputeCorrespondanceAnalysis_16 = Création de la table lexicale pour l'AFC
-
-ComputeCorrespondanceAnalysis_17 = Calcul de l'AFC
-
-ComputeCorrespondanceAnalysis_3 = ** Erreur
-
-ComputeCorrespondanceAnalysis_4 = ** Impossible de calculer l'analyse factorielle avec seulement {0} parties (minimum=4).
-
-ComputeCorrespondanceAnalysis_6 = OK
-
-ComputeCorrespondanceAnalysis_8 = Chargement des résultats de l'analyse factorielle
-
-CorrespondanceAnalysisEditorInput_0 = Valeurs propres
-
-CorrespondanceAnalysisEditorInput_1 = Plan fact.
-
+CorrespondanceAnalysisEditorInput_0  = Valeurs propres
+CorrespondanceAnalysisEditorInput_1  = Plan fact.
 CorrespondanceAnalysisEditorInput_10 = AFC
-
 CorrespondanceAnalysisEditorInput_11 = ∑
+CorrespondanceAnalysisEditorInput_2  = Histogramme des valeurs propres
+CorrespondanceAnalysisEditorInput_3  = Le résultat de l'analyse des correspondances ne peut être nul
+CorrespondanceAnalysisEditorInput_4  = #
+CorrespondanceAnalysisEditorInput_5  = Valeur propre
+CorrespondanceAnalysisEditorInput_8  = Info lignes
+CorrespondanceAnalysisEditorInput_9  = Info colonnes
 
-CorrespondanceAnalysisEditorInput_2 = Histogramme des valeurs propres
-
-CorrespondanceAnalysisEditorInput_3 = Le résultat de l'analyse des correspondances ne peut être nul
-
-CorrespondanceAnalysisEditorInput_4 = #
-
-CorrespondanceAnalysisEditorInput_5 = Valeur propre
-
-CorrespondanceAnalysisEditorInput_8 = Info lignes
-
-CorrespondanceAnalysisEditorInput_9 = Info colonnes
-
-PreferencePage_0 = Format de la colonne Qualité
-
-PreferencePage_1 = Format de la colonne Contribution
-
-PreferencePage_2 = Table lexicale (si la commande est appelée depuis une partition)
-
-PreferencePage_3 = Afficher les colonnes
-
-PreferencePage_4 = Afficher les lignes
-
-PreferencePage_5 = Format de la colonne Masse
-
-PreferencePage_6 = Format de la colonne Distance
-
-PreferencePage_7 = Format de la colonne Cos²
-
-PreferencePage_8 = Format de la colonne Coord
-
+PreferencePage_0                       = Format de la colonne Qualité
+PreferencePage_1                       = Format de la colonne Contribution
+PreferencePage_2                       = Table lexicale (si la commande est appelée depuis une partition)
+PreferencePage_3                       = Afficher les colonnes
+PreferencePage_4                       = Afficher les lignes
+PreferencePage_5                       = Format de la colonne Masse
+PreferencePage_6                       = Format de la colonne Distance
+PreferencePage_7                       = Format de la colonne Cos²
+PreferencePage_8                       = Format de la colonne Coord
 PreferencePage_CHART_SHOW_POINT_SHAPES = Afficher le tracé des points
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages.properties	(revision 685)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages.properties	(revision 686)
@@ -4,6 +4,14 @@
 CHART_TOOLBAR_BUTTON_SHOW_HIDE_POINT_SHAPES  = Show/hide point shapes
 CHART_TOOLBAR_BUTTON_SHOW_ROWS_TOOLTIP       = Show/hide the row points
 
+CaEditor_0 = Error while opening CAEditor: 
+
+ColRowInfosLabelProvider_19 = Q
+ColRowInfosLabelProvider_9  = Chi²
+
+ColsRowsInfosEditor_0 = Wrong input
+ColsRowsInfosEditor_2 = Infos: {0}
+
 ComputeCorrespondanceAnalysisDialog_0 = Correspondence analysis with {0}
 
 ComputeCorrespondanceAnalysis_0       = Computing Correspondence analysis on {0} with property {1}
@@ -15,7 +23,6 @@
 ComputeCorrespondanceAnalysis_17      = Compute CA
 ComputeCorrespondanceAnalysis_3       = ** Error
 ComputeCorrespondanceAnalysis_4       = Can not compute factorial analysis with only {0} parts (the minimum is 4 parts).
-ComputeCorrespondanceAnalysis_6       = OK
 ComputeCorrespondanceAnalysis_8       = Loading correspondence analysis results...
 
 CorrespondanceAnalysisEditorInput_0  = Eigenvalues
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 685)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java	(revision 686)
@@ -45,11 +45,12 @@
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
-import org.txm.rcp.RCPMessages;
+import org.txm.ca.rcp.messages.CAUIMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.ITablableEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
 import org.txm.rcp.editors.TableSorter;
+import org.txm.rcp.messages.TXMUIMessages;
 // TODO: Auto-generated Javadoc
 /**
  * Used to display rows and cols informations such as contribution, inertia,
@@ -126,7 +127,7 @@
 		parent.setLayout(new FillLayout());
 
 		if (!(iEditorInput instanceof ITablableEditorInput)) {
-			throw new IllegalArgumentException(RCPMessages.ColsRowsInfosEditor_0);
+			throw new IllegalArgumentException(CAUIMessages.ColsRowsInfosEditor_0);
 		}
 		tableInput = (ITablableEditorInput) iEditorInput;
 		viewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL
@@ -156,7 +157,7 @@
 			column.getColumn().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(RCPMessages.SORT_COLUMN );
+					StatusLine.setMessage(TXMUIMessages.SORT_COLUMN );
 					tableSorter.setColumn(index);
 					int dir = viewer.getTable().getSortDirection();
 					if (viewer.getTable().getSortColumn() == column.getColumn()) {
@@ -167,7 +168,7 @@
 					viewer.getTable().setSortDirection(dir);
 					viewer.getTable().setSortColumn(column.getColumn());
 					viewer.refresh();
-					StatusLine.setMessage(RCPMessages.SORT_DONE);
+					StatusLine.setMessage(TXMUIMessages.SORT_DONE);
 				}
 			});
 		}
@@ -180,7 +181,7 @@
 		tableSorter.setColumnTypes(tableInput.getColumnTypes());
 		viewer.setSorter(tableSorter);
 
-		this.setContentDescription(NLS.bind(RCPMessages.ColsRowsInfosEditor_2, titles[0]));
+		this.setContentDescription(NLS.bind(CAUIMessages.ColsRowsInfosEditor_2, titles[0]));
 		createContextMenu(viewer);
 		viewer.refresh();
 		for (TableColumn col : viewer.getTable().getColumns())
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 685)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java	(revision 686)
@@ -71,13 +71,13 @@
 import org.txm.chartsengine.rcp.editors.ChartEditorInput;
 import org.txm.chartsengine.rcp.editors.ChartEditor;
 import org.txm.core.results.TXMResult;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.SplitedGenericMultiPageEditor;
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMMultiPageEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.ITablableEditorInput;
 import org.txm.rcp.editors.input.AbstractTablableEditorInput;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.statsengine.core.StatException;
 import org.txm.utils.logger.Log;
 
@@ -184,7 +184,7 @@
 
 
 		if (editors.size() != inputs.size()) {
-			throw new IllegalArgumentException(NLS.bind(RCPMessages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
+			throw new IllegalArgumentException(NLS.bind(TXMUIMessages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
 		}
 
 		// put first editor in the left panel and set is as "main" editor
@@ -242,7 +242,7 @@
 		}
 		catch (Exception e1) {
 			org.txm.rcp.utils.Logger.printStackTrace(e1);
-			System.out.println(RCPMessages.CaEditor_0+e1);
+			System.out.println(CAUIMessages.CaEditor_0 + e1);
 			return;
 		}
 
@@ -253,7 +253,7 @@
 				editorIndex = addPage(editors.get(i), inputs.get(i));
 			} catch (PartInitException e) {
 				org.txm.rcp.utils.Logger.printStackTrace(e);
-				System.out.println(RCPMessages.CaEditor_0+e);
+				System.out.println(CAUIMessages.CaEditor_0 + e);
 				return;
 			}
 			setPageText(editorIndex, names.get(i));
@@ -377,7 +377,7 @@
 			@Override
 			public String[] getColumnTypes() {
 				return new String[] {
-						RCPMessages.FrequencyListEditorInput_6,
+						TXMUIMessages.FrequencyListEditorInput_6,
 						COL_TYPE,
 						COL_TYPE,
 						COL_TYPE,
@@ -442,7 +442,7 @@
 			@Override
 			public String[] getColumnTypes() {
 				coltypes = new ArrayList<String>();
-				coltypes.add(RCPMessages.FrequencyListEditorInput_6);
+				coltypes.add(TXMUIMessages.FrequencyListEditorInput_6);
 				coltypes.add(SEPARATOR);
 				coltypes.add(COL_TYPE);
 				coltypes.add(COL_TYPE);
@@ -526,7 +526,7 @@
 			@Override
 			public String[] getColumnTypes() {
 				coltypes = new ArrayList<String>();
-				coltypes.add(RCPMessages.FrequencyListEditorInput_6);
+				coltypes.add(TXMUIMessages.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 685)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java	(revision 686)
@@ -48,11 +48,11 @@
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.ITablableEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
 import org.txm.rcp.editors.TableSorter;
+import org.txm.rcp.messages.TXMUIMessages;
 // TODO: Auto-generated Javadoc
 /**
  * show the singular values and compute some stats.
@@ -132,7 +132,7 @@
 		parent.setLayout(new FillLayout());
 
 		if (!(iEditorInput instanceof ITablableEditorInput)) {
-			throw new IllegalArgumentException(RCPMessages.SingularValuesEditor_0);
+			throw new IllegalArgumentException(TXMUIMessages.SingularValuesEditor_0);
 		}
 		tableInput = (ITablableEditorInput) iEditorInput;
 
@@ -168,7 +168,7 @@
 				@Override
 				public void widgetSelected(SelectionEvent e)
 				{
-					StatusLine.setMessage(RCPMessages.SORT_COLUMN);
+					StatusLine.setMessage(TXMUIMessages.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(RCPMessages.SORT_DONE);
+					StatusLine.setMessage(TXMUIMessages.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 685)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColRowInfosLabelProvider.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 // 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(RCPMessages.ColRowInfosLabelProvider_9)) {
+			} else if (names[i].startsWith(CAUIMessages.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(RCPMessages.ColRowInfosLabelProvider_19) && names[i].length() == 3) {
+			} else if (names[i].startsWith(CAUIMessages.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(RCPMessages.ColRowInfosLabelProvider_9)) {
+			} else if (name.startsWith(CAUIMessages.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(RCPMessages.ColRowInfosLabelProvider_19)
+			} else if (name.startsWith(CAUIMessages.ColRowInfosLabelProvider_19)
 					&& name.length() == 3) {
 				f = qualitypattern;
 			}
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/export/ExportCAH.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/export/ExportCAH.groovy	(revision 685)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/export/ExportCAH.groovy	(revision 686)
@@ -1,6 +1,6 @@
 package org.txm.export
 
-import org.txm.cah.core.functions.AHC
+import org.txm.ahc.core.functions.AHC
 import org.txm.rcp.views.*
 import org.txm.stat.engine.r.*
 // uncomment this
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/test/CQPBenchmark.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/test/CQPBenchmark.groovy	(revision 685)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/test/CQPBenchmark.groovy	(revision 686)
@@ -42,7 +42,7 @@
 import org.txm.lexicaltable.core.functions.LexicalTable
 import org.txm.objects.Base;
 import org.txm.ca.core.functions.CA
-import org.txm.cah.core.functions.AHC
+import org.txm.ahc.core.functions.AHC
 import org.txm.concordance.core.functions.Concordance
 import org.txm.cooccurrence.core.functions.Cooccurrence
 import org.txm.functions.*;
Index: tmp/org.txm.groovy.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 685)
+++ tmp/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 686)
@@ -12,7 +12,7 @@
  org.txm.concordance.core;bundle-version="1.0.0",
  org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.txm.ca.core;bundle-version="1.0.0",
- org.txm.cah.core;bundle-version="1.0.0",
+ org.txm.ahc.core;bundle-version="1.0.0",
  org.txm.chartsengine.core;bundle-version="1.0.0",
  org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
  org.txm.chartsengine.r.core;bundle-version="1.0.0",
Index: tmp/org.txm.core.tests/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.core.tests/META-INF/MANIFEST.MF	(revision 685)
+++ tmp/org.txm.core.tests/META-INF/MANIFEST.MF	(revision 686)
@@ -11,7 +11,7 @@
  org.eclipse.core.runtime;bundle-version="3.10.0",
  org.txm.core;bundle-version="0.7.0",
  org.txm.ca.core;bundle-version="1.0.0",
- org.txm.cah.core;bundle-version="1.0.0",
+ org.txm.ahc.core;bundle-version="1.0.0",
  org.txm.chartsengine.core;bundle-version="1.0.0",
  org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
  org.txm.chartsengine.r.core;bundle-version="1.0.0",
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 685)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 686)
@@ -77,10 +77,10 @@
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.core.results.TXMParameters;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.widget.AssistedQueryWidget;
 import org.txm.rcp.swt.widget.EmpantWidget;
@@ -472,8 +472,8 @@
 		});
 
 		freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
-		freqColumn.setText(RCPMessages.FrequencyListEditorInput_4);
-		freqColumn.setToolTipText(RCPMessages.FrequencyListEditorInput_4);
+		freqColumn.setText(TXMUIMessages.FrequencyListEditorInput_4);
+		freqColumn.setToolTipText(TXMUIMessages.FrequencyListEditorInput_4);
 		freqColumn.setWidth(100);
 		freqColumn.addSelectionListener(new SelectionListener() {
 			@Override
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 685)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java	(revision 686)
@@ -37,11 +37,11 @@
 import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
 import org.txm.cooccurrence.rcp.editors.CooccurrencesEditor;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.handlers.BaseAbstractHandler;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.utils.Logger;
 import org.txm.rcp.views.corpora.CorporaView;
 import org.txm.searchengine.cqp.CQPEngine;
@@ -120,12 +120,12 @@
 		} else if (selection instanceof Cooccurrence) { // reopening an existing result
 			cooc = (Cooccurrence)selection;
 		} else {
-			System.out.println(RCPMessages.ComputeCooccurrences_1 + selection);
+			System.out.println(TXMUIMessages.ComputeCooccurrences_1 + selection);
 			return null;
 		}
 		
 		try {
-			StatusLine.setMessage(RCPMessages.ComputeCooccurrences_0);
+			StatusLine.setMessage(TXMUIMessages.ComputeCooccurrences_0);
 
 			//System.out.println("DEBUG: opening cooc: "+cooc+" corpus="+cooc.getCorpus());
 			TXMEditor.openEditor(cooc, CooccurrencesEditor.ID);
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 685)
+++ tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java	(revision 686)
@@ -109,7 +109,7 @@
 			
 			
 		} catch (Exception e) {
-			System.err.println(org.txm.rcp.RCPMessages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(org.txm.rcp.messages.TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
 		}
 		return true;
 	}
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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ViewPropertySelection.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 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(RCPMessages.ViewPropertySelection_0);
-		setToolTipText(RCPMessages.ViewPropertySelection_0);
+		setText(TXMUIMessages.common_displayOptions);
+		setToolTipText(TXMUIMessages.common_displayOptions);
 	}
 
 	/* (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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/BackToText.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 // 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(RCPMessages.BackToText_0);
-		setToolTipText(RCPMessages.BackToText_0);
+		setText(TXMUIMessages.BackToText_0);
+		setToolTipText(TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.searchengine.cqp.corpus.Property;
 
 // TODO: Auto-generated Javadoc
@@ -73,8 +73,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(RCPMessages.SetSortProperty_1);
-		setToolTipText(RCPMessages.SetSortProperty_2);
+		setText(TXMUIMessages.SetSortProperty_1);
+		setToolTipText(TXMUIMessages.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(RCPMessages.SetSortProperty_3);
+			group.setText(TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 // 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(RCPMessages.SetContextSize_1);
-		setToolTipText(RCPMessages.SetContextSize_2);
+		setText(TXMUIMessages.SetContextSize_1);
+		setToolTipText(TXMUIMessages.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(RCPMessages.SetContextSize_3);
+			new Label(mainArea, SWT.None).setText(TXMUIMessages.SetContextSize_3);
 			leftSpinner = new Spinner(mainArea, SWT.NONE);
 			leftSpinner.setMinimum(0);
 			leftSpinner.setMaximum(100);
 			leftSpinner.setSelection(concordanceEditor.getLeftContextSize());
-			new Label(mainArea, SWT.None).setText(RCPMessages.SetContextSize_4);
+			new Label(mainArea, SWT.None).setText(TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetLineNumber.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -68,8 +68,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(RCPMessages.SetLineNumber_0);
-		setToolTipText(RCPMessages.SetLineNumber_0);
+		setText(TXMUIMessages.SetLineNumber_0);
+		setToolTipText(TXMUIMessages.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(RCPMessages.SetLineNumber_1);
+			new Label(mainArea, SWT.None).setText(TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java	(revision 686)
@@ -52,8 +52,8 @@
 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.RCPMessages;
 import org.txm.rcp.StatusLine;
+import org.txm.rcp.messages.TXMUIMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -81,8 +81,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(RCPMessages.ComplexSort_1);
-		setToolTipText(RCPMessages.ComplexSort_2);
+		setText(TXMUIMessages.ComplexSort_1);
+		setToolTipText(TXMUIMessages.ComplexSort_2);
 	}
 
 	/* (non-Javadoc)
@@ -139,7 +139,7 @@
 		@Override
 		protected void configureShell(Shell newShell) {
 			super.configureShell(newShell);
-			newShell.setText(RCPMessages.ComplexSort_3);
+			newShell.setText(TXMUIMessages.ComplexSort_3);
 		}
 
 		/**
@@ -181,11 +181,11 @@
 			}
 			list.select(0);
 			Button newButton = new Button(mainArea, SWT.PUSH);
-			newButton.setText(RCPMessages.ComplexSort_4);
+			newButton.setText(TXMUIMessages.ComplexSort_4);
 			newButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(RCPMessages.ComplexSort_0);
+					StatusLine.setMessage(TXMUIMessages.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(RCPMessages.ComplexSort_5);
+			newShell.setText(TXMUIMessages.ComplexSort_5);
 		}
 
 		/* (non-Javadoc)
@@ -285,7 +285,7 @@
 			mainArea.setLayout(layout);
 
 			Label nameLabel = new Label(mainArea, SWT.NONE);
-			nameLabel.setText(RCPMessages.ComplexSort_6);
+			nameLabel.setText(TXMUIMessages.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(RCPMessages.ComplexSort_12);
+					StatusLine.setMessage(TXMUIMessages.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(RCPMessages.ComplexSort_14);
+					StatusLine.setMessage(TXMUIMessages.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(RCPMessages.ComplexSort_16);
+					StatusLine.setMessage(TXMUIMessages.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(RCPMessages.ComplexSort_18);
+					StatusLine.setMessage(TXMUIMessages.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(), RCPMessages.CreateSubcorpusDialog_11,
-						RCPMessages.ComplexSort_9);
+				MessageDialog.openError(getShell(), TXMUIMessages.CreateSubcorpusDialog_11,
+						TXMUIMessages.ComplexSort_9);
 				return;
 			}
 			name = nameText.getText();
 			if (selectedComparators.size() < 2) {
-				MessageDialog.openError(getShell(), RCPMessages.ComplexSort_10,
-						RCPMessages.ComplexSort_11);
+				MessageDialog.openError(getShell(), TXMUIMessages.ComplexSort_10,
+						TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineSortReferencePattern.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.searchengine.cqp.ReferencePattern;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnit;
@@ -79,8 +79,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(RCPMessages.DefineReferencePattern_3);
-		setToolTipText(RCPMessages.DefineReferencePattern_4);
+		setText(TXMUIMessages.DefineReferencePattern_3);
+		setToolTipText(TXMUIMessages.DefineReferencePattern_4);
 	}
 
 	/* (non-Javadoc)
@@ -174,7 +174,7 @@
 		@Override
 		protected void configureShell(Shell shell) {
 		      super.configureShell(shell);
-		      shell.setText(RCPMessages.DefineReferencePattern_5);
+		      shell.setText(TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineViewReferencePattern.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.searchengine.cqp.ReferencePattern;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnit;
@@ -79,8 +79,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(RCPMessages.DefineReferencePattern_1);
-		setToolTipText(RCPMessages.DefineReferencePattern_2);
+		setText(TXMUIMessages.DefineReferencePattern_1);
+		setToolTipText(TXMUIMessages.DefineReferencePattern_2);
 	}
 
 	/* (non-Javadoc)
@@ -174,7 +174,7 @@
 		@Override
 		protected void configureShell(Shell shell) {
 		      super.configureShell(shell);
-		      shell.setText(RCPMessages.DefineReferencePattern_0);
+		      shell.setText(TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SortPropertySelection.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 // 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(RCPMessages.SortPropertySelection_0);
-		setToolTipText(RCPMessages.SortPropertySelection_0);
+		setText(TXMUIMessages.SortPropertySelection_0);
+		setToolTipText(TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 686)
@@ -38,7 +38,7 @@
 import org.eclipse.ui.PartInitException;
 import org.txm.concordance.core.functions.Concordance;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.concordance.rcp.messages.Messages;
+import org.txm.concordance.rcp.messages.ConcordanceUIMessages;
 import org.txm.core.results.TXMParameters;
 import org.txm.core.results.TXMResult;
 import org.txm.rcp.StatusLine;
@@ -83,7 +83,7 @@
 		}
 		
 		if (openEditor(selection) == null) {
-			System.out.println(Messages.ComputeConcordance_1);
+			System.out.println(ConcordanceUIMessages.ComputeConcordance_1);
 		}
 
 		return null;
@@ -126,13 +126,13 @@
 		TXMResultEditorInput editorInput = new TXMResultEditorInput(concordance);
 
 		try {
-			StatusLine.setMessage(Messages.ComputeConcordance_0);
+			StatusLine.setMessage(ConcordanceUIMessages.ComputeConcordance_0);
 			IEditorPart editor = TXMWindows.getActiveWindow().getActivePage().openEditor(editorInput, ConcordanceEditor.class.getName()); //$NON-NLS-1$
 				if (editor == null) return null;
 				
 			return editor;
 		} catch (PartInitException e) {
-			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
+			System.err.println(NLS.bind(ConcordanceUIMessages.GetConcordances_4, e));
 			e.printStackTrace();
 		}
 		return null;
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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/preferences/ConcordancePreferencePage.java	(revision 686)
@@ -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.concordance.rcp.messages.Messages;
+import org.txm.concordance.rcp.messages.ConcordanceUIMessages;
 import org.txm.rcp.preferences.TXMPreferencePage;
 import org.txm.rcp.preferences.TXMPreferenceStore;
 
@@ -50,9 +50,9 @@
 
 	@Override
 	protected void createFieldEditors() {
-		this.addField(new IntegerFieldEditor(ConcordancePreferences.N_LINES_PER_PAGE, Messages.ConcordancerPreferencePage_4, this.getFieldEditorParent()));
-		this.addField(new IntegerFieldEditor(ConcordancePreferences.LEFT_CONTEXT_SIZE, Messages.ConcordancerPreferencePage_5, this.getFieldEditorParent()));
-		this.addField(new IntegerFieldEditor(ConcordancePreferences.RIGHT_CONTEXT_SIZE, Messages.ConcordancerPreferencePage_6, this.getFieldEditorParent()));
+		this.addField(new IntegerFieldEditor(ConcordancePreferences.N_LINES_PER_PAGE, ConcordanceUIMessages.ConcordancerPreferencePage_4, this.getFieldEditorParent()));
+		this.addField(new IntegerFieldEditor(ConcordancePreferences.LEFT_CONTEXT_SIZE, ConcordanceUIMessages.ConcordancerPreferencePage_5, this.getFieldEditorParent()));
+		this.addField(new IntegerFieldEditor(ConcordancePreferences.RIGHT_CONTEXT_SIZE, ConcordanceUIMessages.ConcordancerPreferencePage_6, this.getFieldEditorParent()));
 	}
 	
 	
@@ -60,7 +60,7 @@
 	@Override
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(ConcordancePreferences.PREFERENCES_NODE));
-		this.setTitle(Messages.ConcordancerPreferencePage_3);
+		this.setTitle(ConcordanceUIMessages.ConcordancerPreferencePage_3);
 		this.setImageDescriptor(ConcordanceAdapterFactory.ICON);
 	}
 }
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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 // 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(RCPMessages.ComplexSortSelector_0);
+		new Label(this, SWT.NONE).setText(TXMUIMessages.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(RCPMessages.ComplexSortSelector_2);
+		sortButton.setText(TXMUIMessages.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(RCPMessages.ComplexSortSelector_1+comp);
+			System.out.println(TXMUIMessages.ComplexSortSelector_1+comp);
 			editor.resetSortedColumn(firstKey.getSelectionIndex());
 			editor.setCurrentComparator(defaultComparator);
 			editor.sort();
 		} catch (Exception e) {
-			System.err.println(NLS.bind(RCPMessages.ComplexSortSelector_5, e));
+			System.err.println(NLS.bind(TXMUIMessages.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(RCPMessages.ComplexSortSelector_6)) {
+			if (c.getName().equals(TXMUIMessages.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(
-				RCPMessages.ComplexSortSelector_6, standardComparatorslist);
+				TXMUIMessages.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.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/Messages.java	(revision 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/Messages.java	(revision 686)
@@ -1,143 +0,0 @@
-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_112;
-	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_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_115;
-	public static String ConcordancesEditor_116;
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-	
-}
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/ConcordanceUIMessages.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/ConcordanceUIMessages.java	(revision 0)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/ConcordanceUIMessages.java	(revision 686)
@@ -0,0 +1,142 @@
+package org.txm.concordance.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+public class ConcordanceUIMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.txm.concordance.rcp.messages.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_112;
+	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_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_115;
+	public static String ConcordancesEditor_116;
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, ConcordanceUIMessages.class);
+	}
+	
+}

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

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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/SortPropertySelectionDialog.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 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(RCPMessages.SortPropertySelection_0);
+		newShell.setText(TXMUIMessages.SortPropertySelection_0);
 		newShell.setMinimumSize(300, 200);
 	}
 
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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 686)
@@ -108,7 +108,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.messages.ConcordanceUIMessages;
 import org.txm.concordance.rcp.widgets.ComplexSortSelector;
 import org.txm.cooccurrence.rcp.messages.CooccurrenceUIMessages;
 import org.txm.core.preferences.TXMPreferences;
@@ -118,13 +118,13 @@
 import org.txm.objects.Page;
 import org.txm.rcp.IImageKeys;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.TXMWindows;
 import org.txm.rcp.editors.TXMBrowser;
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.dialog.ViewPropertySelectionDialog;
 import org.txm.rcp.swt.widget.AssistedQueryWidget;
@@ -444,11 +444,11 @@
 
 		referenceColumn = new TableColumn(viewer2.getTable(), SWT.LEFT);
 		refreshReferenceColumnTitle();
-		referenceColumn.setToolTipText(Messages.ConcordancesEditor_1);
+		referenceColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_1);
 		referenceColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.ConcordancesEditor_37);
+				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_37);
 				LineComparator comparator = new PropertiesReferenceComparator();
 				if (viewer2.getTable().getSortColumn() != referenceColumn) {
 					viewer2.getTable().setSortColumn(null);
@@ -533,8 +533,8 @@
 
 		TableViewerColumn leftColumnViewer = new TableViewerColumn(viewer, SWT.RIGHT);
 		leftContextColumn = leftColumnViewer.getColumn();
-		leftContextColumn.setText(Messages.ConcordancesEditor_2);
-		leftContextColumn.setToolTipText(Messages.ConcordancesEditor_2);
+		leftContextColumn.setText(ConcordanceUIMessages.ConcordancesEditor_2);
+		leftContextColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_2);
 		leftContextColumn.setAlignment(SWT.RIGHT);
 		leftColumnViewer.setLabelProvider(new ColumnLabelProvider() {
 			@Override
@@ -546,7 +546,7 @@
 		leftContextColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.ConcordancesEditor_41);
+				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_41);
 				LineComparator comparator = new LexicographicLeftContextComparator();
 				if (viewer.getTable().getSortColumn() != leftContextColumn) {
 					viewer.getTable().setSortColumn(leftContextColumn);
@@ -570,8 +570,8 @@
 
 		TableViewerColumn keywordColumnViewer = new TableViewerColumn(viewer, SWT.CENTER);
 		keywordColumn = keywordColumnViewer.getColumn();
-		keywordColumn.setText(Messages.ConcordancesEditor_3);
-		keywordColumn.setToolTipText(Messages.ConcordancesEditor_3);
+		keywordColumn.setText(ConcordanceUIMessages.ConcordancesEditor_3);
+		keywordColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_3);
 		keywordColumn.setAlignment(SWT.CENTER);
 		keywordColumnViewer.setLabelProvider(new ColumnLabelProvider() {
 			@Override
@@ -583,7 +583,7 @@
 		keywordColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.ConcordancesEditor_45);
+				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_45);
 				LineComparator comparator = new LexicographicKeywordComparator();
 				if (viewer.getTable().getSortColumn() != keywordColumn) {
 					viewer.getTable().setSortColumn(keywordColumn);
@@ -608,8 +608,8 @@
 
 		TableViewerColumn rightContextColumnViewer = new TableViewerColumn(viewer, SWT.LEFT);
 		rightContextColumn = rightContextColumnViewer.getColumn();
-		rightContextColumn.setText(Messages.ConcordancesEditor_4);
-		rightContextColumn.setToolTipText(Messages.ConcordancesEditor_4);
+		rightContextColumn.setText(ConcordanceUIMessages.ConcordancesEditor_4);
+		rightContextColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_4);
 		rightContextColumn.setAlignment(SWT.LEFT);
 		rightContextColumnViewer.setLabelProvider(new ColumnLabelProvider() {
 			@Override
@@ -621,7 +621,7 @@
 		rightContextColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(Messages.ConcordancesEditor_48);
+				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_48);
 				LineComparator comparator = new LexicographicRightContextComparator();
 
 				if (viewer.getTable().getSortColumn() != rightContextColumn) {
@@ -676,7 +676,7 @@
 		MouseListener ms = new MouseListener() {
 			@Override
 			public void mouseDoubleClick(MouseEvent e) {
-				StatusLine.setMessage(Messages.ConcordancesEditor_50);
+				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_50);
 				backToText();
 				StatusLine.setMessage(""); //$NON-NLS-1$
 			}
@@ -792,7 +792,7 @@
 						this.runInit(monitor);
 						JobsTimer.start();
 						try {
-							monitor.beginTask(Messages.ConcordancesEditor_6, concordance.getNLines());
+							monitor.beginTask(ConcordanceUIMessages.ConcordancesEditor_6, concordance.getNLines());
 							concordance.setCurrentMonitor(this);
 							concordance.sort(currentComparator);
 							concordance.setTopIndex(0);
@@ -800,7 +800,7 @@
 							syncExec(new Runnable() {
 								@Override
 								public void run() {
-									StatusLine.setMessage(RCPMessages.SORT_DONE);
+									StatusLine.setMessage(TXMUIMessages.SORT_DONE);
 									fillDisplayArea();
 								}
 							});
@@ -808,7 +808,7 @@
 						} catch (ThreadDeath td) {
 							return Status.CANCEL_STATUS;
 						} catch (Exception e) {
-							System.err.println(NLS.bind(Messages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
+							System.err.println(NLS.bind(ConcordanceUIMessages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
 							org.txm.rcp.utils.Logger.printStackTrace(e);
 						} catch (Error e) {
 							System.err.println("Fatal error: "+e);
@@ -823,7 +823,7 @@
 
 				jobhandler.startJob();
 			} catch (Exception e) {
-				System.err.println(NLS.bind(Messages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
+				System.err.println(NLS.bind(ConcordanceUIMessages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 			}
 		}
@@ -853,7 +853,7 @@
 			try {
 				lines = concordance.getLines(from, to);
 			} catch (Exception e) {
-				System.err.println(Messages.ERROR_WHILE_LOADING_CONCORDANCE_LINE+ e);
+				System.err.println(ConcordanceUIMessages.ERROR_WHILE_LOADING_CONCORDANCE_LINE+ e);
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 			}
 		} else
@@ -947,7 +947,7 @@
 
 		// Query:
 		queryLabel = new Label(queryArea, SWT.NONE);
-		queryLabel.setText(RCPMessages.CreateSubcorpusDialog_10);
+		queryLabel.setText(TXMUIMessages.CreateSubcorpusDialog_10);
 		queryLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false,
 				false));
 
@@ -995,7 +995,7 @@
 
 		// [Search]
 		Button go = new Button(queryArea, SWT.PUSH);
-		go.setText(RCPMessages.SEARCH);
+		go.setText(TXMUIMessages.SEARCH);
 
 		Font f = go.getFont();
 		FontData defaultFont = f.getFontData()[0];
@@ -1025,7 +1025,7 @@
 		deleteLineButton = new Button(navigationArea, SWT.PUSH);
 		deleteLineButton.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false,
 				false));
-		deleteLineButton.setToolTipText(Messages.ConcordancesEditor_88);
+		deleteLineButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_88);
 		deleteLineButton.setImage(IImageKeys.getImage(IImageKeys.CONCORDANCE_DELETE));
 		deleteLineButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -1121,7 +1121,7 @@
 	 * @param bottom
 	 */
 	public void updateEditorFromResult(boolean update) {
-		StatusLine.setMessage(Messages.ConcordancesEditor_56);
+		StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_56);
 		
 		//if (true)// concordance==null || concordance.getQuery()!=query)
 		try {
@@ -1139,14 +1139,14 @@
 			JobsTimer.stopAndPrint();
 
 		} catch (Exception e1) {
-			System.out.println(RCPMessages.CorporaView_3+" "+Log.toString(e1)); //$NON-NLS-1$
+			System.out.println(TXMUIMessages.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(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
-				Log.severe(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
+				System.out.println(TXMUIMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
+				Log.severe(TXMUIMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
 			} catch (Exception e2) {
-				System.out.println(Messages.ConcordancesEditor_7+e2);
+				System.out.println(ConcordanceUIMessages.ConcordancesEditor_7+e2);
 				org.txm.rcp.utils.Logger.printStackTrace(e1);
 				Log.severe(Log.toString(e1));
 			}
@@ -1842,7 +1842,7 @@
 			IConfigurationElement[] config = Platform.getExtensionRegistry()
 					.getConfigurationElementsFor(BACKTOTEXT_COMMAND_ID);
 			for (IConfigurationElement e : config) {
-				Object o = e.createExecutableExtension(Messages.ConcordancesEditor_78);
+				Object o = e.createExecutableExtension(ConcordanceUIMessages.ConcordancesEditor_78);
 				if (o instanceof BackToTextCommand) {
 					return ((BackToTextCommand) o).backToText(this, line.getMatch());
 				}
@@ -1862,7 +1862,7 @@
 
 			IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
 
-			StatusLine.setMessage(RCPMessages.ComputeReferencer_0);
+			StatusLine.setMessage(TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -104,7 +104,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(RCPMessages.ComplexSort_5);
+		newShell.setText(TXMUIMessages.ComplexSort_5);
 	}
 
 	/* (non-Javadoc)
@@ -117,7 +117,7 @@
 		mainArea.setLayout(layout);
 
 		Label nameLabel = new Label(mainArea, SWT.NONE);
-		nameLabel.setText(RCPMessages.ComplexSort_6);
+		nameLabel.setText(TXMUIMessages.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(),
-					RCPMessages.CreateSubcorpusDialog_11,
-					RCPMessages.ComplexSort_9);
+					TXMUIMessages.CreateSubcorpusDialog_11,
+					TXMUIMessages.ComplexSort_9);
 			return;
 		}
 		name = nameText.getText();
 		if (selectedComparators.size() < 2) {
 			MessageDialog.openError(getShell(),
-					RCPMessages.ComplexSort_10,
-					RCPMessages.ComplexSort_11);
+					TXMUIMessages.ComplexSort_10,
+					TXMUIMessages.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 685)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ReferenceLabelProvider.java	(revision 686)
@@ -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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -58,7 +58,7 @@
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
 		if (columnIndex != 0)
-			throw new RuntimeException(RCPMessages.LineLabelProvider_1);
+			throw new RuntimeException(TXMUIMessages.LineLabelProvider_1);
 		Line line = (Line) element;
 		return line.getViewRef().toString();
 	}
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 685)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java	(revision 686)
@@ -107,7 +107,7 @@
 			
 			
 		} catch (Exception e) {
-			System.err.println(org.txm.rcp.RCPMessages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(org.txm.rcp.messages.TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
 		}
 		return true;
 	}
Index: tmp/org.txm.core/buildJavadoc.xml
===================================================================
--- tmp/org.txm.core/buildJavadoc.xml	(revision 685)
+++ tmp/org.txm.core/buildJavadoc.xml	(revision 686)
@@ -24,7 +24,7 @@
 		-->
 		<groovydoc 
 			destdir="javadoc/" 
-			sourcepath="../org.txm.core/src/java:../org.txm.statsengine.r.core/src:../org.txm.core.tests/src:../org.txm.cql2lsa.rcp/src:../org.txm.oriflamms.rcp/src:../org.txm.dictionary.rcp/src:../org.txm.para.core/src:../org.txm.groovy.core/src:../org.txm.para.rcp/src:../org.txm.groovy.rcp/src:../org.txm.partition.core/src:../org.txm.statsengine.r.rcp/src:../org.txm.imports.metopes/src:../org.txm.partition.rcp/src:../org.txm.svn.rcp/src:../org.txm.analec.rcp/src:../org.txm.index.core/src:../org.txm.practically.rcp/src:../org.txm.annotation.core/src:../org.txm.index.rcp/src:../org.txm.progression.core/src:../org.txm.synopticeditor.rcp/src:../org.txm.annotation.rcp/src:../org.txm.internalview.core/src:../org.txm.progression.rcp/src:../org.txm.textsbalance.core/src:../org.txm.backtomedia.rcp/src:../org.txm.internalview.rcp/src:../org.txm.querycooccurrences.rcp/src:../org.txm.ca.core/src:../org.txm.jodconverter.core/src:../org.txm.queryindex.rcp/src:../org.txm.textsbalance.rcp/src:../org.txm.cah.core/src:../org.txm.lexicaltable.core/src:../org.txm.r/src:../org.txm.tigersearch.rcp/src:../org.txm.cah.rcp/src:../org.txm.lexicaltable.rcp/src:../org.txm.rcp/src/main/java:../org.txm.tmp.rcp/src:../org.txm.ca.rcp/src:../org.txm.lexicon.core/src:../org.txm.rcp.about.fragment/src:../org.txm.treetaggerinstaller.rcp/src:../org.txm.chartsengine.core/src:../org.txm.lexicon.rcp/src:../org.txm.treetagger.rcp/src:../org.txm.chartsengine.jfreechart.core/src:../org.txm.rcp.p2.ui/src:../org.txm.utils/src:../org.txm.chartsengine.jfreechart.rcp/src:../org.txm.referencer.core/src:../org.txm.wordcloud.core/src:../org.txm.chartsengine.raster.rcp/src:../org.txm.referencer.rcp/src:../org.txm.chartsengine.r.core/src:../org.txm.searchengine.core/src:../org.txm.wordcloud.rcp/src:../org.txm.chartsengine.rcp/src:../org.txm.searchengine.cqp.core/src:../org.txm.xmleditor.rcp/src:../org.txm.chartsengine.r.rcp/src:../org.txm.chartsengine.svgbatik.rcp/src:../org.txm.searchengine.cqp.rcp/src:../org.txm.concordance.core/src:../org.txm.setups.startdialog/src:../org.txm.concordance.rcp/src:../org.txm.specificities.core/src:../org.txm.cooccurrence.core/src:../org.txm.specificities.rcp/src:../org.txm.cooccurrence.rcp/src:../org.txm.statsengine.core" 
+			sourcepath="../org.txm.core/src/java:../org.txm.statsengine.r.core/src:../org.txm.core.tests/src:../org.txm.cql2lsa.rcp/src:../org.txm.oriflamms.rcp/src:../org.txm.dictionary.rcp/src:../org.txm.para.core/src:../org.txm.groovy.core/src:../org.txm.para.rcp/src:../org.txm.groovy.rcp/src:../org.txm.partition.core/src:../org.txm.statsengine.r.rcp/src:../org.txm.imports.metopes/src:../org.txm.partition.rcp/src:../org.txm.svn.rcp/src:../org.txm.analec.rcp/src:../org.txm.index.core/src:../org.txm.practically.rcp/src:../org.txm.annotation.core/src:../org.txm.index.rcp/src:../org.txm.progression.core/src:../org.txm.synopticeditor.rcp/src:../org.txm.annotation.rcp/src:../org.txm.internalview.core/src:../org.txm.progression.rcp/src:../org.txm.textsbalance.core/src:../org.txm.backtomedia.rcp/src:../org.txm.internalview.rcp/src:../org.txm.querycooccurrences.rcp/src:../org.txm.ca.core/src:../org.txm.jodconverter.core/src:../org.txm.queryindex.rcp/src:../org.txm.textsbalance.rcp/src:../org.txm.ahc.core/src:../org.txm.lexicaltable.core/src:../org.txm.r/src:../org.txm.tigersearch.rcp/src:../org.txm.cah.rcp/src:../org.txm.lexicaltable.rcp/src:../org.txm.rcp/src/main/java:../org.txm.tmp.rcp/src:../org.txm.ca.rcp/src:../org.txm.lexicon.core/src:../org.txm.rcp.about.fragment/src:../org.txm.treetaggerinstaller.rcp/src:../org.txm.chartsengine.core/src:../org.txm.lexicon.rcp/src:../org.txm.treetagger.rcp/src:../org.txm.chartsengine.jfreechart.core/src:../org.txm.rcp.p2.ui/src:../org.txm.utils/src:../org.txm.chartsengine.jfreechart.rcp/src:../org.txm.referencer.core/src:../org.txm.wordcloud.core/src:../org.txm.chartsengine.raster.rcp/src:../org.txm.referencer.rcp/src:../org.txm.chartsengine.r.core/src:../org.txm.searchengine.core/src:../org.txm.wordcloud.rcp/src:../org.txm.chartsengine.rcp/src:../org.txm.searchengine.cqp.core/src:../org.txm.xmleditor.rcp/src:../org.txm.chartsengine.r.rcp/src:../org.txm.chartsengine.svgbatik.rcp/src:../org.txm.searchengine.cqp.rcp/src:../org.txm.concordance.core/src:../org.txm.setups.startdialog/src:../org.txm.concordance.rcp/src:../org.txm.specificities.core/src:../org.txm.cooccurrence.core/src:../org.txm.specificities.rcp/src:../org.txm.cooccurrence.rcp/src:../org.txm.statsengine.core" 
 			packagenames="org.txm.*" 
 
 			use="true"  
Index: tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java	(revision 685)
+++ tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java	(revision 686)
@@ -39,13 +39,6 @@
 	/** The Constant USER_TXM_HOME. */
 	public static final String USER_TXM_HOME = "user_txm_home"; //$NON-NLS-1$
 
-	/** The Constant TREETAGGER_INSTALL_PATH. */
-	public static final String TREETAGGER_INSTALL_PATH = "treetagger_install_path"; //$NON-NLS-1$
-	/** The Constant TREETAGGER_MODELS_PATH. */
-	public static final String TREETAGGER_MODELS_PATH = "treetagger_models_path"; //$NON-NLS-1$
-	public static final String TREETAGGER_OPTIONS = "treetagger_options"; //$NON-NLS-1$
-	public static final String TREETAGGER_APOSTROPHE = "treetagger_fix_apostrophes"; //$NON-NLS-1$
-
 	public static final String METADATA_ENCODING = "metadata_encoding"; //$NON-NLS-1$
 	public static final String METADATA_COLSEPARATOR = "metadata_colseparator"; //$NON-NLS-1$
 	public static final String METADATA_TXTSEPARATOR = "metadata_txtseparator"; //$NON-NLS-1$
@@ -91,10 +84,6 @@
 		preferences.putBoolean(TBXPreferences.LOG_IN_FILE, false); //$NON-NLS-1$
 		preferences.put(TBXPreferences.UI_LOCALE, "fr"); //$NON-NLS-1$
 		
-		preferences.put(TBXPreferences.TREETAGGER_INSTALL_PATH, System.getProperty("osgi.user.area") + "/TXM/treetagger"); //$NON-NLS-1$ //$NON-NLS-2$
-		preferences.put(TBXPreferences.TREETAGGER_MODELS_PATH, TXMPreferences.getString(TBXPreferences.TREETAGGER_INSTALL_PATH, TBXPreferences.PREFERENCES_NODE) + "/models"); //$NON-NLS-1$
-		preferences.put(TBXPreferences.TREETAGGER_APOSTROPHE, "false"); //$NON-NLS-1$
-		
 		preferences.put(TBXPreferences.METADATA_ENCODING, "UTF-8"); //$NON-NLS-1$
 		preferences.put(TBXPreferences.METADATA_TXTSEPARATOR, "\""); //$NON-NLS-1$
 		
Index: tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties	(revision 685)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties	(revision 686)
@@ -5,3 +5,12 @@
 
 QUERY_1 = Запрос:
 
+common_delete         = удалить
+common_description    = Описание
+common_mode           = 
+common_ok             = OK
+common_pleaseWait     = Пожалуйста, подождите...
+common_queries        = Запросы: 
+common_structuralUnit = Структурная единица: 
+common_structure      = Структура
+common_units          = Единицы
Index: tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 685)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 686)
@@ -14,6 +14,23 @@
 
 	private static final String BUNDLE_NAME = "org.txm.core.messages.messages"; //$NON-NLS-1$
 	
+	
+	
+	
+	public static String common_strucutralUnit;
+	public static String common_description;
+	public static String common_structure;
+	public static String common_queries;
+	
+
+	public static String common_units;
+	public static String common_delete;
+	public static String common_ok;
+	public static String common_mode;
+	
+	public static String common_pleaseWait;
+
+	
 	public static String ApplicationWorkbenchAdvisor_15;
 	public static String ApplicationWorkbenchAdvisor_14;
 	public static String ApplicationWorkbenchAdvisor_6;
@@ -31,7 +48,6 @@
 	public static String COMPUTE_DONE_NO_RESULT;
 
 	
-	
 	public static String FAILED;
 	public static String DONE;			
 	public static String AbsoluteFrequency_1;
@@ -98,34 +114,6 @@
 	public static String DROP_PARTITION;
 	public static String DROP_QUERYRESULT;
 	public static String DROP_SUBCORPUS;
-	public static String Diagnostic_0;
-	public static String Diagnostic_1;
-	public static String Diagnostic_10;
-	public static String Diagnostic_11;
-	public static String Diagnostic_12;
-	public static String Diagnostic_13;
-	public static String Diagnostic_14;
-	public static String Diagnostic_15;
-	public static String Diagnostic_16;
-	public static String Diagnostic_17;
-	public static String Diagnostic_18;
-	public static String Diagnostic_19;
-	public static String Diagnostic_2;
-	public static String Diagnostic_20;
-	public static String Diagnostic_22;
-	public static String Diagnostic_23;
-	public static String Diagnostic_26;
-	public static String Diagnostic_3;
-	public static String Diagnostic_4;
-	public static String Diagnostic_40;
-	public static String Diagnostic_41;
-	public static String Diagnostic_43;
-	public static String Diagnostic_49;
-	public static String Diagnostic_5;
-	public static String Diagnostic_6;
-	public static String Diagnostic_7;
-	public static String Diagnostic_8;
-	public static String Diagnostic_9;
 	public static String END_SUBCORPUS_LEXICON;
 	public static String END_SUBCORPUS_SIZE;
 	public static String EVALUATED_EXPRESSION;
Index: tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties	(revision 685)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties	(revision 686)
@@ -85,35 +85,6 @@
 DROP_QUERYRESULT = Suppression du résultat de requête {0}
 DROP_SUBCORPUS   = Suppression du sous-corpus {0}
 
-Diagnostic_0  = <h3>Propriétés des structures\n
-Diagnostic_1  = ** Echec d'accès au corpus
-Diagnostic_10 = Nom de la partition : 
-Diagnostic_11 = \ structures
-Diagnostic_12 = Nombre de parties :
-Diagnostic_13 = Taille de la partition : 
-Diagnostic_14 = Propriétés des unités lexicales (max {0} valeurs)
-Diagnostic_15 = Numéro de la partie : 
-Diagnostic_16 = Nombre d'unités de structure 
-Diagnostic_17 = Nom des parties : 
-Diagnostic_18 = Taille des parties : 
-Diagnostic_19 = Propriétés des parties : 
-Diagnostic_2  = ** Erreur
-Diagnostic_20 = Requêtes de parties : 
-Diagnostic_22 = Propriétés des structures (max {0} valeurs)
-Diagnostic_23 = \ valeurs)
-Diagnostic_26 = Pas de propriété
-Diagnostic_3  = Description du corpus 
-Diagnostic_4  = \ propriétés
-Diagnostic_40 = * Statistiques Générales\n
-Diagnostic_41 = - T
-Diagnostic_43 = - Propriétés de mot 
-Diagnostic_49 = - S
-Diagnostic_5  = Statistiques Générales
-Diagnostic_6  = ** Echec d'accès au corpus
-Diagnostic_7  = Nombre de mots 
-Diagnostic_8  = \ lexique
-Diagnostic_9  = Nombre de propriétés de mot 
-
 END_SUBCORPUS_LEXICON = Lexique du sous-corpus {0} calculé en {1} ms
 END_SUBCORPUS_SIZE    = Taille du sous-corpus {0} ({1}) calculée en {2} ms
 
@@ -403,3 +374,13 @@
 Workspace_6  = ** Echec de la création du fichier d'espace de travail : 
 Workspace_7  = \ pages
 Workspace_8  = Le fichier XML d'espace de travail est mal formé. Un nouveau doit être regénéré...
+
+common_delete         = Supprimer
+common_description    = Description
+common_mode           = Mode
+common_ok             = OK
+common_pleaseWait     = Veuillez patienter...
+common_queries        = Requêtes : 
+common_structuralUnit = Unité structurelle : 
+common_structure      = Structure
+common_units          = Unités
Index: tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties	(revision 685)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties	(revision 686)
@@ -1,12 +1,12 @@
-ApplicationWorkbenchAdvisor_14                           = \ evaluating extension:
-ApplicationWorkbenchAdvisor_15                           = Loading extensions...
-ApplicationWorkbenchAdvisor_6                            = Exception:
 
-
 AbsoluteFrequency_1 = Absolute Frequency
 
 AbstractCqiClient_2 = No error.
 
+ApplicationWorkbenchAdvisor_14 = \ evaluating extension:
+ApplicationWorkbenchAdvisor_15 = Loading extensions...
+ApplicationWorkbenchAdvisor_6  = Exception:
+
 Base_0  = Binary directory 
 Base_22 = 'corpora' element missing from 'base' element
 Base_3  = \ does not exist?
@@ -89,35 +89,6 @@
 DROP_QUERYRESULT = Deleting query results {0}
 DROP_SUBCORPUS   = Deleting subcorpus {0}
 
-Diagnostic_0  = * Structural Units properties\n
-Diagnostic_1  = ** Failed to access corpus 
-Diagnostic_10 = Partition name: 
-Diagnostic_11 = \ structures
-Diagnostic_12 = Number of parts: 
-Diagnostic_13 = Partition size: 
-Diagnostic_14 = Lexical Units properties (max {0} values)
-Diagnostic_15 = Part number: 
-Diagnostic_16 = Number of structural units 
-Diagnostic_17 = Part names: 
-Diagnostic_18 = Part sizes: 
-Diagnostic_19 = Part properties: 
-Diagnostic_2  = ** Error
-Diagnostic_20 = Parts queries: 
-Diagnostic_22 = Structural Units properties (max {0} values)
-Diagnostic_23 = \ values)
-Diagnostic_26 = No property
-Diagnostic_3  = Description of 
-Diagnostic_4  = \ properties
-Diagnostic_40 = * General Statistics\n
-Diagnostic_41 = - T 
-Diagnostic_43 = - Word properties 
-Diagnostic_49 = - S 
-Diagnostic_5  = General Statistics
-Diagnostic_6  = ** Failed to access corpus 
-Diagnostic_7  = Number of words 
-Diagnostic_8  = \ lexicon
-Diagnostic_9  = Number of word properties 
-
 END_SUBCORPUS_LEXICON = Lexicon of subcorpus {0} computed in {1} ms
 END_SUBCORPUS_SIZE    = size of subcorpus {0} ({1}) computed in {2} ms
 
@@ -148,7 +119,6 @@
 
 INT_VECTOR_ADDED_TO_WORKSPACE = Vector "{1}" ({0,number,integer} "int") transmitted to Statistics Engine.
 
-
 LEXICON = Lexicon 
 
 LEXICON_ADDED = Lexicon "{1}" ({0,number,integer} entries) transmitted to Statistics Engine.
@@ -416,3 +386,13 @@
 Workspace_6  = ** Failed to create empty workspace file: 
 Workspace_7  = \ pages
 Workspace_8  = Workspace XML file is mal formed. We need to recreate one...
+
+common_delete         = Delete
+common_description    = Description
+common_mode           = Mode
+common_ok             = OK
+common_pleaseWait     = Please wait...
+common_queries        = Queries:
+common_structuralUnit = Structural Unit:
+common_structure      = Structure
+common_units          = Units
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 685)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java	(revision 686)
@@ -47,10 +47,10 @@
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.OpenGraph;
 import org.txm.rcp.handlers.BaseAbstractHandler;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.rcp.utils.JobHandler;
 
@@ -117,28 +117,28 @@
 			try {
 				file.createNewFile();
 			} catch (IOException e1) {
-				System.err.println(NLS.bind(RCPMessages.ExportResult_3, file, e1));
+				System.err.println(NLS.bind(TXMUIMessages.ExportResult_3, file, e1));
 			}
 			if (!file.canWrite()) {
-				System.err.println(NLS.bind(RCPMessages.ExportResult_5, file));
+				System.err.println(NLS.bind(TXMUIMessages.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(RCPMessages.ExportResult_0) {
+			JobHandler jobhandler = new JobHandler(TXMUIMessages.ExportResult_0) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						this.runInit(monitor);
-						monitor.beginTask(RCPMessages.ExportResult_1, 100);
+						monitor.beginTask(TXMUIMessages.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(RCPMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
+							System.out.println(NLS.bind(TXMUIMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
 
 							// Open internal editor in the UI thread
 							if (TXMPreferences.getBoolean(TBXPreferences.EXPORT_SHOW, TBXPreferences.PREFERENCES_NODE))	{
@@ -150,7 +150,7 @@
 								});
 							}
 						} else {
-							System.out.println(NLS.bind(RCPMessages.ExportResult_4, file.getAbsolutePath(), outputFormat));
+							System.out.println(NLS.bind(TXMUIMessages.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 685)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java	(revision 686)
@@ -33,6 +33,7 @@
 
 
 
+
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -52,9 +53,9 @@
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.OpenGraph;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.rcp.utils.JobHandler;
 
@@ -128,28 +129,28 @@
 				file.createNewFile();
 			}
 			catch(IOException e1) {
-				System.err.println(NLS.bind(RCPMessages.ExportResult_3, file, e1));
+				System.err.println(NLS.bind(TXMUIMessages.ExportResult_3, file, e1));
 			}
 			if(!file.canWrite()) {
-				System.err.println(NLS.bind(RCPMessages.ExportResult_5, file));
+				System.err.println(NLS.bind(TXMUIMessages.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(RCPMessages.ExportResult_0) {
+			JobHandler jobhandler = new JobHandler(TXMUIMessages.ExportResult_0) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						this.runInit(monitor);
-						monitor.beginTask(RCPMessages.ExportResult_1, 100);
+						monitor.beginTask(TXMUIMessages.ExportResult_1, 100);
 
 						String outputFormat = chartEditor.getSWTChartsComponentsProvider().getEditorSupportedExportFileFormats().get(dialog.getFilterIndex());
 						chartEditor.exportView(file, outputFormat);
 
 						if(file.exists()) {
 
-							System.out.println(NLS.bind(RCPMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
+							System.out.println(NLS.bind(TXMUIMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
 
 							// Open internal editor in the UI thread
 							if(TXMPreferences.getBoolean(TBXPreferences.EXPORT_SHOW, TBXPreferences.PREFERENCES_NODE))	{
@@ -162,7 +163,7 @@
 							}
 						}
 						else {
-							System.out.println(NLS.bind(RCPMessages.ExportResult_4, file.getAbsolutePath(), outputFormat));
+							System.out.println(NLS.bind(TXMUIMessages.ExportResult_4, file.getAbsolutePath(), outputFormat));
 						}
 					}
 					catch(ThreadDeath td) {
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 685)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/views/knowledgerepositories/KRView.java	(revision 686)
@@ -42,6 +42,7 @@
 
 
 
+
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -80,7 +81,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.RCPMessages;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.CorpusManager;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
@@ -238,7 +239,7 @@
 				return ((AnnotationType) element).getId()+((AnnotationType) element).getEffect().toSuffix();
 			else if (element instanceof TypedValue)
 				return ((TypedValue) element).getStandardName();
-			return NLS.bind(RCPMessages.QueriesView_10, element);
+			return NLS.bind(TXMUIMessages.QueriesView_10, element);
 		}
 
 		/* (non-Javadoc)
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/concordance/ConcordanceAnnotationExtension.java
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/concordance/ConcordanceAnnotationExtension.java	(revision 685)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/concordance/ConcordanceAnnotationExtension.java	(revision 686)
@@ -21,10 +21,7 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.SelectionEvent;
@@ -42,16 +39,31 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.dialogs.ListDialog;
+import org.txm.annotation.core.Annotation;
+import org.txm.annotation.core.AnnotationManager;
+import org.txm.annotation.core.KRAnnotationEngine;
+import org.txm.annotation.core.preferences.AnnotationPreferences;
+import org.txm.annotation.core.repository.AnnotationType;
+import org.txm.annotation.core.repository.KnowledgeRepository;
+import org.txm.annotation.core.repository.KnowledgeRepositoryManager;
+import org.txm.annotation.core.repository.LocalKnowledgeRepository;
+import org.txm.annotation.core.repository.SQLKnowledgeRepository;
+import org.txm.annotation.core.repository.TypedValue;
+import org.txm.annotation.rcp.commands.InitializeKnowledgeRepository;
+import org.txm.annotation.rcp.commands.SaveAnnotations;
+import org.txm.annotation.rcp.commands.krview.OpenKRView;
+import org.txm.annotation.rcp.messages.AnnotationUIMessages;
+import org.txm.annotation.rcp.views.knowledgerepositories.KRView;
 import org.txm.concordance.core.functions.Concordance;
 import org.txm.concordance.core.functions.Line;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
 import org.txm.concordance.rcp.editors.ConcordanceEditor.ConcordanceColumnSizeControlListener;
 import org.txm.concordance.rcp.editors.ConcordanceEditorExtension;
-import org.txm.concordance.rcp.messages.Messages;
+import org.txm.concordance.rcp.messages.ConcordanceUIMessages;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.OpenBrowser;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.dialog.ConfirmDialog;
 import org.txm.rcp.swt.provider.SimpleLabelProvider;
@@ -62,20 +74,6 @@
 import org.txm.searchengine.cqp.corpus.query.Match;
 import org.txm.utils.AsciiUtils;
 import org.txm.utils.logger.Log;
-import org.txm.annotation.core.Annotation;
-import org.txm.annotation.core.AnnotationManager;
-import org.txm.annotation.core.KRAnnotationEngine;
-import org.txm.annotation.core.preferences.AnnotationPreferences;
-import org.txm.annotation.core.repository.AnnotationType;
-import org.txm.annotation.core.repository.KnowledgeRepository;
-import org.txm.annotation.core.repository.KnowledgeRepositoryManager;
-import org.txm.annotation.core.repository.LocalKnowledgeRepository;
-import org.txm.annotation.core.repository.SQLKnowledgeRepository;
-import org.txm.annotation.core.repository.TypedValue;
-import org.txm.annotation.rcp.commands.InitializeKnowledgeRepository;
-import org.txm.annotation.rcp.commands.SaveAnnotations;
-import org.txm.annotation.rcp.commands.krview.OpenKRView;
-import org.txm.annotation.rcp.views.knowledgerepositories.KRView;
 
 public class ConcordanceAnnotationExtension extends ConcordanceEditorExtension {
 
@@ -155,7 +153,7 @@
 		if (KRAnnotationEngine.getKnowledgeRepositoryNames(corpus).size() > 0) { // shown only if corpus has a registered KR
 
 			annotationButton = new Button(navigationArea, SWT.PUSH);
-			annotationButton.setToolTipText(Messages.ConcordancesEditor_75);
+			annotationButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_75);
 			annotationButton.setImage(IImageKeys.getImage(IImageKeys.PENCIL));
 			annotationButton.addSelectionListener(new SelectionListener() {
 				@Override
@@ -176,7 +174,7 @@
 						if (annotationArea == null) return;
 
 						annotationColumn.pack();
-						annotationButton.setToolTipText(Messages.ConcordancesEditor_76);
+						annotationButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_76);
 						annotationButton.setImage(IImageKeys.getImage(IImageKeys.PENCIL_SAVE));
 
 						annotSize = annotationArea.getSize();
@@ -212,8 +210,8 @@
 		int position = 3;
 		TableViewerColumn annotationColumnViewer = new TableViewerColumn(viewer, SWT.CENTER, position);
 		annotationColumn = annotationColumnViewer.getColumn();
-		annotationColumn.setText(Messages.ConcordancesEditor_15);
-		annotationColumn.setToolTipText(Messages.ConcordancesEditor_17);
+		annotationColumn.setText(ConcordanceUIMessages.ConcordancesEditor_15);
+		annotationColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_17);
 		annotationColumn.setAlignment(SWT.CENTER);
 		
 		annotationColumn.addControlListener(new ConcordanceColumnSizeControlListener(annotationColumn));
@@ -314,9 +312,9 @@
 
 		addRemoveCombo = new Combo(annotationArea, SWT.READ_ONLY);
 		String affectLabel = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_22");
-		if (affectLabel == null) affectLabel= Messages.ConcordancesEditor_22;
+		if (affectLabel == null) affectLabel= ConcordanceUIMessages.ConcordancesEditor_22;
 		String removeLabel = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_24");
-		if (removeLabel == null) removeLabel= Messages.ConcordancesEditor_24;
+		if (removeLabel == null) removeLabel= ConcordanceUIMessages.ConcordancesEditor_24;
 		String items[] = {affectLabel, removeLabel};
 		addRemoveCombo.setItems(items);
 		addRemoveCombo.select(0);
@@ -326,7 +324,7 @@
 				if (addRemoveCombo.getSelectionIndex() == 0) { // add
 					annotationValuesText.setEnabled(true);
 					String withLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_83");
-					if (withLabelText == null) withLabelText= Messages.ConcordancesEditor_83;
+					if (withLabelText == null) withLabelText= ConcordanceUIMessages.ConcordancesEditor_83;
 					withLabel.setText(withLabelText);
 					if (equalLabel != null) equalLabel.setText("=");
 				} else { // remove
@@ -347,7 +345,7 @@
 
 		withLabel = new Label(annotationArea, SWT.NONE);
 		String withLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_83");
-		if (withLabelText == null) withLabelText= Messages.ConcordancesEditor_83;
+		if (withLabelText == null) withLabelText= ConcordanceUIMessages.ConcordancesEditor_83;
 		withLabel.setText(withLabelText);
 		withLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 
@@ -376,7 +374,7 @@
 
 			annotationTypesCombo.getCombo().setLayoutData(gdata);
 			annotationTypesCombo.setInput(typesList);
-			if (advanced_annotation_mode.equals(RCPMessages.AnnotationPreferences_2)) {
+			if (advanced_annotation_mode.equals(AnnotationUIMessages.AnnotationPreferences_2)) {
 				annotationTypesCombo.getCombo().select(0);
 			}
 
@@ -445,7 +443,7 @@
 
 			if (currentKnowledgeRepository instanceof LocalKnowledgeRepository) {
 				addAnnotationTypeLink = new Button(annotationArea, SWT.PUSH);
-				addAnnotationTypeLink.setToolTipText(Messages.ConcordancesEditor_115);
+				addAnnotationTypeLink.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_115);
 				addAnnotationTypeLink.setImage(IImageKeys.getImage(IImageKeys.ACTION_ADD));
 				addAnnotationTypeLink.setEnabled(true);
 				addAnnotationTypeLink.setLayoutData(new GridData(SWT.FILL,	SWT.CENTER, false, true));
@@ -457,7 +455,7 @@
 
 						LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
 
-						InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), Messages.ConcordancesEditor_82, Messages.ConcordancesEditor_81, "", null); //$NON-NLS-3$
+						InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), ConcordanceUIMessages.ConcordancesEditor_82, ConcordanceUIMessages.ConcordancesEditor_81, "", null); //$NON-NLS-3$
 						if (dialog.open() == InputDialog.OK) {
 							String name = dialog.getValue();
 							if (name.trim().length() == 0) return;
@@ -503,14 +501,14 @@
 			Label valueLabel = new Label(annotationArea, SWT.NONE);
 			String valueLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_80");
 			if (valueLabelText == null) {
-				valueLabelText= Messages.ConcordancesEditor_80;
+				valueLabelText= ConcordanceUIMessages.ConcordancesEditor_80;
 			}
 			valueLabel.setText(valueLabelText);
 			valueLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		}
 
 		annotationValuesText = new Text(annotationArea, SWT.BORDER);
-		annotationValuesText.setToolTipText(Messages.ConcordancesEditor_32);
+		annotationValuesText.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_32);
 		GridData gdata2 = new GridData(SWT.FILL, SWT.CENTER, false, true);
 		gdata2.widthHint = 200;
 		annotationValuesText.setLayoutData(gdata2);
@@ -529,10 +527,10 @@
 		if (currentKnowledgeRepository instanceof LocalKnowledgeRepository) {
 			addTypedValueLink = new Button(annotationArea, SWT.PUSH);
 			addTypedValueLink.setText("..."); //$NON-NLS-1$
-			if (advanced_annotation_mode.equals(RCPMessages.AnnotationPreferences_2)) {
-				addTypedValueLink.setToolTipText(Messages.ConcordancesEditor_79);
+			if (advanced_annotation_mode.equals(AnnotationUIMessages.AnnotationPreferences_2)) {
+				addTypedValueLink.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_79);
 			} else {
-				addTypedValueLink.setToolTipText(Messages.ConcordancesEditor_77);
+				addTypedValueLink.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_77);
 			}
 			addTypedValueLink.setEnabled(true);
 			addTypedValueLink.setLayoutData(new GridData(SWT.FILL,	SWT.CENTER, false, true));
@@ -548,12 +546,12 @@
 					LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
 
 					ListDialog dialog = new ListDialog(e.widget.getDisplay().getActiveShell());
-					if (advanced_annotation_mode.equals(RCPMessages.AnnotationPreferences_2)) {
+					if (advanced_annotation_mode.equals(AnnotationUIMessages.AnnotationPreferences_2)) {
 						String title = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_100");
-						if (title == null) title = Messages.ConcordancesEditor_100;
-						dialog.setTitle(Messages.bind(title, type.getName()));//+"valeurs de "+type.getName());
+						if (title == null) title = ConcordanceUIMessages.ConcordancesEditor_100;
+						dialog.setTitle(ConcordanceUIMessages.bind(title, type.getName()));//+"valeurs de "+type.getName());
 					} else {
-						dialog.setTitle(Messages.ConcordancesEditor_99);//+"valeurs de "+type.getName());
+						dialog.setTitle(ConcordanceUIMessages.ConcordancesEditor_99);//+"valeurs de "+type.getName());
 					}
 					dialog.setContentProvider(new ArrayContentProvider());
 					dialog.setLabelProvider(new SimpleLabelProvider() {
@@ -589,7 +587,7 @@
 
 		affectCombo = new Combo(annotationArea, SWT.READ_ONLY);
 		affectCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, true));
-		String items2[] = {Messages.ConcordancesEditor_35, Messages.ConcordancesEditor_42, Messages.ConcordancesEditor_49};
+		String items2[] = {ConcordanceUIMessages.ConcordancesEditor_35, ConcordanceUIMessages.ConcordancesEditor_42, ConcordanceUIMessages.ConcordancesEditor_49};
 		affectCombo.setItems(items2);
 		affectCombo.select(0);
 		gdata = new GridData(SWT.CENTER, SWT.CENTER, false, true);
@@ -597,8 +595,8 @@
 		affectCombo.setLayoutData(gdata);
 
 		affectAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		affectAnnotationButton.setText(Messages.ConcordancesEditor_85);
-		affectAnnotationButton.setToolTipText(Messages.ConcordancesEditor_116);
+		affectAnnotationButton.setText(ConcordanceUIMessages.ConcordancesEditor_85);
+		affectAnnotationButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_116);
 		affectAnnotationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, true));
 		affectAnnotationButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -611,7 +609,7 @@
 						List<Match> matches = concordance.getMatches().subList(editor.getTopLine(), editor.getBottomLine()+1);
 						affectMatchesToSelection(matches);
 					} catch (CqiClientException e1) {
-						Log.severe(Messages.ConcordancesEditor_53+e1);
+						Log.severe(ConcordanceUIMessages.ConcordancesEditor_53+e1);
 						Log.printStackTrace(e1);
 						return;
 					}
@@ -620,7 +618,7 @@
 						List<Match> matches = concordance.getMatches();
 						affectMatchesToSelection(matches);
 					} catch (CqiClientException e1) {
-						Log.severe(Messages.ConcordancesEditor_53+e1);
+						Log.severe(ConcordanceUIMessages.ConcordancesEditor_53+e1);
 						Log.printStackTrace(e1);
 						return;
 					}
@@ -631,7 +629,7 @@
 			public void widgetDefaultSelected(SelectionEvent e) { }
 		});
 		Button cancelAnnotateButton = new Button(annotationArea, SWT.PUSH);
-		cancelAnnotateButton.setText(Messages.ConcordancesEditor_101);
+		cancelAnnotateButton.setText(ConcordanceUIMessages.ConcordancesEditor_101);
 		cancelAnnotateButton.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -642,7 +640,7 @@
 				annotationArea = null;
 				parent.layout(true);
 				parent.layout();
-				annotationButton.setToolTipText(Messages.ConcordancesEditor_75);
+				annotationButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_75);
 				annotationButton.setImage(IImageKeys.getImage(IImageKeys.PENCIL));
 				annotationColumn.setWidth(0);
 				annotationColumn.setResizable(false);
@@ -686,7 +684,7 @@
 		final String svalue = annotationValuesText.getText();
 		final boolean doAffect = addRemoveCombo.getSelectionIndex() == 0; // add is default
 
-		JobHandler job = new JobHandler(Messages.ConcordancesEditor_36, true) {
+		JobHandler job = new JobHandler(ConcordanceUIMessages.ConcordancesEditor_36, true) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
@@ -697,7 +695,7 @@
 						deleteAnnotationValues(matches, type, this);
 					}
 				} catch(Exception e) {
-					Log.severe(Messages.ConcordancesEditor_40+e);
+					Log.severe(ConcordanceUIMessages.ConcordancesEditor_40+e);
 					Log.printStackTrace(e);
 					return Status.CANCEL_STATUS;
 				} catch(ThreadDeath td) {
@@ -739,7 +737,7 @@
 			}
 		}
 
-		if (advanced_annotation_mode.equals(RCPMessages.AnnotationPreferences_2)) {
+		if (advanced_annotation_mode.equals(AnnotationUIMessages.AnnotationPreferences_2)) {
 			if (infosAnnotTypeSelectedLink != null) {
 				infosAnnotTypeSelectedLink.setEnabled(getSelectedAnnotationType() != null);
 			}
@@ -777,7 +775,7 @@
 					return;
 				}
 			} catch (Exception e1) {
-				System.out.println(Messages.ConcordancesEditor_54+e1);
+				System.out.println(ConcordanceUIMessages.ConcordancesEditor_54+e1);
 				Log.printStackTrace(e1);
 				return;
 			}
@@ -810,8 +808,8 @@
 				if (matches.size() > NALERTAFFECTANNOTATIONS) {
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"confirm_annotate",  //$NON-NLS-1$
-							Messages.ConcordancesEditor_86, 
-							Messages.ConcordancesEditor_87+matches.size()+Messages.ConcordancesEditor_108);
+							ConcordanceUIMessages.ConcordancesEditor_86, 
+							ConcordanceUIMessages.ConcordancesEditor_87+matches.size()+ConcordanceUIMessages.ConcordancesEditor_108);
 
 					if (dialog.open() == ConfirmDialog.CANCEL) {
 						System.out.println("Annotation aborted by user."); //$NON-NLS-1$
@@ -822,7 +820,7 @@
 		});
 
 		// get value from combo text value
-		Log.warning(Messages.ConcordancesEditor_57+svalue);
+		Log.warning(ConcordanceUIMessages.ConcordancesEditor_57+svalue);
 		final KnowledgeRepository kr = KnowledgeRepositoryManager.getKnowledgeRepository(type.getKnowledgeRepository());
 		value_to_add = kr.getValue(type, svalue);
 
@@ -833,12 +831,12 @@
 				public void run() {
 					String title = kr.getString(editor.getLocale(), "ConcordancesEditor_110");
 					String content = kr.getString(editor.getLocale(), "ConcordancesEditor_112");
-					if (title == null ) title = Messages.ConcordancesEditor_110;
-					if (content == null ) content = Messages.ConcordancesEditor_112;
+					if (title == null ) title = ConcordanceUIMessages.ConcordancesEditor_110;
+					if (content == null ) content = ConcordanceUIMessages.ConcordancesEditor_112;
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"create_value", //$NON-NLS-1$
-							Messages.bind(title, svalue, type.getName()),  
-							Messages.bind(content, svalue, type.getName()));
+							ConcordanceUIMessages.bind(title, svalue, type.getName()),  
+							ConcordanceUIMessages.bind(content, svalue, type.getName()));
 					if (dialog.open() == ConfirmDialog.CANCEL) {
 						System.out.println("Annotation aborted by user."); //$NON-NLS-1$
 						return;
@@ -856,7 +854,7 @@
 			job.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					String mess = Messages.bind(Messages.ConcordancesEditor_58, svalue);
+					String mess = ConcordanceUIMessages.bind(ConcordanceUIMessages.ConcordancesEditor_58, svalue);
 					System.out.println(mess);
 					MessageDialog.openError(Display.getCurrent().getActiveShell(), "Annotation canceled", mess); //$NON-NLS-1$
 				}
@@ -864,7 +862,7 @@
 			return;
 		}
 
-		Log.info(Messages.ConcordancesEditor_59+value_to_add+Messages.ConcordancesEditor_60+matches);
+		Log.info(ConcordanceUIMessages.ConcordancesEditor_59+value_to_add+ConcordanceUIMessages.ConcordancesEditor_60+matches);
 
 		// finally we can 'try' to create the annotations \o/
 		try {
@@ -872,16 +870,16 @@
 
 			// did we had problems ?
 			if (existingAnnots!=null && existingAnnots.size() > 0) {
-				String message = Messages.ConcordancesEditor_61+value_to_add.getStandardName()+
-						Messages.ConcordancesEditor_62;
+				String message = ConcordanceUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
+						ConcordanceUIMessages.ConcordancesEditor_62;
 				for (Match m : existingAnnots.keySet()) {
-					message += Messages.ConcordancesEditor_63+m+Messages.ConcordancesEditor_64;
+					message += ConcordanceUIMessages.ConcordancesEditor_63+m+ConcordanceUIMessages.ConcordancesEditor_64;
 
 					for (Annotation existingAnnot : existingAnnots.get(m)) {
 						if (existingAnnot.getStart() < m.getStart()){
-							message += Messages.ConcordancesEditor_65+existingAnnot.getType()+Messages.ConcordancesEditor_66+existingAnnot.getStart()+Messages.ConcordancesEditor_67+existingAnnot.getEnd()+Messages.ConcordancesEditor_68;
+							message += ConcordanceUIMessages.ConcordancesEditor_65+existingAnnot.getType()+ConcordanceUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+ConcordanceUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+ConcordanceUIMessages.ConcordancesEditor_68;
 						} else {
-							message += Messages.ConcordancesEditor_69+existingAnnot.getType()+Messages.ConcordancesEditor_70+existingAnnot.getStart()+Messages.ConcordancesEditor_71+existingAnnot.getEnd()+Messages.ConcordancesEditor_72;
+							message += ConcordanceUIMessages.ConcordancesEditor_69+existingAnnot.getType()+ConcordanceUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+ConcordanceUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+ConcordanceUIMessages.ConcordancesEditor_72;
 						}
 					}
 				}
@@ -889,7 +887,7 @@
 				job.syncExec(new Runnable() {
 					@Override
 					public void run() {
-						MessageDialog.openInformation(editor.getSite().getShell(), Messages.ConcordancesEditor_73, final_message);
+						MessageDialog.openInformation(editor.getSite().getShell(), ConcordanceUIMessages.ConcordancesEditor_73, final_message);
 					}
 				});
 			}
@@ -899,7 +897,7 @@
 			if (Log.getLevel().intValue() < Level.WARNING.intValue() && annotManager != null) annotManager.checkData();
 			concordance.reloadLines(editor.getTopLine(), editor.getBottomLine()+1);
 		} catch (Exception e1) {
-			System.out.println(Messages.ConcordancesEditor_74+e1);
+			System.out.println(ConcordanceUIMessages.ConcordancesEditor_74+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
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 685)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/ExportStandoff.java	(revision 686)
@@ -45,8 +45,8 @@
 import org.txm.annotation.core.AnnotationManager;
 import org.txm.annotation.core.KRAnnotationEngine;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.swt.dialog.LastOpened;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
@@ -86,7 +86,7 @@
 		dialog.setFileName(corpus.getName()+"_annotations.zip");
 		dialog.setFilterExtensions(new String[]{"*.zip"});
 		if (dialog.open() != null) {
-			StatusLine.setMessage(RCPMessages.ExportAnnotation_0);
+			StatusLine.setMessage(TXMUIMessages.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 685)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/SaveAnnotations.java	(revision 686)
@@ -14,9 +14,9 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.annotation.core.AnnotationManager;
 import org.txm.annotation.core.KRAnnotationEngine;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.commands.CloseEditorsUsing;
 import org.txm.rcp.commands.workspace.UpdateCorpus;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.corpora.CorporaView;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
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 685)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/preferences/AnnotationPreferencePage.java	(revision 686)
@@ -30,10 +30,9 @@
 import org.eclipse.jface.preference.RadioGroupFieldEditor;
 import org.eclipse.ui.IWorkbench;
 import org.txm.annotation.core.preferences.AnnotationPreferences;
+import org.txm.annotation.rcp.messages.AnnotationUIMessages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.RCPMessages;
-import org.txm.rcp.preferences.RCPPreferences;
-import org.txm.rcp.preferences.RCPPreferencesPage;
 import org.txm.rcp.preferences.TXMPreferencePage;
 import org.txm.rcp.preferences.TXMPreferenceStore;
 /**
@@ -71,11 +70,9 @@
 				Messages.AnnotationPreferences_0, getFieldEditorParent());	
 		addField(mode_expert);*/
 		
-		String[][] labelAndValues = {
-				{RCPMessages.AnnotationPreferences_1, "simple"},
-				{RCPMessages.AnnotationPreferences_2, "advanced"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		String[][] labelAndValues = {{AnnotationUIMessages.AnnotationPreferences_1, "simple"}, {AnnotationUIMessages.AnnotationPreferences_2, "advanced"}}; //$NON-NLS-1$ //$NON-NLS-2$
 		
-		mode_annotation = new RadioGroupFieldEditor(AnnotationPreferences.ANNOTATION_MODE, RCPMessages.AnnotationPreferences_0, 2, labelAndValues, getFieldEditorParent());
+		mode_annotation = new RadioGroupFieldEditor(AnnotationPreferences.ANNOTATION_MODE, TXMCoreMessages.common_mode, 2, labelAndValues, getFieldEditorParent());
 		addField(mode_annotation);
 		//mode_annotation.setPreferenceStore(store);
 	}
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_ru.properties
===================================================================

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

Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_fr.properties	(revision 0)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_fr.properties	(revision 686)
@@ -0,0 +1,3 @@
+
+AnnotationPreferences_1 = simple (avec catégories)
+AnnotationPreferences_2 = avancé (avec types+valeurs)

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

Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java	(revision 0)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java	(revision 686)
@@ -0,0 +1,30 @@
+package org.txm.annotation.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * Annotation UI messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class AnnotationUIMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.annotation.rcp.messages.messages"; //$NON-NLS-1$
+
+	public static String AnnotationPreferences_1;
+	public static String AnnotationPreferences_2;
+
+	
+
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, AnnotationUIMessages.class);
+	}
+
+	private AnnotationUIMessages() {
+	}
+}

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

Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties	(revision 0)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties	(revision 686)
@@ -0,0 +1,3 @@
+
+AnnotationPreferences_1 = simple (with categories)
+AnnotationPreferences_2 = advanced (with types+values)

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

Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 685)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 686)
@@ -70,11 +70,11 @@
 import org.txm.index.core.preferences.IndexPreferences;
 import org.txm.index.rcp.messages.IndexUIMessages;
 import org.txm.rcp.JobsTimer;
-import org.txm.rcp.RCPMessages;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.widget.AssistedQueryWidget;
 import org.txm.rcp.swt.widget.NavigationWidget;
@@ -340,7 +340,7 @@
 
 		//propsArea
 		go = new Button(queryArea, SWT.BOLD);
-		go.setText(RCPMessages.SEARCH);
+		go.setText(TXMUIMessages.SEARCH);
 
 		Font f = go.getFont();
 		FontData defaultFont = f.getFontData()[0];
@@ -584,13 +584,13 @@
 		nColumn.pack();
 
 		unitColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
-		unitColumn.setText(RCPMessages.ReferencerEditor_9);
-		unitColumn.setToolTipText(RCPMessages.ReferencerEditor_9);
+		unitColumn.setText(TXMCoreMessages.common_units);
+		unitColumn.setToolTipText(TXMCoreMessages.common_units);
 		unitColumn.setWidth(200);
 		unitColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(RCPMessages.SORT_COLUMN);
+				StatusLine.setMessage(TXMUIMessages.SORT_COLUMN);
 				if (viewer.getTable().getSortColumn() != unitColumn) {
 					viewer.getTable().setSortColumn(unitColumn);
 					viewer.getTable().setSortDirection(SWT.UP);
@@ -605,7 +605,7 @@
 					}
 				}
 
-				StatusLine.setMessage(RCPMessages.SORT_DONE);
+				StatusLine.setMessage(TXMUIMessages.SORT_DONE);
 				fillDisplayArea();
 			}
 
@@ -617,14 +617,14 @@
 		freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
 		try {
 			if (index.getPartition() != null)
-				freqColumn.setText(RCPMessages.FrequencyListEditorInput_4+" T="+index.getPartition().getTotalSize()); //$NON-NLS-1$
+				freqColumn.setText(TXMUIMessages.FrequencyListEditorInput_4+" T="+index.getPartition().getTotalSize()); //$NON-NLS-1$
 			else
-				freqColumn.setText(RCPMessages.FrequencyListEditorInput_4);
+				freqColumn.setText(TXMUIMessages.FrequencyListEditorInput_4);
 		} catch (CqiClientException e2) {
 			// TODO Auto-generated catch block
 			org.txm.rcp.utils.Logger.printStackTrace(e2);
 		}
-		freqColumn.setToolTipText(RCPMessages.FrequencyListEditorInput_4);
+		freqColumn.setToolTipText(TXMUIMessages.FrequencyListEditorInput_4);
 		freqColumn.setWidth(100);
 		freqColumn.addSelectionListener(new SelectionListener() {
 			@Override
@@ -642,7 +642,7 @@
 						index.sortLines(SortMode.FREQUNIT, false);
 					}
 				}
-				StatusLine.setMessage(RCPMessages.SORT_DONE);
+				StatusLine.setMessage(TXMUIMessages.SORT_DONE);
 				fillDisplayArea();
 			}
 
