Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages.properties	(revision 1202)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages.properties	(revision 1203)
@@ -0,0 +1,66 @@
+ConcordancesEditor_100=Available values for {0}
+ConcordancesEditor_108=\ elements. Continue ?
+ConcordancesEditor_110=New value {0} for category {1}  
+ConcordancesEditor_112=The value {0} is not associated with the category {1}. Associate it ?   
+ConcordancesEditor_115=Add a new category
+ConcordancesEditor_116=Proceed to annotation
+ConcordancesEditor_15=Category
+ConcordancesEditor_17=Keywords annotation
+ConcordancesEditor_22=Affect
+ConcordancesEditor_24=Delete
+ConcordancesEditor_32=Enter a value for an id
+ConcordancesEditor_35=selected lines
+ConcordancesEditor_36=Annotating concordance selection...
+ConcordancesEditor_40=Error while annotating concordance selection: 
+ConcordancesEditor_49=all lines
+ConcordancesEditor_53=Error while annotating concordance: 
+ConcordancesEditor_54=Error while deleting annotation: 
+ConcordancesEditor_57=Looking for TypedValue with id=
+ConcordancesEditor_58=No value found with the {0} id.
+ConcordancesEditor_59=AFFECT 
+ConcordancesEditor_60=\ to SELECTION=
+ConcordancesEditor_61=Could not annotate the value '
+ConcordancesEditor_62='.\n on certain sequences. \n
+ConcordancesEditor_63=\t- The sequence 
+ConcordancesEditor_64=\ is overlapping with \n
+ConcordancesEditor_65=\t\t- the end of a structure 
+ConcordancesEditor_66=, at [
+ConcordancesEditor_67=\ - 
+ConcordancesEditor_68=]\n
+ConcordancesEditor_69=\t\t- the start of a structure 
+ConcordancesEditor_70=, at [
+ConcordancesEditor_71=\ - 
+ConcordancesEditor_72=]\n
+ConcordancesEditor_73=About annotations
+ConcordancesEditor_74=Error while affection annotation: 
+ConcordancesEditor_76=Save the annotations
+ConcordancesEditor_77=Open the list of categories
+ConcordancesEditor_79=Select a value among the list
+ConcordancesEditor_80=value=
+ConcordancesEditor_81=Please enter the new type name
+ConcordancesEditor_82=New category
+ConcordancesEditor_83=with the category
+ConcordancesEditor_85=OK
+ConcordancesEditor_86=Confirm annotation affectation
+ConcordancesEditor_87=You are about to annotate  
+ConcordancesEditor_99=List of categories
+KRAnnotation_1=S�quences de mots (cat�gorie/valeur)
+KRAnnotation_16=Close the toolbar without saving
+KRAnnotation_17=Annotation canceled by user.
+KRAnnotation_4=Available annotation types: 
+KRAnnotation_5=Error: no suitable KnowledgeRepository found
+KRAnnotation_6=Concordance Annotation area
+SimpleKRAnnotation_1=S�quences de mots (cat�gorie)
+SimpleKRAnnotation_10=Close the toolbar without saving
+SimpleKRAnnotation_11=Annotation canceled by user.
+SimpleKRAnnotation_4=Available annotation types: 
+SimpleKRAnnotation_5=Concordance Annotation area
+WordAnnotationToolbar_1=Mots (propri�t�s) <- d�faut
+WordAnnotationToolbar_10=Available annotation types: 
+WordAnnotationToolbar_11=Concordance Annotation area
+WordAnnotationToolbar_12=All
+WordAnnotationToolbar_13=Close the toolbar without saving
+WordAnnotationToolbar_15=Nouvelle propri�t�
+WordAnnotationToolbar_16=Nom de la propri�t� pattern=[a-z][-a-z0-9]+
+WordAnnotationToolbar_2=Annotation canceled by user.
+WordAnnotationToolbar_3=Property
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/KRAnnotationUIMessages.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/KRAnnotationUIMessages.java	(revision 1202)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/KRAnnotationUIMessages.java	(revision 1203)
@@ -22,4 +22,71 @@
 
 	private KRAnnotationUIMessages() {
 	}
+
+	public static String ConcordancesEditor_100;
+	public static String ConcordancesEditor_108;
+	public static String ConcordancesEditor_110;
+	public static String ConcordancesEditor_112;
+	public static String ConcordancesEditor_115;
+	public static String ConcordancesEditor_116;
+	public static String ConcordancesEditor_15;
+	public static String ConcordancesEditor_17;
+	public static String ConcordancesEditor_22;
+	public static String ConcordancesEditor_24;
+	public static String ConcordancesEditor_32;
+	public static String ConcordancesEditor_35;
+	public static String ConcordancesEditor_36;
+	public static String ConcordancesEditor_40;
+	public static String ConcordancesEditor_49;
+	public static String ConcordancesEditor_53;
+	public static String ConcordancesEditor_54;
+	public static String ConcordancesEditor_57;
+	public static String ConcordancesEditor_58;
+	public static String ConcordancesEditor_59;
+	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_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_76;
+	public static String ConcordancesEditor_77;
+	public static String ConcordancesEditor_79;
+	public static String ConcordancesEditor_80;
+	public static String ConcordancesEditor_81;
+	public static String ConcordancesEditor_82;
+	public static String ConcordancesEditor_83;
+	public static String ConcordancesEditor_85;
+	public static String ConcordancesEditor_86;
+	public static String ConcordancesEditor_87;
+	public static String ConcordancesEditor_99;
+	public static String KRAnnotation_1;
+	public static String KRAnnotation_16;
+	public static String KRAnnotation_17;
+	public static String KRAnnotation_4;
+	public static String KRAnnotation_5;
+	public static String KRAnnotation_6;
+	public static String SimpleKRAnnotation_1;
+	public static String SimpleKRAnnotation_10;
+	public static String SimpleKRAnnotation_11;
+	public static String SimpleKRAnnotation_4;
+	public static String SimpleKRAnnotation_5;
+	public static String WordAnnotationToolbar_1;
+	public static String WordAnnotationToolbar_10;
+	public static String WordAnnotationToolbar_11;
+	public static String WordAnnotationToolbar_12;
+	public static String WordAnnotationToolbar_13;
+	public static String WordAnnotationToolbar_15;
+	public static String WordAnnotationToolbar_16;
+	public static String WordAnnotationToolbar_2;
+	public static String WordAnnotationToolbar_3;
 }
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java	(revision 1202)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java	(revision 1203)
@@ -43,6 +43,7 @@
 import org.txm.annotation.kr.core.repository.TypedValue;
 import org.txm.annotation.kr.rcp.commands.InitializeKnowledgeRepository;
 import org.txm.annotation.kr.rcp.commands.SaveAnnotations;
+import org.txm.annotation.kr.rcp.messages.KRAnnotationUIMessages;
 import org.txm.annotation.kr.rcp.views.knowledgerepositories.KRView;
 import org.txm.annotation.rcp.editor.AnnotationArea;
 import org.txm.annotation.rcp.editor.AnnotationExtension;
@@ -75,7 +76,7 @@
 	 * the limit number of annotation when a confirm dialog box is shown
 	 */
 	protected static final int NALERTAFFECTANNOTATIONS = 100;
-	public static final String EMPTYTEXT = "";
+	public static final String EMPTYTEXT = ""; //$NON-NLS-1$
 
 	/** The annotation service */
 	protected AnnotationManager annotManager;
