Index: TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editor/AnnotationExtension.java
===================================================================
--- TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editor/AnnotationExtension.java	(revision 3819)
+++ TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editor/AnnotationExtension.java	(revision 3820)
@@ -41,7 +41,7 @@
 	
 	//private ToolItem saveButton;
 	
-	public static final String GROUP_NAME = "Annotation";
+	public static final String GROUP_NAME = AnnotationUIMessages.Annotation;
 	
 	@Override
 	public String getName() {
@@ -68,7 +68,7 @@
 			
 			@Override
 			public int compare(IConfigurationElement o1, IConfigurationElement o2) {
-				return o1.getAttribute("position").compareTo(o2.getAttribute("position"));
+				return o1.getAttribute("position").compareTo(o2.getAttribute("position")); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		});
 		
@@ -84,7 +84,7 @@
 				if (!cc.equals(r.getClass())) {
 					continue;
 				}
-				Log.finer("Installing AnnotationExtension: " + aa.getName());
+				Log.finer("Installing AnnotationExtension: " + aa.getName()); //$NON-NLS-1$
 				modes.add(aa.getName()); // get the annotation name
 				
 				listeners.add(new SelectionListener() { // create alistener to instantiate a new AnnotationArea
@@ -139,8 +139,8 @@
 		defaultListener = listeners.get(0);
 		String defaultMode = modes.get(0);
 		controlArea = editor.getTopToolbar().installAlternativesGroup(GROUP_NAME, AnnotationUIMessages.annotateWordProperty,
-				"platform:/plugin/org.txm.rcp/icons/functions/pencil_open.png",
-				"platform:/plugin/org.txm.rcp/icons/functions/pencil_close.png", false,
+				"platform:/plugin/org.txm.rcp/icons/functions/pencil_open.png", //$NON-NLS-1$
+				"platform:/plugin/org.txm.rcp/icons/functions/pencil_close.png", false, //$NON-NLS-1$
 				openCloseSelectionListener, modes, listeners);
 		controlArea.setLayout(new GridLayout(1, true));
 		
Index: TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java
===================================================================
--- TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java	(revision 3819)
+++ TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java	(revision 3820)
@@ -15,6 +15,8 @@
 
 	private static final String BUNDLE_NAME = "org.txm.annotation.rcp.messages.messages"; //$NON-NLS-1$
 	public static String annotateWordProperty;
+	public static String Annotation;
+	public static String KnowledgeRepositoryName;
 	
 	static {
 		// initialize resource bundle
Index: TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties
===================================================================
--- TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties	(revision 3819)
+++ TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties	(revision 3820)
@@ -1,3 +1,5 @@
 #TXM messages generated by the PluginMessagesManager class
 #Fri Jun 10 16:36:03 CEST 2022
 annotateWordProperty=Annotate the "word" property
+Annotation=Annotation
+KnowledgeRepositoryName=Knowledge repository name
Index: TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editors/imports/sections/AnnotationSection.java
===================================================================
--- TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editors/imports/sections/AnnotationSection.java	(revision 3819)
+++ TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editors/imports/sections/AnnotationSection.java	(revision 3820)
@@ -12,6 +12,7 @@
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
+import org.txm.annotation.rcp.messages.AnnotationUIMessages;
 import org.txm.objects.Project;
 import org.txm.rcp.editors.imports.ImportFormEditor;
 import org.txm.rcp.editors.imports.sections.ImportEditorSection;
@@ -20,14 +21,14 @@
 	
 	private static final int SECTION_SIZE = 1;
 	
-	public static final String DEFAULTNAMESUFFIX = "KR";
+	public static final String DEFAULTNAMESUFFIX = "KR"; //$NON-NLS-1$
 	
 	Text nameText;
 	
 	public AnnotationSection(ImportFormEditor editor, FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
-		super(editor, toolkit2, form2, parent, style, "annotation");
+		super(editor, toolkit2, form2, parent, style, "annotation"); //$NON-NLS-1$
 		
-		this.section.setText("Annotation");
+		this.section.setText(AnnotationUIMessages.Annotation);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -50,7 +51,7 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 		
-		Label l = toolkit.createLabel(sectionClient, "Knowledge repository name", SWT.WRAP);
+		Label l = toolkit.createLabel(sectionClient, AnnotationUIMessages.KnowledgeRepositoryName, SWT.WRAP);
 		l.setLayoutData(new TableWrapData(TableWrapData.LEFT, TableWrapData.MIDDLE));
 		
 		nameText = new Text(sectionClient, SWT.BORDER);
Index: TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/view/AnnotationsView.java
===================================================================
--- TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/view/AnnotationsView.java	(revision 3819)
+++ TXM/trunk/bundles/org.txm.annotation.rcp/src/org/txm/annotation/rcp/view/AnnotationsView.java	(revision 3820)
@@ -15,7 +15,7 @@
 		
 		parent.setLayout(new GridLayout(1, true));
 		
-		GLComposite toolbar = new GLComposite(parent, SWT.NONE, "toolbar");
+		GLComposite toolbar = new GLComposite(parent, SWT.NONE, "toolbar"); //$NON-NLS-1$
 		
 		TableViewer table = new TableViewer(parent);
 		TableViewerColumn column = new TableViewerColumn(table, SWT.NONE);
