Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/Application.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/Application.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/Application.java	(revision 3893)
@@ -110,12 +110,12 @@
 		List<String> argsList = Arrays.asList((String[]) (args.get("application.args"))); //$NON-NLS-1$
 		System.out.println(TXMCoreMessages.bind(TXMUIMessages.argsColonP0, argsList));
 		
-		headlessMode = argsList.contains("--headless");
+		headlessMode = argsList.contains("--headless"); //$NON-NLS-1$
 		if (headlessMode) {
 			return startHeadLess(argsList);
 		}
 		
-		restMode = argsList.contains("--rest");
+		restMode = argsList.contains("--rest"); //$NON-NLS-1$
 		if (restMode) {
 			return startRest(argsList);
 		}
@@ -197,7 +197,7 @@
 		}
 		
 		if (argsList.contains("-run") //$NON-NLS-1$
-				|| System.getProperty("os.name").contains("Mac") //$NON-NLS-1$
+				|| System.getProperty("os.name").contains("Mac") //$NON-NLS-1$ //$NON-NLS-2$
 				|| Platform.inDevelopmentMode()) { // special case when TXM is run with Eclipse
 			System.out.println("Running TXM"); //$NON-NLS-1$
 			// FIXME: need to check that all has been well moved in Workspace class or build.properties
@@ -292,7 +292,7 @@
 	}
 	
 	private int startRest(List<String> argsList) throws IllegalStateException, IOException {
-		System.out.println("NOT IMPLEMENTED");
+		System.out.println("NOT IMPLEMENTED"); //$NON-NLS-1$
 		
 		return 0;
 	}