@@ -111,7 +112,7 @@
 
 	@Override
 	public String getName() {
-		return "Tag Annotation";
+		return KRAnnotationUIMessages.SimpleKRAnnotation_1;
 	}
 		
 	@Override
@@ -134,8 +135,8 @@
 		
 		TableViewerColumn annotationColumnViewer = new TableViewerColumn(viewer, SWT.CENTER, position);
 		annotationColumn = annotationColumnViewer.getColumn();
-		annotationColumn.setText(ConcordanceUIMessages.ConcordancesEditor_15);
-		annotationColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_17);
+		annotationColumn.setText(KRAnnotationUIMessages.ConcordancesEditor_15);
+		annotationColumn.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_17);
 		annotationColumn.pack();
 		annotationColumn.setAlignment(SWT.CENTER);
 
@@ -153,11 +154,11 @@
 					if (value == null) value = a.getValue();
 
 					if (a.getStart() < line.matchGetStart() - line.getLeftContextSize()) {
-						value = "… "+value;
+						value = "… "+value; //$NON-NLS-1$
 					}
 
 					if (a.getEnd() > line.matchGetEnd() + line.getRightContextSize()) {
-						value = value+" …";
+						value = value+" …"; //$NON-NLS-1$
 					} 
 					return value;
 				} else {
@@ -194,17 +195,17 @@
 		}
 		annotations.setViewAnnotation(tagAnnotationType);
 		
-		Log.warning("Available annotation types: "+typesList);
+		Log.warning(KRAnnotationUIMessages.SimpleKRAnnotation_4+typesList);
 
-		annotationArea = new GLComposite(parent, SWT.NONE, "Concordance Annotation area");
+		annotationArea = new GLComposite(parent, SWT.NONE, KRAnnotationUIMessages.SimpleKRAnnotation_5);
 		annotationArea.getLayout().numColumns = 12;
 		annotationArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
 		addRemoveCombo = new Combo(annotationArea, SWT.READ_ONLY);
-		String affectLabel = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_22");
-		if (affectLabel == null) affectLabel= ConcordanceUIMessages.ConcordancesEditor_22;
-		String removeLabel = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_24");
-		if (removeLabel == null) removeLabel= ConcordanceUIMessages.ConcordancesEditor_24;
+		String affectLabel = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_22"); //$NON-NLS-1$
+		if (affectLabel == null) affectLabel= KRAnnotationUIMessages.ConcordancesEditor_22;
+		String removeLabel = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_24"); //$NON-NLS-1$
+		if (removeLabel == null) removeLabel= KRAnnotationUIMessages.ConcordancesEditor_24;
 		String items[] = {affectLabel, removeLabel};
 		addRemoveCombo.setItems(items);
 		addRemoveCombo.select(0);
@@ -213,8 +214,8 @@
 			public void widgetSelected(SelectionEvent e) {
 				if (addRemoveCombo.getSelectionIndex() == 0) { // add
 					annotationValuesText.setEnabled(true);
-					String withLabelText = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_83");
-					if (withLabelText == null) withLabelText= ConcordanceUIMessages.ConcordancesEditor_83;
+					String withLabelText = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_83"); //$NON-NLS-1$
+					if (withLabelText == null) withLabelText= KRAnnotationUIMessages.ConcordancesEditor_83;
 					withLabel.setText(withLabelText);
 				} else { // remove
 					annotationValuesText.setEnabled(false);
@@ -232,13 +233,13 @@
 		addRemoveCombo.setLayoutData(gdata);
 
 		withLabel = new Label(annotationArea, SWT.NONE);
-		String withLabelText = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_83");
-		if (withLabelText == null) withLabelText= ConcordanceUIMessages.ConcordancesEditor_83;
+		String withLabelText = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_83"); //$NON-NLS-1$
+		if (withLabelText == null) withLabelText= KRAnnotationUIMessages.ConcordancesEditor_83;
 		withLabel.setText(withLabelText);
 		withLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 
 		annotationValuesText = new Text(annotationArea, SWT.BORDER);
-		annotationValuesText.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_32);
+		annotationValuesText.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_32);
 		GridData gdata2 = new GridData(SWT.FILL, SWT.CENTER, false, false);
 		gdata2.widthHint = 200;
 		annotationValuesText.setLayoutData(gdata2);
@@ -257,7 +258,7 @@
 		if (currentKnowledgeRepository instanceof LocalKnowledgeRepository) {
 			addTypedValueLink = new Button(annotationArea, SWT.PUSH);
 			addTypedValueLink.setText("..."); //$NON-NLS-1$
-			addTypedValueLink.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_77);
+			addTypedValueLink.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_77);
 			addTypedValueLink.setEnabled(true);
 			addTypedValueLink.setLayoutData(new GridData(SWT.FILL,	SWT.CENTER, false, false));
 			addTypedValueLink.addSelectionListener(new SelectionListener() {
@@ -272,7 +273,7 @@
 					LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
 
 					ListDialog dialog = new ListDialog(e.widget.getDisplay().getActiveShell());
-					dialog.setTitle(ConcordanceUIMessages.ConcordancesEditor_99);//+"valeurs de "+type.getName());
+					dialog.setTitle(KRAnnotationUIMessages.ConcordancesEditor_99);//+"valeurs de "+type.getName());
 					dialog.setContentProvider(new ArrayContentProvider());
 					dialog.setLabelProvider(new SimpleLabelProvider() {
 						public String getColumnText(Object element, int columnIndex) {
@@ -307,7 +308,7 @@
 
 		affectCombo = new Combo(annotationArea, SWT.READ_ONLY);
 		affectCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		String items2[] = {ConcordanceUIMessages.ConcordancesEditor_35, ConcordanceUIMessages.ConcordancesEditor_49};
+		String items2[] = {KRAnnotationUIMessages.ConcordancesEditor_35, KRAnnotationUIMessages.ConcordancesEditor_49};
 		affectCombo.setItems(items2);
 		affectCombo.select(0);
 		gdata = new GridData(SWT.CENTER, SWT.CENTER, false, false);
@@ -315,8 +316,8 @@
 		affectCombo.setLayoutData(gdata);
 
 		affectAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		affectAnnotationButton.setText(ConcordanceUIMessages.ConcordancesEditor_85);
-		affectAnnotationButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_116);
+		affectAnnotationButton.setText(KRAnnotationUIMessages.ConcordancesEditor_85);
+		affectAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_116);
 		affectAnnotationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		affectAnnotationButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -329,7 +330,7 @@
 						List<Match> matches = concordance.getMatches();
 						affectMatchesToSelection(matches);
 					} catch (CqiClientException e1) {
-						Log.severe(ConcordanceUIMessages.ConcordancesEditor_53+e1);
+						Log.severe(KRAnnotationUIMessages.ConcordancesEditor_53+e1);
 						Log.printStackTrace(e1);
 						return;
 					}
@@ -341,7 +342,7 @@
 		});
 		
 		Button closeButton = new Button(annotationArea, SWT.PUSH);
-		closeButton.setToolTipText("Close the toolbar without saving");
+		closeButton.setToolTipText(KRAnnotationUIMessages.SimpleKRAnnotation_10);
 		closeButton.setImage(IImageKeys.getImage(IImageKeys.ACTION_DELETE));
 		closeButton.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false));
 		closeButton.addSelectionListener(new SelectionListener() {
@@ -391,7 +392,7 @@
 		final String svalue = annotationValuesText.getText();
 		final boolean doAffect = addRemoveCombo.getSelectionIndex() == 0; // add is default
 
-		JobHandler job = new JobHandler(ConcordanceUIMessages.ConcordancesEditor_36, true) {
+		JobHandler job = new JobHandler(KRAnnotationUIMessages.ConcordancesEditor_36, true) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
@@ -402,11 +403,11 @@
 						deleteAnnotationValues(matches, type, this);
 					}
 				} catch(Exception e) {
-					Log.severe(ConcordanceUIMessages.ConcordancesEditor_40+e);
+					Log.severe(KRAnnotationUIMessages.ConcordancesEditor_40+e);
 					Log.printStackTrace(e);
 					return Status.CANCEL_STATUS;
 				} catch(ThreadDeath td) {
-					System.out.println("Annotation canceled by user.");
+					System.out.println(KRAnnotationUIMessages.SimpleKRAnnotation_11);
 					return Status.CANCEL_STATUS;
 				}
 
@@ -474,7 +475,7 @@
 				return;
 			}
 		} catch (Exception e1) {
-			System.out.println(ConcordanceUIMessages.ConcordancesEditor_54+e1);
+			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_54+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
@@ -506,8 +507,8 @@
 				if (matches.size() > NALERTAFFECTANNOTATIONS) {
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"confirm_annotate",  //$NON-NLS-1$
-							ConcordanceUIMessages.ConcordancesEditor_86, 
-							ConcordanceUIMessages.ConcordancesEditor_87+matches.size()+ConcordanceUIMessages.ConcordancesEditor_108);
+							KRAnnotationUIMessages.ConcordancesEditor_86, 
+							KRAnnotationUIMessages.ConcordancesEditor_87+matches.size()+KRAnnotationUIMessages.ConcordancesEditor_108);
 
 					if (dialog.open() == ConfirmDialog.CANCEL) {
 						System.out.println("Annotation aborted by user."); //$NON-NLS-1$
@@ -518,7 +519,7 @@
 		});
 
 		// get value from combo text value
-		Log.warning(ConcordanceUIMessages.ConcordancesEditor_57+svalue);
+		Log.warning(KRAnnotationUIMessages.ConcordancesEditor_57+svalue);
 		final KnowledgeRepository kr = KnowledgeRepositoryManager.getKnowledgeRepository(type.getKnowledgeRepository());
 		value_to_add = kr.getValue(type, svalue);
 
@@ -527,10 +528,10 @@
 			job.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					String title = kr.getString(getLocale(), "ConcordancesEditor_110");
-					String content = kr.getString(getLocale(), "ConcordancesEditor_112");
-					if (title == null ) title = ConcordanceUIMessages.ConcordancesEditor_110;
-					if (content == null ) content = ConcordanceUIMessages.ConcordancesEditor_112;
+					String title = kr.getString(getLocale(), "ConcordancesEditor_110"); //$NON-NLS-1$
+					String content = kr.getString(getLocale(), "ConcordancesEditor_112"); //$NON-NLS-1$
+					if (title == null ) title = KRAnnotationUIMessages.ConcordancesEditor_110;
+					if (content == null ) content = KRAnnotationUIMessages.ConcordancesEditor_112;
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"create_value", //$NON-NLS-1$
 							ConcordanceUIMessages.bind(title, svalue, type.getName()),  
@@ -552,7 +553,7 @@
 			job.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					String mess = ConcordanceUIMessages.bind(ConcordanceUIMessages.ConcordancesEditor_58, svalue);
+					String mess = ConcordanceUIMessages.bind(KRAnnotationUIMessages.ConcordancesEditor_58, svalue);
 					System.out.println(mess);
 					MessageDialog.openError(Display.getCurrent().getActiveShell(), "Annotation canceled", mess); //$NON-NLS-1$
 				}
@@ -560,7 +561,7 @@
 			return;
 		}
 
-		Log.info(ConcordanceUIMessages.ConcordancesEditor_59+value_to_add+ConcordanceUIMessages.ConcordancesEditor_60+matches);
+		Log.info(KRAnnotationUIMessages.ConcordancesEditor_59+value_to_add+KRAnnotationUIMessages.ConcordancesEditor_60+matches);
 
 		// finally we can 'try' to create the annotations \o/
 		try {
@@ -568,16 +569,16 @@
 
 			// did we had problems ?
 			if (existingAnnots!=null && existingAnnots.size() > 0) {
-				String message = ConcordanceUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
-						ConcordanceUIMessages.ConcordancesEditor_62;
+				String message = KRAnnotationUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
+						KRAnnotationUIMessages.ConcordancesEditor_62;
 				for (Match m : existingAnnots.keySet()) {
-					message += ConcordanceUIMessages.ConcordancesEditor_63+m+ConcordanceUIMessages.ConcordancesEditor_64;
+					message += KRAnnotationUIMessages.ConcordancesEditor_63+m+KRAnnotationUIMessages.ConcordancesEditor_64;
 
 					for (Annotation existingAnnot : existingAnnots.get(m)) {
 						if (existingAnnot.getStart() < m.getStart()){
-							message += ConcordanceUIMessages.ConcordancesEditor_65+existingAnnot.getType()+ConcordanceUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+ConcordanceUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+ConcordanceUIMessages.ConcordancesEditor_68;
+							message += KRAnnotationUIMessages.ConcordancesEditor_65+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
 						} else {
-							message += ConcordanceUIMessages.ConcordancesEditor_69+existingAnnot.getType()+ConcordanceUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+ConcordanceUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+ConcordanceUIMessages.ConcordancesEditor_72;
+							message += KRAnnotationUIMessages.ConcordancesEditor_69+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_72;
 						}
 					}
 				}
@@ -585,7 +586,7 @@
 				job.syncExec(new Runnable() {
 					@Override
 					public void run() {
-						MessageDialog.openInformation(editor.getSite().getShell(), ConcordanceUIMessages.ConcordancesEditor_73, final_message);
+						MessageDialog.openInformation(editor.getSite().getShell(), KRAnnotationUIMessages.ConcordancesEditor_73, final_message);
 					}
 				});
 			}
@@ -594,7 +595,7 @@
 				annotManager.checkData();
 			}
 		} catch (Exception e1) {
-			System.out.println(ConcordanceUIMessages.ConcordancesEditor_74+e1);
+			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_74+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/AnnotationLine.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/AnnotationLine.java	(revision 1202)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/AnnotationLine.java	(revision 1203)
@@ -23,4 +23,4 @@
 	public TypedValue getAnnotationValue() {
 		return annotationValue;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java	(revision 1202)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java	(revision 1203)
@@ -50,6 +50,7 @@
 import org.txm.annotation.kr.rcp.commands.InitializeKnowledgeRepository;
 import org.txm.annotation.kr.rcp.commands.SaveAnnotations;
 import org.txm.annotation.kr.rcp.commands.krview.OpenKRView;
+import org.txm.annotation.kr.rcp.messages.KRAnnotationUIMessages;
 import org.txm.annotation.kr.rcp.views.knowledgerepositories.KRView;
 import org.txm.annotation.rcp.editor.AnnotationArea;
 import org.txm.annotation.rcp.editor.AnnotationExtension;
@@ -79,7 +80,7 @@
 	 * the limit number of annotation when a confirm dialog box is shown
 	 */
 	protected static final int NALERTAFFECTANNOTATIONS = 100;
-	public static final String EMPTYTEXT = "";
+	public static final String EMPTYTEXT = ""; //$NON-NLS-1$
 
 	/** The annotation service */
 	protected AnnotationManager annotManager;
@@ -128,7 +129,7 @@
 	}
 
 	public String getName() {
-		return "KR Annotation";
+		return KRAnnotationUIMessages.KRAnnotation_1;
 	}
 	
 	@Override
@@ -151,8 +152,8 @@
 		
 		TableViewerColumn annotationColumnViewer = new TableViewerColumn(viewer, SWT.CENTER, position);
 		annotationColumn = annotationColumnViewer.getColumn();
-		annotationColumn.setText(ConcordanceUIMessages.ConcordancesEditor_15);
-		annotationColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_17);
+		annotationColumn.setText(KRAnnotationUIMessages.ConcordancesEditor_15);
+		annotationColumn.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_17);
 		annotationColumn.setAlignment(SWT.CENTER);
 		annotationColumn.pack();
 		annotationColumn.addControlListener(new ConcordanceColumnSizeControlListener(annotationColumn));