@@ -308,43 +308,43 @@
 		try {
 			if (Toolbox.initialize(TBXPreferences.class, new LogMonitor())) {
 				
-				if (argsList.contains("--action=list")) {
+				if (argsList.contains("--action=list")) { //$NON-NLS-1$
 					ret = doList();
 				}
 				
-				if (argsList.contains("--action=new")) {
-					String path = argsList.get(argsList.indexOf("--action=new") + 1);
+				if (argsList.contains("--action=new")) { //$NON-NLS-1$
+					String path = argsList.get(argsList.indexOf("--action=new") + 1); //$NON-NLS-1$
 					File sourcePath = new File(path);
 					
-					String name = argsList.get(argsList.indexOf("--action=new") + 2);
+					String name = argsList.get(argsList.indexOf("--action=new") + 2); //$NON-NLS-1$
 					
 					ret = doNew(sourcePath, name);
 					
-				} else if (argsList.contains("--action=import")) {
+				} else if (argsList.contains("--action=import")) { //$NON-NLS-1$
 					String path = argsList.get(argsList.size() -1);
 					File sourcePath = new File(path);
 					
 					ret = doImport(sourcePath);
-				} else if (argsList.contains("--action=export")) {
+				} else if (argsList.contains("--action=export")) { //$NON-NLS-1$
 					String path = argsList.get(argsList.size() -1).trim();
 					ret = doExport(path);
-				} else if (argsList.contains("--action=remove")) {
+				} else if (argsList.contains("--action=remove")) { //$NON-NLS-1$
 					String path = argsList.get(argsList.size() -1).trim();
 					ret = doRemove(path);
-				} else if (argsList.contains("--action=command")) {
+				} else if (argsList.contains("--action=command")) { //$NON-NLS-1$
 					
 					String name = argsList.get(argsList.size() -2).trim();
 					
 					String path = argsList.get(argsList.size() -1).trim();
 					
 					ret = doCommand(name, path);
-				} else if (argsList.contains("--action=groovy")) {
+				} else if (argsList.contains("--action=groovy")) { //$NON-NLS-1$
 					
 					
-					String path = argsList.get(argsList.indexOf("--action=groovy") + 1).trim();
+					String path = argsList.get(argsList.indexOf("--action=groovy") + 1).trim(); //$NON-NLS-1$
 					
 					ret = doGroovy(path, argsList);
-				} else if (argsList.contains("--action=R")) {
+				} else if (argsList.contains("--action=R")) { //$NON-NLS-1$
 					
 					
 					String path = argsList.get(argsList.size() -1).trim();
@@ -355,7 +355,7 @@
 				Toolbox.workspace.saveParameters(true);
 				Toolbox.shutdown();
 			} else {
-				Log.severe("Toolbox not initialized - good luck");
+				Log.severe("Toolbox not initialized - good luck"); //$NON-NLS-1$
 			}
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -371,7 +371,7 @@
 		File script = new File(path);
 		if (!script.isFile()) return -1;
 		if (!script.exists()) return -1;
-		if (!script.getName().endsWith(".groovy")) return -1;
+		if (!script.getName().endsWith(".groovy")) return -1; //$NON-NLS-1$
 		try {
 			JobHandler job = ExecuteScript.executeScript(path, null, new StructuredSelection(), argsList);
 			if (job != null) {
@@ -389,12 +389,12 @@
 		File script = new File(path);
 		if (!script.isFile()) return -1;
 		if (!script.exists()) return -1;
-		if (!script.getName().endsWith(".R")) return -1;
+		if (!script.getName().endsWith(".R")) return -1; //$NON-NLS-1$
 		
 		EnginesManager<? extends Engine> em = Toolbox.getEngineManager(EngineType.STATS);
 		if (em == null) return -1;
 		
-		Engine e = em.getEngine("R");
+		Engine e = em.getEngine("R"); //$NON-NLS-1$
 		if (e == null || !e.isRunning()) return -1;
 		
 		JobHandler job = ExecuteScript.executeScript(path, null, new StructuredSelection(), argsList);
@@ -420,17 +420,17 @@
 		
 		int ret = IApplication.EXIT_OK;
 		if (path.length() == 0) {
-			System.err.println("No corpus name provided.");
+			System.err.println("No corpus name provided."); //$NON-NLS-1$
 			ret = -1;
 		} else {
 			Project p = Workspace.getInstance().getProject(path);
 			if (p == null) {
-				System.err.println("No corpus found with name: "+path);
+				System.err.println("No corpus found with name: "+path); //$NON-NLS-1$
 				ret = -1;
 			} else {
-				File f = new File(Toolbox.getTxmHomePath(), path+".txm");
+				File f = new File(Toolbox.getTxmHomePath(), path+".txm"); //$NON-NLS-1$
 				p.export(f);
-				System.out.println("Exported file: "+f.getAbsolutePath());
+				System.out.println("Exported file: "+f.getAbsolutePath()); //$NON-NLS-1$
 			}
 		}
 		return ret;
@@ -440,13 +440,13 @@
 		
 		int ret = IApplication.EXIT_OK;
 		if (name.length() == 0) {
-			System.err.println("No command name parameter provided. Ex: concordance, index");
+			System.err.println("No command name parameter provided. Ex: concordance, index"); //$NON-NLS-1$
 			ret = -1;
 		} else if (path.length() == 0) {
-			System.err.println("No target path parameter provided. Ex: corpus path /VOEUX , concordance name /VOEUX/myconc");
+			System.err.println("No target path parameter provided. Ex: corpus path /VOEUX , concordance name /VOEUX/myconc"); //$NON-NLS-1$
 			ret = -1;
 		} else {
-			System.out.println("CALL: "+name+ " WITH "+path);
+			System.out.println("CALL: "+name+ " WITH "+path); //$NON-NLS-1$ //$NON-NLS-2$
 			CommandsAPI api = new CommandsAPI();
 			api.call(name, Workspace.getResult(path), new TXMParameters());
 					
@@ -459,16 +459,16 @@
 		int ret = IApplication.EXIT_OK;
 		
 		if (path.length() == 0) {
-			System.err.println("No corpus name provided.");
+			System.err.println("No corpus name provided."); //$NON-NLS-1$
 			ret = -1;
 		} else {
 			Project p = Workspace.getInstance().getProject(path);
 			if (p == null) {
-				System.err.println("No corpus found with name: "+path);
+				System.err.println("No corpus found with name: "+path); //$NON-NLS-1$
 				ret = -1;
 			} else {
 				p.delete();
-				System.out.println("Deleted corpus: "+path);
+				System.out.println("Deleted corpus: "+path); //$NON-NLS-1$
 			}
 		}
 		return ret;
@@ -478,13 +478,13 @@
 		
 		int ret = IApplication.EXIT_OK;
 		if (!sourcePath.exists()) {
-			System.err.println("No TXM corpus file found: "+sourcePath);
+			System.err.println("No TXM corpus file found: "+sourcePath); //$NON-NLS-1$
 			ret = -1;
 		} else if (!sourcePath.canRead()) {
-			System.err.println("Cannot read TXM corpus file: "+sourcePath);
+			System.err.println("Cannot read TXM corpus file: "+sourcePath); //$NON-NLS-1$
 			ret = -1;
-		} else if (!sourcePath.getName().endsWith(".txm") || !sourcePath.isFile()) {
-			System.err.println("Not a TXM corpus file: "+sourcePath);
+		} else if (!sourcePath.getName().endsWith(".txm") || !sourcePath.isFile()) { //$NON-NLS-1$
+			System.err.println("Not a TXM corpus file: "+sourcePath); //$NON-NLS-1$
 			ret = -1;
 		} else { // DO IT
 			Project p = Load080BinaryCorpus.loadBinaryCorpusArchive(sourcePath, new LogMonitor(), true);
@@ -504,13 +504,13 @@
 		int ret = IApplication.EXIT_OK;
 		
 		if (!sourcePath.exists()) {
-			System.err.println("No source directory found: "+sourcePath);
+			System.err.println("No source directory found: "+sourcePath); //$NON-NLS-1$
 			ret = -1;
 		} else if (!sourcePath.canRead()) {
-			System.err.println("Cannot read source directory: "+sourcePath);
+			System.err.println("Cannot read source directory: "+sourcePath); //$NON-NLS-1$
 			ret = -1;
 		} else if (!sourcePath.isDirectory()) {
-			System.err.println("Not a source directory: "+sourcePath);
+			System.err.println("Not a source directory: "+sourcePath); //$NON-NLS-1$
 			ret = -1;
 		} else { // DO IT
 			Project p = org.txm.rcp.corpuswizard.ImportWizard.doCreateProject(sourcePath, name);
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/ImportWizard.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/ImportWizard.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/ImportWizard.java	(revision 3893)
@@ -89,7 +89,7 @@
 					project = new Project(Toolbox.workspace, name);
 				}
 				project.setSourceDirectory(path.getAbsolutePath());
-				project.setDescription(NLS.bind(TXMUIMessages.DashImportedByP0, System.getProperty("user.name"))); //$NON-NLS-2$ //$NON-NLS-1$
+				project.setDescription(NLS.bind(TXMUIMessages.DashImportedByP0, System.getProperty("user.name"))); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$
 				project.setLang(Locale.getDefault().getLanguage().toLowerCase());
 				
 				project.getEditionDefinition("default").setEnableCollapsible(false); //$NON-NLS-1$
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportCommand.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportCommand.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportCommand.java	(revision 3893)
@@ -73,7 +73,7 @@
 		
 		Object o = selection.getFirstElement();
 		if (selection .isEmpty() || !(o instanceof TXMResult)) {
-			Log.warning("Slection must be a TXMResult");
+			Log.warning(TXMUIMessages.selectionMustBeACalculus);
 		}
 		
 		TXMResult result = (TXMResult)o;
@@ -87,8 +87,8 @@
 			
 			
 			String filepath = dialog.getZipFile().getAbsolutePath();
-			if (!(filepath.endsWith(".txmcmd"))) {
-				filepath += filepath + ".txmcmd";
+			if (!(filepath.endsWith(".txmcmd"))) { //$NON-NLS-1$
+				filepath += filepath + ".txmcmd"; //$NON-NLS-1$
 			}
 			
 			final File zipfiledir = new File(filepath); // temporary directory to setup the archive
@@ -96,7 +96,7 @@
 			zipfiledir.delete();
 			zipfiledir.mkdirs();
 			
-			final File zipfile = new File(filepath+".tmp");
+			final File zipfile = new File(filepath+".tmp"); //$NON-NLS-1$
 			
 			JobHandler jobhandler = new JobHandler(TXMUIMessages.exportingResults) {
 				
@@ -151,7 +151,7 @@
 								r.compute(subMonitor); // refresh result
 							}
 							
-							File outfile = new File(zipfiledir, (TXMPreferences.getNode(r.getParametersNodePath()).name()+".parameters"));
+							File outfile = new File(zipfiledir, (TXMPreferences.getNode(r.getParametersNodePath()).name()+".parameters")); //$NON-NLS-1$
 							if (r.toParametersFile(outfile)) {
 								files.add(outfile);
 							}
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportCommandDialog.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportCommandDialog.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportCommandDialog.java	(revision 3893)
@@ -20,6 +20,7 @@
 import org.txm.Toolbox;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.core.results.TXMResult;
+import org.txm.rcp.messages.TXMUIMessages;
 
 /**
  * 
@@ -61,7 +62,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(NLS.bind("Exporting command {0}", result.getName()));
+		newShell.setText(NLS.bind(TXMUIMessages.exportingCalculusP0, result.getName()));
 		newShell.setMinimumSize(400, 300);
 	}
 	
@@ -74,7 +75,7 @@
 		layout.numColumns = 3;
 		
 		Label l = new Label(comp, SWT.LEFT);
-		l.setText("Output file");
+		l.setText(TXMUIMessages.outputFile);
 		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false));
 		
 		textField = new Text(comp, SWT.SINGLE | SWT.BORDER);
@@ -121,7 +122,7 @@
 		});
 		
 		l = new Label(comp, SWT.LEFT);
-		l.setText("Options");
+		l.setText(TXMUIMessages.options);
 		l.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 3, 1));
 		
 		exportParentsButton = new Button(comp, SWT.CHECK);
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ImportCommand.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ImportCommand.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ImportCommand.java	(revision 3893)
@@ -96,11 +96,11 @@
 		}
 		try {
 			if (dialog.open() != null) {
-				StatusLine.setMessage("Importing results...");
+				StatusLine.setMessage(TXMUIMessages.importingTheCalculus);
 				String filepath = dialog.getFilterPath()+ "/" + dialog.getFileName(); //$NON-NLS-1$
 				
 				final File zipfile = new File(filepath);
-				File outdir = new File(Toolbox.getTxmHomePath(),  "results/import");
+				File outdir = new File(Toolbox.getTxmHomePath(),  "results/import"); //$NON-NLS-1$
 				DeleteDir.deleteDirectory(outdir);
 				
 				Zip.decompress(zipfile, outdir, false);
@@ -114,7 +114,7 @@
 				Arrays.sort(files);
 				
 				for (File parametersFile : files) { // read parameters files
-					if (!parametersFile.getName().endsWith(".parameters")) continue;
+					if (!parametersFile.getName().endsWith(".parameters")) continue; //$NON-NLS-1$
 					
 					Properties props = new Properties();
 					BufferedReader r = IOUtils.getReader(parametersFile);
@@ -175,8 +175,8 @@
 								
 								Class<?> cl = bundle.loadClass(className);
 								
-								String resultNodePath = defaultParentResult.getProject().getParametersNodeRootPath() + TXMResult.createUUID() + "_" + cl.getSimpleName();
-								Log.info("Importing a "+cl.getSimpleName()+" from "+resultNodePath);
+								String resultNodePath = defaultParentResult.getProject().getParametersNodeRootPath() + TXMResult.createUUID() + "_" + cl.getSimpleName(); //$NON-NLS-1$
+								Log.info(TXMUIMessages.importingAP0From+cl.getSimpleName()+" from "+resultNodePath); //$NON-NLS-2$
 								TXMResult parent = null;
 								
 								if (parent == null && UUIDDependencies.get(UUID) != null) {
@@ -190,7 +190,7 @@
 								// fill the preference node with the right parameter **and then** set the right parent node path 
 								for (Object p : props.keySet()) {
 									String ps = p.toString();
-									TXMPreferences.put(resultNodePath, ps, props.getProperty(ps, ""));
+									TXMPreferences.put(resultNodePath, ps, props.getProperty(ps, "")); //$NON-NLS-1$
 								}
 								TXMPreferences.put(resultNodePath, TXMPreferences.PARENT_PARAMETERS_NODE_PATH, parent.getParametersNodePath());
 								
@@ -208,7 +208,7 @@
 								return Status.CANCEL_STATUS;
 							}
 							catch (Exception e) {
-								Log.info(NLS.bind("Error while loading result {0}: {1}", s, e));
+								Log.info(NLS.bind(TXMUIMessages.errorWhileLoadingCalculusP0P1, s, e));
 								org.txm.utils.logger.Log.printStackTrace(e);
 								if (importedResult != null) {
 									importedResult.delete();
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CopyTXMResult.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CopyTXMResult.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CopyTXMResult.java	(revision 3893)
@@ -64,7 +64,7 @@
 		CopyTXMResultTree.all = false;
 		CopyTXMResultTree.cut = false;
 		
-		Log.info(NLS.bind("Copy {0}", selection.getFirstElement()));
+		Log.info(NLS.bind(TXMUIMessages.copyP0, selection.getFirstElement()));
 		return selection.getFirstElement();
 		
 	}
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CopyTXMResultTree.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CopyTXMResultTree.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CopyTXMResultTree.java	(revision 3893)
@@ -79,7 +79,7 @@
 		all = true;
 		cut = false;
 		
-		Log.info(NLS.bind("Copy {0} and its children", selection.getFirstElement()));
+		Log.info(NLS.bind(TXMUIMessages.copyP0AndItsChildren, selection.getFirstElement()));
 		return srcNode;
 	}
 	
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CutTXMResult.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CutTXMResult.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CutTXMResult.java	(revision 3893)
@@ -76,7 +76,7 @@
 		CopyTXMResultTree.all = false;
 		CopyTXMResultTree.cut = true;
 		
-		Log.info(NLS.bind("Cut {0}", selection.getFirstElement()));
+		Log.info(NLS.bind(TXMUIMessages.cutP0, selection.getFirstElement()));
 		return selection.getFirstElement();
 	}
 	
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CutTXMResultTree.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CutTXMResultTree.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/CutTXMResultTree.java	(revision 3893)
@@ -76,7 +76,7 @@
 		CopyTXMResultTree.all = true;
 		CopyTXMResultTree.cut = true;
 		
-		Log.info(NLS.bind("Cut {0} and its children", selection.getFirstElement()));
+		Log.info(NLS.bind(TXMUIMessages.cutP0AndItsChildren, selection.getFirstElement()));
 		return selection.getFirstElement();
 	}
 	
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/PasteTXMResultTree.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/PasteTXMResultTree.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/PasteTXMResultTree.java	(revision 3893)
@@ -74,12 +74,12 @@
 		TXMResult srcNode =  CopyTXMResultTree.srcNode;
 		
 		if (srcNode == null) {
-			Log.fine("Nothing to paste");
+			Log.fine(TXMUIMessages.nothingToPaste);
 			return null;
 		}
 		
 		if (srcNode.getParent() == null) {
-			Log.fine("Error: result parent is null");
+			Log.fine("Error: result parent is null"); //$NON-NLS-1$
 			return null;
 		}
 		
@@ -92,7 +92,7 @@
 		}
 		
 		if (!srcNode.getParent().getResultType().equals(newParent.getResultType())) {
-			Log.warning(NLS.bind("New parent type ({0}) is different from the old parent type ({1})", newParent.getResultType(), srcNode.getParent().getResultType()));
+			Log.warning(NLS.bind(TXMUIMessages.newParentTypeP0IsDifferentFromTheOldParentTypeP1, newParent.getResultType(), srcNode.getParent().getResultType()));
 			return null;
 		}
 		
@@ -100,11 +100,11 @@
 			Log.info(TXMUIMessages.WarningOnlyParametersAreClonedManualChangesAreNotTransfered);
 		}
 		
-		Log.info(NLS.bind("Pasting {0} to {1}...", srcNode, newParent));
+		Log.info(NLS.bind(TXMUIMessages.pastingP0ToP1, srcNode, newParent));
 		
 		TXMResult result = srcNode.clone(newParent, CopyTXMResultTree.all);
 		if (result == null) {
-			Log.warning("Error: The result was not cloned.");
+			Log.warning(TXMUIMessages.errorTheResultWasNotCloned);
 		}
 		
 		if (CopyTXMResultTree.cut) {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/DeleteFile.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/DeleteFile.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/DeleteFile.java	(revision 3893)
@@ -107,7 +107,7 @@
 						File file = (File) o;
 						
 						if (!file.getAbsolutePath().startsWith(rootPath)) {
-							System.out.println("TXM won't delete files out of TXM working directory: "+file);
+							System.out.println(TXMUIMessages.txmWontDeleteFilesOutOfTXMWorkingDirectory+file);
 							continue;
 						}
 						
@@ -115,19 +115,19 @@
 							if (file.isFile()) {
 								if (definitive) {
 									if (!file.delete()) {
-										System.out.println(NLS.bind(TXMUIMessages.failedToDeleteFileP0, file));
+										System.out.println(NLS.bind("", file)); //$NON-NLS-1$
 									}
 								} else {
-									File dest = new File(System.getProperty("java.io.tmpdir"), file.getName());
+									File dest = new File(System.getProperty("java.io.tmpdir"), file.getName()); //$NON-NLS-1$
 									dest.delete();
 									if (!file.renameTo(dest)) {
-										System.out.println(NLS.bind("Fail to move the {0} file to the tmp directory: {1}", file, dest));
+										System.out.println(NLS.bind(TXMUIMessages.failToMoveTheP0FileToThxTMPDirectoryP1, file, dest));
 									}
 								}
 							}
 							else if (file.isDirectory()) {
 								if (!DeleteDir.deleteDirectory(file, definitive)) {
-									System.out.println(NLS.bind(TXMUIMessages.failedToDeleteFileP0, file));
+									System.out.println(NLS.bind("", file)); //$NON-NLS-1$
 								}
 							}
 						}
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 3893)
@@ -1,23 +1,28 @@
 #TXM messages generated by the PluginMessagesManager class
 #Mon Jun 05 16:37:17 CEST 2023
 chooseOutfile=Choose the output file
+theAvailableContexts=The available contexts
 theFileP0DoesNotExist=The {0} file can not be found.
 doneColonP0Created=Done\: {0} created
 deletingSeveralResultsP0Continue=Do you really want to delete those {0} items?
 UpdateTheEditionPages=Update editions
 updateCanceled=Update canceled.
+updated=Updated
 frontXSL=Front XSL
 ampContextsDisplayOptions=&Contexts display options
 CouldNotAddTheP0UpdateRepositoryP1=** Could not add {0} update repository\: {1}
 tokenization=Tokenization
+cannotAddPartP0IntoP1=Cannot addPart {0} into {1}
 cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab=** Can not display the simple options tab when the user has selected the advanced options tab
 invalidProperty=Invalid property
 ImageDirectory=Images folder 
 Reload=Reload
 CommonSourcesLangOfTreeTaggerModels=Corpus language (only TreeTagger's models languages listed)
+expertMode=Expert mode
 exportSettings=Export settings
 OpeningTheP0Corpus=Opening the {0} corpus 
 regexpPatternToHideFiles=Regexp of names of files to hide
+regularExpressionToUse=Regular expression to use
 WarningOnlyParametersAreClonedManualChangesAreNotTransfered=Warning only parameters can be cloned, manual editions are not exported.
 referencesSortOptions=References sort options
 xmlTagNameThatEncodesWords=XML tag name that encodes words
@@ -45,8 +50,10 @@
 separatedByAtLeast1Word=separated by some words
 DoYouWantToStartADiagnosticOfYourCorporaEtcP0FileEtc=Do you want to start a diagnostic of your corpora?  (diagnostics will be written in the {0} file - its path will be copied in the clipboard)
 warning_popup_allDescendantResultsWillBeUpdated=All descendant results will be updated. Do you want to continue?
+newParentTypeP0IsDifferentFromTheOldParentTypeP1=New parent type ({0}) is different from the old parent type ({1})
 newPart=New part
 fileExplorerColonIncorrectPattern=** File Explorer\: Incorrect Regular Expression
+TabPattern=\tPattern
 TXTStartingError=** TXM starting error
 mainLanguage=Main language
 sec=\ sec
@@ -62,6 +69,7 @@
 errorColonDeleteReturnedFalse=** Error while deleting
 exportAll=Export all
 propertiesColon=Properties\:
+propertyToTest=Property to test
 theP0CorpusWillBeReplaced=The ''{0}'' corpus will be replaced.
 impossibleToReadP0=** Impossible to read {0}.
 queryCannotBeLeftEmpty=The Query field must be filled in.
@@ -71,13 +79,16 @@
 wordsDistanceP0=Distance in words\: {0}.
 editTheNameOfTheNewColumnCreatedByTheMergedColumns=Enter the name of the new column resulting from the merge
 panColonRightMousePlusDrag=\ Pan\: Right Mouse + Drag 
+testToDo=Test to do
 textLanguage=Text language
 ThisWillRestartTXM=This will restart TXM.
 Forward=Forward
 failedToExportFileP0WithP1=** Failed to export file {0} with device {1}
 errorWithElementP0=** Error with element {0}
+cannotSetIntegerFieldWithDefaultPropertiesValue=Cannot set IntegerField with default value=
 cannotStartImportConfigurationNoSourceFolderSelected=** Can not  start import\: no source folder selected.
 unknowedWidgetNameColon=** Error\: unknown widget name\: '
+unmanagedElementPolicy=Unmanaged elements policy
 forceLoggin=Enabling all logs…
 updateLevel=Update level
 corpus=Corpus
@@ -86,6 +97,7 @@
 ShowMoreUpdateParametersBeforeUpdating=Modify update parameters
 CQPStructurePropertiesProjection=CQP structure properties projection
 EmptyPropertyValuecode=Empty word properties default value
+showAllFiles=Show all files
 showAllResultNodesInCorporaView=Show all result nodes in the Corpus view
 iAcceptTheLicenceAndAgreeToQuoteTXMInMyWork=I accept TXM license terms and I accept to quote TXM in my publications.
 PropertiesOfTheCompoundFormForStructurePropertiesAndOfTheSimpleFormForWordProperties=Properties of the compound form "text_id" for structure properties, and of the simple form "id" for word properties.
@@ -140,6 +152,7 @@
 columnsSeparatedBy=Columns separated by
 referencesAmpsortOptions=References &sort options
 selectACompositeSorter=Select a multiple sorter
+selectAll=Select all
 theP0directoryNotABinaryCorpus=The {0} folder is not a binary corpus.
 TXMInstallDirectoryIsNotSetP0PreferenceIsNotSet=** TXM install folder is not set (preference ''{0}'' is not set).
 createSubcorpus=Create sub-corpus
@@ -196,15 +209,19 @@
 thisDirectorySeemsToContainABinaryCorpus=This folder seems to contain a binary corpus
 TXMPaths=TXM paths
 theCorpusAndTheCorpusP0WillBeDeleted=The corpus {0} will be deleted.
+theDefaultReferencesDisplayedInTheEtc=The default references displayed in the References column.
 nothing=<nothing>
+nothingToPaste=Nothing to paste
 OpenEtc=Open...
 addingToSelection=Add to selection
 Sources=Sources
 TheDownloadedFileIsNotATXMCorpus=The file downloaded is not a TXM corpus.
 theP0CorpusWillBeCreatedFromTheP1Directory=Corpus {0} will be created from folder {1}.
 saveScriptBeforeExecution=Save script before execution
+removeTheLastPropertyTest=remove the last property test
 removeTheLastWord=Remove the last word
 saveBeforeExecution=Save before execution ?
+initialisationErrorP0=Initialisation error: 
 initializingPlatform=Initialization of the platform...
 assisted=Assisted
 loadingViews=Loading views
@@ -223,13 +240,16 @@
 sortDone=Sorting finished.
 errorColonSubcorpusWasNotCreated=** Error\: the sub-corpus has not been created.
 loadingTXMInstallPreferencesP0=Loading TXM installation preferences from {0}.
+loadTheP0CorpusFile=Load the {0} corpus file ?
 deletingOneResultP0Continue=Do you really want to delete {0}?
 ChangingTheWorkingDirectory=Changing working folder...
 login=Login
 selectionIsNotACorpusColon=The selected object is not a corpus\: 
+selectionMustBeACalculus=Selection must be a calculus
 generalPreferencesBackup=General backup of preferences
 errorDuringUIInitializationP0=** Error during Graphical User Interface initialization\: {0}.
 invalidComparator=Invalid comparator
+done=Done.
 doneInP0=Done in {0}.
 clipboardIsEmpty=** The clipboard is empty.
 UpdateTheP0CorpusUsingP1=Updating the {0} corpus with {1} 
@@ -252,12 +272,14 @@
 contextsDisplayOptions=Contexts display options
 errorWhileComputingCorpusSummary=** Error while computing corpus properties
 selectValuesToAssignColon=Select the values to assign\: 
+selectValuesUsingARegularExpression=Select values using a regular expression
 CopingFilesP0=Copying files\: {0}
 sourceCharactersEncoding=Source characters encoding
 aBinaryCorpusIsATXMFileExtensionTxmOrZip=A TXM corpus in binary format is either a file with an extension .txm or .zip, or a compressed folder composed of sub-folders 'html', 'data', 'registry', 'txm'
 showExportResultInTheTextEditor=Show the result of the export in a text editor
 failedToRename=** Failed to rename
 metadatasParameters=Metadata parameters
+errorWhileLoadingCalculusP0P1=Error while loading calculus {0}: {1}
 errorWhileLoadingTXMP0=** TXM startup error\: {0}.
 OKOpenTheDiagnosticFile=OK, open the diagnostic file
 imLookingForColon=I am looking for\: 
@@ -270,7 +292,9 @@
 ExportResultParameters_WarningOnlyTheParametersAreExportedManualChangesAreNotTransfered=Warning\: only command parameters are exported, result manual editions are not exported.
 descriptionOfTheP0CorpusP1=Description of the {0} corpus ({1})
 downloading=Downloading…
+downloadingTheP0File=Downloading {0} file...
 selectAProperty=Select a property
+selectBetweenTheFollowingValues=Select between the following values
 coocMatrixParameters=Word-word matrix parameters
 userInterfaceLanguage=Language of the interface
 EnterTheNewNameToShowInTheCorpusView=Enter the new name to show in the Corpus view
@@ -304,6 +328,8 @@
 CouldNotUpdateTXMP0=** Could not update TXM\: {0}
 sourcesCharactersEncodingColon=Sources characters encoding\:
 copiedLinesColonP0=Copied lines\:\n{0}
+copyP0=Copy {0}
+copyP0AndItsChildren=Copy {0} and its children
 NoteElements=Notes tags
 punctuations=Punctuations
 selectTextId=Select a text
@@ -327,6 +353,7 @@
 P0Import={0} Import
 CouldNotLoadThecorpusFromtheP0DirectoryP1=** Could not load corpus from {0}\: {1}
 toolboxReady=Platform ready.
+tooltipProperties=Tooltip properties
 aWordWithItsProperties=a word with properties
 importStarted=Start of import
 TXMInitializationHasBeenCanceledByUserDotPleaseRestartTXM=** TXM initialization has been canceled by user. Please restart TXM.
@@ -347,13 +374,16 @@
 LoadBinaryCorporaDirectory_loadingCorporaFromTheP0Directory=Loading corpora from the {0} folder...
 mergeResultName=Name of the result of the merger
 password=Password
+pastingP0ToP1=Pasting {0} to {1}...
 structureColon=Structure\:
 AvailableSourceFilesEncodingCodeOnlyMostUsedAreShown=Character encodings (only the most used listed)
 info_txmIsReady=TXM is ready.
 merge=merge
 common_end=End
+disableTheWarningDialogWhenTestingTXM=Disable the warning dialog when testing TXM
 displayFont=Display font
 errorWhileGettingCurrentPositionValueColon=** Error while retrieving data at position\: 
+errorWhileGettingResultInformationsP0=Error while getting result informations: 
 CancelCredentialSettings=Cancel login settings
 ExecuteRTextSelectionNotImplemented=R execution of selected text is not implemented
 milestoneElements=Milestone elements
@@ -377,25 +407,33 @@
 numberOfNodesP0=Number of nodes\: {0}.
 TXMInstallDirectoryIsSetToP0ButIsNotReadable=** TXM install folder is set to ''{0}'' but is not readable.
 metadatacsvFileFormat=metadata.csv file format
+addAPropertyTest=add a property test
 addAWord=Add a word
 TheAnnotateImportParameterWasNotActivatedSinceTreeTaggerIsNotInstalled=The import parameter 'annotate' has not been activated by default because the extensionTreeTagger is not installed.
 DashImportedByP0=Corpus imported by {0}.
 Closing=Closing
 selectThecorporaSetsToRestore=Select corpora to retrieve
+selectTheImportSourceDirectory=Select the import source directory
 FailedToLoadTheP0Corpus=** Failed to load corpus {0}.
 Open=Open
 setDefaultTheme=Set default theme
 defaultLanguage=Default language
+defaultReferences=Default References
 WarningNoXMLTXMFilesDirectoryP0=Warning no XML-TXM files in the {0} folder. 
 identifiedLanguageP0=Identified Language\: {0}.
+ignoreTheElementsAreNotWrittenEtc=ignore: the elements are not written ;  rename to span: rename the element to 'span' and set the class attribute
 startJobColonInitializeUI=Startup\: initializing the user interface
 moduleUIParametersColonP0=Module User Interface parameters\: {0}
 openingCooccurrentsTable=Opening cooccurrents table
 outfileColonNone=Output file\: none
+outputFile=Output file
+open=Open...
 openingP0etc=Opening {0}...
 ampMultipleSort=&Multiple Sort
 thisComputerEncodingColon=Default character encoding of this computer
 theErrorIsColon=The error is\: 
+theMaximumNumberOfColumnShownInTables=The maximum number of columns shown in tables
+theMaximumNumberOfQueryStoredInTheQueryHistory=The maximum number of query stored in the query history
 importDone=Import done.
 SelectADirectory=Select a folder
 prettyVersionP0P1={0} ({1})
@@ -425,7 +463,9 @@
 errorInAtOptionNameDeclarationColon=** Error in the declaration of the name of the @Option 
 corpusNameOnlyCapsAndNoDigitAtBeginning=Corpus name* (upper case, no figure at the beginning)
 noActiveWorkbenchWindow=no active workbench window
+noCharactersSelected=no charracters selected.
 exporting=Exporting…
+exportingCalculusP0=Exporting calculus {0}
 failedToSaveAsP0ErrorP1=** Failed to save file {0} (error\: {1}).
 ampNew=&New
 tokenizerParameterFileColon=Tokenizer parameters\: 
@@ -436,7 +476,10 @@
 doesNotContain=does not contain
 BuildFacsEdition=Build 'facs' edition
 SourceDirectoryPage_6=Source folder to use
+all=all
 allCriteria=All criteria (&&)
+allPropertyTestsAreVerified=All property tests are verified
+allTheCorpusTextsWillBeUpdated=All the corpus texts will be updated
 SourceDirectoryPage_8=Warning\: corpus name normalization\: no valid character available to build the corpus name (try to use some American English - ASCII - characters in the folder name)
 SourceDirectoryPage_2=The source folder contains the sources files read by the import module.
 failedToLoadCorpusFromDirectoryColonP0WeCannotFindTheNecessaryComponents=** Failed to load corpus from folder {0}. Can not find the necessary components
@@ -445,12 +488,17 @@
 SourceDirectoryPage_5=click to select the corpus source folder
 common_refresh=Update
 commands=Commands
+commaSeparatedList=comma separated list (comma*=all)
 SourceDirectoryPage_0=Select source files folder
 SourceDirectoryPage_1=Sources
 thisComputerLanguageColon=Default language of this computer
+thisWillCloseAllEditors=This will will close all editors all non saved changes will be lost. Continue?
+thisWillRestoreTheViewAndCloseEditors=This will will restore the views and close the additional views of the current perspective. Continue?
 startingUpP0=Starting TXM {0}…
 corpusNameDoesNotMatchesTheAZAZ09120PatternColonP0=The corpus name does not conform to the syntax ''[AZ] [- A-Z0-9] {1,20}''\: {0}.
 query=Query
+queryOptions=Query options
+quitTXM=Quit TXM...
 CanNotDeleteP0=** Can not delete {0}.
 errorElementColon=Error element\: '
 SelectTheImportLanguageToUse=Select corpus language
@@ -473,11 +521,13 @@
 scriptExecution=Script execution
 OpenTheSelectedPathWithTheDefaultToolSetByTheSystem=Open the file with the default tool of the system.
 refreshingCorpora=Updating the Corpus view…
+refreshTheQuery=Refresh the query
 distance=Distance in words
 string=String
 textualPlanes=Textual planes
 CouldNotAddTheP0ExtensionsUpdateRepositoryP1=** Could not add the {0} extension update repository\: {1}
 description=Description
+deselectAll=De-select all
 removeUnusedEclipseRCPPreferencePage=Removing unused Eclipse RCP preference pages...
 What=What
 writingCoocMatrixInGRAPHMLFileColonP0=Writing the words-words matrix in the GRAPHML file {0} ...
@@ -485,6 +535,7 @@
 theP0FileAlreadyExistsWouldYouLikeToReplaceIt=the {0} file already exists. Would you like to replace it?
 couldNotReadInstallPreferencesFileP0=** Failed to read installation preferences file {0}.
 resetAll=Reset All
+resetPerspective=Reset perspective
 valueSelector=Values selector
 errorWhileFetchingUpdatesP0=Error while fetching updates\: {0}
 exportingP0ThisMayTakeAWhile=Exporting {0}. This can take time, depending on the size of the corpus.
@@ -492,6 +543,7 @@
 wordTag=Word tag
 errorsOccuredDuringTXMPostInstallation=** Errors occurred during TXM post-installation.
 errorWhileCreatingAPartitionColonP0=** Error while creating a partition\: {0}
+errorWhileExportingQueriesP0=Error while exporting queries: 
 UpdateParametersForTheP0ImportModule=Update parameters of the {0} import module
 NoteElementsThatEncodePonctualNotes=Ponctual notes tags
 EMPTY=\  
@@ -510,6 +562,7 @@
 failedToExportInFileP0WithFormatP1=** Failed to export as {1} in file {0}
 theP0CorpusWillBeRestarted=The ''{0}'' corpus import will be resumed or restarted.
 InstanceConfigurationDirectory=Instance configuration folder
+deleting=Deleting
 deletingP0=Deleting {0}
 corpusToProcess=Cospus to process
 selectTheSourceDirectory=Select the source files folder and name the corpus
@@ -523,17 +576,24 @@
 WarningYouNeedAdministratorPrivilegesToFullyUpdateTXMEtcP0InstalledEtc=Please note that you need administrator privileges to update TXM (TXM is installed in {0}). Some updates may not be fully installed.
 createANewSorter=Create a new sort method
 importClipboardText=Importing the textual content of the clipboard ...
+importingAP0From=Importing a 
+importingTheCalculus=Importing calculus...
 endOfSentenceCharacters=End of sentence characters
 concordanceContextStructureLimits=Structures delimiting concordance contexts
+concordances=Concordances
+concordancesSubSection=Concordance sub-section
 XMLTXMFilesExportedInP0=XML-TXM files exported in {0}
 displayRuntimesInConsole=Display runtime in the console
 consoleReportsAnInternalError=\ Internal error.
 extractingBinaryCorpus=Extracting binary corpus
 options=Options...
+options=Options
 startCorpusImport=Start the import of the corpus.
 doneP0Ms=Done in {0} ms.
 newMacro=New macro
 objColon=Object\:
+oneConfigure=1- Configure
+onlyTheModifiedCorpusTextsAreUpdated=Only the modified corpus texts are updated
 TheSelectedFileIsADirectory=** The file selected is a folder. Aborting.
 ClickToSelectTheCorpusSourceDirectory=Click to select the corpus source folder
 openingComplexSortDialog=Opening multiple sort dialog box
@@ -547,7 +607,9 @@
 Explorer_7=⌂
 ErrorTheAvailablePropertiesListIsNULL=** Error\: the available properties list is NULL.
 initializingToolboxEnginesAndCorpora=Initialization of the platform (engines and corpora)...
+initialZoom=Zoom initial
 selectEngine=Select engine
+selectUsingAListOfValues=Select using a list of values
 errorWhileUpdatingTXMP0NoHandlerServiceFound=** Error while updating TXM\: no handler service found
 FileTreeContentProvider_4='
 EnableCollapsibleMetadata=Make metadata lists retractable
@@ -555,9 +617,12 @@
 canceling=Canceling…
 ampQuery=&Query 
 warning_popup_editedResultsWillBelostP0=The following results have been manually edited\: {0} The modifications will not be saved. Do you want to continue?
+zoomIn=Zoom avant
 zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag=\ Zoom +/-\: Mouse wheel OR Shift + Right Mouse + Drag 
+zoomOut=Zoom arrière
 previousPage=Previous page
 failedToLoadBinaryCorpusNullError=** Failed to load binary corpus (null error).
+failedToLoadPreviousValuesFromP0P1=Failed to load previous values from {0}: {1}
 coocMatrixColonP0=Word-word matrix {0}.
 pattern=pattern
 settingStatusLineAndConfiguringActionSets=Retrieving status line and configuring menus and toolbars
@@ -575,6 +640,7 @@
 DoneP0=Done\: {0}
 lexicon=Lexicon
 UpdateSiteAddress=Update site address
+common_delete=
 common_displayOptions=Display options
 couldNotUnzipBinaryCorpusColonP0=** Failed to unzip binary corpus {0}
 executingLastScriptColon=Executing last script\: 
@@ -616,6 +682,8 @@
 CompilingP0Etc=Compiling {0}...
 chooseTheLanguage=Choose the language
 checkingForExistingWorkspaceDirectory=Verifying the presence of the workspace folder
+checkToAddAStructureConstraint=Check to add a structure constraint
+checkToTargetThisWordInTheQuery=Check to target this word in the query
 textSeparator=Text separator
 failedToCancel=** Failed to cancel
 cannotComputeCooccurrencesWithTheCurrentSelectionP0=** Can not compute cooccurrents of the selection {0}.
@@ -629,11 +697,15 @@
 editTheNameOfTheNewLineCreatedByTheMergedLines=Enter the name of the new line resulting from the merge
 rightContextSize=Right context size
 theP0BinaryCorpusVersionIsP1={0} TXM binary format is {1}.
+theWordPropertyValue=The word property value
 creatingANewPartitionWithP0=Creating a new partition on {0}
 creatingTXMUserWorkingDirectory=Creating TXM user workspace…
 ToPopulateTthisMenuCreateMacrosInTheP0MacroDirectory=To populate this menu, you must create .groovy macro files in subdirectories of the ''{0}'' macro folder.
 warning_popup_theP0HasBeenEditedItsChangesWillBeLost=The {0} has been edited. Its changes will be lost. Do you want to continue?
+warningFailedToStoreDefaultMacroValuesAtP0=Warning: failed to store default macro values at {0} 
+warningImageNotFoundAtP0=Warning: image not found in '
 goToTXMHome_2=Go to TXM workspace folder
+goToTXMHomeDirectory=Go to TXM home directory
 followedBy=followed by 
 startJobColonCheckTXMHOME=Startup\: check TXMHOME
 Copy=Copy
@@ -653,6 +725,7 @@
 SomeResultHaveBeenManuallyModified=Some results have been modified manually
 part=Part
 error=Error 
+error=Error
 SelectionP0MustBeAcorpusAborting0=No corpus selected ({0}). Aborting
 changeCharactersEncoding=Change characters encoding
 mainLanguageColon=Main language\:
@@ -663,35 +736,52 @@
 common_all=all
 failedToGetLastCQPErrorColon=** Failed to retrieve last CQP error\: 
 ready=Ready.
+recoveringCorpora=Recovering corpora
 errorTheProvidedTXMHOMEDirectoryDoesNotExistsP0Aborting=Error\: provided TXM home folder does not exist\: {0}. Aborting.
+errorTheResultWasNotCloned=Error: The result was not cloned.
+resetTheEditors=Reset the editors
 resetTheViewColonF5=\ Reset view\: F5
+resetValues=Reset values
+resetValues=Reset values
 executionOfP0=Execution of script "{0}"...
 noTextNext=No next text
 sortingColumn=Sorting column…
 startingUpdateFetch=Starting updates retrieval
 P0LinesFound={0} lines found.
 listOfMilestoneElementsSeparatedByComma=List of 'milestone' elements (separated by ',' comma) (to encode in word properties)
+listOfValuesToSelect=List of values to select
 ampStructureColon=&Structure\:
 errorColonCurrentGroovyScriptDirectoryDoesNotExistColon=** Error\: current Groovy script folder does not exist\: 
 UpdateSiteIsNotReachableP0P1Aborting=Update site is not reachable ({0})\: {1}. Aborting.
 match=Match
 restartTXM=Restart TXM
 couldNotFindTextP0InCorpusP1=** Can not find text {0} in corpus {1}
+couldNotGetFileSize=Could not get file size
+couldNotOpenTheParameterDialogP0=Could not open the parameter dialog: 
 TXMUserDirectoryIsSetToP0ButDoesNotExist=** TXM user folder is set to ''{0}'' but does not exist.
 errorDuringParametersInitialisation=** Error while initializing parameters
 guessColon=Guess\:
 corpusConversionFailed=The conversion of the corpus failed.
 tabulation=<tabulation>
+twoGenerateTheQuery=2- Generate the query
+txmWontDeleteFilesOutOfTXMWorkingDirectory=TXM won't delete files out of TXM working directory: 
 addColon=add\: 
 abortingLoadingOfP0ACorpusWithTheSameNameAlreadyExists=A corpus with the same name {1} already exists. Aborting loading of {0}.
 completeNameAuthorDateLicenseComment=Complete name, author, date, license, comment…
 contextColon=Context\: 
+contextSize=context size
 failedToSavePreferencesColonP0=** Failed to save preferences\: {0}.
 doNotConfirmToDeleteAnObject=Do not ask for confirmation to delete an object
 saveFileBeforeExecution=Save file before execution ?
+saveParameters=Save parameters
 cannotReadTheFileP0=** Can not read file {0}.
+cutP0=Cut {0}
+cutP0AndItsChildren=Cut {0} and its children
 displayInFullText=Display in full text…
 startingTxm=Starting TXM
 showHideCommandParameters=Show/Hide command parameters
+showTheModuleScripts=Show module scripts
 failedToBackupExistingCorporaP0=** Unable to backup existing corpora\: {0}.
+failToMoveTheP0FileToThxTMPDirectoryP1=Fail to move the {0} file to the tmp directory: {1}
 startsWith=starts with
+startToImport=Start import
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 3893)
@@ -9,6 +9,9 @@
 	private static final String BUNDLE_NAME = "org.txm.rcp.messages.messages"; //$NON-NLS-1$
 	
 	
+	public static String theAvailableContexts;
+
+
 	public static String theP0FileAlreadyExistsWouldYouLikeToReplaceIt;
 	
 	public static String theP0directoryNotABinaryCorpus;
@@ -86,6 +89,9 @@
 	
 	public static String activateProxyService;
 	
+	public static String addAPropertyTest;
+
+
 	public static String addAWord;
 	
 	public static String addAXsltParameter;
@@ -97,7 +103,16 @@
 	public static String advanced;
 	
 	
+	public static String all;
+
+
 	public static String allCriteria;
+
+
+	public static String allPropertyTestsAreVerified;
+
+
+	public static String allTheCorpusTextsWillBeUpdated;
 	
 	public static String alwaysSaveBeforeLaunching;
 	
@@ -156,6 +171,9 @@
 	
 	public static String canceling_2;
 	
+	public static String cannotAddPartP0IntoP1;
+
+
 	public static String cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab;
 	
 	public static String cannotComputeCooccurrencesWithTheCurrentSelectionP0;
@@ -167,6 +185,9 @@
 	public static String cannotReadTheFileP0;
 	
 	
+	public static String cannotSetIntegerFieldWithDefaultPropertiesValue;
+
+
 	public static String cannotStartImportConfigurationNoSourceFolderSelected;
 	
 	public static String cantLoadPropertiesFromCorpusP0ColonP1;
@@ -182,6 +203,12 @@
 	public static String checkForUpdatesAtStartup;
 	
 	public static String checkingForExistingWorkspaceDirectory;
+
+
+	public static String checkToAddAStructureConstraint;
+
+
+	public static String checkToTargetThisWordInTheQuery;
 	
 	public static String chooseOutfile;
 	
@@ -202,11 +229,17 @@
 	public static String columnsSeparatedBy;
 	
 	public static String commands;
+
+
+	public static String commaSeparatedList;
 	
 	public static String common_areYouSure;
 	
 	public static String common_beginning;
 	
+	public static String common_delete;
+
+
 	public static String common_displayOptions;
 	
 	
@@ -227,6 +260,12 @@
 	
 	
 	public static String concordanceContextStructureLimits;
+
+
+	public static String concordances;
+
+
+	public static String concordancesSubSection;
 	
 	public static String configurationOfTheUserInterfaceLanguage;
 	
@@ -239,12 +278,21 @@
 	public static String contextColon;
 	
 	public static String contextsDisplayOptions;
+
+
+	public static String contextSize;
 	
 	public static String coocMatrixColonP0;
 	
 	public static String coocMatrixParameters;
 	
 	public static String copiedLinesColonP0;
+
+
+	public static String copyP0;
+
+
+	public static String copyP0AndItsChildren;
 	
 	
 	public static String corpus;
@@ -261,8 +309,14 @@
 	public static String couldNotFindDirectoryColonP0;
 	
 	public static String couldNotFindTextP0InCorpusP1;
+
+
+	public static String couldNotGetFileSize;
 	
 	public static String couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuColonGeneralSupWebNavigator;
+
+
+	public static String couldNotOpenTheParameterDialogP0;
 	
 	public static String couldNotReadInstallPreferencesFileP0;
 	
@@ -291,12 +345,18 @@
 	public static String dDotMandatoryField;
 	
 	public static String defaultLanguage;
+
+
+	public static String defaultReferences;
 	
 	public static String defineAndUseACompositeSorter;
 	
 	public static String deleteParameter;
 	
 	
+	public static String deleting;
+
+
 	public static String deletingP0;
 	
 	public static String deletingSeveralResultsP0Continue;
@@ -306,9 +366,15 @@
 	public static String description;
 	
 	public static String descriptionOfTheP0CorpusP1;
+
+
+	public static String deselectAll;
 	
 	public static String desktopIsNotSupportedFatal;
 	
+	public static String disableTheWarningDialogWhenTestingTXM;
+
+
 	public static String displayFont;
 	
 	public static String displayInFullText;
@@ -328,6 +394,9 @@
 	public static String doneColonP0ItemsAndP1Occ;
 	
 	
+	public static String done;
+
+
 	public static String doneInP0;
 	
 	public static String doneInP0P1;
@@ -339,6 +408,9 @@
 	public static String dontSaveAndRun;
 	
 	public static String downloading;
+
+
+	public static String downloadingTheP0File;
 	
 	public static String eRROR;
 	
@@ -365,7 +437,7 @@
 	public static String equalsTo;
 	
 	public static String error;
-	
+
 	public static String errorColonCorporaDirectoryDoesntExistColon;
 	
 	public static String errorColonCurrentGroovyScriptDirectoryDoesNotExistColon;
@@ -407,11 +479,20 @@
 	public static String errorWhileCreatingAPartitionColonP0;
 	
 	public static String errorWhileDeletingP0ColonP1;
+
+
+	public static String errorWhileExportingQueriesP0;
 	
 	public static String errorWhileFetchingUpdatesP0;
 	
 	public static String errorWhileGettingCurrentPositionValueColon;
+
+
+	public static String errorWhileGettingResultInformationsP0;
 	
+	public static String errorWhileLoadingCalculusP0P1;
+
+
 	public static String errorWhileLoadingTXMP0;
 	
 	public static String errorWhileOpeningBibliographicRecordP0WithURLEqualsP1;
@@ -436,6 +517,9 @@
 	public static String errorTheProvidedInstallDirectoryDoesNotExistAborting;
 	
 	public static String errorTheProvidedTXMHOMEDirectoryDoesNotExistsP0Aborting;
+
+
+	public static String errorTheResultWasNotCloned;
 	
 	public static String executingP0;
 	
@@ -451,6 +535,9 @@
 	public static String executionOfP0;
 	
 	
+	public static String expertMode;
+
+
 	public static String exportAll;
 	
 	public static String exportColonCantCreateFileP0ColonP1;
@@ -460,6 +547,9 @@
 	public static String exportSettings;
 	
 	public static String exporting;
+
+
+	public static String exportingCalculusP0;
 	
 	public static String exportingP0;
 	
@@ -478,8 +568,6 @@
 	
 	public static String failedToDelete;
 	
-	public static String failedToDeleteFileP0;
-	
 	public static String failedToDeleteSubcorpusP0;
 	
 	public static String failedToExecuteTheP0ScriptColonP1;
@@ -499,6 +587,9 @@
 	public static String failedToLoadCorpusFromDirectoryColonP0WeCannotFindTheNecessaryComponents;
 	
 	public static String failedToLoadCorpusP0;
+
+
+	public static String failedToLoadPreviousValuesFromP0P1;
 	
 	
 	public static String failedToRename;
@@ -506,6 +597,9 @@
 	public static String failedToSaveAsP0ErrorP1;
 	
 	public static String failedToSavePreferencesColonP0;
+
+
+	public static String failToMoveTheP0FileToThxTMPDirectoryP1;
 	
 	public static String fileColon;
 	
@@ -537,6 +631,9 @@
 	public static String goToTXMHome;
 	
 	public static String goToTXMHome_2;
+
+
+	public static String goToTXMHomeDirectory;
 	
 	public static String graphicsKeyboardShortcuts;
 	
@@ -565,11 +662,17 @@
 	public static String info_txmIsReady;
 	
 	
+	public static String initialisationErrorP0;
+
+
 	public static String initializationOfThePlatform;
 	
 	public static String initializingPlatform;
 	
 	public static String initializingToolboxEnginesAndCorpora;
+
+
+	public static String initialZoom;
 	
 	public static String installPathColonP0;
 	
@@ -602,6 +705,9 @@
 	public static String listOfTagsEncodingTheOutsidetextNoStructureOrWordContentIndexedNoStructureOrWordContentEditedInTXM;
 	
 	public static String listOfTagsEncodingTheOutsidetextToEditNoStructureOrWordContentIndexedStructureAndWordContentEditedInTXM;
+
+
+	public static String listOfValuesToSelect;
 	
 	public static String loadingBinaryCorpus;
 	
@@ -614,6 +720,9 @@
 	public static String theP0BinaryCorpusVersionIsP1;
 	
 	public static String loadingViews;
+
+
+	public static String loadTheP0CorpusFile;
 	
 	public static String lockRCPWorkspace;
 	
@@ -684,6 +793,9 @@
 	
 	public static String newName;
 	
+	public static String newParentTypeP0IsDifferentFromTheOldParentTypeP1;
+
+
 	public static String newPart;
 	
 	public static String nextPage;
@@ -695,6 +807,9 @@
 	public static String noActivePage;
 	
 	public static String noActiveWorkbenchWindow;
+
+
+	public static String noCharactersSelected;
 	
 	public static String noDefaultEditionPageFoundForElementColon;
 	
@@ -724,6 +839,12 @@
 	public static String numberOfNodesP0;
 	
 	public static String objColon;
+
+
+	public static String oneConfigure;
+
+
+	public static String onlyTheModifiedCorpusTextsAreUpdated;
 	
 	public static String openTheQueryAssistant;
 	
@@ -734,6 +855,8 @@
 	public static String options;
 	
 	public static String outfileColonNone;
+
+	public static String outputFile;
 	
 	public static String outsidetext;
 	
@@ -771,6 +894,9 @@
 	public static String printTheStacktrace;
 	
 	public static String propertiesColon;
+
+
+	public static String propertyToTest;
 	
 	public static String punctuations;
 	
@@ -783,10 +909,19 @@
 	public static String queryAssistant;
 	
 	public static String queryCannotBeLeftEmpty;
+
+
+	public static String queryOptions;
+
+
+	public static String quitTXM;
 	
 	public static String ready;
 	
 	public static String readyToShowUpdateUI;
+
+
+	public static String recoveringCorpora;
 	
 	public static String referencesAmpdisplayOptions;
 	
@@ -797,8 +932,14 @@
 	public static String referencesSortOptions;
 	
 	public static String refreshingCorpora;
+
+
+	public static String refreshTheQuery;
 	
 	public static String regexpPatternToHideFiles;
+
+
+	public static String regularExpressionToUse;
 	
 	public static String reload;
 	
@@ -806,6 +947,9 @@
 	
 	public static String removeFromSelection;
 	
+	public static String removeTheLastPropertyTest;
+
+
 	public static String removeTheLastWord;
 	
 	public static String removeUnnecessaryE4Elements;
@@ -817,6 +961,9 @@
 	
 	public static String renamingByColon;
 	
+	public static String resetTheEditors;
+
+
 	public static String resetTheViewColonF5;
 	
 	public static String restartTXM;
@@ -841,6 +988,9 @@
 	public static String saveBeforeExecution;
 	
 	public static String saveFileBeforeExecution;
+
+
+	public static String saveParameters;
 	
 	public static String saveScript;
 	
@@ -855,6 +1005,9 @@
 	public static String select;
 	
 	public static String selectACompositeSorter;
+
+
+	public static String selectAll;
 	
 	public static String selectAProperty;
 	
@@ -865,8 +1018,14 @@
 	public static String selectTheSourceDirectory;
 	
 	public static String selectValuesToAssignColon;
+
+
+	public static String selectValuesUsingARegularExpression;
 	
 	public static String selectionIsNotACorpusColon;
+
+
+	public static String selectionMustBeACalculus;
 	
 	public static String separatedByAtLeast0Word;
 	
@@ -882,6 +1041,9 @@
 	
 	public static String shouldNotHappen;
 	
+	public static String showAllFiles;
+
+
 	public static String showAllResultNodesInCorporaView;
 	
 	public static String showExportResultInTheTextEditor;
@@ -889,6 +1051,9 @@
 	public static String showHiddenFiles;
 	
 	public static String showHideCommandParameters;
+
+
+	public static String showTheModuleScripts;
 	
 	public static String simple;
 	
@@ -929,6 +1094,9 @@
 	public static String startingUpdateFetch;
 	
 	public static String startsWith;
+
+
+	public static String startToImport;
 	
 	public static String startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuColonHelpSup;
 	
@@ -953,6 +1121,9 @@
 	public static String tXMiniColon;
 	
 	
+	public static String testToDo;
+
+
 	public static String textEditorColonP0EncodingFoundP1;
 	
 	public static String textID;
@@ -964,12 +1135,21 @@
 	public static String textualPlanes;
 	
 	public static String theCorpusAndTheCorpusP0WillBeDeleted;
+
+
+	public static String theDefaultReferencesDisplayedInTheEtc;
 	
 	public static String theErrorIsColon;
 	
 	public static String theFileP0DoesNotExist;
 	
 	public static String theInputP0CannotBeDisplayed;
+
+
+	public static String theMaximumNumberOfColumnShownInTables;
+
+
+	public static String theMaximumNumberOfQueryStoredInTheQueryHistory;
 	
 	public static String theNumberOfEditorsP0AndNumberOfInputsP1MustBeEqual;
 	
@@ -992,6 +1172,12 @@
 	public static String thisFileIsNotATXMFileColonP0;
 	
 	public static String thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual;
+
+
+	public static String thisWillCloseAllEditors;
+
+
+	public static String thisWillRestoreTheViewAndCloseEditors;
 	
 	public static String titleColon;
 	
@@ -1006,10 +1192,19 @@
 	public static String tokenizerParameterFileColon;
 	
 	public static String toolboxReady;
+
+
+	public static String tooltipProperties;
 	
 	public static String unknowedWidgetNameColon;
+
+
+	public static String unmanagedElementPolicy;
 	
 	public static String updateCanceled;
+
+
+	public static String updated;
 	
 	public static String updateLevel;
 	
@@ -1033,6 +1228,12 @@
 	public static String warning_popup_editedResultsWillBelostP0;
 	
 	public static String warning_popup_theP0HasBeenEditedItsChangesWillBeLost;
+
+
+	public static String warningFailedToStoreDefaultMacroValuesAtP0;
+
+
+	public static String warningImageNotFoundAtP0;
 	
 	public static String withinAContextOf;
 	
@@ -1048,7 +1249,13 @@
 	
 	public static String youMustSelectAtLeast2Comparators;
 	
+	public static String zoomIn;
+
+
 	public static String zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag;
+
+
+	public static String zoomOut;
 	
 	public static String zoomToSelectionColonCtrlPlusLeftMousePlusdrag;
 	
@@ -1067,9 +1274,18 @@
 	public static String corporaWillBeRestoredInTheFollowingOrderCorporaAlreadyRestoredWillNotBeReplaced;
 	
 	public static String selectThecorporaSetsToRestore;
+
+
+	public static String selectTheImportSourceDirectory;
 	
 	public static String importDone;
 	
+	public static String importingAP0From;
+
+
+	public static String importingTheCalculus;
+
+
 	public static String updateDone;
 	
 	public static String gnuLicenceLink;
@@ -1077,9 +1293,15 @@
 	public static String gnuLicenceName;
 	
 	public static String iAcceptTheLicenceAndAgreeToQuoteTXMInMyWork;
+
+
+	public static String ignoreTheElementsAreNotWrittenEtc;
 	
 	public static String seeTheQuoteSectionIn;
 	
+	public static String TabPattern;
+
+
 	public static String TheAnnotateImportParameterHasBeenActivatedSinceTreeTaggerIsInstalled;
 
 	public static String TheAnnotateImportParameterWasNotActivatedSinceTreeTaggerIsNotInstalled;
@@ -1213,12 +1435,22 @@
 	public static String LoadBinaryCorporaDirectory_selectTheTXMCorpusToLoadInP0;
 	
 	public static String selectAnotherTXMCorporaToRestore;
+
+
+	public static String selectBetweenTheFollowingValues;
 	
 	public static String resetAll;
 
+
+	public static String resetPerspective;
+
+	public static String resetValues;
+
 	public static String retokenizePreEncodedWords;
 	
 	public static String password;
+
+	public static String pastingP0ToP1;
 	
 	public static String login;
 	
@@ -1265,6 +1497,9 @@
 	public static String theP0CorpusWillBeRestarted;
 	
 	public static String theP0CorpusWillBeCreated;
+
+
+	public static String theWordPropertyValue;
 	
 	public static String SourceDirectoryPage_14;
 	
@@ -1388,6 +1623,9 @@
 	public static String tabulation;
 	public static String nothing;
 
+
+	public static String nothingToPaste;
+
 	public static String OK;
 
 	public static String OKOpenTheDiagnosticFile;
@@ -1435,9 +1673,18 @@
 
 	public static String YouReGoingToLostThoseModificationsIfNotAlreadyExportedContinue;
 
+	public static String open;
+
+
 	public static String openingP0etc;
 
 	public static String corpusToProcess;
+
+
+	public static String cutP0;
+
+
+	public static String cutP0AndItsChildren;
 	
 	public static String textsToProcess;
 
@@ -1445,8 +1692,17 @@
 
 	public static String textLanguage;
 
+
+	public static String twoGenerateTheQuery;
+
+
+	public static String txmWontDeleteFilesOutOfTXMWorkingDirectory;
+
 	public static String selectEngine;
 
+
+	public static String selectUsingAListOfValues;
+
 	public static String PropertiesOfTheCompoundFormForStructurePropertiesAndOfTheSimpleFormForWordProperties;
 
 	public static String youAreUsingAnAlphaBetaVersionOfTXMItIsNotRecommendedToUseItForYourWork;
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeLabelProvider.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeLabelProvider.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeLabelProvider.java	(revision 3893)
@@ -69,42 +69,42 @@
 		}
 		else if (f.isFile()) {
 			String fname = f.getName().toLowerCase();
-			if (fname.matches(".*\\.(mp4|avi|mkv|ogv|mpg|webm)")) {
+			if (fname.matches(".*\\.(mp4|avi|mkv|ogv|mpg|webm)")) { //$NON-NLS-1$
 				imageDescriptor = AbstractUIPlugin
 						.imageDescriptorFromPlugin(Application.PLUGIN_ID,
 								IImageKeys.FILE_VIDEO);
 			}
-			else if (fname.endsWith(".txm")) {
+			else if (fname.endsWith(".txm")) { //$NON-NLS-1$
 				imageDescriptor = AbstractUIPlugin
 						.imageDescriptorFromPlugin(Application.PLUGIN_ID,
 								IImageKeys.TXM1616);
 			}
-			else if (fname.matches(".*\\.(mp3|ogg|wav|flac)")) {
+			else if (fname.matches(".*\\.(mp3|ogg|wav|flac)")) { //$NON-NLS-1$
 				imageDescriptor = AbstractUIPlugin
 						.imageDescriptorFromPlugin(Application.PLUGIN_ID,
 								IImageKeys.FILE_AUDIO);
 			}
-			else if (fname.matches(".*\\.(png|jpg|jpeg|bmp|gif|svg)")) {
+			else if (fname.matches(".*\\.(png|jpg|jpeg|bmp|gif|svg)")) { //$NON-NLS-1$
 				imageDescriptor = AbstractUIPlugin
 						.imageDescriptorFromPlugin(Application.PLUGIN_ID,
 								IImageKeys.FILE_IMAGE);
 			}
-			else if (fname.endsWith("Macro.groovy")) {
+			else if (fname.endsWith("Macro.groovy")) { //$NON-NLS-1$
 				imageDescriptor = AbstractUIPlugin
 						.imageDescriptorFromPlugin(Application.PLUGIN_ID,
 								IImageKeys.SCRIPT_RUN);
 			}
-			else if (fname.matches(".*\\.(groovy|R|py|pl|java|rb|sh|bat|js|c|cpp|xml|xsl|css)")) {
+			else if (fname.matches(".*\\.(groovy|R|py|pl|java|rb|sh|bat|js|c|cpp|xml|xsl|css)")) { //$NON-NLS-1$
 				imageDescriptor = AbstractUIPlugin
 						.imageDescriptorFromPlugin(Application.PLUGIN_ID,
 								IImageKeys.SCRIPT);
 			}
-			else if (fname.matches(".*\\.(doc.|od.|pdf|rtf)")) {
+			else if (fname.matches(".*\\.(doc.|od.|pdf|rtf)")) { //$NON-NLS-1$
 				imageDescriptor = AbstractUIPlugin
 						.imageDescriptorFromPlugin(Application.PLUGIN_ID,
 								IImageKeys.FILE_DOC);
 			}
-			else if (fname.endsWith("html")) {
+			else if (fname.endsWith("html")) { //$NON-NLS-1$
 				imageDescriptor = AbstractUIPlugin
 						.imageDescriptorFromPlugin(Application.PLUGIN_ID,
 								IImageKeys.WORLD);
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java	(revision 3893)
@@ -174,7 +174,7 @@
 		parent.setLayout(formLayout);
 		
 		// controles composite
-		GLComposite controls = new GLComposite(parent, SWT.NONE, "buttons");
+		GLComposite controls = new GLComposite(parent, SWT.NONE, "buttons"); //$NON-NLS-1$
 		
 		FormData controlsData = new FormData();
 		controlsData.top = new FormAttachment(0);
@@ -249,7 +249,7 @@
 		Button txmHomeBtn = new Button(controls, SWT.NONE);
 		txmHomeBtn.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
 		txmHomeBtn.setImage(IImageKeys.getImage(IImageKeys.TXM1616));
-		txmHomeBtn.setToolTipText("Go to TXM home directory");
+		txmHomeBtn.setToolTipText(TXMUIMessages.goToTXMHomeDirectory);
 		txmHomeBtn.addSelectionListener(new SelectionAdapter() {
 			
 			@Override
@@ -281,7 +281,7 @@
 				File selectedItem = (File) selection.getFirstElement();
 				String ext = FileUtils.getExtension(selectedItem).toLowerCase();
 				if (!selectedItem.isDirectory()) {
-					if (ext.endsWith("html") || ext.endsWith("bmp") || ext.endsWith("png") || ext.endsWith("jpg") || ext.endsWith("gif")) //$NON-NLS-1$
+					if (ext.endsWith("html") || ext.endsWith("bmp") || ext.endsWith("png") || ext.endsWith("jpg") || ext.endsWith("gif")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 					{
 						OpenBrowser.openfile(selectedItem.getAbsolutePath());
 					}
@@ -292,7 +292,7 @@
 					else if (ext.equals("txm")) //$NON-NLS-1$
 					{
 						MessageBox dialog = new MessageBox(tv.getTree().getShell(), SWT.YES | SWT.NO);
-						dialog.setMessage(NLS.bind("Load the {0} corpus file ?", selectedItem));
+						dialog.setMessage(NLS.bind(TXMUIMessages.loadTheP0CorpusFile, selectedItem));
 						
 						int buttonID = dialog.open();
 						switch (buttonID) {
@@ -311,7 +311,7 @@
 								// does nothing ...
 						}
 					}
-					else if (ext.equals("pdf") || ext.equals("odt") || ext.startsWith("doc")) //$NON-NLS-1$
+					else if (ext.equals("pdf") || ext.equals("odt") || ext.startsWith("doc")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 					{
 						Program.launch(selectedItem.getAbsolutePath());
 					}
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java	(revision 3893)
@@ -228,8 +228,8 @@
 		});
 		
 		all = new Button(controls, SWT.CHECK);
-		all.setText("all");
-		all.setToolTipText("Show all files");
+		all.setText(TXMUIMessages.all);
+		all.setToolTipText(TXMUIMessages.showAllFiles);
 		all.setLayoutData(new GridData());
 		all.addSelectionListener(new SelectionAdapter() {
 			
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 3893)
@@ -376,7 +376,7 @@
 						TXMResult r = ((TXMResult)selectedItem);
 						String mess = null;
 						try {mess = r.getSimpleDetails();}
-						catch(Exception e2) {Log.info("Error while getting result informations: "+e2); Log.printStackTrace(e2);}
+						catch(Exception e2) {Log.info(TXMUIMessages.errorWhileGettingResultInformationsP0+e2); Log.printStackTrace(e2);}
 						
 						if (mess == null) mess = r.getName();
 						StatusLine.setMessage(mess);
@@ -398,7 +398,7 @@
 		for (int i = 0; i < cmds.length; i++) {
 			try {
 				if (cmds[i].getReturnType() != null) { // RCP hack using the command return type to associate the selection class with the command
-					Log.fine("CorporaView.createPartControl(): registering command " + cmds[i].getId() + " for TXMResult of type " + cmds[i].getReturnType().getId() + "."); //$NON-NLS-3$
+					Log.fine("CorporaView.createPartControl(): registering command " + cmds[i].getId() + " for TXMResult of type " + cmds[i].getReturnType().getId() + ".");  //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
 					doubleClickInstalledCommands.put(cmds[i].getReturnType().getId(), cmds[i].getId());
 				}
 			}
@@ -477,7 +477,7 @@
 						
 						if (!DeleteObject.askContinueToDelete((IStructuredSelection) sel)) return;
 						
-						JobHandler job = new JobHandler("Deleting", true) {
+						JobHandler job = new JobHandler(TXMUIMessages.deleting, true) {
 							
 							@Override
 							protected IStatus run(IProgressMonitor monitor) {
@@ -646,7 +646,7 @@
 				view = (CorporaView) page.showView(CorporaView.ID);
 			}
 			if (view == null) {
-				System.out.println("Error Unite view not found: " + CorporaView.ID);
+				System.out.println("Error Unite view not found: " + CorporaView.ID); //$NON-NLS-1$
 			} else {
 				view.getSite().getPage().activate(view);
 			}
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java	(revision 3893)
@@ -195,7 +195,7 @@
 					EditFile.openfile(path);
 					refresh();
 				} catch (IOException e) {
-					Log.severe("Error while exporting queries: "+e.getLocalizedMessage());
+					Log.severe(TXMUIMessages.errorWhileExportingQueriesP0+e.getLocalizedMessage());
 				} catch (Exception e) {
 					// TODO Auto-generated catch block
 					org.txm.utils.logger.Log.printStackTrace(e);
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/wizard/NewCorpusWizard.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/wizard/NewCorpusWizard.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/wizard/NewCorpusWizard.java	(revision 3893)
@@ -12,9 +12,9 @@
 	
 	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		page = new WizardNewProjectCreationPage("Corpus TXM");
-		page.setTitle("Corpus TXM");
-		page.setDescription("select the directory containing the source files");
+		page = new WizardNewProjectCreationPage("Corpus TXM"); //$NON-NLS-1$
+		page.setTitle("Corpus TXM"); //$NON-NLS-1$
+		page.setDescription("select the directory containing the source files"); //$NON-NLS-1$
 		addPage(page);
 	}
 
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/utils/SWTEditorsUtils.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/utils/SWTEditorsUtils.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/utils/SWTEditorsUtils.java	(revision 3893)
@@ -31,6 +31,7 @@
 import org.txm.core.results.TXMResult;
 import org.txm.rcp.editors.ITXMResultEditor;
 import org.txm.rcp.editors.TXMMultiPageEditor;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.utils.logger.Log;
 
 /**
@@ -335,7 +336,7 @@
 		
 		MUIElement parent = parentPart.getParent();
 		if (parent == null) {
-			Log.warning("Cannot addPart "+partToAdd+" into "+parentPart);
+			Log.warning(TXMUIMessages.cannotAddPartP0IntoP1+partToAdd+" into "+parentPart); //$NON-NLS-2$
 			return;
 		}
 		
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java	(revision 3893)
@@ -105,11 +105,11 @@
 				final int contentLength = connection.getContentLength(); 
 
 				if (contentLength == -1) {
-					System.out.println("Could not get file size");
+					System.out.println(TXMUIMessages.couldNotGetFileSize);
 				} else {
 					done = false;
 
-					System.out.print(NLS.bind("Downloading {0} file...", url));
+					System.out.print(NLS.bind(TXMUIMessages.downloadingTheP0File, url));
 					
 //					DownloadJobHandler job = new DownloadJobHandler("Download "+url, outfile, contentLength, done);
 //					job.setUser(true);
@@ -126,7 +126,7 @@
 					writeFile.close();
 					input.close();
 					done = true;
-					System.out.println("Done.");
+					System.out.println(TXMUIMessages.done);
 //					job.done();
 				}
 			}
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java	(revision 3893)
@@ -111,7 +111,7 @@
 		}
 		else {
 			Log.warning(
-					"** Error: TXM language configuration could not be set. You can set TXM language by editing HOME/TXM-<version>/.txm/TXM.ini) configuration file by adding '-nl\n<language code>' before the '-vmargs' line.");
+					"** Error: TXM language configuration could not be set. You can set TXM language by editing HOME/TXM-<version>/.txm/TXM.ini) configuration file by adding '-nl\n<language code>' before the '-vmargs' line."); //$NON-NLS-1$
 		}
 		
 		return null;
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/PrintHexacode.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/PrintHexacode.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/PrintHexacode.java	(revision 3893)
@@ -72,7 +72,7 @@
 		try {
 			ISelection isel = te.getTextViewer().getSelection();
 			if (isel.isEmpty()) {
-				Log.info("no charracters selected.");
+				Log.info(TXMUIMessages.noCharactersSelected);
 				return;
 			}
 			
@@ -80,7 +80,7 @@
 				TextSelection tsel = (TextSelection)isel;
 				String text = tsel.getText();
 				if (text.length() == 0) {
-					Log.info("no charracters selected.");
+					Log.info(TXMUIMessages.noCharactersSelected);
 					return;
 				}
 				
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanEditors.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanEditors.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanEditors.java	(revision 3893)
@@ -4,6 +4,7 @@
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
+import org.txm.rcp.messages.TXMUIMessages;
 
 public class CleanEditors extends AbstractHandler {
 
@@ -12,7 +13,7 @@
 	 */
 	@Override
 	public Object execute(ExecutionEvent event) {
-		if (MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Reset the window", "This will will close all editors all non saved changes will be lost. Continue?" )) {
+		if (MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), TXMUIMessages.resetTheEditors, TXMUIMessages.thisWillCloseAllEditors )) {
 			CleanPerspective.reset(event, false, true);
 		}
 		return null;
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/UpdateCorpus.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/UpdateCorpus.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/UpdateCorpus.java	(revision 3893)
@@ -146,7 +146,7 @@
 				try {
 					if (project.compute(monitor, true)) { // TODO children should be recomputed later only when the user needs it
 						
-						project.appendToHistory("Updated");
+						project.appendToHistory(TXMUIMessages.updated);
 						
 						this.syncExec(new Runnable() {
 							
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java	(revision 3893)
@@ -361,10 +361,10 @@
 			// engine.stop();
 			// }
 
-			if (sourceName.matches(".+/TXM-.\\..\\../corpora")) {
-				sourceName = "TXM"+sourceName.substring(sourceName.length()-14, sourceName.length()-8);
+			if (sourceName.matches(".+/TXM-.\\..\\../corpora")) { //$NON-NLS-1$
+				sourceName = "TXM"+sourceName.substring(sourceName.length()-14, sourceName.length()-8); //$NON-NLS-1$
 			}
-			monitor.beginTask(TXMUIMessages.loadingBinaryCorpus +" "+sourceName+" ("+corporaFiles.size()+").", corporaFiles.size());
+			monitor.beginTask(TXMUIMessages.loadingBinaryCorpus +" "+sourceName+" ("+corporaFiles.size()+").", corporaFiles.size()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			// job.acquireSemaphore();
 			// Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
 			// job.releaseSemaphore();
@@ -373,7 +373,7 @@
 			int n = 0;
 			for (File corpusDirectory : corporaFiles) {
 				n++;
-				monitor.subTask(TXMUIMessages.loadingTheCorpusInThePlatform+": \n"+corpusDirectory.getName()+" ("+n+"/"+corporaFiles.size()+").");
+				monitor.subTask(TXMUIMessages.loadingTheCorpusInThePlatform+": \n"+corpusDirectory.getName()+" ("+n+"/"+corporaFiles.size()+")."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				monitor.worked(1);
 				try {
 					if (corpusDirectory.isHidden()) {
@@ -391,7 +391,7 @@
 						if (Workspace.isCorpusBinarydirectoryValid(corpusDirectory)) {
 							project = LoadBinaryCorpus.loadBinaryCorpusAsDirectory(corpusDirectory, monitor, replace);
 						} else {
-							Log.fine("Skip recovering of corpus: "+corpusDirectory);
+							Log.fine("Skip recovering of corpus: "+corpusDirectory); //$NON-NLS-1$
 						}
 					}
 					else {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/QuitHandler.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/QuitHandler.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/QuitHandler.java	(revision 3893)
@@ -4,6 +4,7 @@
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.swt.widgets.Display;
+import org.txm.rcp.messages.TXMUIMessages;
 
 import jline.internal.Log;
 
@@ -18,7 +19,7 @@
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		
-		Log.info("Quit TXM...");
+		Log.info(TXMUIMessages.quitTXM);
 				
 		Display.getCurrent().getActiveShell().close();
 		
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java	(revision 3893)
@@ -66,16 +66,16 @@
 				// creation time, last access, lastModofiedTime
 				// getOwner getGroup
 				try {
-					Map<String, Object> attrs = Files.readAttributes(f.toPath(), "*");
+					Map<String, Object> attrs = Files.readAttributes(f.toPath(), "*"); //$NON-NLS-1$
 					
-					if (attrs.get("posix:owner") != null) {
-						System.out.println(" owner: "+attrs.get("posix:owner"));
-						System.out.println(" ggroup: "+attrs.get("posix:group"));
+					if (attrs.get("posix:owner") != null) { //$NON-NLS-1$
+						System.out.println(" owner: "+attrs.get("posix:owner")); //$NON-NLS-1$ //$NON-NLS-2$
+						System.out.println(" ggroup: "+attrs.get("posix:group")); //$NON-NLS-1$ //$NON-NLS-2$
 					}
 					
-					System.out.println(" last access time: "+attrs.get("lastAccessTime"));
-					System.out.println(" last modified time: "+attrs.get("lastModifiedTime"));
-					System.out.println(" creation time: "+attrs.get("creationTime"));
+					System.out.println(" last access time: "+attrs.get("lastAccessTime")); //$NON-NLS-1$ //$NON-NLS-2$
+					System.out.println(" last modified time: "+attrs.get("lastModifiedTime")); //$NON-NLS-1$ //$NON-NLS-2$
+					System.out.println(" creation time: "+attrs.get("creationTime")); //$NON-NLS-1$ //$NON-NLS-2$
 					
 //					
 //					for (String attr : attrs.keySet()) {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/RecoverCorporaFromInstalls.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/RecoverCorporaFromInstalls.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/RecoverCorporaFromInstalls.java	(revision 3893)
@@ -39,7 +39,7 @@
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
-		JobHandler job = new JobHandler("Recovering corpora") {
+		JobHandler job = new JobHandler(TXMUIMessages.recoveringCorpora) {
 
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java	(revision 3893)
@@ -15,6 +15,7 @@
 import org.eclipse.ui.internal.Workbench;
 import org.eclipse.ui.internal.registry.PerspectiveDescriptor;
 import org.eclipse.ui.internal.registry.PerspectiveRegistry;
+import org.txm.rcp.messages.TXMUIMessages;
 
 public class CleanPerspective extends AbstractHandler {
 
@@ -23,7 +24,7 @@
 	 */
 	@Override
 	public Object execute(ExecutionEvent event) {
-		if (MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Reset perspective", "This will will restore the views and close the additional views of the current perspective. Continue?" )) {
+		if (MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), TXMUIMessages.resetPerspective, TXMUIMessages.thisWillRestoreTheViewAndCloseEditors )) {
 			reset(event, true, false);
 		}
 		return null;
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java	(revision 3893)
@@ -70,9 +70,9 @@
 		// Auto save each result after computing and auto load them at startup
 		this.addField(new BooleanFieldEditor(TBXPreferences.AUTO_PERSISTENCE_ENABLED, TXMUIMessages.enableAutomaticSaveOfAllResultsPersistence, BooleanFieldEditor.SEPARATE_LABEL, this.getFieldEditorParent()));
 		
-		this.addField(new IntegerFieldEditor(RCPPreferences.MAX_NUMBER_OF_COLUMNS, "The maximum number of columns shown in tables", this.getFieldEditorParent()));
+		this.addField(new IntegerFieldEditor(RCPPreferences.MAX_NUMBER_OF_COLUMNS, TXMUIMessages.theMaximumNumberOfColumnShownInTables, this.getFieldEditorParent()));
 		
-		this.addField(new IntegerFieldEditor(TBXPreferences.QUERY_HISTORY_SIZE, "The maximum number of query stored in the query history", this.getFieldEditorParent()));
+		this.addField(new IntegerFieldEditor(TBXPreferences.QUERY_HISTORY_SIZE, TXMUIMessages.theMaximumNumberOfQueryStoredInTheQueryHistory, this.getFieldEditorParent()));
 	}
 	
 	@Override
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DebugPreferencePage.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DebugPreferencePage.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DebugPreferencePage.java	(revision 3893)
@@ -26,9 +26,9 @@
 		addField(new StringFieldEditor(TBXPreferences.UPDATESITE, TXMUIMessages.UpdateSiteAddress, getFieldEditorParent()));
 		
 		// enable some Eclipse features deactivated for TXM
-		addField(new BooleanFieldEditor(TBXPreferences.EXPERT_USER, "Expert mode", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(TBXPreferences.EXPERT_USER, TXMUIMessages.expertMode, getFieldEditorParent()));
 		
-		addField(new BooleanFieldEditor(RCPPreferences.DISABLE_TEST_WARNING, "Disable the warning dialog when testing TXM", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(RCPPreferences.DISABLE_TEST_WARNING, TXMUIMessages.disableTheWarningDialogWhenTestingTXM, getFieldEditorParent()));
 	}
 	
 	
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/IImageKeys.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/IImageKeys.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/IImageKeys.java	(revision 3893)
@@ -33,6 +33,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.FrameworkUtil;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.utils.logger.Log;
 
 /**
@@ -331,7 +332,7 @@
 		if (!images.containsKey(imagekey)) {
 			ImageDescriptor imgg = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, imagekey);
 			if (imgg == null) {
-				Log.severe("Warning: image not found in '" + pluginId + "' -> '" + imagekey + "'");
+				Log.severe(TXMUIMessages.warningImageNotFoundAtP0 + pluginId + "' -> '" + imagekey + "'"); //$NON-NLS-2$ //$NON-NLS-3$
 				return getImage("icons/null.png"); //$NON-NLS-1$
 			}
 			
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/CommandsSection.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/CommandsSection.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/CommandsSection.java	(revision 3893)
@@ -62,8 +62,8 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 		
-		Label sep = toolkit.createLabel(sectionClient, "Concordances");
-		sep.setToolTipText("Concordance sub-section");
+		Label sep = toolkit.createLabel(sectionClient, TXMUIMessages.concordances);
+		sep.setToolTipText(TXMUIMessages.concordancesSubSection);
 		sep.setLayoutData(getSectionGridData(2));
 		sep.setFont(FontDescriptor.createFrom(sep.getFont()).setStyle(SWT.BOLD).createFont(sep.getDisplay()));
 		
@@ -76,11 +76,11 @@
 		TableWrapData gdata = getTextGridData();
 		structLimitsText.setLayoutData(gdata);
 		
-		Label tmp2Label = toolkit.createLabel(sectionClient, "Default References"); 
-		tmp2Label.setToolTipText("The default references displayed in the References column.");
+		Label tmp2Label = toolkit.createLabel(sectionClient, TXMUIMessages.defaultReferences); 
+		tmp2Label.setToolTipText(TXMUIMessages.theDefaultReferencesDisplayedInTheEtc);
 		tmp2Label.setLayoutData(getSectionGridData(2));
 		
-		Label tmp3Label = toolkit.createLabel(sectionClient, "	Pattern"); 
+		Label tmp3Label = toolkit.createLabel(sectionClient, TXMUIMessages.TabPattern); 
 		tmp3Label.setToolTipText(TXMUIMessages.YouNeedToSetAsManyPercentSPrintfMarksAsSelectedProperties);
 		tmp3Label.setLayoutData(getLabelGridData());
 		
@@ -107,19 +107,19 @@
 			structLimitsText.setText(concPrefs.get("context_limits")); //$NON-NLS-1$
 		}
 		else {
-			structLimitsText.setText("text"); // TODO use the concordance preferences instead of hardcoding 'text'
+			structLimitsText.setText("text"); // TODO use the concordance preferences instead of hardcoding 'text' //$NON-NLS-1$
 		}
 		
 		if (concPrefs.get("view_reference_pattern") != null) { //$NON-NLS-1$
 			String gsonString = concPrefs.get("view_reference_pattern"); //$NON-NLS-1$
 			if (ReferencePattern.isGsonString(gsonString)) {
 				referencePatternText.setText(ReferencePattern.fromGSonToPattern(gsonString));
-				referencePatternProperties.setText(StringUtils.join(ReferencePattern.fromGSonToPropertyNames(gsonString), ","));
-			} else if(gsonString.contains("{0}")) {
-				System.out.println("WARNING: experimental reference pattern format found: "+gsonString);
+				referencePatternProperties.setText(StringUtils.join(ReferencePattern.fromGSonToPropertyNames(gsonString), ",")); //$NON-NLS-1$
+			} else if(gsonString.contains("{0}")) { //$NON-NLS-1$
+				System.out.println("WARNING: experimental reference pattern format found: "+gsonString); //$NON-NLS-1$
 			} else {
-				referencePatternText.setText("");
-				referencePatternProperties.setText(StringUtils.join(gsonString.split("\t"), ","));
+				referencePatternText.setText(""); //$NON-NLS-1$
+				referencePatternProperties.setText(StringUtils.join(gsonString.split("\t"), ",")); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 		else {
@@ -137,8 +137,8 @@
 	public boolean saveFields(Project project) {
 		if (this.section != null && !section.isDisposed()) {
 			CorpusCommandPreferences concPrefs = project.getCommandPreferences("concordance"); //$NON-NLS-1$
-			concPrefs.set("context_limits_type", "list"); //$NON-NLS-1$ $NON-NLS-2$
-			concPrefs.set("context_limits", structLimitsText.getText());
+			concPrefs.set("context_limits_type", "list"); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
+			concPrefs.set("context_limits", structLimitsText.getText()); //$NON-NLS-1$
 			
 			concPrefs.set("view_reference_pattern", //$NON-NLS-1$
 					ReferencePattern.referenceToString(
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java	(revision 3893)
@@ -137,8 +137,8 @@
 		
 		if (importName.startsWith("xtz")) { //$NON-NLS-1$
 			
-			Label tmpLabel4 = toolkit.createLabel(sectionClient, "Unmanaged elements policy");
-			tmpLabel4.setToolTipText("ignore: the elements are not written ;  convert to span: rename the element to 'span' and set the class attribute");
+			Label tmpLabel4 = toolkit.createLabel(sectionClient, TXMUIMessages.unmanagedElementPolicy);
+			tmpLabel4.setToolTipText(TXMUIMessages.ignoreTheElementsAreNotWrittenEtc);
 			TableWrapData gdata4 = getLabelGridData();
 			gdata4.indent = 40;
 			tmpLabel4.setLayoutData(gdata4);
@@ -147,8 +147,8 @@
 			gdata4 = getTextGridData();
 			gdata4.colspan = 3; // one line
 			unmanagedElementsPolicyCombo.setLayoutData(gdata4);
-			unmanagedElementsPolicyCombo.setItems("ignore", "rename to span");
-			unmanagedElementsPolicyCombo.setToolTipText("ignore: the elements are not written ; convert to span: rename the element to 'span' and set the class attribute");
+			unmanagedElementsPolicyCombo.setItems("ignore", "rename to span"); //$NON-NLS-1$ //$NON-NLS-2$
+			unmanagedElementsPolicyCombo.setToolTipText(TXMUIMessages.ignoreTheElementsAreNotWrittenEtc);
 			
 			Label tmpLabel3 = toolkit.createLabel(sectionClient, TXMUIMessages.NoteElements);
 			tmpLabel3.setToolTipText(TXMUIMessages.NoteElementsThatEncodePonctualNotes);
@@ -225,8 +225,8 @@
 			gdata.colspan = 2;
 			defaultEditions.setLayoutData(gdata);
 			
-			tmpLabel = toolkit.createLabel(sectionClient, "Tooltip properties");
-			tmpLabel.setToolTipText("comma separated list (comma*=all)");
+			tmpLabel = toolkit.createLabel(sectionClient, TXMUIMessages.tooltipProperties);
+			tmpLabel.setToolTipText(TXMUIMessages.commaSeparatedList);
 			gdata = getLabelGridData();
 			gdata.indent = 20;
 			tmpLabel.setLayoutData(gdata);
@@ -325,11 +325,11 @@
 			wordsPerPageText.setText("" + wppt); //$NON-NLS-1$
 			
 			if (noteElementsText != null) {
-				noteElementsText.setText(project.getTextualPlan("Note", "note")); //$NON-NLS-1$
+				noteElementsText.setText(project.getTextualPlan("Note", "note")); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			
 			if (unmanagedElementsPolicyCombo != null) {
-				unmanagedElementsPolicyCombo.setText(project.getTextualPlan("UnmanagedElementsPolicy", "rename to span")); //$NON-NLS-1$
+				unmanagedElementsPolicyCombo.setText(project.getTextualPlan("UnmanagedElementsPolicy", "rename to span")); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			
 			String pbt = edition_params.getPageElement();
@@ -339,7 +339,7 @@
 		}
 		
 		if (defaultEditionTooltipPropertiesText != null) {
-			defaultEditionTooltipPropertiesText.setText(project.getEditionDefinition("default").get(TBXPreferences.EDITION_DEFINITION_TOOLTIP_PROPERTIES, "*").replace(" ", ""));
+			defaultEditionTooltipPropertiesText.setText(project.getEditionDefinition("default").get(TBXPreferences.EDITION_DEFINITION_TOOLTIP_PROPERTIES, "*").replace(" ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		}
 		
 		EditionDefinition edition_params = project.getEditionDefinition("facs"); //$NON-NLS-1$
@@ -392,11 +392,11 @@
 			}
 			
 			if (unmanagedElementsPolicyCombo != null) {
-				project.setTextualPlan("UnmanagedElementsPolicy", unmanagedElementsPolicyCombo.getText());
+				project.setTextualPlan("UnmanagedElementsPolicy", unmanagedElementsPolicyCombo.getText()); //$NON-NLS-1$
 			}
 			
 			if (defaultEditionTooltipPropertiesText != null) {
-				project.getEditionDefinition("default").set(TBXPreferences.EDITION_DEFINITION_TOOLTIP_PROPERTIES, defaultEditionTooltipPropertiesText.getText().replace(" ", ""));
+				project.getEditionDefinition("default").set(TBXPreferences.EDITION_DEFINITION_TOOLTIP_PROPERTIES, defaultEditionTooltipPropertiesText.getText().replace(" ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 			
 			if (buildFacsEditionCheckButton != null) {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java	(revision 3893)
@@ -813,27 +813,27 @@
 			ImageHyperlink openImportLink = toolkit.createImageHyperlink(hyperlinks, SWT.NULL);
 			openImportLink.setLayoutData(new TableWrapData(TableWrapData.FILL, TableWrapData.MIDDLE));
 			openImportLink.setImage(IImageKeys.getImage(IImageKeys.FOLDER));
-			openImportLink.setToolTipText("Select the import source directory");
+			openImportLink.setToolTipText(TXMUIMessages.selectTheImportSourceDirectory);
 			openImportLink.addHyperlinkListener(selectDirHListener);
 		}
 
 		ImageHyperlink saveImportLink = toolkit.createImageHyperlink(hyperlinks, SWT.NULL);
 		saveImportLink.setLayoutData(new TableWrapData(TableWrapData.FILL, TableWrapData.MIDDLE));
 		saveImportLink.setImage(IImageKeys.getImage(IImageKeys.SAVE));
-		saveImportLink.setToolTipText("Save parameters");
+		saveImportLink.setToolTipText(TXMUIMessages.saveParameters);
 		saveImportLink.addHyperlinkListener(saveHListener);
 
 		ImageHyperlink startImportLink = toolkit.createImageHyperlink(hyperlinks, SWT.NULL);
 		startImportLink.setLayoutData(new TableWrapData(TableWrapData.FILL, TableWrapData.MIDDLE));
 		startImportLink.setImage(IImageKeys.getImage(IImageKeys.START));
-		startImportLink.setToolTipText("Start import");
+		startImportLink.setToolTipText(TXMUIMessages.startToImport);
 		startImportLink.addHyperlinkListener(startImportListener);
 
 		if (RCPPreferences.getInstance().getBoolean(RCPPreferences.EXPERT_USER)) {
 			ImageHyperlink scriptImportLink = toolkit.createImageHyperlink(hyperlinks, SWT.NULL);
 			scriptImportLink.setLayoutData(new TableWrapData(TableWrapData.FILL, TableWrapData.MIDDLE));
 			scriptImportLink.setImage(IImageKeys.getImage(IImageKeys.SCRIPT));
-			scriptImportLink.setToolTipText("Show module scripts");
+			scriptImportLink.setToolTipText(TXMUIMessages.showTheModuleScripts);
 			scriptImportLink.addHyperlinkListener(editImporScriptstListener);
 		}
 		int n = 1;
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowserEditor.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowserEditor.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowserEditor.java	(revision 3893)
@@ -147,11 +147,11 @@
 	//	b.evaluate("alert(document);");
 	//	b.evaluate("alert(document.children[0].style);");
 //		b.evaluate("alert(document.children[0].children[1]);");
-		boolean isHTML = (boolean) b.evaluate("return document.getElementsByTagName('body')[0] != null;");
+		boolean isHTML = (boolean) b.evaluate("return document.getElementsByTagName('body')[0] != null;"); //$NON-NLS-1$
 		if (isHTML) {
-			String zoom = (String) b.evaluate("return document.getElementsByTagName('body')[0].style.zoom;");
+			String zoom = (String) b.evaluate("return document.getElementsByTagName('body')[0].style.zoom;"); //$NON-NLS-1$
 			if (zoom == null || zoom.isEmpty()) {
-				zoom = "1.0";
+				zoom = "1.0"; //$NON-NLS-1$
 			}
 			
 			float fzoom = Float.parseFloat(zoom) + diff;
@@ -159,11 +159,11 @@
 				fzoom = 1.0f;
 			}
 			
-			b.evaluate("document.getElementsByTagName('body')[0].style.zoom = \""+fzoom+"\";");
+			b.evaluate("document.getElementsByTagName('body')[0].style.zoom = \""+fzoom+"\";"); //$NON-NLS-1$ //$NON-NLS-2$
 		} else {
-			String zoom = (String) b.evaluate("return document.children[0].style.zoom;");
+			String zoom = (String) b.evaluate("return document.children[0].style.zoom;"); //$NON-NLS-1$
 			if (zoom == null || zoom.isEmpty()) {
-				zoom = "1.0";
+				zoom = "1.0"; //$NON-NLS-1$
 			}
 			
 			float fzoom = Float.parseFloat(zoom) + diff;
@@ -171,7 +171,7 @@
 				fzoom = 1.0f;
 			}
 			
-			b.evaluate("document.children[0].style.zoom = \""+fzoom+"\";");
+			b.evaluate("document.children[0].style.zoom = \""+fzoom+"\";"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 	
@@ -211,7 +211,7 @@
 				copyItem.setEnabled(text != null && text.length() > 0);
 				
 				MenuItem zoomInItem = new MenuItem(menu, SWT.NONE);
-				zoomInItem.setText("Zoom avant");
+				zoomInItem.setText(TXMUIMessages.zoomIn);
 				zoomInItem.addSelectionListener(new SelectionListener() {
 					
 					@Override
@@ -224,7 +224,7 @@
 				});
 				
 				MenuItem zoomOutItem = new MenuItem(menu, SWT.NONE);
-				zoomOutItem.setText("Zoom arrière");
+				zoomOutItem.setText(TXMUIMessages.zoomOut);
 				zoomOutItem.addSelectionListener(new SelectionListener() {
 					
 					@Override
@@ -238,7 +238,7 @@
 				});
 				
 				MenuItem zoomResetItem = new MenuItem(menu, SWT.NONE);
-				zoomResetItem.setText("Zoom initial");
+				zoomResetItem.setText(TXMUIMessages.initialZoom);
 				zoomResetItem.addSelectionListener(new SelectionListener() {
 					
 					@Override
@@ -524,7 +524,7 @@
 		
 
 		MenuItem zoomInItem = new MenuItem(menu, SWT.NONE);
-		zoomInItem.setText("Zoom avant");
+		zoomInItem.setText(TXMUIMessages.zoomIn);
 		zoomInItem.addSelectionListener(new SelectionListener() {
 			
 			@Override
@@ -537,7 +537,7 @@
 		});
 		
 		MenuItem zoomOutItem = new MenuItem(menu, SWT.NONE);
-		zoomOutItem.setText("Zoom arrière");
+		zoomOutItem.setText(TXMUIMessages.zoomOut);
 		zoomOutItem.addSelectionListener(new SelectionListener() {
 			
 			@Override
@@ -551,7 +551,7 @@
 		});
 		
 		MenuItem zoomResetItem = new MenuItem(menu, SWT.NONE);
-		zoomResetItem.setText("Zoom initial");
+		zoomResetItem.setText(TXMUIMessages.initialZoom);
 		zoomResetItem.addSelectionListener(new SelectionListener() {
 			
 			@Override
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java	(revision 3893)
@@ -132,7 +132,7 @@
 		}
 		
 		Label firstStep = new Label(this, SWT.NONE);
-		firstStep.setText("1- Configure");
+		firstStep.setText(TXMUIMessages.oneConfigure);
 		firstStep = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
 		firstStep.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
 		
@@ -161,7 +161,7 @@
 		// affichage requete
 		
 		Label secondStep = new Label(this, SWT.NONE);
-		secondStep.setText("2- Generate query");
+		secondStep.setText(TXMUIMessages.twoGenerateTheQuery);
 		secondStep = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
 		secondStep.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
 		
@@ -172,7 +172,7 @@
 		queryField.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 		
 		Button refreshBtn = new Button(this, SWT.PUSH);
-		refreshBtn.setText("Refresh the query");
+		refreshBtn.setText(TXMUIMessages.refreshTheQuery);
 		refreshBtn.addSelectionListener(new SelectionListener() {
 			
 			@Override
@@ -217,11 +217,11 @@
 		LinkedHashSet<String> parts = new LinkedHashSet<>(); // to avoid duplicates 
 		for (QueryItem item : queryItems) {
 			
-			String query = "";
+			String query = ""; //$NON-NLS-1$
 			
 			String prop = item.selectedSup.getFullName();
 			IStructuredSelection sel = item.valueCombo.getStructuredSelection();
-			String value = StringUtils.join(sel.toList(), "|");
+			String value = StringUtils.join(sel.toList(), "|"); //$NON-NLS-1$
 			
 			int test = item.testCombo.getSelectionIndex();
 			
@@ -237,11 +237,11 @@
 			parts.add(query);
 		}
 		
-		String sep = " | ";
+		String sep = " | "; //$NON-NLS-1$
 		if (andBtn.getSelection())
 			sep = " & "; //$NON-NLS-1$
 		
-		return "["+ StringUtils.join(parts, sep)+"]+ expand to "+queryItems.get(queryItems.size() - 1).structCombo.getText();
+		return "["+ StringUtils.join(parts, sep)+"]+ expand to "+queryItems.get(queryItems.size() - 1).structCombo.getText(); //$NON-NLS-1$ //$NON-NLS-2$
 		
 	}
 	
@@ -259,22 +259,22 @@
 		
 		for (QueryItem queryItem : queryItems) {
 			
-			String testString = "=";
+			String testString = "="; //$NON-NLS-1$
 			int test = queryItem.testCombo.getSelectionIndex();
 			if (test == 0) // is
-				testString = "=";
+				testString = "="; //$NON-NLS-1$
 			else if (test == 1) // is not
-				testString = "!=";
+				testString = "!="; //$NON-NLS-1$
 			else if (test == 2) // contains
-				testString = " contains ";
+				testString = " contains "; //$NON-NLS-1$
 			else // does not contain
-				testString = " does not contains";
+				testString = " does not contains"; //$NON-NLS-1$
 			
 			String generated = queryItem.selectedSup.asFullNameString() + testString + queryItem.valueCombo.getList().getSelection()[0];
 			parts.add(generated);
 		}
 		
-		String sep = " | ";
+		String sep = " | "; //$NON-NLS-1$
 		if (andBtn.getSelection())
 			sep = " & "; //$NON-NLS-1$
 		
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/SuperListViewer.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/SuperListViewer.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/SuperListViewer.java	(revision 3893)
@@ -22,19 +22,20 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.List;
 import org.txm.rcp.IImageKeys;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.swt.GLComposite;
 
 public class SuperListViewer extends GLComposite {
 	
 	ListViewer valueCombo;
 	Button selectByListButton;
-	String lastValuesSelected = "";
+	String lastValuesSelected = ""; //$NON-NLS-1$
 	Button selectByRegex;
-	String lastRegexSelected = "";
+	String lastRegexSelected = ""; //$NON-NLS-1$
 	
 	public SuperListViewer(Composite parent, int listStyle) {
 		
-		super(parent, SWT.NONE, "SuperListViewer");
+		super(parent, SWT.NONE, "SuperListViewer"); //$NON-NLS-1$
 		
 		this.getLayout().numColumns = 2;
 		this.getLayout().verticalSpacing = 1;
@@ -57,8 +58,8 @@
 		});
 		
 		selectByListButton = new Button(this, SWT.PUSH);
-		selectByListButton.setToolTipText("Select values using a list of values");
-		selectByListButton.setImage(IImageKeys.getImage("icons/functions/data.png"));
+		selectByListButton.setToolTipText(TXMUIMessages.selectUsingAListOfValues);
+		selectByListButton.setImage(IImageKeys.getImage("icons/functions/data.png")); //$NON-NLS-1$
 		selectByListButton.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
 		selectByListButton.addSelectionListener(new SelectionListener() {
 			
@@ -67,7 +68,7 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				
-				InputDialog dialog = new InputDialog(e.display.getActiveShell(), "Select values using a list of values", "List of values to select", lastValuesSelected, null);
+				InputDialog dialog = new InputDialog(e.display.getActiveShell(), TXMUIMessages.selectUsingAListOfValues, TXMUIMessages.listOfValuesToSelect, lastValuesSelected, null);
 				
 				if (dialog.open() == InputDialog.OK) {
 					String str = dialog.getValue();
@@ -82,7 +83,7 @@
 		});
 
 		selectByRegex = new Button(this, SWT.PUSH);
-		selectByRegex.setToolTipText("Select values using a regular expression");
+		selectByRegex.setToolTipText(TXMUIMessages.selectValuesUsingARegularExpression);
 		selectByRegex.setImage(IImageKeys.getImage(IImageKeys.ACTION_SEARCH));
 		selectByRegex.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 		selectByRegex.addSelectionListener(new SelectionListener() {
@@ -90,7 +91,7 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				
-				InputDialog dialog = new InputDialog(e.display.getActiveShell(), "Select values by regular expression", "Regular expression to use", lastRegexSelected, null);
+				InputDialog dialog = new InputDialog(e.display.getActiveShell(), TXMUIMessages.selectValuesUsingARegularExpression, TXMUIMessages.regularExpressionToUse, lastRegexSelected, null);
 				if (dialog.open() == InputDialog.OK) {
 					String str = dialog.getValue();
 					str = str.trim();
@@ -106,7 +107,7 @@
 		});
 		
 		Button allButton = new Button(this, SWT.PUSH);
-		allButton.setToolTipText("Select all");
+		allButton.setToolTipText(TXMUIMessages.selectAll);
 		allButton.setImage(IImageKeys.getImage(IImageKeys.CHECKEDALL));
 		allButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 		allButton.addSelectionListener(new SelectionListener() {
@@ -122,7 +123,7 @@
 		});
 		
 		Button clearButton = new Button(this, SWT.PUSH);
-		clearButton.setToolTipText("De-select all");
+		clearButton.setToolTipText(TXMUIMessages.deselectAll);
 		clearButton.setImage(IImageKeys.getImage(IImageKeys.UNCHECKEDALL));
 		clearButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 		clearButton.addSelectionListener(new SelectionListener() {
@@ -167,7 +168,7 @@
 		if (str == null) return;
 		if (str.length() == 0) return;
 		
-		selectByStringValues(str.split("[\t\n|]"));
+		selectByStringValues(str.split("[\t\n|]")); //$NON-NLS-1$
 	}
 	
 	public void selectByStringValues(String[] values) {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/QueryWidget.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/QueryWidget.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/QueryWidget.java	(revision 3893)
@@ -70,7 +70,7 @@
 		super(parent, style);
 		this.se = se;
 		if (se == null) {
-			System.out.println("WARNING");
+			System.out.println("WARNING"); //$NON-NLS-1$
 		}
 		this.project = project;
 
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/DynamicTableViewer.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/DynamicTableViewer.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/DynamicTableViewer.java	(revision 3893)
@@ -62,11 +62,11 @@
 				
 				viewer.setContentProvider(new ArrayContentProvider());
 				ArrayList<List<String>> data = new ArrayList<List<String>>();
-				data.add(Arrays.asList("1111111111111111111 111111111111 1 1 11111111111111 11111111111", "2", "3"));
-				data.add(Arrays.asList("11111111111 1111111111  1111 1 1 1 1 111111111111  1 1 1 1 1 1 1 11 1 1 1 ", "2", "3"));
-				data.add(Arrays.asList("1", "2", "3"));
+				data.add(Arrays.asList("1111111111111111111 111111111111 1 1 11111111111111 11111111111", "2", "3")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				data.add(Arrays.asList("11111111111 1111111111  1111 1 1 1 1 111111111111  1 1 1 1 1 1 1 11 1 1 1 ", "2", "3")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				data.add(Arrays.asList("1", "2", "3")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 								
-				TableViewerColumn col = viewer.addColumn("first");
+				TableViewerColumn col = viewer.addColumn("first"); //$NON-NLS-1$
 				col.setLabelProvider(new ColumnLabelProvider() {
 				      @Override
 				      public String getText(Object element) {
@@ -75,7 +75,7 @@
 				      }
 				    });
 							
-				col = viewer.addColumn("second");
+				col = viewer.addColumn("second"); //$NON-NLS-1$
 				col.setLabelProvider(new ColumnLabelProvider() {
 				      @Override
 				      public String getText(Object element) {
@@ -84,7 +84,7 @@
 				      }
 				    });
 				
-				col = viewer.addColumn("third");
+				col = viewer.addColumn("third"); //$NON-NLS-1$
 				col.setLabelProvider(new ColumnLabelProvider() {
 				      @Override
 				      public String getText(Object element) {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java	(revision 3893)
@@ -137,7 +137,7 @@
 			List<StructuralUnit> sus = corpus.getOrderedStructuralUnits();
 			Collections.sort(sus);
 			for (StructuralUnit su : sus) {
-				if (su.getName().equals("txmcorpus")) continue;
+				if (su.getName().equals("txmcorpus")) continue; //$NON-NLS-1$
 				structCombo.add(su.getName());
 			}
 			getStructure();
@@ -285,7 +285,7 @@
 		List<StructuralUnitProperty> sups = su.getOrderedProperties();
 		Collections.sort(sups);
 		for (StructuralUnitProperty sup : sups) {
-			if (su.getName().equals("text") && (sup.getName().equals("base") || sup.getName().equals("project"))) continue;
+			if (su.getName().equals("text") && (sup.getName().equals("base") || sup.getName().equals("project"))) continue; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			
 			propCombo.add(sup.getName());
 		}
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/___TXMDirectoryFieldEditor.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/___TXMDirectoryFieldEditor.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/___TXMDirectoryFieldEditor.java	(revision 3893)
@@ -12,6 +12,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.utils.logger.Log;
 
 // FIXME: not used
@@ -35,7 +36,7 @@
 		changeButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 		
 		openModelDirectoryButton = new Button(parent, SWT.PUSH);
-		openModelDirectoryButton.setText("Open...");
+		openModelDirectoryButton.setText(TXMUIMessages.open);
 		openModelDirectoryButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 		openModelDirectoryButton.addSelectionListener(new SelectionListener() {
 			@Override
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog2.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog2.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog2.java	(revision 3893)
@@ -139,7 +139,7 @@
 		// }
 		// });
 		
-		Button button = createButton(parent, IDialogConstants.BACK_ID, "Reset values", false);
+		Button button = createButton(parent, IDialogConstants.BACK_ID, TXMUIMessages.resetValues, false);
 		button.removeListener(SWT.Selection, button.getListeners(SWT.Selection)[0]);
 		
 		button.addSelectionListener(new SelectionAdapter() {
@@ -168,7 +168,7 @@
 		GridLayout layout = new GridLayout(1, true);
 		composite.setLayout(layout);
 		
-		columns = new ParametersGLComposite(composite, SWT.NONE, "parameters", this.manager);
+		columns = new ParametersGLComposite(composite, SWT.NONE, "parameters", this.manager); //$NON-NLS-1$
 		
 		new Label(composite, SWT.NONE).setText(TXMUIMessages.mandatoryFields);
 		
@@ -183,7 +183,7 @@
 	protected void okPressed() {
 		ArrayList<String> missing = columns.getNonSetFields();
 		if (missing.size() > 0) {
-			System.out.println(TXMUIMessages.errorColonMissingValueColon + StringUtils.join(missing, ", "));
+			System.out.println(TXMUIMessages.errorColonMissingValueColon + StringUtils.join(missing, ", ")); //$NON-NLS-1$
 			return; // abort
 		}
 		
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/DateField.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/DateField.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/DateField.java	(revision 3893)
@@ -53,7 +53,7 @@
 				dt.setMonth(date.getMonth());
 				dt.setDay(date.getDay());
 			} catch(Exception e) {
-				System.out.println("Failed to set default value with: "+getWidgetDefault()+": "+e); //$NON-NLS-2$
+				System.out.println("Failed to set default value with: "+getWidgetDefault()+": "+e);  //$NON-NLS-1$//$NON-NLS-2$
 				org.txm.utils.logger.Log.printStackTrace(e);
 			}
 		}
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java	(revision 3893)
@@ -113,7 +113,7 @@
 				}
 				
 				// count number of mandatory fields set AND add exception for "Separator" widget types
-				if (option.required() || "Separator".equals(option.widget())) {
+				if (option.required() || "Separator".equals(option.widget())) { //$NON-NLS-1$
 					mandatoryParametersToSetByTheUser.add(option.name());
 				}
 				parametersToSetByTheUser.add(option.name());
@@ -126,7 +126,7 @@
 		defaultValues = new Properties();
 		String scriptRootDir = Toolbox.getTxmHomePath() + "/scripts/groovy/user"; //$NON-NLS-1$
 		
-		propFile = new File(scriptRootDir, this.script.replace(".", "/") + ".properties");
+		propFile = new File(scriptRootDir, this.script.replace(".", "/") + ".properties"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		
 		loadDefaultValuesFromPropFile();
 	}
@@ -136,10 +136,10 @@
 		if (propFile.exists()) {
 			try {
 				defaultValues.load(new FileReader(propFile));
-				Log.fine("Retrieving previous macro parameters from " + propFile + " values=" + defaultValues.entrySet() + "...");
+				Log.fine("Retrieving previous macro parameters from " + propFile + " values=" + defaultValues.entrySet() + "..."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 			catch (Throwable e) {
-				Log.severe("Failed to load previous values from " + propFile + ": " + e);
+				Log.severe(TXMUIMessages.failedToLoadPreviousValuesFromP0P1 + propFile + ": " + e);
 				Log.printStackTrace(e);
 			}
 		}
@@ -150,17 +150,17 @@
 			String stringValue = option.def();
 			
 			Object value = null;
-			if ("File".equals(widgetName) || "FileOpen".equals(widgetName)) { //$NON-NLS-1$
+			if ("File".equals(widgetName) || "FileOpen".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
 				value = new File(stringValue);
-			} else if ("Files".equals(widgetName) || "FilesOpen".equals(widgetName)) { //$NON-NLS-1$
-				String[] paths = stringValue.split(""+File.pathSeparatorChar);
+			} else if ("Files".equals(widgetName) || "FilesOpen".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
+				String[] paths = stringValue.split(""+File.pathSeparatorChar); //$NON-NLS-1$
 				File[] files = new File[paths.length];
 				for (int i = 0 ; i < paths.length ; i++) {
 					files[i] = new File(paths[i]);
 				}
 				value = files;
 			}
-			else if ("CreateFile".equals(widgetName) || "FileSave".equals(widgetName)) { //$NON-NLS-1$
+			else if ("CreateFile".equals(widgetName) || "FileSave".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
 				value = new File(stringValue);
 			}
 			else if ("Folder".equals(widgetName)) { //$NON-NLS-1$
@@ -174,7 +174,7 @@
 					value = DateField.formater.parse(stringValue);
 				}
 				catch (ParseException e) {
-					Log.severe("Wrong default date format: " + stringValue + ". Waiting for: " + DateField.STRINGFORMAT + ". Error = " + e + ".");
+					Log.severe("Wrong default date format: " + stringValue + ". Waiting for: " + DateField.STRINGFORMAT + ". Error = " + e + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 					value = new Date();
 				}
 			}
@@ -224,9 +224,9 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		int idx2 = script.lastIndexOf("Macro");
+		int idx2 = script.lastIndexOf("Macro"); //$NON-NLS-1$
 		if (idx2 < 0) idx2 = script.length();
-		title = TXMUIMessages.bind(TXMUIMessages.p0ParametersInput, script.substring(script.lastIndexOf(".") + 1, idx2));
+		title = TXMUIMessages.bind(TXMUIMessages.p0ParametersInput, script.substring(script.lastIndexOf(".") + 1, idx2)); //$NON-NLS-1$
 		newShell.setText(title);
 		newShell.setMinimumSize(450, 450);
 		
@@ -286,7 +286,7 @@
 		// }
 		// });
 		
-		Button button = createButton(parent, IDialogConstants.BACK_ID, "Reset values", false);
+		Button button = createButton(parent, IDialogConstants.BACK_ID, TXMUIMessages.resetValues, false);
 		button.removeListener(SWT.Selection, button.getListeners(SWT.Selection)[0]);
 		
 		button.addSelectionListener(new SelectionAdapter() {
@@ -335,7 +335,7 @@
 		// scrolledComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		// scrolledComposite.setLayout(new GridLayout(1, true));
 		
-		GLComposite columns = new GLComposite(composite, SWT.NONE, "columns");
+		GLComposite columns = new GLComposite(composite, SWT.NONE, "columns"); //$NON-NLS-1$
 		columns.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		columns.getLayout().numColumns = 1;
 		
@@ -350,7 +350,7 @@
 			columns.getLayout().numColumns = 1 + (parametersToSetByTheUser.size() / MAX_PARAMETERS_PER_LINE);
 		}
 		
-		GLComposite column = new GLComposite(columns, SWT.NONE, "column");
+		GLComposite column = new GLComposite(columns, SWT.NONE, "column"); //$NON-NLS-1$
 		GridData gdata = new GridData(SWT.FILL, SWT.FILL, true, true);
 		gdata.minimumWidth = 200;
 		column.setLayoutData(gdata);
@@ -361,7 +361,7 @@
 		for (NamedOptionDef option : parameters) {
 			n++;
 			if (n % MAX_PARAMETERS_PER_LINE == 0) {
-				column = new GLComposite(columns, SWT.NONE, "column");
+				column = new GLComposite(columns, SWT.NONE, "column"); //$NON-NLS-1$
 				gdata = new GridData(SWT.FILL, SWT.FILL, true, true);
 				gdata.minimumWidth = 200;
 				column.setLayoutData(gdata);
@@ -371,12 +371,12 @@
 			// each widget is initialized with de default value set in @Field@def attribute
 			String widgetName = option.widget();
 			ParameterField widget = null;
-			if ("File".equals(widgetName) || "FileOpen".equals(widgetName)) { //$NON-NLS-1$
+			if ("File".equals(widgetName) || "FileOpen".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
 				widget = new FileField(column, SWT.NONE, option);
-			} else if ("Files".equals(widgetName) || "FilesOpen".equals(widgetName)) { //$NON-NLS-1$
+			} else if ("Files".equals(widgetName) || "FilesOpen".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
 				widget = new FilesField(column, SWT.NONE, option);
 			}
-			else if ("CreateFile".equals(widgetName) || "FileSave".equals(widgetName)) { //$NON-NLS-1$
+			else if ("CreateFile".equals(widgetName) || "FileSave".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
 				widget = new CreateFileField(column, SWT.NONE, option);
 			}
 			else if ("Folder".equals(widgetName)) { //$NON-NLS-1$
@@ -432,7 +432,7 @@
 				String value = defaultValues.getProperty(option.name());
 				String value2 = null;
 				if (args.get(option.name()) != null) {
-					value2 = ""+args.get(option.name());
+					value2 = ""+args.get(option.name()); //$NON-NLS-1$
 				}
 				if (value != null) { // set the default value using the properties stored
 					widget.setDefault(value);
@@ -460,7 +460,7 @@
 			Object value = w.getWidgetValue();
 			
 			// is widget set if mandatory EXCEPT "Separator" widgets
-			if (w.isWidgetMandatory() && value == null && !("Separator".equals(w.getWidgetType()))) {
+			if (w.isWidgetMandatory() && value == null && !("Separator".equals(w.getWidgetType()))) { //$NON-NLS-1$
 				Log.warning(TXMUIMessages.errorColonMissingValueColon + field);
 				error = true;
 			}
@@ -485,10 +485,10 @@
 		if (!error) {
 			try {
 				propFile.getParentFile().mkdirs();
-				defaultValues.store(new FileWriter(propFile), "");
+				defaultValues.store(new FileWriter(propFile), ""); //$NON-NLS-1$
 			}
 			catch (IOException e) {
-				Log.severe("Warning: failed to store default macro values in " + propFile + ": " + e);
+				Log.severe(TXMUIMessages.warningFailedToStoreDefaultMacroValuesAtP0 + propFile + ": " + e); //$NON-NLS-2$
 				Log.printStackTrace(e);
 			}
 		}
@@ -522,7 +522,7 @@
 					if (value instanceof File[]) {
 						defaultValues.setProperty(name, StringUtils.join((File[])value, File.pathSeparator));
 					} else if (value instanceof Object[]) {
-						defaultValues.setProperty(name, StringUtils.join((File[])value, ","));
+						defaultValues.setProperty(name, StringUtils.join((File[])value, ",")); //$NON-NLS-1$
 					} else {
 						defaultValues.setProperty(name, value.toString());
 					}
@@ -580,7 +580,7 @@
 				groovy.lang.Script script = (groovy.lang.Script) bean;
 				
 				// if the "args" variable exists then use its values. Can be used to set a default value by another Macro
-				if (script.getBinding().hasVariable("args")) {
+				if (script.getBinding().hasVariable("args")) { //$NON-NLS-1$
 					oArgs = script.getBinding().getVariable("args"); //$NON-NLS-1$
 				}
 			}
@@ -590,7 +590,7 @@
 				groovy.lang.Script script = (groovy.lang.Script) bean;
 				
 				// if the "defaultArgs" variable exists then use its values. Can be used to set a default value by another Macro
-				if (script.getBinding().hasVariable("defaultArgs")) {
+				if (script.getBinding().hasVariable("defaultArgs")) { //$NON-NLS-1$
 					oDefaultArgs = script.getBinding().getVariable("defaultArgs"); //$NON-NLS-1$
 				}
 			}
@@ -605,8 +605,8 @@
 			
 			if (bean instanceof groovy.lang.Script) { // create the args binding if not already existing
 				groovy.lang.Script script = (groovy.lang.Script) bean;
-				if (!script.getBinding().hasVariable("args")) {
-					script.getBinding().setVariable("args", args);
+				if (!script.getBinding().hasVariable("args")) { //$NON-NLS-1$
+					script.getBinding().setVariable("args", args); //$NON-NLS-1$
 				}
 			}
 			
@@ -620,12 +620,12 @@
 			
 			if (bean instanceof groovy.lang.Script) { // create the args binding if not already existing
 				groovy.lang.Script script = (groovy.lang.Script) bean;
-				if (!script.getBinding().hasVariable("defaultArgs")) {
-					script.getBinding().setVariable("defaultArgs", defaultArgs);
+				if (!script.getBinding().hasVariable("defaultArgs")) { //$NON-NLS-1$
+					script.getBinding().setVariable("defaultArgs", defaultArgs); //$NON-NLS-1$
 				}
 			}
 			
-			Log.finest("Calling syncExec on display: " + Display.getDefault());
+			Log.finest("Calling syncExec on display: " + Display.getDefault()); //$NON-NLS-1$
 			Display.getDefault().syncExec(new Runnable() {
 				
 				@Override
@@ -636,17 +636,17 @@
 						
 						Display display = Display.getCurrent();
 						Shell shell = display.getActiveShell();
-						Log.finest("Display=" + display + " Shell=" + shell);
+						Log.finest("Display=" + display + " Shell=" + shell); //$NON-NLS-1$ //$NON-NLS-2$
 						// check names
 						Class c = bean.getClass();
-						Log.finest("Parsing options: " + parser.getOptions());
+						Log.finest("Parsing options: " + parser.getOptions()); //$NON-NLS-1$
 						for (OptionHandler opt : parser.getOptions()) { // pre set variable using the defaultArgs binding
 							try {
 								if (opt.option instanceof NamedOptionDef) {
 									NamedOptionDef option = (NamedOptionDef) opt.option;
 									c.getDeclaredField(option.name());
 									if (defaultArgs.containsKey(option.name())) {
-										option.def = ""+defaultArgs.get(option.name());
+										option.def = ""+defaultArgs.get(option.name()); //$NON-NLS-1$
 									}
 								}
 							}
@@ -667,12 +667,12 @@
 							
 							dialog.initializeMacroVariables(); // with args
 							if (missingParameters.size() > 0) {
-								Log.finer("The parameters dialog must be opened to fill parameters " + missingParameters + " and all mandatory fields: " + missingMandatoryParameters);
+								Log.finer("The parameters dialog must be opened to fill parameters " + missingParameters + " and all mandatory fields: " + missingMandatoryParameters); //$NON-NLS-1$ //$NON-NLS-2$
 								retOpen = dialog.open() == ParametersDialog.OK;
 								errorOpen = dialog.isError();
 							}
 							else { // fields initialized by 'args'
-								Log.finest("The parameters dialog dont need to be opened all mandatory fields are set: " + args);
+								Log.finest("The parameters dialog dont need to be opened all mandatory fields are set: " + args); //$NON-NLS-1$
 								if (dialog.getNumberOfFields() > 0) dialog.saveParameters();
 								retOpen = true;
 								errorOpen = false;
@@ -681,16 +681,16 @@
 							if (bean instanceof groovy.lang.Script) { // reset the timer binding if already existing
 								
 								groovy.lang.Script script = (groovy.lang.Script) bean;
-								if (script.getBinding().hasVariable("timer")) {
-									Log.finest("Reset groovy execution timer: " + args);
-									Timer timer = (Timer) script.getBinding().getVariable("timer");
+								if (script.getBinding().hasVariable("timer")) { //$NON-NLS-1$
+									Log.finest("Reset groovy execution timer: " + args); //$NON-NLS-1$
+									Timer timer = (Timer) script.getBinding().getVariable("timer"); //$NON-NLS-1$
 									timer.reset();
 								}
 							}
 						}
 					}
 					catch (Throwable e) {
-						Log.severe("Could not open the parameter dialog: " + e);
+						Log.severe(TXMUIMessages.couldNotOpenTheParameterDialogP0 + e);
 						Log.printStackTrace(e);
 						errorOpen = true;
 					}
@@ -698,7 +698,7 @@
 			});
 			
 		} catch (Throwable e) {
-			Log.severe("Could not open the parameter dialog: " + e);
+			Log.severe(TXMUIMessages.couldNotOpenTheParameterDialogP0 + e);
 			Log.printStackTrace(e);
 			errorOpen = true;
 		}
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersManager.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersManager.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersManager.java	(revision 3893)
@@ -302,20 +302,20 @@
 		String widgetName = getParameterType(key);
 		
 		Object value = null;
-		if ("File".equals(widgetName) || "FileOpen".equals(widgetName)) { //$NON-NLS-1$
+		if ("File".equals(widgetName) || "FileOpen".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
 			value = new File(stringValue);
-		} else if ("Files".equals(widgetName) || "FilesOpen".equals(widgetName)) { //$NON-NLS-1$
-			String[] paths = stringValue.split(""+File.pathSeparatorChar);
+		} else if ("Files".equals(widgetName) || "FilesOpen".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
+			String[] paths = stringValue.split(""+File.pathSeparatorChar); //$NON-NLS-1$
 			File[] files = new File[paths.length];
 			for (int i = 0 ; i < paths.length ; i++) {
 				files[i] = new File(paths[i]);
 			}
 			value = files;
 		}
-		else if ("CreateFile".equals(widgetName) || "FileSave".equals(widgetName)) { //$NON-NLS-1$
+		else if ("CreateFile".equals(widgetName) || "FileSave".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
 			value = new File(stringValue);
 		}
-		else if ("Folder".equals(widgetName) || "Directory".equals(widgetName)) { //$NON-NLS-1$
+		else if ("Folder".equals(widgetName) || "Directory".equals(widgetName)) { //$NON-NLS-1$ //$NON-NLS-2$
 			value = new File(stringValue);
 		}
 		else if ("Query".equals(widgetName)) { //$NON-NLS-1$
@@ -326,7 +326,7 @@
 				value = DateField.formater.parse(stringValue);
 			}
 			catch (ParseException e) {
-				Log.severe("Wrong default date format: " + stringValue + ". Waiting for: " + DateField.STRINGFORMAT + ". Error = " + e + ".");
+				Log.severe("Wrong default date format: " + stringValue + ". Waiting for: " + DateField.STRINGFORMAT + ". Error = " + e + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				value = new Date();
 			}
 		}
@@ -372,7 +372,7 @@
 	
 	private String getParameterType(String key) {
 		if (key == null || parameters == null || !parameters.containsKey(key)) {
-			return "String";
+			return "String"; //$NON-NLS-1$
 		}
 		
 		return parameters.get(key).widget();
@@ -415,7 +415,7 @@
 	public void finalToFile(File propFile) throws IOException {
 		Properties props = finalToProperties();
 		PrintWriter writer = IOUtils.getWriter(propFile);
-		props.store(writer, "TXM parameters");
+		props.store(writer, "TXM parameters"); //$NON-NLS-1$
 		writer.close();
 		return;
 	}
@@ -423,13 +423,13 @@
 	public static void main(String[] args) {
 		AtestClass atc = new AtestClass();
 		ParametersManager pm = new ParametersManager();
-		pm.updateChosenValue("file", new File("testfile"));
-		pm.updateChosenValue("dir", new File("testdir"));
-		pm.updateChosenValue("ii", 1);
+		pm.updateChosenValue("file", new File("testfile")); //$NON-NLS-1$ //$NON-NLS-2$
+		pm.updateChosenValue("dir", new File("testdir")); //$NON-NLS-1$ //$NON-NLS-2$
+		pm.updateChosenValue("ii", 1); //$NON-NLS-1$
 		pm.historyBack();
 		pm.historyBack();
 		pm.finalToBean(atc);
-		System.out.println("atc=" + atc);
+		System.out.println("atc=" + atc); //$NON-NLS-1$
 	}
 	
 	public LinkedHashMap<String, Object> getDefaultValues() {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/IntegerField.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/IntegerField.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/IntegerField.java	(revision 3893)
@@ -5,6 +5,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Spinner;
 import org.kohsuke.args4j.NamedOptionDef;
+import org.txm.rcp.messages.TXMUIMessages;
 
 public class IntegerField extends LabelField {
 	Spinner dt;
@@ -27,7 +28,7 @@
 		try {
 			dt.setSelection(Integer.parseInt(""+text)); //$NON-NLS-1$
 		} catch(Exception e) {
-			System.out.println("Cannot set IntegerField with default properties value="+text+": "+e); //$NON-NLS-2$
+			System.out.println(TXMUIMessages.cannotSetIntegerFieldWithDefaultPropertiesValue+text+": "+e); //$NON-NLS-2$
 		}
 	}
 
@@ -37,7 +38,7 @@
 			try {
 				dt.setSelection(Integer.parseInt(getWidgetDefault()));
 			} catch (Exception e) {
-				System.out.println("Cannot set IntegerField with default value="+getWidgetDefault()+": "+e); //$NON-NLS-2$
+				System.out.println(TXMUIMessages.cannotSetIntegerFieldWithDefaultPropertiesValue+getWidgetDefault()+": "+e); //$NON-NLS-2$
 			}
 		}  else {
 			dt.setSelection(0);
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedChoiceQueryWidget.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedChoiceQueryWidget.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedChoiceQueryWidget.java	(revision 3893)
@@ -126,8 +126,8 @@
 
 			settingsButton = new Button(this, SWT.PUSH);
 			settingsButton.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
-			settingsButton.setImage(IImageKeys.getImage("platform:/plugin/org.eclipse.jface/org/eclipse/jface/dialogs/images/popup_menu.png"));
-			settingsButton.setToolTipText("Query options");
+			settingsButton.setImage(IImageKeys.getImage("platform:/plugin/org.eclipse.jface/org/eclipse/jface/dialogs/images/popup_menu.png")); //$NON-NLS-1$
+			settingsButton.setToolTipText(TXMUIMessages.queryOptions);
 			settingsButton.addSelectionListener(new SelectionListener() {
 
 				@Override
@@ -181,7 +181,7 @@
 		// querywidget.layout();
 		// relayout();
 
-		setMagicEnabled("CQP".equals(se.getName()) || "CQP".equals(se.getOptionForSearchengine())); //$NON-NLS-1$
+		setMagicEnabled("CQP".equals(se.getName()) || "CQP".equals(se.getOptionForSearchengine())); //$NON-NLS-1$ //$NON-NLS-2$
 
 		String defaultEngineName = SearchEnginePreferences.getInstance().getString(SearchEnginePreferences.DEFAULT_SEARCH_ENGINE);
 		if (defaultEngineName.equals(se.getName()) || defaultEngineName.equals(se.getOptionForSearchengine())) {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/SelectDirectoryWidget.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/SelectDirectoryWidget.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/SelectDirectoryWidget.java	(revision 3893)
@@ -51,7 +51,7 @@
 		});
 		
 		Button selectDirectoryButton = new Button(this, SWT.PUSH);
-		selectDirectoryButton.setText("...");
+		selectDirectoryButton.setText("..."); //$NON-NLS-1$
 		selectDirectoryButton.addSelectionListener(new SelectionListener() {
 
 			@Override
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/UpdateCorpusDialog.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/UpdateCorpusDialog.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/UpdateCorpusDialog.java	(revision 3893)
@@ -117,12 +117,12 @@
 		
 		modifiesTextsCheck = new Button(textsGroup, SWT.RADIO);
 		modifiesTextsCheck.setText(TXMUIMessages.withModifications);
-		modifiesTextsCheck.setToolTipText("Only the modified corpus texts are updated");
+		modifiesTextsCheck.setToolTipText(TXMUIMessages.onlyTheModifiedCorpusTextsAreUpdated);
 		modifiesTextsCheck.setSelection(!doForceUpdate);
 		
 		forceUpdateCheck = new Button(textsGroup, SWT.RADIO);
 		forceUpdateCheck.setText(TXMUIMessages.common_all);
-		forceUpdateCheck.setToolTipText("All the corpus texts will be updated, modified or not");
+		forceUpdateCheck.setToolTipText(TXMUIMessages.allTheCorpusTextsWillBeUpdated);
 		forceUpdateCheck.setSelection(doForceUpdate);
 		
 		//		Group todoGroup = new Group(comp, SWT.NONE);
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java	(revision 3893)
@@ -199,7 +199,7 @@
 			Font font = new Font(Display.getCurrent(), fd);
 			addwordButton.setFont(font);
 			addwordButton.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
-			addwordButton.setText(TXMUIMessages.addAWord+" ⯯");
+			addwordButton.setText(TXMUIMessages.addAWord+" ⯯"); //$NON-NLS-1$
 			addwordButton.addSelectionListener(new SelectionListener() {
 				
 				@Override
@@ -227,7 +227,7 @@
 			withinComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
 			withinButton = new Button(withinComposite, SWT.CHECK);
 			withinButton.setText(TXMUIMessages.withinAContextOf); // "within structure: "
-			withinButton.setToolTipText("Check to add structure contraint");
+			withinButton.setToolTipText(TXMUIMessages.checkToAddAStructureConstraint);
 			withinButton.addSelectionListener(new SelectionListener() {
 				
 				@Override
@@ -241,26 +241,26 @@
 			});
 			
 			withinN = new Spinner(withinComposite, SWT.CHECK);
-			withinN.setToolTipText("context size");
+			withinN.setToolTipText(TXMUIMessages.contextSize);
 			withinN.setMinimum(1);
 			withinN.setMaximum(200);
 			withinN.setEnabled(false);
 			
 			structsCombo = new Combo(withinComposite, SWT.READ_ONLY);
-			structsCombo.setToolTipText("The available contexts");
+			structsCombo.setToolTipText(TXMUIMessages.theAvailableContexts);
 			structsCombo.setEnabled(false);
-			structsCombo.add("<word>");
+			structsCombo.add("<word>"); //$NON-NLS-1$
 			
 			int iText = -1;
 			int iP = -1;
 			List<StructuralUnit> sus = corpus.getOrderedStructuralUnits();
 			for (int i = 0; i < sus.size(); i++) {
 				StructuralUnit su = sus.get(i);
-				if (su.getName().equals("txmcorpus")) continue;
+				if (su.getName().equals("txmcorpus")) continue; //$NON-NLS-1$
 				structsCombo.add(su.getName());
 				
-				if (su.getName().equals("text")) iText = i;
-				if (su.getName().equals("p")) iP = i;
+				if (su.getName().equals("text")) iText = i; //$NON-NLS-1$
+				if (su.getName().equals("p")) iP = i; //$NON-NLS-1$
 			}
 			if (structsCombo.getItemCount() > 0) {
 				if (iP >= 0) {
@@ -368,13 +368,13 @@
 		}
 		
 		if (withinButton != null && withinButton.getSelection() && structsCombo.getText().length() > 0) {
-			query += " within ";
+			query += " within "; //$NON-NLS-1$
 			
 			if (withinN.getSelection() > 1) {
-				query += "" + withinN.getSelection() + " "; //$NON-NLS-1$
+				query += "" + withinN.getSelection() + " "; //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			
-			if (!structsCombo.getText().equals("<word>")) {
+			if (!structsCombo.getText().equals("<word>")) { //$NON-NLS-1$
 				query += structsCombo.getText();
 			}
 		}
@@ -418,12 +418,12 @@
 		 * @param no the no
 		 */
 		public WordPropertyField(Composite parent, int style, int no) {
-			super(parent, style, "" + no);
+			super(parent, style, "" + no); //$NON-NLS-1$
 			
 			this.getLayout().numColumns = 3;
 			
 			propCombo = new Combo(this, SWT.READ_ONLY | SWT.SINGLE);
-			propCombo.setToolTipText("Property to test");
+			propCombo.setToolTipText(TXMUIMessages.propertyToTest);
 			if (properties != null) {
 				for (Property p : properties) {
 					propCombo.add(p.getName());
@@ -441,7 +441,7 @@
 			}
 			
 			testCombo = new Combo(this, SWT.READ_ONLY | SWT.SINGLE);
-			testCombo.setToolTipText("Test to do");
+			testCombo.setToolTipText(TXMUIMessages.testToDo);
 			testCombo.add(TXMUIMessages.equalsTo);
 			testCombo.add(TXMUIMessages.startsWith);
 			testCombo.add(TXMUIMessages.endsWith);
@@ -450,7 +450,7 @@
 			testCombo.select(0);
 			
 			valueT = new Combo(this, SWT.SINGLE);
-			valueT.setToolTipText("The word property value");
+			valueT.setToolTipText(TXMUIMessages.theWordPropertyValue);
 			GridData gdata = new GridData(GridData.FILL, GridData.FILL, false, false);
 			gdata.widthHint = 150;
 			gdata.minimumWidth = 150;
@@ -475,7 +475,7 @@
 		private void updateAvailableValues() {
 			String p = propCombo.getText();
 			String[] items = null;
-			if (p.contains("_")) {
+			if (p.contains("_")) { //$NON-NLS-1$
 				StructuralUnitProperty sup = corpus.getStructuralUnitProperty(p);
 				try {
 					if (sup.getNValues() > 1000) {
@@ -560,8 +560,8 @@
 			
 			Button addPropertyButton = new Button(this, SWT.PUSH);
 			addPropertyButton.setLayoutData(buttonLayout);
-			addPropertyButton.setText("+");
-			addPropertyButton.setToolTipText("add a property test");
+			addPropertyButton.setText("+"); //$NON-NLS-1$
+			addPropertyButton.setToolTipText(TXMUIMessages.addAPropertyTest);
 			addPropertyButton.addSelectionListener(new SelectionListener() {
 				
 				@Override
@@ -575,8 +575,8 @@
 			
 			Button removePropertyButton = new Button(this, SWT.PUSH);
 			removePropertyButton.setLayoutData(buttonLayout);
-			removePropertyButton.setText("-");
-			removePropertyButton.setToolTipText("remove the last property test");
+			removePropertyButton.setText("-"); //$NON-NLS-1$
+			removePropertyButton.setToolTipText(TXMUIMessages.removeTheLastPropertyTest);
 			removePropertyButton.addSelectionListener(new SelectionListener() {
 				
 				@Override
@@ -588,22 +588,22 @@
 				public void widgetDefaultSelected(SelectionEvent e) {}
 			});
 			
-			propertiesFieldComposite = new GLComposite(this, SWT.NONE, "properties");
+			propertiesFieldComposite = new GLComposite(this, SWT.NONE, "properties"); //$NON-NLS-1$
 			GridData propertiesvlayout = new GridData(GridData.FILL, GridData.CENTER, true, false);
 			propertiesFieldComposite.setLayoutData(propertiesvlayout);
 			propertiesFieldComposite.getLayout().numColumns = 2;
 			
 			allCriteriaLabel = new Label(this, SWT.NONE);
-			allCriteriaLabel.setText("  ");
+			allCriteriaLabel.setText("  "); //$NON-NLS-1$
 			
 			allCriteriaButton = new Button(this, SWT.CHECK);
-			allCriteriaButton.setToolTipText("All property tests are verified");
+			allCriteriaButton.setToolTipText(TXMUIMessages.allPropertyTestsAreVerified);
 			allCriteriaButton.setSelection(true);
 			
-			new Label(this, SWT.NONE).setText("@");
+			new Label(this, SWT.NONE).setText("@"); //$NON-NLS-1$
 			
 			targetButton = new Button(this, SWT.CHECK);
-			targetButton.setToolTipText("Check to target the word in the query");
+			targetButton.setToolTipText(TXMUIMessages.checkToTargetThisWordInTheQuery);
 			targetButton.addSelectionListener(new SelectionListener() {
 				
 				@Override
@@ -678,9 +678,9 @@
 			allCriteriaButton.setEnabled(propertyFields.size() > 1);
 			allCriteriaButton.setVisible(propertyFields.size() > 1);
 			if (allCriteriaButton.isEnabled()) {
-				allCriteriaLabel.setText("&&");
+				allCriteriaLabel.setText("&&"); //$NON-NLS-1$
 			} else {
-				allCriteriaLabel.setText("  ");
+				allCriteriaLabel.setText("  "); //$NON-NLS-1$
 			}
 			// propertiesAllOrOne.setVisible(propertyFields.size() > 1);
 			// ((GridData)propertiesAllOrOne.getLayoutData()).exclude = propertyFields.size() < 2;
@@ -707,15 +707,15 @@
 		 * @return the query
 		 */
 		public String getQuery() {
-			String query = "";
+			String query = ""; //$NON-NLS-1$
 			if (targetButton.getSelection()) {
-				query += "@";
+				query += "@"; //$NON-NLS-1$
 			}
 			query += "["; //$NON-NLS-1$
 			
-			String propertiesAllOrOne = " | ";
+			String propertiesAllOrOne = " | "; //$NON-NLS-1$
 			if (allCriteriaButton.getSelection()) {
-				propertiesAllOrOne = " & ";
+				propertiesAllOrOne = " & "; //$NON-NLS-1$
 			}
 			
 			int nField = 0;
@@ -729,7 +729,7 @@
 				}
 				
 				String p = propCombo.getItem(propCombo.getSelectionIndex());
-				if (p.contains("_")) query += "_."; // structural properties must be prefixed with "_."
+				if (p.contains("_")) query += "_."; // structural properties must be prefixed with "_." //$NON-NLS-1$ //$NON-NLS-2$
 				query += p;
 				if (testCombo.getSelectionIndex() == 0)// equals
 					query += " = \"" + valueT.getText().replace("\"", "\\\"") + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ComboDialog.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ComboDialog.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ComboDialog.java	(revision 3893)
@@ -39,6 +39,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Layout;
 import org.eclipse.swt.widgets.Shell;
+import org.txm.rcp.messages.TXMUIMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -133,7 +134,7 @@
 		layout.marginRight = 5;
 		
 		Label l = new Label(p, SWT.NONE);
-		l.setText("Select between the following values");
+		l.setText(TXMUIMessages.selectBetweenTheFollowingValues);
 		
 		int style = SWT.READ_ONLY | SWT.SINGLE;
 		if (comboStyle != null) {
Index: TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java
===================================================================
--- TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 3892)
+++ TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 3893)
@@ -200,7 +200,7 @@
 						// CREATE THE CLOSE CONTROL FILE
 						String rootPath = Platform.getInstanceLocation().getURL().toURI().getPath();
 						lockFile = new File(rootPath, "txm_was_not_closed_correctly.lock"); //$NON-NLS-1$
-						Log.fine("Lock file path: "+lockFile);
+						Log.fine("Lock file path: "+lockFile); //$NON-NLS-1$
 						if (lockFile.exists()) { // the close control file was not deleted //$NON-NLS-1$
 							lockFile.delete(); //$NON-NLS-1$
 
@@ -787,7 +787,7 @@
 						//							e1.printStackTrace();
 						//							return;
 						//						}
-						MessageDialog.openError(w.getDisplay().getActiveShell(), "Error", record.getMessage());
+						MessageDialog.openError(w.getDisplay().getActiveShell(), TXMUIMessages.error, record.getMessage());
 					}
 				});
 
@@ -1049,7 +1049,7 @@
 									jobHandler.setTaskName(TXMUIMessages.toolboxReady);
 								}
 								catch (Throwable e) {
-									System.out.println("Initialisation error: "+e);
+									System.out.println(TXMUIMessages.initialisationErrorP0+e);
 									e.printStackTrace();
 								}
 							}