@@ -169,11 +170,11 @@
 					if (value == null) value = a.getValue();
 
 					if (a.getStart() < line.matchGetStart() - line.getLeftContextSize()) {
-						value = "… "+value;
+						value = "… "+value; //$NON-NLS-1$
 					}
 
 					if (a.getEnd() > line.matchGetEnd() + line.getRightContextSize()) {
-						value = value+" …";
+						value = value+" …"; //$NON-NLS-1$
 					} 
 					return value;
 				} else {
@@ -214,24 +215,24 @@
 
 			typesList.addAll(krtypes);
 
-			Log.warning("Available annotation types: "+typesList);
+			Log.warning(KRAnnotationUIMessages.KRAnnotation_4+typesList);
 			break;
 		}
 
 		if (currentKnowledgeRepository == null) {
-			System.out.println("Error: no suitable KnowledgeRepository found");
+			System.out.println(KRAnnotationUIMessages.KRAnnotation_5);
 			return false;
 		}
 
-		annotationArea = new GLComposite(parent, SWT.NONE, "Concordance Annotation area");
+		annotationArea = new GLComposite(parent, SWT.NONE, KRAnnotationUIMessages.KRAnnotation_6);
 		annotationArea.getLayout().numColumns = 12;
 		annotationArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
 		addRemoveCombo = new Combo(annotationArea, SWT.READ_ONLY);
-		String affectLabel = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_22");
-		if (affectLabel == null) affectLabel= ConcordanceUIMessages.ConcordancesEditor_22;
-		String removeLabel = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_24");
-		if (removeLabel == null) removeLabel= ConcordanceUIMessages.ConcordancesEditor_24;
+		String affectLabel = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_22"); //$NON-NLS-1$
+		if (affectLabel == null) affectLabel= KRAnnotationUIMessages.ConcordancesEditor_22;
+		String removeLabel = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_24"); //$NON-NLS-1$
+		if (removeLabel == null) removeLabel= KRAnnotationUIMessages.ConcordancesEditor_24;
 		String items[] = {affectLabel, removeLabel};
 		addRemoveCombo.setItems(items);
 		addRemoveCombo.select(0);
@@ -240,14 +241,14 @@
 			public void widgetSelected(SelectionEvent e) {
 				if (addRemoveCombo.getSelectionIndex() == 0) { // add
 					annotationValuesText.setEnabled(true);
-					String withLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_83");
-					if (withLabelText == null) withLabelText= ConcordanceUIMessages.ConcordancesEditor_83;
+					String withLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_83"); //$NON-NLS-1$
+					if (withLabelText == null) withLabelText= KRAnnotationUIMessages.ConcordancesEditor_83;
 					withLabel.setText(withLabelText);
-					if (equalLabel != null) equalLabel.setText("=");
+					if (equalLabel != null) equalLabel.setText("="); //$NON-NLS-1$
 				} else { // remove
 					annotationValuesText.setEnabled(false);
 					withLabel.setText(""); //$NON-NLS-1$
-					if (equalLabel != null) equalLabel.setText("");
+					if (equalLabel != null) equalLabel.setText(""); //$NON-NLS-1$
 				}
 				withLabel.redraw();
 				annotationArea.layout();
@@ -261,8 +262,8 @@
 		addRemoveCombo.setLayoutData(gdata);
 
 		withLabel = new Label(annotationArea, SWT.NONE);
-		String withLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_83");
-		if (withLabelText == null) withLabelText= ConcordanceUIMessages.ConcordancesEditor_83;
+		String withLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_83"); //$NON-NLS-1$
+		if (withLabelText == null) withLabelText= KRAnnotationUIMessages.ConcordancesEditor_83;
 		withLabel.setText(withLabelText);
 		withLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 
@@ -359,7 +360,7 @@
 
 		if (currentKnowledgeRepository instanceof LocalKnowledgeRepository) {
 			addAnnotationTypeLink = new Button(annotationArea, SWT.PUSH);
-			addAnnotationTypeLink.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_115);
+			addAnnotationTypeLink.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_115);
 			addAnnotationTypeLink.setImage(IImageKeys.getImage(IImageKeys.ACTION_ADD));
 			addAnnotationTypeLink.setEnabled(true);
 			addAnnotationTypeLink.setLayoutData(new GridData(SWT.FILL,	SWT.CENTER, false, false));
@@ -371,7 +372,7 @@
 
 					LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
 
-					InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), ConcordanceUIMessages.ConcordancesEditor_82, ConcordanceUIMessages.ConcordancesEditor_81, "", null); //$NON-NLS-3$
+					InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), KRAnnotationUIMessages.ConcordancesEditor_82, KRAnnotationUIMessages.ConcordancesEditor_81, "", null); //$NON-NLS-3$ //$NON-NLS-1$
 					if (dialog.open() == InputDialog.OK) {
 						String name = dialog.getValue();
 						if (name.trim().length() == 0) return;
@@ -413,15 +414,15 @@
 		}
 
 		Label valueLabel = new Label(annotationArea, SWT.NONE);
-		String valueLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_80");
+		String valueLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_80"); //$NON-NLS-1$
 		if (valueLabelText == null) {
-			valueLabelText= ConcordanceUIMessages.ConcordancesEditor_80;
+			valueLabelText= KRAnnotationUIMessages.ConcordancesEditor_80;
 		}
 		valueLabel.setText(valueLabelText);
 		valueLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 
 		annotationValuesText = new Text(annotationArea, SWT.BORDER);
-		annotationValuesText.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_32);
+		annotationValuesText.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_32);
 		GridData gdata2 = new GridData(SWT.FILL, SWT.CENTER, false, false);
 		gdata2.widthHint = 200;
 		annotationValuesText.setLayoutData(gdata2);
@@ -440,7 +441,7 @@
 		if (currentKnowledgeRepository instanceof LocalKnowledgeRepository) {
 			addTypedValueLink = new Button(annotationArea, SWT.PUSH);
 			addTypedValueLink.setText("..."); //$NON-NLS-1$
-			addTypedValueLink.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_79);
+			addTypedValueLink.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_79);
 			addTypedValueLink.setEnabled(true);
 			addTypedValueLink.setLayoutData(new GridData(SWT.FILL,	SWT.CENTER, false, false));
 			addTypedValueLink.addSelectionListener(new SelectionListener() {
@@ -455,8 +456,8 @@
 					LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
 
 					ListDialog dialog = new ListDialog(e.widget.getDisplay().getActiveShell());
-					String title = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_100");
-					if (title == null) title = ConcordanceUIMessages.ConcordancesEditor_100;
+					String title = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_100"); //$NON-NLS-1$
+					if (title == null) title = KRAnnotationUIMessages.ConcordancesEditor_100;
 					dialog.setTitle(ConcordanceUIMessages.bind(title, type.getName()));//+"valeurs de "+type.getName());
 					dialog.setContentProvider(new ArrayContentProvider());
 					dialog.setLabelProvider(new SimpleLabelProvider() {
@@ -492,7 +493,7 @@
 
 		affectCombo = new Combo(annotationArea, SWT.READ_ONLY);
 		affectCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		String items2[] = {ConcordanceUIMessages.ConcordancesEditor_35, ConcordanceUIMessages.ConcordancesEditor_49};
+		String items2[] = {KRAnnotationUIMessages.ConcordancesEditor_35, KRAnnotationUIMessages.ConcordancesEditor_49};
 		affectCombo.setItems(items2);
 		affectCombo.select(0);
 		gdata = new GridData(SWT.CENTER, SWT.CENTER, false, false);
@@ -500,8 +501,8 @@
 		affectCombo.setLayoutData(gdata);
 
 		affectAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		affectAnnotationButton.setText(ConcordanceUIMessages.ConcordancesEditor_85);
-		affectAnnotationButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_116);
+		affectAnnotationButton.setText(KRAnnotationUIMessages.ConcordancesEditor_85);
+		affectAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_116);
 		affectAnnotationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		affectAnnotationButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -514,7 +515,7 @@
 						List<Match> matches = concordance.getMatches();
 						affectMatchesToSelection(matches);
 					} catch (CqiClientException e1) {
-						Log.severe(ConcordanceUIMessages.ConcordancesEditor_53+e1);
+						Log.severe(KRAnnotationUIMessages.ConcordancesEditor_53+e1);
 						Log.printStackTrace(e1);
 						return;
 					}
@@ -525,7 +526,7 @@
 			public void widgetDefaultSelected(SelectionEvent e) { }
 		});
 		Button saveAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		saveAnnotationButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_76);
+		saveAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_76);
 		saveAnnotationButton.setImage(IImageKeys.getImage(IImageKeys.PENCIL_SAVE));
 
 		saveAnnotationButton.addSelectionListener(new SelectionListener() {
@@ -553,7 +554,7 @@
 		});
 		
 		Button closeButton = new Button(annotationArea, SWT.PUSH);
-		closeButton.setToolTipText("Close the toolbar without saving");
+		closeButton.setToolTipText(KRAnnotationUIMessages.KRAnnotation_16);
 		closeButton.setImage(IImageKeys.getImage(IImageKeys.ACTION_DELETE));
 		closeButton.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false));
 		closeButton.addSelectionListener(new SelectionListener() {
@@ -598,7 +599,7 @@
 		final String svalue = annotationValuesText.getText();
 		final boolean doAffect = addRemoveCombo.getSelectionIndex() == 0; // add is default
 
-		JobHandler job = new JobHandler(ConcordanceUIMessages.ConcordancesEditor_36, true) {
+		JobHandler job = new JobHandler(KRAnnotationUIMessages.ConcordancesEditor_36, true) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
@@ -609,11 +610,11 @@
 						deleteAnnotationValues(matches, type, this);
 					}
 				} catch(Exception e) {
-					Log.severe(ConcordanceUIMessages.ConcordancesEditor_40+e);
+					Log.severe(KRAnnotationUIMessages.ConcordancesEditor_40+e);
 					Log.printStackTrace(e);
 					return Status.CANCEL_STATUS;
 				} catch(ThreadDeath td) {
-					System.out.println("Annotation canceled by user.");
+					System.out.println(KRAnnotationUIMessages.KRAnnotation_17);
 					return Status.CANCEL_STATUS;
 				}
 
@@ -687,7 +688,7 @@
 					return;
 				}
 			} catch (Exception e1) {
-				System.out.println(ConcordanceUIMessages.ConcordancesEditor_54+e1);
+				System.out.println(KRAnnotationUIMessages.ConcordancesEditor_54+e1);
 				Log.printStackTrace(e1);
 				return;
 			}
@@ -720,8 +721,8 @@
 				if (matches.size() > NALERTAFFECTANNOTATIONS) {
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"confirm_annotate",  //$NON-NLS-1$
-							ConcordanceUIMessages.ConcordancesEditor_86, 
-							ConcordanceUIMessages.ConcordancesEditor_87+matches.size()+ConcordanceUIMessages.ConcordancesEditor_108);
+							KRAnnotationUIMessages.ConcordancesEditor_86, 
+							KRAnnotationUIMessages.ConcordancesEditor_87+matches.size()+KRAnnotationUIMessages.ConcordancesEditor_108);
 
 					if (dialog.open() == ConfirmDialog.CANCEL) {
 						System.out.println("Annotation aborted by user."); //$NON-NLS-1$
@@ -732,7 +733,7 @@
 		});
 
 		// get value from combo text value
-		Log.warning(ConcordanceUIMessages.ConcordancesEditor_57+svalue);
+		Log.warning(KRAnnotationUIMessages.ConcordancesEditor_57+svalue);
 		final KnowledgeRepository kr = KnowledgeRepositoryManager.getKnowledgeRepository(type.getKnowledgeRepository());
 		value_to_add = kr.getValue(type, svalue);
 
@@ -741,10 +742,10 @@
 			job.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					String title = kr.getString(editor.getLocale(), "ConcordancesEditor_110");
-					String content = kr.getString(editor.getLocale(), "ConcordancesEditor_112");
-					if (title == null ) title = ConcordanceUIMessages.ConcordancesEditor_110;
-					if (content == null ) content = ConcordanceUIMessages.ConcordancesEditor_112;
+					String title = kr.getString(editor.getLocale(), "ConcordancesEditor_110"); //$NON-NLS-1$
+					String content = kr.getString(editor.getLocale(), "ConcordancesEditor_112"); //$NON-NLS-1$
+					if (title == null ) title = KRAnnotationUIMessages.ConcordancesEditor_110;
+					if (content == null ) content = KRAnnotationUIMessages.ConcordancesEditor_112;
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"create_value", //$NON-NLS-1$
 							ConcordanceUIMessages.bind(title, svalue, type.getName()),  
@@ -766,7 +767,7 @@
 			job.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					String mess = ConcordanceUIMessages.bind(ConcordanceUIMessages.ConcordancesEditor_58, svalue);
+					String mess = ConcordanceUIMessages.bind(KRAnnotationUIMessages.ConcordancesEditor_58, svalue);
 					System.out.println(mess);
 					MessageDialog.openError(Display.getCurrent().getActiveShell(), "Annotation canceled", mess); //$NON-NLS-1$
 				}
@@ -774,7 +775,7 @@
 			return;
 		}
 
-		Log.info(ConcordanceUIMessages.ConcordancesEditor_59+value_to_add+ConcordanceUIMessages.ConcordancesEditor_60+matches);
+		Log.info("AFFECT "+value_to_add+" to SELECTION="+matches); //$NON-NLS-1$ //$NON-NLS-1$
 
 		// finally we can 'try' to create the annotations \o/
 		try {
@@ -782,16 +783,16 @@
 
 			// did we had problems ?
 			if (existingAnnots!=null && existingAnnots.size() > 0) {
-				String message = ConcordanceUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
-						ConcordanceUIMessages.ConcordancesEditor_62;
+				String message = KRAnnotationUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
+						KRAnnotationUIMessages.ConcordancesEditor_62;
 				for (Match m : existingAnnots.keySet()) {
-					message += ConcordanceUIMessages.ConcordancesEditor_63+m+ConcordanceUIMessages.ConcordancesEditor_64;
+					message += KRAnnotationUIMessages.ConcordancesEditor_63+m+KRAnnotationUIMessages.ConcordancesEditor_64;
 
 					for (Annotation existingAnnot : existingAnnots.get(m)) {
 						if (existingAnnot.getStart() < m.getStart()){
-							message += ConcordanceUIMessages.ConcordancesEditor_65+existingAnnot.getType()+ConcordanceUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+ConcordanceUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+ConcordanceUIMessages.ConcordancesEditor_68;
+							message += KRAnnotationUIMessages.ConcordancesEditor_65+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
 						} else {
-							message += ConcordanceUIMessages.ConcordancesEditor_69+existingAnnot.getType()+ConcordanceUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+ConcordanceUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+ConcordanceUIMessages.ConcordancesEditor_72;
+							message += KRAnnotationUIMessages.ConcordancesEditor_69+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_72;
 						}
 					}
 				}
@@ -799,7 +800,7 @@
 				job.syncExec(new Runnable() {
 					@Override
 					public void run() {
-						MessageDialog.openInformation(editor.getSite().getShell(), ConcordanceUIMessages.ConcordancesEditor_73, final_message);
+						MessageDialog.openInformation(editor.getSite().getShell(), KRAnnotationUIMessages.ConcordancesEditor_73, final_message);
 					}
 				});
 			}
@@ -811,7 +812,7 @@
 			}
 			concordance.reloadCurrentLines();
 		} catch (Exception e1) {
-			System.out.println(ConcordanceUIMessages.ConcordancesEditor_74+e1);
+			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_74+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java	(revision 1202)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java	(revision 1203)
@@ -45,6 +45,7 @@
 import org.txm.annotation.kr.core.repository.TypedValue;
 import org.txm.annotation.kr.rcp.commands.InitializeKnowledgeRepository;
 import org.txm.annotation.kr.rcp.commands.SaveAnnotations;
+import org.txm.annotation.kr.rcp.messages.KRAnnotationUIMessages;
 import org.txm.annotation.kr.rcp.views.knowledgerepositories.KRView;
 import org.txm.annotation.rcp.editor.AnnotationArea;
 import org.txm.annotation.rcp.editor.AnnotationExtension;
@@ -73,7 +74,7 @@
 	 * the limit number of annotation when a confirm dialog box is shown
 	 */
 	protected static final int NALERTAFFECTANNOTATIONS = 100;
-	public static final String EMPTYTEXT = "";
+	public static final String EMPTYTEXT = ""; //$NON-NLS-1$
 
 	/** The annotation service */
 	protected AnnotationManager annotManager;
@@ -115,7 +116,7 @@
 	private TableViewerColumn annotationColumnViewer;
 
 	public String getName() {
-		return "Word properties";
+		return KRAnnotationUIMessages.WordAnnotationToolbar_1;
 	}
 	
 	@Override
@@ -127,7 +128,6 @@
 	}
 
 	protected AnnotationType getSelectedAnnotationType() {
-
 		return annotations.getViewAnnotation();
 	}
 
@@ -169,8 +169,8 @@
 				if (matches.size() > NALERTAFFECTANNOTATIONS) {
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"confirm_annotate",  //$NON-NLS-1$
-							ConcordanceUIMessages.ConcordancesEditor_86, 
-							ConcordanceUIMessages.ConcordancesEditor_87+matches.size()+ConcordanceUIMessages.ConcordancesEditor_108);
+							KRAnnotationUIMessages.ConcordancesEditor_86, 
+							KRAnnotationUIMessages.ConcordancesEditor_87+matches.size()+KRAnnotationUIMessages.ConcordancesEditor_108);
 
 					if (dialog.open() == ConfirmDialog.CANCEL) {
 						System.out.println("Annotation aborted by user."); //$NON-NLS-1$
@@ -181,7 +181,7 @@
 		});
 
 		// get value from combo text value
-		Log.warning(ConcordanceUIMessages.ConcordancesEditor_57+svalue);
+		Log.warning(KRAnnotationUIMessages.ConcordancesEditor_57+svalue);
 		final KnowledgeRepository kr = KnowledgeRepositoryManager.getKnowledgeRepository(type.getKnowledgeRepository());
 		value_to_add = kr.getValue(type, svalue);
 
@@ -194,7 +194,7 @@
 			job.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					String mess = ConcordanceUIMessages.bind(ConcordanceUIMessages.ConcordancesEditor_58, svalue);
+					String mess = KRAnnotationUIMessages.bind(KRAnnotationUIMessages.ConcordancesEditor_58, svalue);
 					System.out.println(mess);
 					MessageDialog.openError(Display.getCurrent().getActiveShell(), "Annotation canceled", mess); //$NON-NLS-1$
 				}
@@ -202,7 +202,7 @@
 			return;
 		}
 
-		Log.info(ConcordanceUIMessages.ConcordancesEditor_59+value_to_add+ConcordanceUIMessages.ConcordancesEditor_60+matches);
+		Log.info("AFFECT "+value_to_add+" to SELECTION="+matches); //$NON-NLS-1$ //$NON-NLS-1$
 
 		// finally we can 'try' to create the annotations \o/
 		try {
@@ -210,16 +210,16 @@
 
 			// did we had problems ?
 			if (existingAnnots!=null && existingAnnots.size() > 0) {
-				String message = ConcordanceUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
-						ConcordanceUIMessages.ConcordancesEditor_62;
+				String message = KRAnnotationUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
+						KRAnnotationUIMessages.ConcordancesEditor_62;
 				for (Match m : existingAnnots.keySet()) {
-					message += ConcordanceUIMessages.ConcordancesEditor_63+m+ConcordanceUIMessages.ConcordancesEditor_64;
+					message += KRAnnotationUIMessages.ConcordancesEditor_63+m+KRAnnotationUIMessages.ConcordancesEditor_64;
 
 					for (Annotation existingAnnot : existingAnnots.get(m)) {
 						if (existingAnnot.getStart() < m.getStart()){
-							message += ConcordanceUIMessages.ConcordancesEditor_65+existingAnnot.getType()+ConcordanceUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+ConcordanceUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+ConcordanceUIMessages.ConcordancesEditor_68;
+							message += KRAnnotationUIMessages.ConcordancesEditor_65+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
 						} else {
-							message += ConcordanceUIMessages.ConcordancesEditor_69+existingAnnot.getType()+ConcordanceUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+ConcordanceUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+ConcordanceUIMessages.ConcordancesEditor_72;
+							message += KRAnnotationUIMessages.ConcordancesEditor_69+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_72;
 						}
 					}
 				}
@@ -227,7 +227,7 @@
 				job.syncExec(new Runnable() {
 					@Override
 					public void run() {
-						MessageDialog.openInformation(editor.getSite().getShell(), ConcordanceUIMessages.ConcordancesEditor_73, final_message);
+						MessageDialog.openInformation(editor.getSite().getShell(), KRAnnotationUIMessages.ConcordancesEditor_73, final_message);
 					}
 				});
 			}
@@ -239,7 +239,7 @@
 			}
 			concordance.reloadCurrentLines();
 		} catch (Exception e1) {
-			System.out.println(ConcordanceUIMessages.ConcordancesEditor_74+e1);
+			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_74+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
@@ -276,7 +276,7 @@
 				return;
 			}
 		} catch (Exception e1) {
-			System.out.println(ConcordanceUIMessages.ConcordancesEditor_54+e1);
+			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_54+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
@@ -298,18 +298,18 @@
 		final AnnotationType type = getSelectedAnnotationType();
 		final String svalue = annotationValuesText.getText();
 
-		JobHandler job = new JobHandler(ConcordanceUIMessages.ConcordancesEditor_36, true) {
+		JobHandler job = new JobHandler(KRAnnotationUIMessages.ConcordancesEditor_36, true) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
 				try {
 					affectAnnotationValues(matches, type, svalue, this);
 				} catch(Exception e) {
-					Log.severe(ConcordanceUIMessages.ConcordancesEditor_40+e);
+					Log.severe(KRAnnotationUIMessages.ConcordancesEditor_40+e);
 					Log.printStackTrace(e);
 					return Status.CANCEL_STATUS;
 				} catch(ThreadDeath td) {
-					System.out.println("Annotation canceled by user.");
+					System.out.println(KRAnnotationUIMessages.WordAnnotationToolbar_2);
 					return Status.CANCEL_STATUS;
 				}
 
@@ -338,8 +338,8 @@
 		
 		annotationColumnViewer = new TableViewerColumn(viewer, SWT.CENTER, position);
 		annotationColumn = annotationColumnViewer.getColumn();
-		annotationColumn.setText("Property");
-		annotationColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_17);
+		annotationColumn.setText(KRAnnotationUIMessages.WordAnnotationToolbar_3);
+		annotationColumn.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_17);
 		annotationColumn.setAlignment(SWT.CENTER);
 		annotationColumn.pack();
 		annotationColumn.setResizable(true);
@@ -357,11 +357,11 @@
 					if (value == null) value = a.getValue();
 
 					if (a.getStart() < line.matchGetStart() - line.getLeftContextSize()) {
-						value = "… "+value;
+						value = "… "+value; //$NON-NLS-1$
 					}
 
 					if (a.getEnd() > line.matchGetEnd() + line.getRightContextSize()) {
-						value = value+" …";
+						value = value+" …"; //$NON-NLS-1$
 					} 
 					return value;
 				} else {
@@ -384,15 +384,15 @@
 			HashMap<String, HashMap<String, String>> strings = new HashMap<String, HashMap<String, String>>();
 			conf.put(KRAnnotationEngine.KNOWLEDGE_STRINGS, strings);
 
-			access.put("mode", DatabasePersistenceManager.ACCESS_FILE);
-			access.put("version", "0");
+			access.put("mode", DatabasePersistenceManager.ACCESS_FILE); //$NON-NLS-1$
+			access.put("version", "0"); //$NON-NLS-1$ //$NON-NLS-2$
 			currentKnowledgeRepository = KnowledgeRepositoryManager.createKnowledgeRepository(corpus.getMainCorpus().getName(), conf);
 			KnowledgeRepositoryManager.registerKnowledgeRepository(currentKnowledgeRepository);
 		}
 
 		List<WordProperty> wordProperties = corpus.getProperties();
 		for (WordProperty p : wordProperties) {
-			if (p.getName().equals("id")) continue;
+			if (p.getName().equals("id")) continue; //$NON-NLS-1$
 			AnnotationType type = currentKnowledgeRepository.getType(p.getName());
 			if (type == null) {
 				AnnotationType t = currentKnowledgeRepository.addType(p.getName(), p.getName());
@@ -407,9 +407,9 @@
 
 		typesList.addAll(krtypes);
 
-		Log.warning("Available annotation types: "+typesList);
+		Log.warning(KRAnnotationUIMessages.WordAnnotationToolbar_10+typesList);
 
-		annotationArea = new GLComposite(parent, SWT.NONE, "Concordance Annotation area");
+		annotationArea = new GLComposite(parent, SWT.NONE, KRAnnotationUIMessages.WordAnnotationToolbar_11);
 		annotationArea.getLayout().numColumns = 12;
 		annotationArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
@@ -489,7 +489,7 @@
 		equalLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 
 		annotationValuesText = new Text(annotationArea, SWT.BORDER);
-		annotationValuesText.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_32);
+		annotationValuesText.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_32);
 		GridData gdata2 = new GridData(SWT.FILL, SWT.CENTER, false, false);
 		gdata2.widthHint = 200;
 		annotationValuesText.setLayoutData(gdata2);
@@ -506,8 +506,8 @@
 		});
 
 		affectAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		affectAnnotationButton.setText(ConcordanceUIMessages.ConcordancesEditor_85);
-		affectAnnotationButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_116);
+		affectAnnotationButton.setText(KRAnnotationUIMessages.ConcordancesEditor_85);
+		affectAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_116);
 		affectAnnotationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		affectAnnotationButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -520,8 +520,8 @@
 		});
 
 		affectAllAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		affectAllAnnotationButton.setText("All");
-		affectAllAnnotationButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_116);
+		affectAllAnnotationButton.setText(KRAnnotationUIMessages.WordAnnotationToolbar_12);
+		affectAllAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_116);
 		affectAllAnnotationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		affectAllAnnotationButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -531,7 +531,7 @@
 					List<Match> matches = concordance.getMatches();
 					affectMatchesToSelection(matches);
 				} catch (CqiClientException e1) {
-					Log.severe(ConcordanceUIMessages.ConcordancesEditor_53+e1);
+					Log.severe(KRAnnotationUIMessages.ConcordancesEditor_53+e1);
 					Log.printStackTrace(e1);
 					return;
 				}
@@ -543,7 +543,7 @@
 		
 		addAnnotationTypeButton = new Button(annotationArea, SWT.PUSH);
 		addAnnotationTypeButton.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false));
-		addAnnotationTypeButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_115);
+		addAnnotationTypeButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_115);
 		addAnnotationTypeButton.setImage(IImageKeys.getImage(IImageKeys.ACTION_ADD));
 		addAnnotationTypeButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -570,7 +570,7 @@
 		});
 		
 		Button closeButton = new Button(annotationArea, SWT.PUSH);
-		closeButton.setToolTipText("Close the toolbar without saving");
+		closeButton.setToolTipText(KRAnnotationUIMessages.WordAnnotationToolbar_13);
 		closeButton.setImage(IImageKeys.getImage(IImageKeys.ACTION_REMOVE));
 		
 		closeButton.addSelectionListener(new SelectionListener() {
@@ -598,8 +598,8 @@
 		if (!(currentKnowledgeRepository instanceof LocalKnowledgeRepository)) return;
 
 		LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
-		if (typeName == null) typeName = "";
-		InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), "Nouvelle propriété", "Nom de la propriété pattern=[a-z][-a-z0-9]+", typeName, null); //$NON-NLS-3$
+		if (typeName == null) typeName = ""; //$NON-NLS-1$
+		InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), KRAnnotationUIMessages.WordAnnotationToolbar_15, KRAnnotationUIMessages.WordAnnotationToolbar_16, typeName, null); //$NON-NLS-3$
 		if (dialog.open() == InputDialog.OK) {
 			String name = dialog.getValue();
 			if (name.trim().length() == 0) return;
Index: tmp/org.txm.treetagger.files.feature/.project
===================================================================
--- tmp/org.txm.treetagger.files.feature/.project	(revision 1202)
+++ tmp/org.txm.treetagger.files.feature/.project	(revision 1203)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.txm.treetagger.files.feature</name>
+	<name>org.txm.treetagger.models.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
Index: tmp/org.txm.treetagger.files.feature/feature.xml
===================================================================
--- tmp/org.txm.treetagger.files.feature/feature.xml	(revision 1202)
+++ tmp/org.txm.treetagger.files.feature/feature.xml	(revision 1203)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.txm.treetagger.files.feature"
-      label="TreeTagger files"
+      id="org.txm.treetagger.models.feature"
+      label="TreeTagger models"
       version="1.0.0.qualifier"
       provider-name="Textometrie.org">
 
@@ -69,54 +69,14 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.core" version="0.8.0" match="greaterOrEqual"/>
       <import plugin="org.txm.treetagger.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.7.8" match="greaterOrEqual"/>
    </requires>
 
    <plugin
-         id="org.txm.treetagger.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.txm.treetagger.core.linux"
-         os="linux"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.txm.treetagger.core.macosx"
-         os="macosx"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
          id="org.txm.treetagger.core.models"
          download-size="0"
          install-size="0"
          version="0.0.0"
          fragment="true"/>
 
-   <plugin
-         id="org.txm.treetagger.core.win32"
-         os="win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.txm.treetagger.rcp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
Index: tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/InstallAnalecFiles.java
===================================================================
--- tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/InstallAnalecFiles.java	(revision 1202)
+++ tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/InstallAnalecFiles.java	(revision 1203)
@@ -31,7 +31,7 @@
 		File macroDirectory = new File(userDirectory, "org/txm/macro");
 		File analecMacroDirectory = new File(macroDirectory, "analec");
 	
-		String bundle_id = "org.txm.analec.rcp";
+		String bundle_id = "org.txm.annotation.urs.rcp";
 		BundleUtils.copyFiles(bundle_id, "src/", "org/txm/macro", "analec", macroDirectory);
 		
 		return analecMacroDirectory.exists();
@@ -39,6 +39,6 @@
 
 	@Override
 	public String getName() {
-		return "Analec (org.txm.analec.rcp)";
+		return "Annotation URS (org.txm.annotation.urs.rcp)";
 	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java	(revision 1202)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java	(revision 1203)
@@ -74,7 +74,12 @@
 
 		try {
 			String corpusName = TXMUIMessages.ImportSelectedText_1.toUpperCase()+(nextclipcorpus++);
-			while (new File(Toolbox.workspace.getLocation(), corpusName).exists()) {
+			File wl = Toolbox.workspace.getLocation();
+			if (wl == null) {
+				System.out.println("Error: Toolbox not correctly initialized. Aborting clipboard import.");
+				return null;
+			}
+			while (new File(wl, corpusName).exists()) {
 				corpusName = TXMUIMessages.ImportSelectedText_1.toUpperCase()+(nextclipcorpus++);
 			}
 			importText(result, corpusName);
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java	(revision 1202)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java	(revision 1203)
@@ -61,10 +61,14 @@
 		state = false;
 		// test if must-have properties for CWB are set
 
-
 		String reg_path = ""; // new way that concats registry of loaded corpus
 		String path_separator = System.getProperty("path.separator");
-		for (File binDir : Toolbox.workspace.getLocation().listFiles()) {
+		File wl = Toolbox.workspace.getLocation();
+		if (wl == null) {
+			System.out.println("Error: Toolbox not correctly initialized. Aborting CQP engine initializing.");
+			return false;
+		}
+		for (File binDir : wl.listFiles()) {
 			if (!binDir.isDirectory()) continue;
 			if (binDir.isHidden()) continue;
 			if (binDir.getName().startsWith(".")) continue;
@@ -74,7 +78,7 @@
 			if (!registryDir.isDirectory()) continue;
 			
 			File[] files = registryDir.listFiles();
-			if (files != null && files.length > 0)
+			if (files != null && files.length > 0) {
 				reg_path += path_separator + registryDir.getAbsolutePath();
 				for (File registryFile : files) {
 					if (registryFile.isHidden()) continue;
@@ -90,6 +94,7 @@
 						return false;
 					}
 				}
+			}
 		}
 		if (reg_path.length() > 0) reg_path = reg_path.substring(path_separator.length()); // remove first path_separator
 		reg_path = reg_path.replace("\\\\", "//"); // fix the UNC paths for mingw
Index: tmp/org.txm.core/src/java/org/txm/Toolbox.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/Toolbox.java	(revision 1202)
+++ tmp/org.txm.core/src/java/org/txm/Toolbox.java	(revision 1203)
@@ -278,15 +278,16 @@
 		}
 
 		// loads and recreate the existing projects, loadParameters() needs engines to be ready
-		workspace.loadProjectsFromProjectScopes();
+		if (workspace != null) {
+			workspace.loadProjectsFromProjectScopes();
+		} else {
+			System.out.println("Error: Toolbox not correctly initialized. Aborting workspace initialization.");
+		}
 
-
 		initializing = false;
 		return checkState();
 	}
 
-
-	
 	/**
 	 * initialize the toolbox from a UTF-8 file
 	 * 
@@ -325,8 +326,7 @@
 		initializing = true;
 
 		try {
-			BufferedReader input = new BufferedReader(new InputStreamReader(
-					new FileInputStream(file), encoding));
+			BufferedReader input = new BufferedReader(new InputStreamReader(new FileInputStream(file), encoding));
 			String line = input.readLine();
 			while (line != null) {
 				String[] split = line.split("="); //$NON-NLS-1$
@@ -361,7 +361,6 @@
 		return initializing;
 	}
 
-
 	/**
 	 * Allow to install a TXM extension AFTER the Toolbox is initialized
 	 */
Index: tmp/org.txm.translate.rcp/src/org/txm/rcp/translate/ExternalizationFilesUpdater.java
===================================================================
--- tmp/org.txm.translate.rcp/src/org/txm/rcp/translate/ExternalizationFilesUpdater.java	(revision 1202)
+++ tmp/org.txm.translate.rcp/src/org/txm/rcp/translate/ExternalizationFilesUpdater.java	(revision 1203)
@@ -301,7 +301,7 @@
 	public static void main(String[] args) throws Exception
 	{
 		String userdir = System.getProperty("user.home");
-		File workspaceDir = new File(userdir, "workspace047/org.txm.analec.rcp");
+		File workspaceDir = new File(userdir, "workspace047/org.txm.annotation.urs.rcp");
 		
 		for (File project : workspaceDir.listFiles()) {
 			if (!project.isDirectory()) continue;
Index: tmp/org.txm.treetagger.feature/feature.xml
===================================================================
--- tmp/org.txm.treetagger.feature/feature.xml	(revision 1202)
+++ tmp/org.txm.treetagger.feature/feature.xml	(revision 1203)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.txm.treetagger.feature"
-      label="TreeTagger files"
+      label="TreeTagger"
       version="1.0.0.qualifier"
       provider-name="Textometrie.org">
 
