Index: tmp/org.txm.core/src/java/org/txm/Toolbox.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/Toolbox.java	(revision 837)
+++ tmp/org.txm.core/src/java/org/txm/Toolbox.java	(revision 838)
@@ -271,7 +271,7 @@
 		// FIXME: persistence tests
 		if (TBXPreferences.getBoolean(TBXPreferences.AUTO_SAVE_RESULTS, TBXPreferences.PREFERENCES_NODE)) {
 			Log.finest("Toolbox.initialize(): reloading persitent results...");
-			ArrayList<String> resultsNodesQualifiers = TXMPreferences.getResultsNodesQualifiers();
+			ArrayList<String> resultsNodesQualifiers = TXMPreferences.getAllResultsNodesQualifiers();
 			for (String nodeQualifier : resultsNodesQualifiers) {
 				try {
 					Log.finest("Toolbox.initialize(): loading from result node qualifier " + nodeQualifier);
@@ -490,6 +490,14 @@
 		//save preferences
 		IPreferencesService service = Platform.getPreferencesService();
 		try {
+			
+			
+			// remove result local nodes if persistence preference is disabled
+			if (!TBXPreferences.getBoolean(TBXPreferences.AUTO_SAVE_RESULTS, TBXPreferences.PREFERENCES_NODE)) {
+				TXMPreferences.deleteAllResultsNodes();
+			}
+
+			
 			service.getRootNode().flush();
 			//		.childrenNames()) {
 			//			System.out.println("********************************************************************************************************"); //$NON-NLS-1$
Index: tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java	(revision 837)
+++ tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java	(revision 838)
@@ -6,8 +6,6 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import java.io.StringBufferInputStream;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -22,8 +20,9 @@
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
+import org.txm.core.results.TXMParameters;
 import org.txm.core.results.TXMResult;
-import org.txm.core.results.TXMParameters;
 import org.txm.utils.logger.Log;
 
 
@@ -918,35 +917,7 @@
 		dump(scope, nodeQualifier);
 	}
 
-	/**
-	 * Gets all the result nodes qualifier (from *.prefs file starting with "txm_res").
-	 * @return
-	 */
-	public static ArrayList<String> getResultsNodesQualifiers()	{
-		ArrayList<String> resultsNodesQualifiers = new ArrayList<String>();
-		try {
-			IPreferencesService service = Platform.getPreferencesService();
-			for (String scopeName : service.getRootNode().childrenNames()) {
-				if(scopeName != TXMPreferences.scope.getName())	{
-					continue;
-				}
-					
-				String[] nodesNames = service.getRootNode().node(scopeName).childrenNames();
-				Arrays.sort(nodesNames);
-				for (String nodeName : nodesNames) {
-					if(nodeName.startsWith("txm_res_"))	{
-						resultsNodesQualifiers.add(nodeName);
-					}
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();;
-		}
 
-		return resultsNodesQualifiers;
-	}
-	
-	
 	/**
 	 * 
 	 * @param nodeQualifier
@@ -1068,20 +1039,69 @@
 	 * @param result
 	 */
 	public static void delete(TXMResult result)	{
+		delete(scope.getNode(result.getUUID()));
+		Log.finest("TXMPreferences.delete(): Local preferences node for object " + result.getUUID() + " deleted.");
+	}
+
+
+	/**
+	 * Deletes the specified node if exists and the associated .prefs file.
+	 * @param node
+	 */
+	public static void delete(IEclipsePreferences node)	{
 		try {
-			System.err.println("TXMPreferences.delete(): Local preferences for object " + result.getUUID() + " deleted.");
-			scope.getNode(result.getUUID()).clear();
-			scope.getNode(result.getUUID()).flush();
-			scope.getNode(result.getUUID()).removeNode();
+			node.clear();
+			node.flush();
+			node.removeNode();
 		}
 		catch(BackingStoreException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
+	
+	/**
+	 * Deletes all the result nodes from the preferences and files.
+	 */
+	public static void deleteAllResultsNodes()	{
+		ArrayList<String> resultsNodesQualifier = getAllResultsNodesQualifiers();
+		for (int i = 0; i < resultsNodesQualifier.size(); i++) {
+			delete(scope.getNode(resultsNodesQualifier.get(i)));
+		}
+	}
+	
+	
+	/**
+	 * Gets all the result nodes qualifiers (from *.prefs file starting with TXMResult.UUID_PREFIX, eg.: "txm_res_").
+	 * @return
+	 */
+	public static ArrayList<String> getAllResultsNodesQualifiers()	{
+		ArrayList<String> resultsNodesQualifiers = new ArrayList<String>();
+		try {
+			IPreferencesService service = Platform.getPreferencesService();
+			for (String scopeName : service.getRootNode().childrenNames()) {
+				if(scopeName != TXMPreferences.scope.getName())	{
+					continue;
+				}
+					
+				String[] nodesNames = service.getRootNode().node(scopeName).childrenNames();
+				Arrays.sort(nodesNames);
+				for (String nodeName : nodesNames) {
+					if(nodeName.startsWith(TXMResult.UUID_PREFIX))	{
+						resultsNodesQualifiers.add(nodeName);
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 
+		return resultsNodesQualifiers;
+	}
+	
 
-
+	
+	
 	/**
 	 * Internal method to find the node qualifier of a result otherwise look in instance, default scopes and in alternatives nodes qualifiers.
 	 * @param result
Index: tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java	(revision 837)
+++ tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java	(revision 838)
@@ -61,6 +61,7 @@
 public abstract class TXMResult implements Cloneable, IProgressMonitor, Comparable<TXMResult> {
 
 	public static final DateFormat ID_TIME_FORMAT = new SimpleDateFormat("YYYYMMdd_HHmmssSSS");
+	public static final String UUID_PREFIX = "txm_res_"; //$NON-NLS-1$
 	public static final Pattern FILE_NAME_PATTERN = Pattern.compile("[^a-zA-Z0-9\\.-]+"); //$NON-NLS-1$
 	public static final String UNDERSCORE = "_";
 
@@ -157,13 +158,11 @@
 		if (parent == this) {
 			throw new IllegalArgumentException("A result can not be parent of itself.");
 		}
-		this.parent = parent;
+//		this.parent = parent;
 		if(uuid == null)	{
-			this.createUUID();
+			uuid = createUUID();
 		}
-		else	{
-			this.uniqueID = uuid;
-		}
+		this.uniqueID = uuid;
 
 
 		this.weight = 0;
@@ -209,8 +208,6 @@
 		try {
 			this.autoLoadParametersFromAnnotations(); // auto fill from Parameter annotations
 			this.loadParameters();  // subclasses manual settings
-
-
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -222,15 +219,17 @@
 		//this.saveParameter(TXMPreferences.NAME, name);
 	}
 
+
 	/**
-	 * Creates and stores an UUID dedicated to persistence of this result.
+	 * Creates an UUID dedicated to persistence of this result.
+	 * @return
 	 */
-	protected void createUUID() {
+	public static String createUUID() {
 		// FIXME: see if it's useful to put the class name or not, should be better to save it in the .prefs
 		//this.uniqueID = this.getClass().getName() + '@' + ID_TIME_FORMAT.format(new Date(System.currentTimeMillis())) + "_" + UUID.randomUUID();
-		this.uniqueID = "txm_res_" + ID_TIME_FORMAT.format(new Date(System.currentTimeMillis())) + "_" + UUID.randomUUID();
+		return UUID_PREFIX + ID_TIME_FORMAT.format(new Date(System.currentTimeMillis())) + "_" + UUID.randomUUID();
 	}
-
+	
 	/**
 	 * Checks if the result at least one child.
 	 * @return
@@ -964,16 +963,22 @@
 	 */
 	synchronized public boolean addChild(TXMResult child) {
 		try {
-			// remove from current parent if exists
-			child.removeFromParent();
-
-			child.setParent(this);
-			if (!this.children.contains(child)) {
-				// FIXME: Debug
-				// System.err.println("TXMResult.addResult(); adding child " +
-				// child + " to parent " + this);
-				return this.children.add(child);
-			}
+			// do nothing if the parent is already this result
+//			if(child.getParent() == this)	{
+//				return true;
+//			}
+//			else	{
+				// remove from current parent if exists
+				child.removeFromParent();
+	
+				child.setParent(this);
+				if (!this.children.contains(child)) {
+					// FIXME: Debug
+					// System.err.println("TXMResult.addResult(); adding child " +
+					// child + " to parent " + this);
+					return this.children.add(child);
+				}
+//			}
 		} catch (Exception e) {
 		}
 		return false;
@@ -1406,7 +1411,7 @@
 		TXMResult clone = null;
 		try {
 			clone = (TXMResult) super.clone();
-			clone.createUUID();
+			clone.uniqueID = createUUID();
 			this.parent.addChild(clone);
 			TXMPreferences.cloneNode(this, clone);
 			clone.dirty = true;
@@ -1523,7 +1528,7 @@
 	 * @throws CqiClientException
 	 * @throws IOException
 	 */
-	protected boolean compute(IProgressMonitor monitor, boolean deepComputing, boolean updateLastParameters) throws Exception {
+	synchronized protected boolean compute(IProgressMonitor monitor, boolean deepComputing, boolean updateLastParameters) throws Exception {
 
 		boolean skipComputing = false;
 
@@ -1588,7 +1593,9 @@
 
 
 				for (int i = 0; i < this.children.size(); i++) {
+					// FIXME: may be better to add a member needFullRecomputing in TXMResult?
 					this.getChild(i).setDirty(); // force recomputing even if some parameters of the result itself have not changed
+					this.getChild(i).setHasBeenComputedOnce(false); // force recomputing even if some parameters of the result itself have not changed
 					this.getChild(i).compute(monitor, deepComputing, updateLastParameters);
 				}
 			}
@@ -1763,10 +1770,10 @@
 	}
 
 	/**
-	 * @return the userName (never null) "" if not set
+	 * Gets the user defined name.
+	 * @return the user name
 	 */
 	public String getUserName() {
-		//return this.getStringParameterValue(TXMPreferences.NAME);
 		return userName;
 	}
 
@@ -1782,4 +1789,11 @@
 
 		return e1.getUUID().compareTo(e2.getUUID());
 	}
+
+	/**
+	 * @param hasBeenComputedOnce the hasBeenComputedOnce to set
+	 */
+	public void setHasBeenComputedOnce(boolean hasBeenComputedOnce) {
+		this.hasBeenComputedOnce = hasBeenComputedOnce;
+	}
 }
Index: tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 837)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 838)
@@ -13,6 +13,9 @@
  */
 public class TXMCoreMessages extends NLS {
 
+	
+	private static final String BUNDLE_NAME = "org.txm.core.messages.messages"; //$NON-NLS-1$
+	
 	public static String common_cols;
 	public static String common_delete;
 	public static String common_description;
@@ -271,7 +274,7 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(TXMCoreMessages.class);
+		Utf8NLS.initializeMessages(BUNDLE_NAME, TXMCoreMessages.class);
 	}
 	
 	
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java	(revision 837)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java	(revision 838)
@@ -151,10 +151,6 @@
 	protected String propertyRegex;
 
 	
-	/**
-	 * Creates an empty Progression result with no parent.
-	 * @param corpus
-	 */
 	public Progression(Corpus corpus)	{
 		this(null, corpus);
 	}
@@ -314,7 +310,7 @@
 
 			this.subTask("Processing queries.");
 			if (!stepQueries()) {
-				System.out.println(ProgressionCoreMessages.ComputeProgression_3);
+				Log.severe(ProgressionCoreMessages.ComputeProgression_3);
 				return false;
 			}
 
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionCumulativeChartCreator.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionCumulativeChartCreator.java	(revision 837)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionCumulativeChartCreator.java	(revision 838)
@@ -14,7 +14,6 @@
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.ui.RectangleAnchor;
 import org.jfree.ui.TextAnchor;
-import org.txm.chartsengine.core.ChartsEngine;
 import org.txm.chartsengine.core.results.ChartResult;
 import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
 import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
Index: tmp/org.txm.chartsengine.svgbatik.rcp/src/org/txm/chartsengine/svgbatik/rcp/swt/SVGComposite.java
===================================================================
--- tmp/org.txm.chartsengine.svgbatik.rcp/src/org/txm/chartsengine/svgbatik/rcp/swt/SVGComposite.java	(revision 837)
+++ tmp/org.txm.chartsengine.svgbatik.rcp/src/org/txm/chartsengine/svgbatik/rcp/swt/SVGComposite.java	(revision 838)
@@ -1,8 +1,5 @@
 package org.txm.chartsengine.svgbatik.rcp.swt;
-import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.EventQueue;
-import java.awt.Frame;
 import java.awt.Graphics2D;
 import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;
@@ -13,14 +10,10 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 
-import javax.swing.JPanel;
-
-import org.eclipse.swt.awt.SWT_AWT;
 import org.eclipse.swt.widgets.Composite;
 import org.txm.chartsengine.rcp.IChartComponent;
 import org.txm.chartsengine.rcp.editors.ChartEditor;
-import org.txm.chartsengine.rcp.events.EventCallBackHandler;
-import org.txm.chartsengine.rcp.swt.ChartComposite;
+import org.txm.chartsengine.rcp.swt.SwingChartComposite;
 import org.txm.chartsengine.svgbatik.rcp.swing.SVGPanel;
 import org.txm.utils.logger.Log;
 import org.w3c.dom.svg.SVGDocument;
@@ -31,26 +24,15 @@
  * @author sjacquot
  *
  */
-public class SVGComposite extends ChartComposite	{
+public class SVGComposite extends SwingChartComposite	{
 
-	// FIXME: useless ? for reducing the flickering on resize under Window but it doesn't seem to work
-//	static
-//	{
-//		System.setProperty("sun.awt.noerasebackground", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-//	}
-
 	
-	
 	/**
 	 * The loaded SVG file.
 	 */
 	protected File file;
 	
-	protected Frame frame;
 	
-	protected JPanel rootPanel;
-	
-	
 	/**
 	 * Creates a Batik SVG composite.
 	 * @param parent
@@ -60,16 +42,6 @@
 		super(chartEditor, parent, style);
 	
 		this.file = null;
-		
-		this.frame = SWT_AWT.new_Frame(this);
-		// Need to add an AWT Panel to fix mouse events and mouse cursors changes on Swing JPanel
-		this.rootPanel = new JPanel(new BorderLayout());
-		
-		this.frame.add(this.rootPanel);
-
-		//this.frame.pack();
-		this.frame.setVisible(true);
-		
 	}
 
 
@@ -114,53 +86,9 @@
 	}
 
 	
-	@Override
-	public void requestFocusInComposite()	{
-		EventQueue.invokeLater(new Runnable () {
-			public void run () {
-				getPanel().requestFocusInWindow();
-			}
-		});
-	}
 
 	
 	@Override
-	public void loadChart()	{
-		
-		// loads the chart from the result
-		Object chart = this.chartEditor.getChart();
-
-		if(chart != null) {
-			// creates components if they not exist
-			if(this.chartComponent == null)	{
-				
-				// recreates the chart if not of right type
-				if(!(chart instanceof File))	{
-					try {
-						this.chartEditor.getResult().clearLastRenderingParameters();
-						this.chartEditor.getResult().compute();
-					}
-					catch (Exception e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				
-				
-				this.chartEditor.getSWTChartsComponentsProvider().createChartContainer(this.chartEditor.getEditorInput());
-				this.chartComponent = (IChartComponent) this.chartEditor.getEditorInput().getChartContainer();
-				
-				this.rootPanel.add((Component) this.chartComponent);
-
-				this.frame.setVisible(true);
-			}
-			this.file = (File) chart;	
-			this.loadSVGDocument(this.file);
-		}
-	}
-	
-	
-	@Override
 	public void loadChart(Object data) {
 		this.loadSVGDocument((File) data);
 	}
@@ -168,60 +96,15 @@
 	
 
 
-	@Override
-	public void copyChartViewToClipboard() {
-		SVGPanel panel = this.getPanel();
-		int w = panel.getWidth();
-		int h = panel.getHeight();
-		final BufferedImage bufferedImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
-		Graphics2D g = bufferedImg.createGraphics();
-		panel.paint(g);
-		
-		Transferable img = new Transferable() {
-			
-			@Override
-			public boolean isDataFlavorSupported(DataFlavor flavor) {
-				return DataFlavor.imageFlavor.equals(flavor);
-			}
-			
-			@Override
-			public DataFlavor[] getTransferDataFlavors() {
-				return new DataFlavor[] {DataFlavor.imageFlavor};
-			}
-			
-			@Override
-			public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
-				if(!DataFlavor.imageFlavor.equals(flavor))					    {
-					throw new UnsupportedFlavorException(flavor);
-				}
-				return bufferedImg;
-			}
 
-		};
-		
-		Toolkit.getDefaultToolkit().getSystemClipboard().setContents(img, null);
-		
-	}
 
 	@Override
 	public Object getChart() {
 		return this.file;
 	}
 
-	
-	@Override
-	public EventCallBackHandler getMouseCallBackHandler() {
-		return super.getMouseCallBackHandler(this.getPanel());
-	}
 
-
 	@Override
-	public EventCallBackHandler getKeyCallBackHandler() {
-		return super.getKeyCallBackHandler(this.getPanel());
-	}
-
-
-	@Override
 	public void clearChartItemsSelection() {
 		System.err.println("SVGComposite.clearChartItemsSelection(): not implemented.");
 	}
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/JFCChartsEngine.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/JFCChartsEngine.java	(revision 837)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/JFCChartsEngine.java	(revision 838)
@@ -62,7 +62,7 @@
 	/**
 	 * The charts engine description.
 	 */
-	public final static String DESCRIPTION = "Java";
+	public final static String DESCRIPTION = "JFreeChart/Java2D";
 
 	/**
 	 * The rendering theme.
@@ -978,15 +978,15 @@
 
 			// JFreeSVG generates rgba(x,x,x,x.x) CSS style which is part of SVG version 2. It's incompatible with the actual Batik version used by TXM to display SVG Files
 			// To fix this, replace from rgba() to rgb(), e.g.: stroke: rgba(255,0,0,0.352941);stroke-opacity: 1.0
-			svg = svg.replaceAll("rgba\\(([0-9]+),([0-9]+),([0-9]+),([0-9\\.]+)\\);(stroke|fill)-opacity: [0-9\\.]+", "rgb\\($1,$2,$3\\);$5-opacity: $4");
+			svg = svg.replaceAll("rgba\\(([0-9]+),([0-9]+),([0-9]+),([0-9\\.]+)\\);(stroke|fill)-opacity: [0-9\\.]+", "rgb\\($1,$2,$3\\);$5-opacity: $4"); //$NON-NLS-1$
 			// second pass
-			svg = svg.replaceAll("rgba\\(([0-9]+),([0-9]+),([0-9]+),[0-9\\.]+\\)", "rgb\\($1,$2,$3\\)");
+			svg = svg.replaceAll("rgba\\(([0-9]+),([0-9]+),([0-9]+),[0-9\\.]+\\)", "rgb\\($1,$2,$3\\)"); //$NON-NLS-1$
 
 			// fix angular line join bug in step charts #1056
-			svg = svg.replaceAll("<svg ", "<svg style=\"stroke-linecap:square;\" ");
+			svg = svg.replaceAll("<svg ", "<svg style=\"stroke-linecap:square;\" "); //$NON-NLS-1$
 
 			// fix double ;; character bug  #1554
-			svg = svg.replaceAll("(;)(; )(stroke|fill)", "$2$3");
+			svg = svg.replaceAll("(;)(; )(stroke|fill)", "$2$3"); //$NON-NLS-1$
 			
 			
 			
@@ -995,8 +995,8 @@
 			    BufferedWriter writer = null;
 			    try {
 			        writer = new BufferedWriter(new FileWriter(file));
-			        writer.write("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
-			        writer.write(svg + "\n");
+			        writer.write("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"); //$NON-NLS-1$
+			        writer.write(svg + "\n"); //$NON-NLS-1$
 			        writer.flush();
 			    }
 			    finally	{
@@ -1310,30 +1310,19 @@
 	}
 
 
-	/**
-	 * 
-	 * @return
-	 */
-	public static ArrayList<String> getSupportedOutputDisplayFormatsStatic() {
+
+	@Override
+	public ArrayList<String> getSupportedOutputDisplayFormats() {
 		ArrayList<String> formats = new ArrayList<String>(1);
 		
 		formats.add(OUTPUT_FORMAT_JFC_JAVA2D);
 		
 		return formats;
 	}
-	
 
 	@Override
-	public ArrayList<String> getSupportedOutputDisplayFormats() {
-		return getSupportedOutputDisplayFormatsStatic();
-	}
-
-	/**
-	 * 
-	 * @return
-	 */
-	public static ArrayList<String> getSupportedOutputFileFormatsStatic() {
-	ArrayList<String> formats = new ArrayList<String>(6);
+	public ArrayList<String> getSupportedOutputFileFormats() {
+		ArrayList<String> formats = new ArrayList<String>(6);
 		
 		formats.add(OUTPUT_FORMAT_SVG); // Default format
 
@@ -1350,11 +1339,6 @@
 
 		return formats;
 	}
-	
-	@Override
-	public ArrayList<String> getSupportedOutputFileFormats() {
-		return getSupportedOutputFileFormatsStatic();
-	}
 
 
 
Index: tmp/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF	(revision 837)
+++ tmp/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF	(revision 838)
@@ -1,16 +1,18 @@
 Manifest-Version: 1.0
-Require-Bundle: org.txm.libs.jfreechart;bundle-version="1.0.17";visibi
- lity:=reexport,org.txm.libs.itext;visibility:=reexport,org.eclipse.co
- re.runtime;visibility:=reexport,org.txm.libs.jfreesvg;bundle-version=
- "1.7.0";visibility:=reexport,org.txm.chartsengine.core;bundle-version
- ="1.0.0";visibility:=reexport,org.txm.core;visibility:=reexport
-Export-Package: org.txm.chartsengine.jfreechart.core,org.txm.chartseng
- ine.jfreechart.core.preferences,org.txm.chartsengine.jfreechart.core.
- renderers,org.txm.chartsengine.jfreechart.core.renderers.interfaces,o
- rg.txm.chartsengine.jfreechart.core.themes.base,org.txm.chartsengine.
- jfreechart.core.themes.highcharts.defaulttheme,org.txm.chartsengine.j
- freechart.core.themes.highcharts.defaulttheme.renderers,org.txm.chart
- sengine.jfreechart.core.themes.highcharts.defaulttheme.swing
+Require-Bundle: org.txm.libs.jfreechart;bundle-version="1.0.17";visibility:=reexport,
+ org.txm.libs.itext;visibility:=reexport,
+ org.eclipse.core.runtime;visibility:=reexport,
+ org.txm.libs.jfreesvg;bundle-version="1.7.0";visibility:=reexport,
+ org.txm.chartsengine.core;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.core;visibility:=reexport
+Export-Package: org.txm.chartsengine.jfreechart.core,
+ org.txm.chartsengine.jfreechart.core.preferences,
+ org.txm.chartsengine.jfreechart.core.renderers,
+ org.txm.chartsengine.jfreechart.core.renderers.interfaces,
+ org.txm.chartsengine.jfreechart.core.themes.base,
+ org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme,
+ org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers,
+ org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing
 Bundle-Vendor: Textometrie.org
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: JFreeChart Charts Engine Core
Index: tmp/org.txm.backtomedia.feature/.project
===================================================================
--- tmp/org.txm.backtomedia.feature/.project	(revision 837)
+++ tmp/org.txm.backtomedia.feature/.project	(revision 838)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>BackToMediaFeature</name>
+	<name>org.txm.backtomedia.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java	(revision 837)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java	(revision 838)
@@ -422,10 +422,10 @@
 						tableViewer.setSelection(new StructuredSelection(line), true);
 						// FIXME: commented because the set top index makes the read of the table difficult
 						//tableViewer.getTable().setTopIndex(selectedPointInTableRange);
-						System.out.println("ProgressionEventCallBack.updateLinkedConcordanceEditor(...).new Runnable() {...}.run(): Selecting progression point (" + selectedPointInTableRange + " / " + tableViewer.getTable().getItemCount() + ") in the linked Concordance table.");
+						Log.finest("ProgressionEventCallBack.updateLinkedConcordanceEditor(...).new Runnable() {...}.run(): Selecting progression point (" + selectedPointInTableRange + " / " + tableViewer.getTable().getItemCount() + ") in the linked Concordance table.");
 					}
 					else	{
-						System.err.println("ProgressionEventCallBack.updateLinkedConcordanceEditor(...).new Runnable() {...}.run(): Selected progression point (" + selectedPointInTableRange + " / " + tableViewer.getTable().getItemCount() + ") doesn't exist in the linked Concordance table.");
+						Log.finest("ProgressionEventCallBack.updateLinkedConcordanceEditor(...).new Runnable() {...}.run(): Selected progression point (" + selectedPointInTableRange + " / " + tableViewer.getTable().getItemCount() + ") doesn't exist in the linked Concordance table.");
 					}
 				}
 			});
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java	(revision 837)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java	(revision 838)
@@ -39,58 +39,51 @@
 
 
 /**
- * Computes a Progression and opens the result editor.
+ * Opens a Progression editor.
  * 
  * @author mdecorde
  * @author sjacquot
  */
 public class ComputeProgression extends BaseAbstractHandler {
 	
-	// FIXME: should be put in an Activator? or better in an extension point loaded by the corpora view? or in a method called here as initTreeDoubleClickListener(Class resultDataType, String commandId)?
-	// adds a double click listener to the Corpus View
-//	static	{
-//		CorporaView.addDoubleClickListener(Progression.class, ComputeProgression.class);
-//	}
-	
-	
-	
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
-		
 		if(!this.checkStatsEngine() || !this.checkCorpusEngine()) {
 			return false;
 		}
 
-		Object selection = this.getSelection(event);
-
-		
 		Progression progression = null;
 		
-
-		// Creating from UUID and preferences nodes
-		if (!event.getParameters().isEmpty()) {
-			progression = new Progression(event.getParameter(TXMPreferences.RESULT_UUID));
+		// From link: creating from UUID and preferences nodes
+		String uuid = event.getParameter(TXMPreferences.RESULT_UUID);
+		if (uuid != null && !uuid.isEmpty()) {
+			progression = new Progression(uuid);
 		}
-		// Creating from Corpus
-		else if (selection instanceof Corpus)	{
-			Corpus corpus = (Corpus) selection;
+		// From view result node
+		else	{
+			Object selection = this.getSelection(event);
 
-			if (!Progression.canRunProgression(corpus)) {
-				Log.severe(ProgressionCoreMessages.ComputeProgression_0);
-				// La fonctionnalité Progression n'est pas encore disponible pour les sous-corpus discontinus.
-				return null;
+			// Creating from Corpus
+			if (selection instanceof Corpus)	{
+				Corpus corpus = (Corpus) selection;
+	
+				if (!Progression.canRunProgression(corpus)) {
+					Log.severe(ProgressionCoreMessages.ComputeProgression_0);
+					// La fonctionnalité Progression n'est pas encore disponible pour les sous-corpus discontinus.
+					return null;
+				}
+				progression = new Progression(corpus);
 			}
-			progression = new Progression(corpus);
+			// Reopening an existing result
+			else if (selection instanceof Progression)	{
+				progression = (Progression) selection;
+			}
+			// Error
+			else {
+				return this.logCanNotCompute(selection);
+			}
 		}
-		// Reopening an existing result
-		else if (selection instanceof Progression)	{
-			progression = (Progression) selection;
-		}
-		// Error
-		else {
-			this.logCanNotCompute(selection);
-		}
 
 		ChartEditor.openEditor(progression);
 		
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 837)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 838)
@@ -863,6 +863,7 @@
 		refreshReferenceColumnTitle();
 		viewer.getControl().setRedraw(true);
 		viewer2.getControl().setRedraw(true);
+		
 	}
 
 
@@ -1240,13 +1241,19 @@
 
 		//if (true)// concordance==null || concordance.getQuery()!=query)
 		try {
+			
+			//FIXME: usless? called by TXMEditor
 			CorporaView.refresh();
 			CorporaView.expand(concordance.getCorpus());
+			
+			
 			QueriesView.refresh();
 
 			fillDisplayArea();
-
+			
+			//FIXME: usless? called by TXMEditor	
 			setPartName(concordance.getName());
+			
 			queryWidget.memorize();
 
 			resetColumnWidths();
@@ -1254,11 +1261,10 @@
 			JobsTimer.stopAndPrint();
 
 		} catch (Exception e1) {
-			System.out.println(TXMUIMessages.CorporaView_3+" "+Log.toString(e1)); //$NON-NLS-1$
+			System.out.println(TXMUIMessages.CorporaView_3 + " " + Log.toString(e1)); //$NON-NLS-1$
 			//System.err.println(Messages.CorporaView_3);
 			org.txm.rcp.utils.Logger.printStackTrace(e1);
 			try {
-				System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
 				Log.severe(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
 			} catch (Exception e2) {
 				System.out.println(ConcordanceUIMessages.ConcordancesEditor_7+e2);
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 837)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 838)
@@ -27,21 +27,15 @@
 //
 package org.txm.concordance.rcp.handlers;
 
-import java.util.Map;
-
-import javax.inject.Inject;
-
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IEditorPart;
 import org.txm.concordance.core.functions.Concordance;
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
 import org.txm.concordance.rcp.messages.ConcordanceUIMessages;
-import org.txm.core.results.TXMParameters;
+import org.txm.core.preferences.TXMPreferences;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.handlers.BaseAbstractHandler;
-import org.txm.searchengine.cqp.CQPSearchEngine;
 import org.txm.searchengine.cqp.corpus.Corpus;
 
 /**
@@ -55,56 +49,98 @@
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		
-		// if a TXMParameters is linked to the command call, uses its parent to create the concordance
-		TXMParameters parameters = null;
-		Map cmdparameters = event.getParameters();
-		System.out.println(cmdparameters);
-		if (cmdparameters.containsKey(TXMParameters.class.getName())) {
-			Object iparam = cmdparameters.get(TXMParameters.class.getName());
-			if (iparam instanceof TXMParameters) {
-				parameters = (TXMParameters)iparam;
-			}
+		if(!this.checkCorpusEngine()) {
+			return false;
 		}
-		Object selection = null;
-		if (parameters == null) { // no parameters provided
-			selection = this.getSelection(event);
-		} else {
-			selection = parameters;
-		}
-		
-		if (openEditor(selection) == null) {
-			System.out.println(ConcordanceUIMessages.ComputeConcordance_1);
-		}
 
-		return null;
-	}
-
-	@Inject
-	public static IEditorPart openEditor(Object o) {
+		Object selection = this.getSelection(event);
 		
-		if (!CQPSearchEngine.isInitialized()) {
-			System.out.println("SearchEngine is not ready. Aborting.");
-			return null;
-		}
-		
 		Concordance concordance = null;
 
-		// Creating from Corpus
-		if (o instanceof Corpus) {
-			Corpus corpus = (Corpus) o;
-			concordance = new Concordance(corpus);
+		// From link: creating from UUID and preferences nodes
+		String uuid = event.getParameter(TXMPreferences.RESULT_UUID);
+		if (uuid != null && !uuid.isEmpty()) {
+			concordance = new Concordance(uuid);
 		}
-		// Reopening existing result
-		else if (o instanceof Concordance) {
-			concordance = (Concordance)o;
+		// From view result node
+		else	{
+			// Creating from Corpus
+			if (selection instanceof Corpus) {
+				Corpus corpus = (Corpus) selection;
+				concordance = new Concordance(corpus);
+			}
+			// Reopening existing result
+			else if (selection instanceof Concordance) {
+				concordance = (Concordance)selection;
+			}
+			// Error
+			else {
+				return this.logCanNotCompute(selection);
+			}
 		}
-		else {
-			System.out.println("Could not call ComputeConcordance with: "+o);
-			return null;
-		}
 		
 		StatusLine.setMessage(ConcordanceUIMessages.ComputeConcordance_0);
 		TXMEditor.openEditor(concordance, ConcordanceEditor.class.getName());
 		return null;
+		
+		// FIXME: old version
+		// if a TXMParameters is linked to the command call, uses its parent to create the concordance
+//		TXMParameters parameters = null;
+//		Map cmdparameters = event.getParameters();
+//		System.out.println(cmdparameters);
+//		if (cmdparameters.containsKey(TXMParameters.class.getName())) {
+//			Object iparam = cmdparameters.get(TXMParameters.class.getName());
+//			if (iparam instanceof TXMParameters) {
+//				parameters = (TXMParameters)iparam;
+//			}
+//		}
+//		Object selection = null;
+//		if (parameters == null) { // no parameters provided
+//			selection = this.getSelection(event);
+//		} else {
+//			selection = parameters;
+//		}
+//		
+//		if (openEditor(selection) == null) {
+//			System.out.println(ConcordanceUIMessages.ComputeConcordance_1);
+//		}
+//
+//		return null;
 	}
+
+	// FIXME: old version
+//	@Inject
+//	public static IEditorPart openEditor(Object o) {
+//		
+//		if (!CQPSearchEngine.isInitialized()) {
+//			System.out.println("SearchEngine is not ready. Aborting.");
+//			return null;
+//		}
+//		
+//		Concordance concordance = null;
+//
+//		// Creating from UUID and preferences nodes
+//		String uuid = event.getParameter(TXMPreferences.RESULT_UUID);
+//		if (uuid != null && !uuid.isEmpty()) {
+//			progression = new Progression(uuid);
+//		}
+//
+//		// Creating from Corpus
+//		if (o instanceof Corpus) {
+//			Corpus corpus = (Corpus) o;
+//			concordance = new Concordance(corpus);
+//		}
+//		// Reopening existing result
+//		else if (o instanceof Concordance) {
+//			concordance = (Concordance)o;
+//		}
+//		else {
+//			System.out.println("Could not call ComputeConcordance with: "+o);
+//			return null;
+//		}
+//		
+//		StatusLine.setMessage(ConcordanceUIMessages.ComputeConcordance_0);
+//		TXMEditor.openEditor(concordance, ConcordanceEditor.class.getName());
+//		return null;
+//	}
 }
Index: tmp/org.txm.oriflamms.rcp/.project
===================================================================
--- tmp/org.txm.oriflamms.rcp/.project	(revision 837)
+++ tmp/org.txm.oriflamms.rcp/.project	(revision 838)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OriflammsRCP</name>
+	<name>org.txm.exts.oriflamms.rcp</name>
 	<comment></comment>
 	<projects>
 	</projects>
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 837)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 838)
@@ -275,7 +275,7 @@
 				}
 
 				if (e1 instanceof TXMResult && e2 instanceof TXMResult) {
-					return TXMResult.compare((TXMResult)e1, (TXMResult)e2);
+					return ((TXMResult)e1).compareTo((TXMResult)e2);
 				} else {
 					return super.compare(viewer, e1, e2);
 				}
@@ -377,6 +377,7 @@
 					}
 
 					// test if a double click listener has been set
+					@Deprecated
 					Class commandClass = managedDoubleClickClasses.get(selectedItem.getClass());
 					//System.out.println("classes: "+managedDoubleClickClasses);
 					if (commandClass != null) {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/debug/TXMResultDebugView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/debug/TXMResultDebugView.java	(revision 837)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/debug/TXMResultDebugView.java	(revision 838)
@@ -127,6 +127,7 @@
 		buffer.append("\n"); //$NON-NLS-1$
 		buffer.append("Selected object = " + this.currentResult + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 		buffer.append("Node visible = " + this.currentResult.isVisible() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+		buffer.append("Node weight = " + this.currentResult.getWeight() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 		if (this.currentResult instanceof ChartResult) 	{
 			buffer.append("Chart engine = " + ((ChartResult)this.currentResult).getChartsEngine() + ", chart object = " + ((ChartResult)this.currentResult).getChart()
 					+ ", chart type = " + ((ChartResult)this.currentResult).getChartType()
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 837)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 838)
@@ -34,6 +34,8 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPartSite;
@@ -644,6 +646,24 @@
 			CorporaView.refreshObject(this);
 			TXMResultDebugView.refreshView();
 
+			// FIXME: update all open editors of the children result
+			// FIXME: prob here is that updateEditorFromResult() doesn't enough because the compute() method does some other stuff
+			// so the cascade computing may be done here rather than in TXMResult.compute() or we need to move some stuff from TXMEditor.compute() to
+			// TXMEditor.updateEditorFromResult(), eg. the chart loading
+			// WARNING: At This moment, with this code, TXMResult.compute() of the children is called twice
+//			for (IEditorReference reference : PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getEditorReferences()) {
+//				IEditorPart editor = reference.getEditor(false);
+//				if(editor != null && editor instanceof TXMEditor)	{
+//					TXMEditor txmEditor = ((TXMEditor)editor);
+//					if(txmEditor.getResult().getParent() == this.getResult())	{
+//						Log.finest("TXMEditor.refresh(): updating editor for result: " + txmEditor.getResult().getSimpleName());
+//						txmEditor.compute(true);
+//						//txmEditor.updateEditorFromResult(false);
+//					}
+//				}
+//			}
+			
+			
 		}
 	}
 
Index: tmp/org.txm.rcp/plugin.xml
===================================================================
--- tmp/org.txm.rcp/plugin.xml	(revision 837)
+++ tmp/org.txm.rcp/plugin.xml	(revision 838)
@@ -480,6 +480,10 @@
                         value="hyperbaseLoader.groovy">
                   </parameter>
                </command>
+               <separator
+                     name="menu.file.import.separator.cqp"
+                     visible="true">
+               </separator>
                <command
                      commandId="org.txm.rcp.handlers.scripts.ExecuteImportScript"
                      label="%command.label.82"
@@ -500,7 +504,7 @@
                   label="Charger">
                <command
                      commandId="org.txm.rcp.commands.workspace.LoadBinaryCorpus"
-                     label="un corpus (.txm)..."
+                     label="un corpus binaire (.txm)..."
                      style="push">
                </command>
                <command
@@ -645,12 +649,6 @@
                   name="menu.file.separator.lang"
                   visible="true">
             </separator>
-            <command
-                  commandId="org.txm.rcp.commands.changelanguage"
-                  label="%command.label.75"
-                  style="push"
-                  tooltip="%command.tooltip.42">
-            </command>
             <separator
                   name="menu.file.separator.update"
                   visible="true">
@@ -1101,6 +1099,12 @@
                   commandId="org.eclipse.ui.window.newWindow"
                   label="%command.label.157">
             </command>
+            <command
+                  commandId="org.txm.rcp.commands.changelanguage"
+                  label="%command.label.75"
+                  style="push"
+                  tooltip="%command.tooltip.42">
+            </command>
          </menu>
          <menu
                id="menu.help"
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle.properties	(revision 837)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle.properties	(revision 838)
@@ -32,7 +32,7 @@
 
 command.label = Open in browser...
 
-command.label.0 = CNR + CSV
+command.label.0 = Cordial + CSV
 
 command.label.1 = XML/w + CSV
 
@@ -344,7 +344,7 @@
 
 command.label.82 = CQP
 
-command.label.83 = New file
+command.label.83 = New...
 
 command.label.84 = Lexicon
 
@@ -596,7 +596,7 @@
 
 command.tooltip.33 = Delete the selected item
 
-command.tooltip.34 = Creates a new File
+command.tooltip.34 = Edit a new File
 
 command.tooltip.35 = Toggle Show Whitespace Characters
 
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 837)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 838)
@@ -2,115 +2,115 @@
 #=
 #Mon Mar 05 10:02:31 CET 2012=N/A_
 
-category.description = \u0422\u0435\u043A\u0441\u0442\u043E\u043C\u0435\u0442\u0440\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u043A\u043E\u043C\u0430\u043D\u0434\u044B
+category.description = Текстометрические команды
 
 category.name = TXM
 
 category.name.0 = TXM
 
-command.description = \u041F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C TXM
+command.description = Перезагрузить TXM
 
-command.description.0 = \u041A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0430\u0440\u044B\u0439 \u0431\u0438\u043D\u0430\u0440\u043D\u044B\u0439 \u0444\u0430\u0439\u043B
+command.description.0 = Конвертировать старый бинарный файл
 
 command.description.1 = Reset corpora
 
-command.label = \u041F\u0440\u043E\u0447\u0438\u0442\u0430\u0442\u044C \u0444\u0430\u0439\u043B HTML
+command.label = Прочитать файл HTML
 
-command.label.0 = CNR + CSV
+command.label.0 = Cordial + CSV
 
 command.label.1 = XML/w + CSV
 
 command.label.100 = N/A_ Find Previous
 
-command.label.101 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442 SVG
+command.label.101 = Экспорт SVG
 
-command.label.103 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u043D\u0430 \u043F\u0440\u043E\u0433\u0440\u0435\u0441\u0441\u0438\u044E
+command.label.103 = Отправить на прогрессию
 
-command.label.105 = \u041E\u0431\u044A\u0435\u0434\u0438\u043D\u0438\u0442\u044C \u0441\u0442\u0440\u043E\u043A\u0438
+command.label.105 = Объединить строки
 
-command.label.106 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0430\u0431\u043B\u0438\u0446\u0443
+command.label.106 = Экспортировать таблицу
 
-command.label.107 = \u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0430\u0431\u043B\u0438\u0446\u0443
+command.label.107 = Импортировать таблицу
 
-command.label.108 = \u0421\u0441\u044B\u043B\u043A\u0438
+command.label.108 = Ссылки
 
 command.label.109 = N/A_ Incremental Find
 
-command.label.11 = \u041A\u043E\u043D\u043A\u043E\u0440\u0434\u0430\u043D\u0441\u044B
+command.label.11 = Конкордансы
 
 command.label.110 = N/A_ Incremental Find (reverse)
 
-command.label.111 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442 R
+command.label.111 = Выполнить скрипт R
 
 command.label.113 = N/A_ Goto line
 
-command.label.114 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441
+command.label.114 = Экспортировать корпус
 
-command.label.116 = \u041A\u043B\u0430\u0441\u0441\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F
+command.label.116 = Классификация
 
-command.label.117 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 R
+command.label.117 = Отправить в R
 
-command.label.118 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441
+command.label.118 = Экспортировать корпус
 
 command.label.12 = XML-TEI TXM
 
-command.label.120 = \u041A\u043B\u0430\u0441\u0441\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F
+command.label.120 = Классификация
 
-command.label.121 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 R
+command.label.121 = Отправить в R
 
-command.label.122 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0444\u0430\u0439\u043B
+command.label.122 = Создать файл
 
-command.label.123 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443
+command.label.123 = Создать папку
 
-command.label.124 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441
+command.label.124 = Экспортировать корпус
 
-command.label.126 = \u041A\u043B\u0430\u0441\u0441\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F
+command.label.126 = Классификация
 
-command.label.127 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u043D\u0430 R
+command.label.127 = Отправить на R
 
-command.label.128 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u043D\u0430 \u0418\u043D\u0434\u0435\u043A\u0441
+command.label.128 = Отправить на Индекс
 
-command.label.129 = \u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+command.label.129 = Копировать
 
-command.label.13 = \u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441 TXM 0.5
+command.label.13 = Загрузить корпус TXM 0.5
 
-command.label.130 = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C
+command.label.130 = Вставить
 
-command.label.131 = \u041A\u043E\u0440\u043F\u0443\u0441
+command.label.131 = Корпус
 
 command.label.132 = R
 
 command.label.133 = N/A_ Open URL
 
-command.label.134 = \u041A\u043E\u0440\u043F\u0443\u0441
+command.label.134 = Корпус
 
-command.label.135 = \u0424\u0430\u0439\u043B
+command.label.135 = Файл
 
-command.label.136 = \u0417\u0430\u043F\u0440\u043E\u0441
+command.label.136 = Запрос
 
-command.label.139 = \u0415\u0449\u0451...
+command.label.139 = Ещё...
 
-command.label.14 = \u041E \u041F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0435 TXM
+command.label.14 = О Платформе TXM
 
 command.label.140 = N/A_ Show Line Numbers
 
-command.label.141 = \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 SVG 
+command.label.141 = управление SVG 
 
-command.label.143 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C
+command.label.143 = Выполнить
 
 command.label.144 = N/A_ Toggle Show Whitespace Characters
 
 command.label.145 = N/A_ Revert to saved
 
-command.label.146 = \u0411\u0438\u0431\u043B\u0438\u043E\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u0437\u0430\u043F\u0438\u0441\u044C
+command.label.146 = Библиографическая запись
 
-command.label.147 = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043A\u0443\u044E \u0437\u0430\u043F\u0438\u0441\u044C
+command.label.147 = Открыть библиографическую запись
 
-command.label.148 = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043A\u0443\u044E \u0437\u0430\u043F\u0438\u0441\u044C
+command.label.148 = Открыть библиографическую запись
 
-command.label.149 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 \u0421\u043E\u0432\u043C\u0435\u0441\u0442\u043D\u0443\u044E \u0432\u0441\u0442\u0440\u0435\u0447\u0430\u0435\u043C\u043E\u0441\u0442\u044C
+command.label.149 = Отправить в Совместную встречаемость
 
-command.label.15 = \u041F\u043E\u0438\u0441\u043A...
+command.label.15 = Поиск...
 
 command.label.150 = Execute import script
 
@@ -120,11 +120,11 @@
 
 command.label.153 = Execute import script
 
-command.label.154 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442 \u0438\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F
+command.label.154 = Выполнить скрипт импортирования
 
-command.label.155 = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0444\u0430\u0439\u043B \u0432 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0435
+command.label.155 = Открыть файл в браузере
 
-command.label.156 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0444\u0430\u0439\u043B Groovy
+command.label.156 = Выполнить файл Groovy
 
 command.label.157 = N/A_ New window
 
@@ -132,7 +132,7 @@
 
 command.label.159 = N/A_ Search and Replace
 
-command.label.16 = \u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C
+command.label.16 = Отменить
 
 command.label.160 = N/A_ Find previous
 
@@ -154,7 +154,7 @@
 
 command.label.169 = N/A_ Show Control characters
 
-command.label.17 = \u041F\u043E\u0432\u0442\u043E\u0440\u0438\u0442\u044C
+command.label.17 = Повторить
 
 command.label.170 = N/A_ Execute current script
 
@@ -168,119 +168,119 @@
 
 command.label.175 = N/A_ Test all commands
 
-command.label.18 = \u0412\u044B\u0440\u0435\u0437\u0430\u0442\u044C
+command.label.18 = Вырезать
 
-command.label.19 = \u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+command.label.19 = Копировать
 
 command.label.2 = XML-PPS
 
-command.label.20 = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C
+command.label.20 = Вставить
 
-command.label.21 = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0432 \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u043E\u043C \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0435
+command.label.21 = Открыть в текстовом редакторе
 
-command.label.22 = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0432 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0435 HTML
+command.label.22 = Открыть в браузере HTML
 
-command.label.23 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442
+command.label.23 = Выполнить скрипт
 
-command.label.24 = \u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430
+command.label.24 = Свойства
 
-command.label.25 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0435 \u0441\u0442\u0440\u043E\u043A\u0438
+command.label.25 = Выполнить выделенные строки
 
-command.label.27 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C
+command.label.27 = Удалить
 
-command.label.28 = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0451
+command.label.28 = Выбрать всё
 
-command.label.29 = \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043A\u0430\u043A...
+command.label.29 = Сохранить как...
 
 command.label.3 = XML-TRS + CSV
 
-command.label.30 = \u041A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430
+command.label.30 = Кодировка
 
-command.label.31 = \u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C
+command.label.31 = Просмотреть
 
-command.label.32 = \u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C
+command.label.32 = Просмотреть
 
-command.label.33 = \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043A\u0430\u043A...
+command.label.33 = Сохранить как...
 
 command.label.34 = Add a third-party extension
 
-command.label.35 = \u0412\u044B\u043F\u043E\u043B\u0438\u043D\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442
+command.label.35 = Выполинть скрипт
 
-command.label.39 = \u0414\u043E\u0431\u0430\u0432\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442
+command.label.39 = Добавть скрипт
 
-command.label.4 = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
+command.label.4 = Настройки
 
-command.label.40 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442
+command.label.40 = Удалить проект
 
-command.label.41 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0431\u0430\u0437\u0443
+command.label.41 = Удалить базу
 
-command.label.43 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442
+command.label.43 = Удалить скрипт
 
-command.label.44 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0444\u0430\u0439\u043B
+command.label.44 = Удалить файл
 
-command.label.45 = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0444\u0430\u0439\u043B
+command.label.45 = Открыть файл
 
-command.label.46 = \u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B
+command.label.46 = Копировать файл
 
-command.label.47 = \u0412\u044B\u0440\u0435\u0437\u0430\u0442\u044C \u0444\u0430\u0439\u043B
+command.label.47 = Вырезать файл
 
 command.label.5 = XML-TEI-BFM
 
-command.label.50 = \u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C
+command.label.50 = Загрузить
 
-command.label.51 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+command.label.51 = Экспортировать
 
 command.label.52 = Key assist
 
-command.label.53 = \u0421\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F \u043E\u0431 \u043E\u0448\u0438\u0431\u043A\u0430\u0445
+command.label.53 = Сообщения об ошибках
 
-command.label.54 = \u0417\u0430\u044F\u0432\u043A\u0438 \u043D\u0430 \u043D\u043E\u0432\u044B\u0435 \u0444\u0443\u043D\u043A\u0446\u0438\u0438
+command.label.54 = Заявки на новые функции
 
-command.label.55 = \u041F\u043E\u0434\u043F\u0438\u0441\u0430\u0442\u044C\u0441\u044F \u043D\u0430 \u0440\u0430\u0441\u0441\u044B\u043B\u043A\u0443 txm-users
+command.label.55 = Подписаться на рассылку txm-users
 
-command.label.56 = \u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u044F
+command.label.56 = Обновления
 
-command.label.57 = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0444\u0430\u0439\u043B
+command.label.57 = Вставить файл
 
-command.label.58 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+command.label.58 = Экспортировать
 
-command.label.59 = \u041F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C
+command.label.59 = Перезагрузить
 
-command.label.6 = \u0412\u044B\u0439\u0442\u0438
+command.label.6 = Выйти
 
-command.label.60 = \u0411\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430 (FR)
+command.label.60 = Буфер обмена (FR)
 
 command.label.61 = Hyperbase
 
 command.label.62 = Alceste
 
-command.label.63 = \u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C
+command.label.63 = Просмотреть
 
 command.label.64 = N/A_ Factiva TXT
 
-command.label.65 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C
+command.label.65 = Удалить
 
-command.label.66 = \u0418\u043D\u0434\u0435\u043A\u0441
+command.label.66 = Индекс
 
-command.label.67 = \u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C TreeTagger
+command.label.67 = Установить TreeTagger
 
 command.label.68 = N/A_ Online manual
 
 command.label.69 = N/A_ Textometrie project web site
 
-command.label.7 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u043E\u0434\u043A\u043E\u0440\u043F\u0443\u0441
+command.label.7 = Создать подкорпус
 
 command.label.70 = N/A_ TXM manuals directory
 
-command.label.71 = \u0418\u0437\u0434\u0430\u043D\u0438\u0435
+command.label.71 = Издание
 
 command.label.72 = N/A_ Textometrie project documentation
 
-command.label.73 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 \u043A\u043E\u043D\u043A\u043E\u0440\u0434\u0430\u043D\u0441
+command.label.73 = Отправить в конкорданс
 
-command.label.74 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 \u043A\u043E\u043D\u043A\u043E\u0440\u0434\u0430\u043D\u0441
+command.label.74 = Отправить в конкорданс
 
-command.label.75 = \u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u044F\u0437\u044B\u043A
+command.label.75 = Изменить язык
 
 command.label.76 = XML-TEI BFM
 
@@ -288,107 +288,107 @@
 
 command.label.78 = TXT + CSV
 
-command.label.79 = \u0421\u043B\u043E\u0432\u0430\u0440\u044C
+command.label.79 = Словарь
 
-command.label.8 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0420\u0430\u0441\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435
+command.label.8 = Создать Распределение
 
-command.label.80 = \u0424\u0410\u0421
+command.label.80 = ФАС
 
 command.label.81 = N/A_ XML-TMX
 
 command.label.82 = N/A_ CWB
 
-command.label.83 = N/A_ New
+command.label.83 = 
 
-command.label.84 = \u0421\u043B\u043E\u0432\u0430\u0440\u044C
+command.label.84 = Словарь
 
 command.label.86 = N/A_ Save
 
-command.label.87 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442
+command.label.87 = Экспорт
 
 command.label.88 = N/A_ Save All
 
-command.label.89 = \u0421\u043B\u043E\u0432\u0430\u0440\u043D\u0430\u044F \u0442\u0430\u0431\u043B\u0438\u0446\u0430
+command.label.89 = Словарная таблица
 
 command.label.9 = XML-TEI Frantext
 
 command.label.90 = N/A_ Close
 
-command.label.92 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442
+command.label.92 = Экспорт
 
 command.label.93 = N/A_ Close all
 
-command.label.94 = \u0421\u043B\u043E\u0432\u0430\u0440\u043D\u0430\u044F \u0442\u0430\u0431\u043B\u0438\u0446\u0430
+command.label.94 = Словарная таблица
 
-command.label.96 = \u0421\u043E\u0432\u043C\u0435\u0441\u0442\u043D\u0430\u044F \u0432\u0441\u0442\u0440\u0435\u0447\u0430\u0435\u043C\u043E\u0441\u0442\u044C
+command.label.96 = Совместная встречаемость
 
 command.label.98 = N/A_ Find next
 
-command.label.99 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 \u043F\u0440\u043E\u0433\u0440\u0435\u0441\u0441\u0438\u044E
+command.label.99 = Отправить в прогрессию
 
-command.name = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0444\u0430\u0439\u043B
+command.name = Открыть файл
 
-command.name.0 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442 Groovy
+command.name.0 = Выполнить скрипт Groovy
 
-command.name.1 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u041F\u043E\u0434\u043A\u043E\u0440\u043F\u0443\u0441
+command.name.1 = Создать Подкорпус
 
-command.name.10 = \u0412\u044B\u043F\u043E\u043B\u0438\u043D\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0435 \u0441\u0442\u0440\u043E\u043A\u0438 \u043A\u0430\u043A \u0441\u043A\u0440\u0438\u043F\u0442 Groovy
+command.name.10 = Выполинть выделенные строки как скрипт Groovy
 
-command.name.11 = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442
+command.name.11 = Добавить проект
 
-command.name.12 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442
+command.name.12 = Удалить проект
 
-command.name.13 = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0431\u0430\u0437\u0443
+command.name.13 = Добавить базу
 
-command.name.14 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0431\u0430\u0437\u0443
+command.name.14 = Удалить базу
 
-command.name.15 = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0442\u0435\u043A\u0441\u0442
+command.name.15 = Добавить текст
 
-command.name.16 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0442\u0435\u043A\u0441\u0442
+command.name.16 = Удалить текст
 
-command.name.17 = \u041F\u043E\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441
+command.name.17 = Построить корпус
 
-command.name.18 = \u0412\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441\u0430
+command.name.18 = Восстановить корпуса
 
 command.name.19 = OPENTESTEDITOR
 
-command.name.2 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0420\u0430\u0441\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435
+command.name.2 = Создать Распределение
 
-command.name.20 = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u043F\u043E\u0438\u0441\u043A\u043E\u0432\u0443\u044E \u043C\u0430\u0448\u0438\u043D\u0443
+command.name.20 = Выбрать поисковую машину
 
-command.name.21 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C\u0421\u043A\u0440\u0438\u043F\u0442
+command.name.21 = ВыполнитьСкрипт
 
-command.name.22 = \u0412\u044B\u043F\u043E\u043D\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442 \u0438\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F
+command.name.22 = Выпонить скрипт импортирования
 
-command.name.23 = \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
+command.name.23 = Описание
 
-command.name.24 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+command.name.24 = Экспортировать
 
-command.name.25 = \u041F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C
+command.name.25 = Перезагрузить
 
-command.name.26 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C
+command.name.26 = Удалить
 
-command.name.28 = \u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u0443\u0435\u0442 \u043A\u043E\u0440\u043F\u0443\u0441 \u0438\u0437 \u0431\u0443\u0444\u0435\u0440\u0430 \u043E\u0431\u043C\u0435\u043D\u0430 (FR)
+command.name.28 = Импортирует корпус из буфера обмена (FR)
 
-command.name.29 = \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u0438\u0437\u0434\u0430\u043D\u0438\u0435
+command.name.29 = Открывает издание
 
-command.name.3 = \u041A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0430\u0440\u044B\u0439 \u0431\u0438\u043D\u0430\u0440\u043D\u044B\u0439 \u0444\u0430\u0439\u043B
+command.name.3 = Конвертировать старый бинарный файл
 
 command.name.30 = IndexToConcordances
 
-command.name.31 = \u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u044F\u0437\u044B\u043A
+command.name.31 = Изменить язык
 
 command.name.34 = ExportSVG
 
 command.name.36 = ComputeLexicalTable
 
-command.name.37 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C
+command.name.37 = Удалить
 
-command.name.38 = \u041E\u0431\u044A\u0435\u0434\u0438\u043D\u0438\u0442\u044C
+command.name.38 = Объединить
 
-command.name.39 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0430\u0431\u043B\u0438\u0446\u0443
+command.name.39 = Экспортировать таблицу
 
-command.name.40 = \u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0430\u0431\u043B\u0438\u0446\u0443
+command.name.40 = Импортировать таблицу
 
 command.name.41 = CoocToConc
 
@@ -396,25 +396,25 @@
 
 command.name.43 = VocToLexicalTable
 
-command.name.47 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0444\u0430\u0439\u043B
+command.name.47 = Создать файл
 
-command.name.48 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443
+command.name.48 = Создать папку
 
-command.name.50 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C\u0422\u0435\u043A\u0441\u0442
+command.name.50 = ВыполнитьТекст
 
-command.name.51 = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
+command.name.51 = Настройки
 
-command.name.52 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441
+command.name.52 = Экспортировать корпус
 
-command.name.54 = \u041A\u043B\u0430\u0441\u0441\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F
+command.name.54 = Классификация
 
-command.name.55 = \u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+command.name.55 = Копировать
 
-command.name.56 = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C
+command.name.56 = Вставить
 
 command.name.58 = LexiconToIndex
 
-command.name.6 = \u0410\u043D\u0430\u043B\u0438\u0437 \u041A\u043E\u0440\u0440\u0435\u043B\u044F\u0446\u0438\u0439
+command.name.6 = Анализ Корреляций
 
 command.name.60 = SubmitRcode
 
@@ -422,61 +422,61 @@
 
 command.name.63 = Open Biblio
 
-command.name.66 = \u0412\u044B\u043F\u043E\u043B\u0438\u0442\u044C \u0444\u0430\u0439\u043B Groovy
+command.name.66 = Выполить файл Groovy
 
-command.name.67 = \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C\u041A\u0430\u043A
+command.name.67 = СохранитьКак
 
-command.name.68 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C\u0424\u0430\u0439\u043B
+command.name.68 = УдалитьФайл
 
-command.name.69 = \u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C\u0424\u0430\u0439\u043B
+command.name.69 = КопироватьФайл
 
-command.name.70 = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C\u0424\u0430\u0439\u043B
+command.name.70 = ВставитьФайл
 
-command.name.71 = \u0412\u044B\u0440\u0435\u0437\u0430\u0442\u044C\u0424\u0430\u0439\u043B
+command.name.71 = ВырезатьФайл
 
-command.name.72 = \u041A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430
+command.name.72 = Кодировка
 
-command.name.73 = \u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C
+command.name.73 = Просмотреть
 
 command.name.74 = N/A_ Open localized HTML page
 
 command.name.78 = N/A_ Tests commands
 
-command.name.8 = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0435 HTML
+command.name.8 = Показать в браузере HTML
 
-command.name.9 = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C
+command.name.9 = Показать
 
-command.tooltip = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0432 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0435 HTML
+command.tooltip = Открыть в браузере HTML
 
-command.tooltip.0 = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
+command.tooltip.0 = Показать настройки
 
 command.tooltip.1 = XML-PPS
 
-command.tooltip.10 = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430 \u044D\u0442\u043E\u0433\u043E \u044D\u043A\u0437\u0435\u043C\u043F\u043B\u044F\u0440\u0430 \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u044B TXM
+command.tooltip.10 = Показать свойства этого экземпляра платформы TXM
 
 command.tooltip.11 = XML-TEI TXM
 
-command.tooltip.12 = \u041A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0431\u0438\u043D\u0430\u0440\u043D\u044B\u0439 \u043A\u043E\u0440\u043F\u0443\u0441 TXM 0.5 \u0432 \u0444\u043E\u0440\u043C\u0430\u0442 TXM 0.6
+command.tooltip.12 = Конвертировать бинарный корпус TXM 0.5 в формат TXM 0.6
 
-command.tooltip.13 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442
+command.tooltip.13 = Выполнить скрипт
 
-command.tooltip.14 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442
+command.tooltip.14 = Выполнить скрипт
 
-command.tooltip.15 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0444\u0430\u0439\u043B
+command.tooltip.15 = Удалить файл
 
-command.tooltip.16 = \u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B
+command.tooltip.16 = Копировать файл
 
-command.tooltip.17 = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0444\u0430\u0439\u043B \u0432 \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u043E\u043C \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0435
+command.tooltip.17 = Открыть файл в текстовом редакторе
 
-command.tooltip.18 = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0444\u0430\u0439\u043B \u0432 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0435 HTML
+command.tooltip.18 = Открыть файл в браузере HTML
 
-command.tooltip.19 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0421\u043A\u0440\u0438\u043F\u0442
+command.tooltip.19 = Выполнить Скрипт
 
-command.tooltip.2 = \u0412\u044B\u0439\u0442\u0438 \u0438\u0437 \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u044B TXM
+command.tooltip.2 = Выйти из платформы TXM
 
-command.tooltip.20 = \u0412\u044B\u0440\u0435\u0437\u0430\u0442\u044C \u0444\u0430\u0439\u043B
+command.tooltip.20 = Вырезать файл
 
-command.tooltip.21 = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0444\u0430\u0439\u043B
+command.tooltip.21 = Вставить файл
 
 command.tooltip.22 = N/A_ Factiva TXT
 
@@ -486,25 +486,25 @@
 
 command.tooltip.25 = N/A_ CWB
 
-command.tooltip.26 = \u041F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C TXM
+command.tooltip.26 = Перезагрузить TXM
 
-command.tooltip.27 = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u044D\u0442\u0443 \u0444\u0443\u043D\u043A\u0446\u0438\u044E \u043F\u043E\u0441\u043B\u0435 \u0442\u043E\u0433\u043E, \u043A\u0430\u043A \u0441\u043A\u043E\u043F\u0438\u0440\u0443\u0435\u0442\u0435 \u0442\u0435\u043A\u0441\u0442 \u0432 \u0431\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430
+command.tooltip.27 = Используйте эту функцию после того, как скопируете текст в буфер обмена
 
-command.tooltip.28 = \u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u0443\u0435\u0442 \u043A\u043E\u0440\u043F\u0443\u0441 \u0438\u0437 \u043F\u0430\u043F\u043A\u0438, \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0449\u0435\u0439 \u0444\u0430\u0439\u043B csv \u0438 \u0444\u0430\u0439\u043B\u044B cnr
+command.tooltip.28 = Импортирует корпус из папки, содержащей файл csv и файлы cnr
 
-command.tooltip.29 = \u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u0443\u0435\u0442 \u043A\u043E\u0440\u043F\u0443\u0441 \u0438\u0437 \u043F\u0430\u043F\u043A\u0438, \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0449\u0435\u0439 \u0438\u0441\u0445\u043E\u0434\u043D\u044B\u0439 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B \u0432 \u0444\u043E\u0440\u043C\u0430\u0442\u0435 Hyperbase
+command.tooltip.29 = Импортирует корпус из папки, содержащей исходный материал в формате Hyperbase
 
-command.tooltip.3 = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0447\u0430\u0441\u0442\u044C \u0443\u043F\u043E\u0442\u0440\u0435\u0431\u043B\u0435\u043D\u0438\u0439
+command.tooltip.3 = Выбрать часть употреблений
 
-command.tooltip.30 = \u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u0443\u0435\u0442 \u043A\u043E\u0440\u043F\u0443\u0441 \u0438\u0437 \u043F\u0430\u043F\u043A\u0438, \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0449\u0435\u0439 \u0438\u0441\u0445\u043E\u0434\u043D\u044B\u0439 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B \u0432 \u0444\u043E\u0440\u043C\u0430\u0442\u0435 Alceste
+command.tooltip.30 = Импортирует корпус из папки, содержащей исходный материал в формате Alceste
 
 command.tooltip.31 = N/A_ Toggle Show Whitespace Characters
 
-command.tooltip.32 = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u043A\u043E\u0440\u043F\u0443\u0441\u0430
+command.tooltip.32 = Показать издание корпуса
 
-command.tooltip.33 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u044D\u043B\u0435\u043C\u0435\u043D\u0442
+command.tooltip.33 = Удалить выделенный элемент
 
-command.tooltip.34 = N/A_ Creates a new File
+command.tooltip.34 = 
 
 command.tooltip.35 = N/A_ Toggle Show Whitespace Characters
 
@@ -514,81 +514,81 @@
 
 command.tooltip.38 = N/A_ Starts a long process to test all the available commands
 
-command.tooltip.39 = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u043A\u043E\u0440\u043F\u0443\u0441\u0430
+command.tooltip.39 = Показать издание корпуса
 
-command.tooltip.4 = \u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u043E\u0431\u044A\u0435\u043A\u0442 \u043D\u0430 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0447\u0430\u0441\u0442\u0435\u0439
+command.tooltip.4 = Разделить выделенный объект на несколько частей
 
-command.tooltip.42 = \u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u044F\u0437\u044B\u043A
+command.tooltip.42 = Изменить язык
 
 command.tooltip.43 = XML-TEI BFM
 
 command.tooltip.44 = XML/w
 
-command.tooltip.45 = \u0418\u0437 \u043F\u0430\u043F\u043A\u0438 \u0441 \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u043C\u0438 \u0444\u0430\u0439\u043B\u0430\u043C\u0438
+command.tooltip.45 = Из папки с текстовыми файлами
 
-command.tooltip.46 = \u0424\u0410\u041A
+command.tooltip.46 = ФАК
 
-command.tooltip.49 = \u0424\u0410\u041A
+command.tooltip.49 = ФАК
 
 command.tooltip.5 = XML-TRS
 
-command.tooltip.50 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442 SVG
+command.tooltip.50 = Экспорт SVG
 
-command.tooltip.51 = \u0421\u043B\u043E\u0432\u0430\u0440\u043D\u0430\u044F \u0442\u0430\u0431\u043B\u0438\u0446\u0430
+command.tooltip.51 = Словарная таблица
 
-command.tooltip.53 = \u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442 \u0441\u043E\u0432\u043C\u0435\u0441\u0442\u043D\u044B\u0435 \u0443\u043F\u043E\u0442\u0440\u0435\u0431\u043B\u0435\u043D\u0438\u044F \u0434\u043B\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u0430
+command.tooltip.53 = Показывает совместные употребления для запроса
 
-command.tooltip.54 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442 SVG
+command.tooltip.54 = Экспорт SVG
 
-command.tooltip.55 = \u0421\u043B\u043E\u0432\u0430\u0440\u043D\u0430\u044F \u0442\u0430\u0431\u043B\u0438\u0446\u0430
+command.tooltip.55 = Словарная таблица
 
-command.tooltip.58 = \u0421\u043B\u043E\u0432\u0430\u0440\u043D\u0430\u044F \u0442\u0430\u0431\u043B\u0438\u0446\u0430
+command.tooltip.58 = Словарная таблица
 
-command.tooltip.60 = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440 \u0438 \u0441\u043B\u043E\u0432\u0430\u0440\u043D\u044B\u0445 \u0435\u0434\u0438\u043D\u0438\u0446
+command.tooltip.60 = Показать свойства структур и словарных единиц
 
-command.tooltip.63 = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0438 \u043E\u0442\u0432\u0435\u0442\u043E\u0432 \u043D\u0430 \u0437\u0430\u043F\u0440\u043E\u0441
+command.tooltip.63 = Показать ссылки ответов на запрос
 
-command.tooltip.64 = \u0418\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B\u044B \u0432 \u0444\u043E\u0440\u043C\u0430\u0442\u0435 XML-TXM \u0438\u0437 \u043F\u0430\u043F\u043A\u0438
+command.tooltip.64 = Испортировать файлы в формате XML-TXM из папки
 
-command.tooltip.65 = \u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B\u044B \u0432 \u0444\u043E\u0440\u043C\u0430\u0442\u043A TRS, \u043F\u0440\u0438\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0435 \u043A \u0444\u0430\u0439\u043B\u0443 metadata.csv
+command.tooltip.65 = Импортировать файлы в форматк TRS, привязанные к файлу metadata.csv
 
-command.tooltip.66 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043A\u0430\u043A \u0441\u043A\u0440\u0438\u043F\u0442 R
+command.tooltip.66 = Выполнить как скрипт R
 
-command.tooltip.67 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441 \u0432 \u0430\u0440\u0445\u0438\u0432
+command.tooltip.67 = Экспортировать корпус в архив
 
-command.tooltip.69 = \u041A\u043B\u0430\u0441\u0441\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F
+command.tooltip.69 = Классификация
 
-command.tooltip.7 = \u0421\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043D\u043A\u043E\u0440\u0434\u0430\u043D\u0441
+command.tooltip.7 = Составить конкорданс
 
-command.tooltip.70 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 R
+command.tooltip.70 = Отправить в R
 
-command.tooltip.71 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441 \u0432 \u0430\u0440\u0445\u0438\u0432
+command.tooltip.71 = Экспортировать корпус в архив
 
-command.tooltip.73 = \u041A\u043B\u0430\u0441\u0441\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F
+command.tooltip.73 = Классификация
 
-command.tooltip.74 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 R
+command.tooltip.74 = Отправить в R
 
-command.tooltip.75 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0444\u0430\u0439\u043B
+command.tooltip.75 = Создать файл
 
-command.tooltip.76 = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443
+command.tooltip.76 = Создать папку
 
-command.tooltip.77 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u0440\u043F\u0443\u0441 \u0432 \u0430\u0440\u0445\u0438\u0432
+command.tooltip.77 = Экспортировать корпус в архив
 
-command.tooltip.79 = \u041A\u043B\u0430\u0441\u0441\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F
+command.tooltip.79 = Классификация
 
 command.tooltip.8 = XML-TEI-BFM
 
-command.tooltip.80 = \u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432 R
+command.tooltip.80 = Отправить в R
 
-command.tooltip.81 = \u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0435 \u0437\u0430\u043F\u0440\u043E\u0441\u044B
+command.tooltip.81 = Копировать выделенные запросы
 
-command.tooltip.82 = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0437\u0430\u043F\u0440\u043E\u0441 \u0432 \u043E\u0442\u0447\u0435\u0442
+command.tooltip.82 = Добавить запрос в отчет
 
-command.tooltip.83 = \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 SVG 
+command.tooltip.83 = управление SVG 
 
-command.tooltip.84 = \u041D\u043E\u0432\u044B\u0439 \u0441\u0435\u0430\u043D\u0441
+command.tooltip.84 = Новый сеанс
 
-command.tooltip.85 = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0435 \u0441\u0442\u0440\u043E\u043A\u0438 \u0438\u043B\u0438 \u0441\u043A\u0440\u0438\u043F\u0442
+command.tooltip.85 = Выполнить выделенные строки или скрипт
 
 command.tooltip.87 = Open edition
 
@@ -600,97 +600,97 @@
 
 command.tooltip.90 = Open biblio
 
-command.tooltip.91 = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043A\u0443\u044E \u0437\u0430\u043F\u0438\u0441\u044C
+command.tooltip.91 = Открыть библиографическую запись
 
-commandParameter.name = \u0424\u0430\u0439\u043B
+commandParameter.name = Файл
 
-commandParameter.name.0 = \u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u043A\u043E\u0440\u043F\u0443\u0441\u0430
+commandParameter.name.0 = Параметр корпуса
 
-commandParameter.name.1 = \u0441\u043A\u0440\u0438\u043F\u0442
+commandParameter.name.1 = скрипт
 
-commandParameter.name.2 = \u0441\u043A\u0440\u0438\u043F\u0442 \u0434\u043B\u044F \u0438\u043C\u043F\u043E\u0440\u0442\u0430
+commandParameter.name.2 = скрипт для импорта
 
 commandParameter.name.3 = N/A_ web page key
 
-editor.name = \u0413\u0440\u0430\u0444\u0438\u043A\u0438 SVG
+editor.name = Графики SVG
 
-editor.name.0 = \u0418\u043D\u0434\u0435\u043A\u0441
+editor.name.0 = Индекс
 
 editor.name.1 = Multitab
 
-editor.name.10 = \u0413\u0440\u0430\u0444 \u0424\u0410\u0421
+editor.name.10 = Граф ФАС
 
-editor.name.11 = \u0421\u043B\u043E\u0432\u0430\u0440\u043D\u0430\u044F \u0442\u0430\u0431\u043B\u0438\u0446\u0430
+editor.name.11 = Словарная таблица
 
-editor.name.13 = \u0424\u0410\u0421
+editor.name.13 = ФАС
 
-editor.name.15 = \u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0438\u043C\u043F\u043E\u0440\u0442\u0430
+editor.name.15 = Параметры импорта
 
-editor.name.16 = \u0422\u0435\u0441\u0442\u043E\u0432\u044B\u0439 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440
+editor.name.16 = Тестовый редактор
 
-editor.name.17 = \u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C
+editor.name.17 = Просмотреть
 
 editor.name.18 = N/A_ Classification
 
-editor.name.2 = \u041A\u043E\u043D\u043A\u043E\u0440\u0434\u0430\u043D\u0441\u044B
+editor.name.2 = Конкордансы
 
-editor.name.4 = \u0422\u0435\u043A\u0441\u0442
+editor.name.4 = Текст
 
-editor.name.5 = \u0418\u0437\u0434\u0430\u043D\u0438\u0435
+editor.name.5 = Издание
 
-editor.name.6 = \u041F\u0440\u043E\u0432\u043E\u0434\u043D\u0438\u043A \u043F\u043E \u043E\u0431\u044A\u0435\u043A\u0442\u0430\u043C
+editor.name.6 = Проводник по объектам
 
 extension-point.name = N/A_Command
 
-extension.name = \u041A\u043E\u043C\u0430\u043D\u0434\u044B \u041C\u0430\u0441\u0442\u0435\u0440\u0441\u043A\u043E\u0439
+extension.name = Команды Мастерской
 
-menu.label = \u0424\u0430\u0439\u043B
+menu.label = Файл
 
-menu.label.0 = \u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+menu.label.0 = Импортировать
 
-menu.label.1 = \u041A\u043E\u0440\u043F\u0443\u0441
+menu.label.1 = Корпус
 
 menu.label.10 = Groovy
 
-menu.label.2 = \u041F\u043E\u043C\u043E\u0449\u044C
+menu.label.2 = Помощь
 
-menu.label.3 = \u0418\u0437\u0434\u0430\u043D\u0438\u0435
+menu.label.3 = Издание
 
-menu.label.6 = \u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B
+menu.label.6 = Инструменты
 
-menu.label.7 = \u0412\u0438\u0434
+menu.label.7 = Вид
 
-menu.label.8 = \u041F\u0435\u0440\u0441\u043F\u0435\u043A\u0442\u0438\u0432\u044B
+menu.label.8 = Перспективы
 
-menu.label.9 = \u0412\u0438\u0434\u044B
+menu.label.9 = Виды
 
-menu.tooltip = \u0427\u0438\u0442\u0430\u0442\u044C \u0420\u0443\u043A\u043E\u0432\u043E\u0434\u0441\u0442\u0432\u043E \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F TXM
+menu.tooltip = Читать Руководство пользователя TXM
 
-menu.tooltip.0 = \u0412\u0438\u0434
+menu.tooltip.0 = Вид
 
-page.name = \u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C
+page.name = Пользователь
 
-page.name.0 = \u0414\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u043E
+page.name.0 = Дополнительно
 
-page.name.10 = \u0430\u043D\u0430\u043B\u0438\u0437 \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0439
+page.name.10 = анализ соответствий
 
-page.name.12 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442
+page.name.12 = Экспорт
 
-page.name.16 = \u0421\u0441\u044B\u043B\u043A\u0438
+page.name.16 = Ссылки
 
-page.name.17 = \u041A\u043B\u0430\u0441\u0441\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F
+page.name.17 = Классификация
 
-page.name.18 = \u0421\u043A\u0440\u0438\u043F\u0442\u044B
+page.name.18 = Скрипты
 
-page.name.19 = \u0418\u043C\u043F\u043E\u0440\u0442
+page.name.19 = Импорт
 
-page.name.2 = \u041F\u0440\u043E\u0432\u043E\u0434\u043D\u0438\u043A \u043F\u043E \u0444\u0430\u0439\u043B\u0430\u043C
+page.name.2 = Проводник по файлам
 
-page.name.3 = \u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u043C\u0430\u0448\u0438\u043D\u0430
+page.name.3 = Статистическая машина
 
-page.name.4 = \u041F\u043E\u0438\u0441\u043A\u043E\u0432\u0430\u044F \u043C\u0430\u0448\u0438\u043D\u0430
+page.name.4 = Поисковая машина
 
-page.name.5 = \u042F\u0437\u044B\u043A
+page.name.5 = Язык
 
 page.name.6 = \ TXM
 
@@ -700,16 +700,16 @@
 
 product.name = TXM
 
-view.name = \u041A\u043E\u0440\u043F\u0443\u0441
+view.name = Корпус
 
-view.name.0 = \u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441\u0438\u044F
+view.name.0 = Прогрессия
 
-view.name.1 = \u0424\u0430\u0439\u043B
+view.name.1 = Файл
 
-view.name.2 = G. \u041A\u043E\u043D\u0441\u043E\u043B\u044C
+view.name.2 = G. Консоль
 
-view.name.3 = \u0411\u0430\u0437\u0430
+view.name.3 = База
 
-view.name.4 = \u0417\u0430\u043F\u0440\u043E\u0441
+view.name.4 = Запрос
 
-view.name.7 = \u0421\u043E\u0434\u0435\u0440\u0436\u0438\u043C\u043E\u0435
+view.name.7 = Содержимое
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 837)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 838)
@@ -16,7 +16,7 @@
 
 category.name.3 = TXM
 
-command.description = Red\u00E9marrer TXM
+command.description = Red�marrer TXM
 
 command.description.0 = Convertir ancien fichier binaire
 
@@ -24,19 +24,19 @@
 
 command.description.2 = Test Nils
 
-command.description.3 = Mise \u00E0 jour de TXM
+command.description.3 = Mise � jour de TXM
 
-command.description.4 = Mise \u00E0 jour de TXM
+command.description.4 = Mise � jour de TXM
 
 command.label = Ouvrir dans un navigateur...
 
-command.label.0 = CNR + CSV
+command.label.0 = Cordial + CSV
 
 command.label.1 = XML/w + CSV
 
-command.label.10 = Sp\u00E9cificiti\u00E9s
+command.label.10 = Sp�cificiti�s
 
-command.label.100 = Trouver pr\u00E9c\u00E9dent
+command.label.100 = Trouver pr�c�dent
 
 command.label.101 = Graphique...
 
@@ -46,21 +46,21 @@
 
 command.label.105 = Fusionner les lignes
 
-command.label.106 = Exporter la table pour r\u00E9-import
+command.label.106 = Exporter la table pour r�-import
 
 command.label.107 = Importer une table
 
-command.label.108 = R\u00E9f\u00E9rences
+command.label.108 = R�f�rences
 
-command.label.109 = Recherche incr\u00E9mentielle
+command.label.109 = Recherche incr�mentielle
 
-command.label.110 = Recherche incr\u00E9mentielle (invers\u00E9e)
+command.label.110 = Recherche incr�mentielle (invers�e)
 
 command.label.111 = Enregistrer les annotations
 
-command.label.112 = Ex\u00E9cuter la s\u00E9lection de texte
+command.label.112 = Ex�cuter la s�lection de texte
 
-command.label.113 = Aller \u00E0 la ligne...
+command.label.113 = Aller � la ligne...
 
 command.label.114 = Exporter
 
@@ -110,7 +110,7 @@
 
 command.label.135 = Fichier
 
-command.label.136 = Requ\u00EAte
+command.label.136 = Requ�te
 
 command.label.137 = Console R
 
@@ -118,19 +118,19 @@
 
 command.label.139 = Autres...
 
-command.label.14 = \u00C0 Propos de TXM
+command.label.14 = � Propos de TXM
 
-command.label.140 = Afficher les num\u00E9ros de ligne
+command.label.140 = Afficher les num�ros de ligne
 
 command.label.141 = Raccourcis clavier graphiques
 
-command.label.143 = Ex\u00E9cuter
+command.label.143 = Ex�cuter
 
-command.label.144 = Activer l'affichage des caract\u00E8res invisibles
+command.label.144 = Activer l'affichage des caract�res invisibles
 
-command.label.145 = Retour \u00E0 l'\u00E9tat initial du fichier
+command.label.145 = Retour � l'�tat initial du fichier
 
-command.label.146 = Mettre \u00E0 jour le corpus
+command.label.146 = Mettre � jour le corpus
 
 command.label.147 = Recoder le corpus
 
@@ -140,21 +140,21 @@
 
 command.label.15 = Chercher et Remplacer...
 
-command.label.150 = R\u00E9f\u00E9rentiels
+command.label.150 = R�f�rentiels
 
 command.label.151 = Enregistrer les annotations
 
-command.label.152 = Mettre \u00E0 jour le corpus
+command.label.152 = Mettre � jour le corpus
 
 command.label.153 = Recoder le corpus
 
 command.label.154 = Enregistrer les annotations
 
-command.label.155 = Mettre \u00E0 jour le corpus
+command.label.155 = Mettre � jour le corpus
 
-command.label.156 = Ex\u00E9cuter un fichier Groovy
+command.label.156 = Ex�cuter un fichier Groovy
 
-command.label.157 = Nouvelle fen\u00EAtre
+command.label.157 = Nouvelle fen�tre
 
 command.label.158 = Nouveau fichier
 
@@ -162,37 +162,37 @@
 
 command.label.16 = Annuler
 
-command.label.160 = Trouver le pr\u00E9c\u00E9dent
+command.label.160 = Trouver le pr�c�dent
 
 command.label.161 = Trouver le suivante
 
-command.label.162 = Recherche incr\u00E9mentielle
+command.label.162 = Recherche incr�mentielle
 
-command.label.163 = Recherche incr\u00E9mentielle (invers\u00E9e)
+command.label.163 = Recherche incr�mentielle (invers�e)
 
-command.label.164 = Retour \u00E0 l'\u00E9tat initial du fichier
+command.label.164 = Retour � l'�tat initial du fichier
 
-command.label.165 = Tout s\u00E9lectionner
+command.label.165 = Tout s�lectionner
 
-command.label.166 = Aller \u00E0 la ligne...
+command.label.166 = Aller � la ligne...
 
 command.label.167 = Hyperlien
 
-command.label.168 = Afficher les num\u00E9ros de ligne
+command.label.168 = Afficher les num�ros de ligne
 
 command.label.169 = Show Control characters
 
-command.label.17 = R\u00E9tablir
+command.label.17 = R�tablir
 
-command.label.170 = Ex\u00E9cuter le script courant
+command.label.170 = Ex�cuter le script courant
 
-command.label.171 = Ex\u00E9cuter le texte s\u00E9lectionn\u00E9
+command.label.171 = Ex�cuter le texte s�lectionn�
 
-command.label.172 = Ex\u00E9cuter un script Groovy
+command.label.172 = Ex�cuter un script Groovy
 
 command.label.173 = Bienvenue
 
-command.label.174 = T\u00E9l\u00E9charger le manuel - PDF
+command.label.174 = T�l�charger le manuel - PDF
 
 command.label.175 = Tester toutes les commandes
 
@@ -208,7 +208,7 @@
 
 command.label.180 = Tester les modules d'imports
 
-command.label.181 = V\u00E9rifier les mises \u00E0 jour
+command.label.181 = V�rifier les mises � jour
 
 command.label.182 = Ajouter une extension
 
@@ -218,9 +218,9 @@
 
 command.label.185 = Vue interne
 
-command.label.186 = \u00C9diter
+command.label.186 = �diter
 
-command.label.187 = Cr\u00E9er une macro \u00E0 partir d'un template
+command.label.187 = Cr�er une macro � partir d'un template
 
 command.label.188 = Copier dans le presse-papier
 
@@ -240,27 +240,27 @@
 
 command.label.20 = Coller
 
-command.label.21 = Ouvrir dans un \u00E9diteur de texte
+command.label.21 = Ouvrir dans un �diteur de texte
 
 command.label.22 = Ouvrir dans un navigateur
 
-command.label.23 = Ex\u00E9cuter le Script
+command.label.23 = Ex�cuter le Script
 
-command.label.24 = Propri\u00E9t\u00E9s
+command.label.24 = Propri�t�s
 
-command.label.25 = Ex\u00E9cuter la s\u00E9lection de texte
+command.label.25 = Ex�cuter la s�lection de texte
 
-command.label.26 = Ex\u00E9cuter le Script
+command.label.26 = Ex�cuter le Script
 
 command.label.27 = Supprimer
 
-command.label.28 = S\u00E9lectionner tout
+command.label.28 = S�lectionner tout
 
 command.label.29 = Sauver sous...
 
 command.label.3 = XML Transcriber +CSV
 
-command.label.30 = Encodage des caract\u00E8res
+command.label.30 = Encodage des caract�res
 
 command.label.31 = Nils
 
@@ -272,13 +272,13 @@
 
 command.label.35 = Wiki txm-users 
 
-command.label.38 = V\u00E9rifier les packages R
+command.label.38 = V�rifier les packages R
 
 command.label.39 = CooccurrencesList
 
-command.label.4 = Pr\u00E9f\u00E9rences
+command.label.4 = Pr�f�rences
 
-command.label.40 = R\u00E9-ex\u00E9cuter
+command.label.40 = R�-ex�cuter
 
 command.label.41 = CooccurrencesList
 
@@ -288,7 +288,7 @@
 
 command.label.44 = Supprimer
 
-command.label.45 = \u00C9diter...
+command.label.45 = �diter...
 
 command.label.46 = Copier
 
@@ -298,23 +298,23 @@
 
 command.label.50 = Charger
 
-command.label.51 = Donn\u00E9es...
+command.label.51 = Donn�es...
 
 command.label.52 = Raccourcis clavier
 
 command.label.53 = Signaler un bug
 
-command.label.54 = Proposer une am\u00E9lioration
+command.label.54 = Proposer une am�lioration
 
-command.label.55 = S'inscrire \u00E0 la liste de diffusion txm-users
+command.label.55 = S'inscrire � la liste de diffusion txm-users
 
 command.label.56 = Site web du logiciel TXM
 
 command.label.57 = Coller
 
-command.label.58 = Exporter les donn\u00E9es
+command.label.58 = Exporter les donn�es
 
-command.label.59 = Red\u00E9marrer les moteurs
+command.label.59 = Red�marrer les moteurs
 
 command.label.6 = Quitter
 
@@ -336,15 +336,15 @@
 
 command.label.68 = Lire le manuel en ligne
 
-command.label.69 = Site web du projet Textom\u00E9trie
+command.label.69 = Site web du projet Textom�trie
 
 command.label.7 = Sous-Corpus
 
 command.label.70 = Dossier des manuels de TXM
 
-command.label.71 = \u00C9dition
+command.label.71 = �dition
 
-command.label.72 = Documentation du projet Textom\u00E9trie
+command.label.72 = Documentation du projet Textom�trie
 
 command.label.73 = Envoyer vers les concordances
 
@@ -368,7 +368,7 @@
 
 command.label.82 = CQP
 
-command.label.83 = Nouveau fichier
+command.label.83 = Nouveau...
 
 command.label.84 = Lexique
 
@@ -404,11 +404,11 @@
 
 command.name = Ouvrir un fichier
 
-command.name.0 = Ex\u00E9cuter un Script Groovy
+command.name.0 = Ex�cuter un Script Groovy
 
-command.name.1 = Cr\u00E9er un Sous-Corpus
+command.name.1 = Cr�er un Sous-Corpus
 
-command.name.10 = Ex\u00E9cuter la s\u00E9lection de texte en tant que script Groovy
+command.name.10 = Ex�cuter la s�lection de texte en tant que script Groovy
 
 command.name.100 = Recoder le corpus
 
@@ -422,11 +422,11 @@
 
 command.name.105 = Ajouter
 
-command.name.106 = Editer le fichier s\u00E9lection\u00E9
+command.name.106 = Editer le fichier s�lection�
 
 command.name.107 = Exporter les annotations en stand-off
 
-command.name.109 = Calculer le diagramme en b\u00E2tons des lignes s\u00E9lectionn\u00E9es
+command.name.109 = Calculer le diagramme en b�tons des lignes s�lectionn�es
 
 command.name.11 = Ajouter un Projet
 
@@ -444,21 +444,21 @@
 
 command.name.18 = Supprimer tous les corpus
 
-command.name.19 = Ouvrir l'\u00E9diteur de test
+command.name.19 = Ouvrir l'�diteur de test
 
-command.name.2 = Cr\u00E9er une Partition
+command.name.2 = Cr�er une Partition
 
 command.name.20 = Choisir moteur de recherche
 
-command.name.21 = Ex\u00E9cuter Script
+command.name.21 = Ex�cuter Script
 
-command.name.22 = Ex\u00E9cuter un Script d'import
+command.name.22 = Ex�cuter un Script d'import
 
 command.name.23 = Description
 
-command.name.24 = Exporter les donn\u00E9es
+command.name.24 = Exporter les donn�es
 
-command.name.25 = Red\u00E9marrer
+command.name.25 = Red�marrer
 
 command.name.26 = Supprimer
 
@@ -466,7 +466,7 @@
 
 command.name.28 = Importe un corpus depuis le presse-papier (FR)
 
-command.name.29 = Ouvre l'\u00E9dition
+command.name.29 = Ouvre l'�dition
 
 command.name.3 = Convertir ancien fichier binaire
 
@@ -488,7 +488,7 @@
 
 command.name.39 = Exporter la table
 
-command.name.4 = Sp\u00E9cificit\u00E9s
+command.name.4 = Sp�cificit�s
 
 command.name.40 = Importer une table
 
@@ -498,9 +498,9 @@
 
 command.name.43 = VocToLexicalTable
 
-command.name.45 = Ex\u00E9cuter un script R
+command.name.45 = Ex�cuter un script R
 
-command.name.46 = Ex\u00E9cuter la s\u00E9lection de texte 
+command.name.46 = Ex�cuter la s�lection de texte 
 
 command.name.47 = Nouveau fichier
 
@@ -508,9 +508,9 @@
 
 command.name.49 = Dimensions
 
-command.name.50 = Ex\u00E9cuter Text
+command.name.50 = Ex�cuter Text
 
-command.name.51 = R\u00E9glages
+command.name.51 = R�glages
 
 command.name.52 = Corpus au format binaire...
 
@@ -532,7 +532,7 @@
 
 command.name.63 = Ouvrir Biblio
 
-command.name.66 = Ex\u00E9cuter un fichier Groovy
+command.name.66 = Ex�cuter un fichier Groovy
 
 command.name.67 = Sauver Sous
 
@@ -560,15 +560,15 @@
 
 command.name.78 = Tester toutes les commandes
 
-command.name.79 = Ex\u00E9cuter la Macro
+command.name.79 = Ex�cuter la Macro
 
 command.name.8 = Afficher dans un lecteur HTML
 
-command.name.80 = Cr\u00E9erMacro
+command.name.80 = Cr�erMacro
 
 command.name.81 = Distance intertextuelle
 
-command.name.82 = Index de requ\u00EAte
+command.name.82 = Index de requ�te
 
 command.name.83 = CoocMatrix
 
@@ -576,17 +576,17 @@
 
 command.name.85 = Test Nils
 
-command.name.86 = Index de requ\u00EAte vers Table lexicale
+command.name.86 = Index de requ�te vers Table lexicale
 
-command.name.87 = Mise \u00E0 jour de TXM
+command.name.87 = Mise � jour de TXM
 
-command.name.88 = Mise \u00E0 jour de TXM
+command.name.88 = Mise � jour de TXM
 
-command.name.89 = R\u00E9-ex\u00E9cuter le dernier script Groovy
+command.name.89 = R�-ex�cuter le dernier script Groovy
 
-command.name.9 = Propri\u00E9t\u00E9s
+command.name.9 = Propri�t�s
 
-command.name.90 = V\u00E9rifier les packages R
+command.name.90 = V�rifier les packages R
 
 command.name.91 = DownloadFile
 
@@ -594,7 +594,7 @@
 
 command.name.93 = Reconnecter le RWorkspace
 
-command.name.94 = R\u00E9initialiser l'affichage
+command.name.94 = R�initialiser l'affichage
 
 command.name.95 = Lire le manuel
 
@@ -602,17 +602,17 @@
 
 command.name.97 = Enregistrer les annotations
 
-command.name.98 = Mettre \u00E0 jour le corpus
+command.name.98 = Mettre � jour le corpus
 
-command.name.99 = Vue r\u00E9f\u00E9rentiels
+command.name.99 = Vue r�f�rentiels
 
 command.tooltip = Ouvrir dans un navigateur HTML
 
-command.tooltip.0 = Afficher les pr\u00E9f\u00E9rences
+command.tooltip.0 = Afficher les pr�f�rences
 
 command.tooltip.1 = Import au format XML-PPS de Factiva
 
-command.tooltip.10 = Afficher les propri\u00E9t\u00E9s de cette instance de la plateforme TXM
+command.tooltip.10 = Afficher les propri�t�s de cette instance de la plateforme TXM
 
 command.tooltip.11 = XML-TEI TXM
 
@@ -620,17 +620,17 @@
 
 command.tooltip.13 = Documentation des macros
 
-command.tooltip.14 = Ex\u00E9cuter le script
+command.tooltip.14 = Ex�cuter le script
 
 command.tooltip.15 = Supprimer fichier
 
 command.tooltip.16 = Copier le fichier
 
-command.tooltip.17 = Ouvrir un fichier dans un \u00E9diteur de texte
+command.tooltip.17 = Ouvrir un fichier dans un �diteur de texte
 
 command.tooltip.18 = Ouvrir un fichier dans un navigateur
 
-command.tooltip.19 = Ex\u00E9cuter le Script
+command.tooltip.19 = Ex�cuter le Script
 
 command.tooltip.2 = Quitter la plateforme TXM
 
@@ -642,13 +642,13 @@
 
 command.tooltip.23 = Lire la version HTML du manuel de TXM
 
-command.tooltip.233 = T\u00E9l\u00E9charger la version PDF du manuel de TXM pour impression
+command.tooltip.233 = T�l�charger la version PDF du manuel de TXM pour impression
 
 command.tooltip.24 = Importer un corpus au format XML-TMX
 
 command.tooltip.25 = Importer un corpus au format CQP
 
-command.tooltip.26 = Red\u00E9marrer les moteurs de TXM
+command.tooltip.26 = Red�marrer les moteurs de TXM
 
 command.tooltip.27 = Importer un corpus depuis le presse-papier
 
@@ -656,33 +656,33 @@
 
 command.tooltip.29 = Importer un corpus au format Hyperbase
 
-command.tooltip.3 = S\u00E9lectionner un sous-ensemble d'occurrences
+command.tooltip.3 = S�lectionner un sous-ensemble d'occurrences
 
 command.tooltip.30 = Importer un corpus au format Alceste
 
-command.tooltip.31 = Afficher les caract\u00E8res non imprimables
+command.tooltip.31 = Afficher les caract�res non imprimables
 
-command.tooltip.32 = Lire l'\u00E9dition
+command.tooltip.32 = Lire l'�dition
 
-command.tooltip.33 = Supprimer l'objet s\u00E9lectionn\u00E9
+command.tooltip.33 = Supprimer l'objet s�lectionn�
 
-command.tooltip.34 = Cr\u00E9\u00E9 un nouveau fichier
+command.tooltip.34 = �diter un nouveau fichier
 
-command.tooltip.35 = Afficher les caract\u00E8res non imprimables
+command.tooltip.35 = Afficher les caract�res non imprimables
 
-command.tooltip.36 = Ex\u00E9cuter le texte s\u00E9lectionn\u00E9
+command.tooltip.36 = Ex�cuter le texte s�lectionn�
 
-command.tooltip.37 = Ex\u00E9cuter un script Groovy
+command.tooltip.37 = Ex�cuter un script Groovy
 
 command.tooltip.38 = Lancer un long processus de test de toute les commandes disponibles
 
-command.tooltip.39 = Lire l'\u00E9dition
+command.tooltip.39 = Lire l'�dition
 
-command.tooltip.4 = Diviser l'objet s\u00E9lectionn\u00E9 en plusieurs parties
+command.tooltip.4 = Diviser l'objet s�lectionn� en plusieurs parties
 
-command.tooltip.40 = Lire les propri\u00E9t\u00E9s des mots du corpus
+command.tooltip.40 = Lire les propri�t�s des mots du corpus
 
-command.tooltip.41 = R\u00E9ponses aux questions les plus fr\u00E9quentes
+command.tooltip.41 = R�ponses aux questions les plus fr�quentes
 
 command.tooltip.42 = Changer la langue de l'interface
 
@@ -690,11 +690,11 @@
 
 command.tooltip.44 = XML/w + CSV
 
-command.tooltip.45 = Ex\u00E9cuter un script d'import sur un dossier de fichiers source
+command.tooltip.45 = Ex�cuter un script d'import sur un dossier de fichiers source
 
 command.tooltip.46 = Calculer l'Analyse Factorielle des Correspondances
 
-command.tooltip.47 = Contribuer \u00E0 TXM
+command.tooltip.47 = Contribuer � TXM
 
 command.tooltip.48 = Tester les modules d'import
 
@@ -702,37 +702,37 @@
 
 command.tooltip.5 = Import au format XML-TRS de Trasncriber
 
-command.tooltip.50 = R\u00E9-ex\u00E9cuter le dernier script Groovy
+command.tooltip.50 = R�-ex�cuter le dernier script Groovy
 
 command.tooltip.51 = Calculer une table lexicale
 
-command.tooltip.52 = Lire les propri\u00E9t\u00E9s des mots du corpus
+command.tooltip.52 = Lire les propri�t�s des mots du corpus
 
-command.tooltip.53 = Calculer les cooccurrents d'une requ\u00EAte
+command.tooltip.53 = Calculer les cooccurrents d'une requ�te
 
 command.tooltip.54 = Exporter au format SVG...
 
 command.tooltip.55 = Calculer une table lexicale
 
-command.tooltip.56 = Calculer la progression d'une ou plusieurs requ\u00EAtes
+command.tooltip.56 = Calculer la progression d'une ou plusieurs requ�tes
 
-command.tooltip.57 = Calculer les cooccurrents d'une requ\u00EAte
+command.tooltip.57 = Calculer les cooccurrents d'une requ�te
 
 command.tooltip.58 = Calculer une table lexicale
 
-command.tooltip.59 = Lire les propri\u00E9t\u00E9s des mots du corpus
+command.tooltip.59 = Lire les propri�t�s des mots du corpus
 
-command.tooltip.6 = Calculer les mots sp\u00E9cifiques de chaque partie
+command.tooltip.6 = Calculer les mots sp�cifiques de chaque partie
 
-command.tooltip.60 = Calculer la synth\u00E8se des propri\u00E9t\u00E9s du corpus
+command.tooltip.60 = Calculer la synth�se des propri�t�s du corpus
 
 command.tooltip.61 = Calculer le lexique complet
 
-command.tooltip.62 = Calculer le lexique d'une requ\u00EAte
+command.tooltip.62 = Calculer le lexique d'une requ�te
 
-command.tooltip.63 = Calculer les r\u00E9f\u00E9rences d'une requ\u00EAte
+command.tooltip.63 = Calculer les r�f�rences d'une requ�te
 
-command.tooltip.64 = Ouvre le manuel PDF avec le lecteur PDF par d\u00E9faut
+command.tooltip.64 = Ouvre le manuel PDF avec le lecteur PDF par d�faut
 
 command.tooltip.65 = cannal IRC TXM
 
@@ -768,19 +768,19 @@
 
 command.tooltip.80 = Envoyer vers R
 
-command.tooltip.81 = Copier les requ\u00EAtes s\u00E9lectionn\u00E9es
+command.tooltip.81 = Copier les requ�tes s�lectionn�es
 
-command.tooltip.82 = Ajouter une requ\u00EAte au journal
+command.tooltip.82 = Ajouter une requ�te au journal
 
 command.tooltip.83 = Raccourcis clavier graphiques
 
 command.tooltip.84 = Nouvelle session
 
-command.tooltip.85 = Ex\u00E9cuter la s\u00E9lection ou le script
+command.tooltip.85 = Ex�cuter la s�lection ou le script
 
 command.tooltip.86 = Editer la macro
 
-command.tooltip.87 = Ouvrir l'\u00E9dition
+command.tooltip.87 = Ouvrir l'�dition
 
 command.tooltip.88 = XML-XTZ + CSV
 
@@ -788,17 +788,17 @@
 
 command.tooltip.9 = XML-TEI Frantext
 
-command.tooltip.90 = Remise \u00E0 z\u00E9ro et recharger des valeurs
+command.tooltip.90 = Remise � z�ro et recharger des valeurs
 
 command.tooltip.91 = Ouvrir biblio
 
-command.tooltip.92 = Cr\u00E9er une macro
+command.tooltip.92 = Cr�er une macro
 
-command.tooltip.93 = Affiche des informations suppl\u00E9mentaires de l'\u00E9l\u00E9ment s\u00E9lectionn\u00E9
+command.tooltip.93 = Affiche des informations suppl�mentaires de l'�l�ment s�lectionn�
 
-command.tooltip.94 = Ajouter un nouvel \u00E9l\u00E9ment
+command.tooltip.94 = Ajouter un nouvel �l�ment
 
-command.tooltip.95 = Supprimer l'\u00E9l\u00E9ment s\u00E9lectionn\u00E9
+command.tooltip.95 = Supprimer l'�l�ment s�lectionn�
 
 commandParameter.name = Fichier
 
@@ -808,11 +808,11 @@
 
 commandParameter.name.2 = import script
 
-commandParameter.name.3 = cl\u00E9 web page
+commandParameter.name.3 = cl� web page
 
-context.description = Le contexte r\u00E9f\u00E9rentiel
+context.description = Le contexte r�f�rentiel
 
-context.name = Vue r\u00E9f\u00E9rentiels
+context.name = Vue r�f�rentiels
 
 editor.name = Graphiques SVG
 
@@ -828,7 +828,7 @@
 
 editor.name.13 = AFC
 
-editor.name.15 = Param\u00E8tres d'import
+editor.name.15 = Param�tres d'import
 
 editor.name.16 = Test editor
 
@@ -838,7 +838,7 @@
 
 editor.name.19 = Vue interne
 
-editor.name.20 = Index de requ\u00EAte
+editor.name.20 = Index de requ�te
 
 editor.name.21 = Nuage de mot
 
@@ -850,11 +850,11 @@
 
 editor.name.25 = Graphique SVG Batik 
 
-editor.name.3 = Sp\u00E9cificit\u00E9s
+editor.name.3 = Sp�cificit�s
 
 editor.name.4 = Texte
 
-editor.name.5 = \u00C9dition
+editor.name.5 = �dition
 
 editor.name.6 = Exploreur d'object
 
@@ -880,7 +880,7 @@
 
 menu.label.2 = Aide
 
-menu.label.3 = \u00C9dition
+menu.label.3 = �dition
 
 menu.label.4 = Extensions
 
@@ -902,7 +902,7 @@
 
 page.name = Utilisateur
 
-page.name.0 = Avanc\u00E9
+page.name.0 = Avanc�
 
 page.name.10 = Analyse des correspondances
 
@@ -914,9 +914,9 @@
 
 page.name.14 = Progression
 
-page.name.15 = Sp\u00E9cificit\u00E9s
+page.name.15 = Sp�cificit�s
 
-page.name.16 = R\u00E9f\u00E9rences
+page.name.16 = R�f�rences
 
 page.name.17 = Classification
 
@@ -968,7 +968,7 @@
 
 view.name.3 = Base
 
-view.name.4 = Requ\u00EAte
+view.name.4 = Requ�te
 
 view.name.5 = Variables R
 
@@ -978,7 +978,7 @@
 
 view.name.8 = Macro
 
-view.name.9 = R\u00E9f\u00E9rentiels
+view.name.9 = R�f�rentiels
 
 wizard.description = Create a corpus from sources files. Then compile indexes to be able to analyse the corpus.
 
Index: tmp/org.txm.utils/src/org/txm/utils/messages/Utf8NLS.java
===================================================================
--- tmp/org.txm.utils/src/org/txm/utils/messages/Utf8NLS.java	(revision 837)
+++ tmp/org.txm.utils/src/org/txm/utils/messages/Utf8NLS.java	(revision 838)
@@ -4,7 +4,6 @@
 import java.lang.reflect.Modifier;
 
 import org.eclipse.osgi.util.NLS;
-import org.txm.utils.logger.Log;
 
 
 /**
Index: tmp/org.txm.links.rcp/plugin.xml
===================================================================
--- tmp/org.txm.links.rcp/plugin.xml	(revision 837)
+++ tmp/org.txm.links.rcp/plugin.xml	(revision 838)
@@ -5,20 +5,21 @@
          id="links"
          point="org.eclipse.ui.commands">
       <command
-            defaultHandler="org.txm.synopticedition.rcp.commands.link.ToConcordance"
-            id="org.txm.synopticedition.rcp.commands.link.ToConcordance"
+            id="org.txm.links.rcp.commands.SendToConcordance"
             name="%command.name.1">
       </command>
       <command
-            defaultHandler="org.txm.synopticedition.rcp.commands.link.ToIndex"
-            id="org.txm.synopticedition.rcp.commands.link.ToIndex"
+            id="org.txm.links.rcp.commands.SendToIndex"
             name="%command.name.2">
       </command>
       <command
-            defaultHandler="org.txm.synopticedition.rcp.commands.link.ToProgression"
-            id="org.txm.synopticedition.rcp.commands.link.ToProgression"
+            id="org.txm.links.rcp.commands.SendToProgression"
             name="%command.name.3">
       </command>
+            <command
+                  id="org.txm.links.rcp.commands.SendToCooccurrence"
+                  name="Send to cooccurrence">
+            </command>
            <command
             categoryId="org.txm.synopticedition.rcp.category.txm"
             defaultHandler="org.txm.synopticedition.rcp.commands.link.CooccurrencesToConcordances"
Index: tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_fr.properties	(revision 837)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_fr.properties	(revision 838)
@@ -1,7 +1,7 @@
 
-DetailsFromCorpus = Index:\n\	Corpus {0}\n\	Requ�te {1}\n\	propri�t�s {2}\n\	Fmin {3}\n\	Fmax {4}
+DetailsFromCorpus = Index:\n\	Corpus {0}\n\	Requête {1}\n\	propriétés {2}\n\	Fmin {3}\n\	Fmax {4}
 
-DetailsFromPartition = Index:\n\	Partition {0}\n\	Requ�te {1}\n\	propri�t�s {2}\n\	Fmin {3}\n\	Fmax {4}
+DetailsFromPartition = Index:\n\	Partition {0}\n\	Requête {1}\n\	propriétés {2}\n\	Fmin {3}\n\	Fmax {4}
 
 Index_0 = ** Erreur lors du calcul du lexique : \n
 Index_1 = console : 
Index: tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 837)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 838)
@@ -216,7 +216,7 @@
 
 			}
 			else {
-				System.out.println("Error: Index parent is neither a Corpus nor a partition.");
+				Log.severe("Error: Index parent is neither a Corpus nor a partition.");
 				return false;
 			}
 		}
@@ -416,13 +416,13 @@
 			Property property = pProperties.get(0);
 			if (lexicon == null) {
 				lexicon = new Lexicon(getCorpus());
-				lexicon.setProperty(property);
-				lexicon.compute(null);
-			} else {
-				lexicon.setProperty(this.pProperties.get(0));
-				lexicon.compute(monitor);
 			}
-
+			lexicon.setProperty(property);
+			lexicon.setDirty();
+			lexicon.compute(monitor);
+			
+			
+			
 			this.nTotalTokens = lexicon.nbrOfToken();
 			String[] forms = lexicon.getForms();
 			int[] freqs = lexicon.getFreq();
Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java	(revision 837)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java	(revision 838)
@@ -103,6 +103,10 @@
 		HashMap<String, ChartCreator> map = this.chartCreators.get(result.getClass());
 		if(map != null)	{
 			chartCreator = map.get(chartType);
+			// if chart type was null
+			if(chartCreator == null)	{
+				chartCreator = map.get(ChartsEnginePreferences.DEFAULT_CHART_TYPE);
+			}
 		}
 		
 		if(chartCreator == null && showLogWarning)	{
@@ -555,7 +559,7 @@
 
 	@Override
 	public String toString() {
-		String str = this.getName() + " (description: " + this.description + ", output format: " + this.outputFormat;
+		String str = this.getName() + " (description: " + this.description + ", current output format: " + this.outputFormat;
 		
 		str += ", supported output display formats: " + this.getSupportedOutputDisplayFormats().toString().replaceAll("\\[|\\]", ""); //$NON-NLS-2$ //$NON-NLS-3$
 		str += ", supported output file formats: " + this.getSupportedOutputFileFormats().toString().replaceAll("\\[|\\]", ""); //$NON-NLS-2$ //$NON-NLS-3$
Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java	(revision 837)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java	(revision 838)
@@ -141,7 +141,7 @@
 	@Override
 	public void setDirty() {
 		super.setDirty();
-		this.chart = null;
+//		this.chart = null;
 		this.setChartDirty();
 	}
 
@@ -153,6 +153,11 @@
 	}
 
 
+	@Override
+	public void setHasBeenComputedOnce(boolean hasBeenComputedOnce) {
+		super.setHasBeenComputedOnce(hasBeenComputedOnce);
+		this.chart = null;
+	}
 	
 	@Override
 	public boolean compute(IProgressMonitor monitor) throws Exception {
@@ -555,6 +560,14 @@
 		this.chartsEngine = chartsEngine;
 	}
 
+
+	/**
+	 * @param chart the chart to set
+	 */
+	public void setChart(Object chart) {
+		this.chart = chart;
+	}
+
 	
 
 	// FIXME
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPPreferences.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPPreferences.java	(revision 837)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPPreferences.java	(revision 838)
@@ -3,10 +3,7 @@
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.prefs.Preferences;
-import org.txm.core.messages.TXMCoreMessages;
-import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.utils.logger.Log;
 
 /**
  * CQP preferences initializer.
@@ -25,10 +22,6 @@
 
 	@Override
 	public void initializeDefaultPreferences() {
-		Log.info(TXMCoreMessages.Toolbox_4 + TBXPreferences.getID()); 
-
 		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
-		
-
 	}
 }
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/ChartComposite.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/ChartComposite.java	(revision 837)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/ChartComposite.java	(revision 838)
@@ -1,6 +1,8 @@
 package org.txm.chartsengine.rcp.swt;
 
 import java.awt.Component;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseListener;
 import java.util.ArrayList;
 import java.util.EventListener;
 
@@ -16,7 +18,7 @@
 import org.txm.rcp.editors.TXMEditor;
 
 /**
- * Chart drawing area composite.
+ * Chart drawing area base composite.
  * @author sjacquot
  *
  */
@@ -229,6 +231,7 @@
 	 * @return
 	 */
 	public EventCallBackHandler getMouseCallBackHandler(Component component) {
+		// FIXME: old version
 		EventCallBackHandler handler = null;
 		EventListener[] listeners = component.getMouseListeners();
 
@@ -239,6 +242,7 @@
 			}
 		}
 		return handler;
+//		return this.getCallBackHandler(MouseListener.class);
 	}
 
 
@@ -248,6 +252,7 @@
 	 * @return
 	 */
 	public EventCallBackHandler getKeyCallBackHandler(Component component) {
+		// FIXME: old version
 		EventCallBackHandler handler = null;
 		EventListener[] listeners = component.getKeyListeners();
 
@@ -258,9 +263,27 @@
 			}
 		}
 		return handler;
+//		return this.getCallBackHandler(KeyListener.class);
 	}
 
+	/**
+	 * Gets the event call back handler of the specified class.
+	 * @param listenerType
+	 * @return
+	 */
+	public EventCallBackHandler getCallBackHandler(Class listenerType)	{
+		EventCallBackHandler handler = null;
+		EventListener[] listeners = ((Component) this.chartComponent).getListeners(listenerType);
 
+		for(int i = 0; i < listeners.length; i++) {
+			if(listeners[i] instanceof EventCallBackHandler)	{
+				handler = (EventCallBackHandler) listeners[i];
+				break;
+			}
+		}
+		return handler;
+	}
+
 	/**
 	 * Gets the chart component dedicated to rendering the chart.
 	 * @return the chartComponent
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/SwingChartComposite.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/SwingChartComposite.java	(revision 0)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/SwingChartComposite.java	(revision 838)
@@ -0,0 +1,213 @@
+/**
+ * 
+ */
+package org.txm.chartsengine.rcp.swt;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics2D;
+import java.awt.Toolkit;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.swing.JPanel;
+
+import org.eclipse.swt.awt.SWT_AWT;
+import org.eclipse.swt.widgets.Composite;
+import org.jfree.chart.JFreeChart;
+import org.txm.chartsengine.core.results.ChartResult;
+import org.txm.chartsengine.rcp.IChartComponent;
+import org.txm.chartsengine.rcp.editors.ChartEditor;
+import org.txm.chartsengine.rcp.events.EventCallBackHandler;
+
+/**
+ * Base chart composite with Swing/AWT support.
+ * This composite uses the SWT/AWT bridge to add some Swing/AWT chart component.
+ * 
+ * @author sjacquot
+ *
+ */
+public abstract class SwingChartComposite extends ChartComposite {
+	
+	
+	
+	// For reducing resize flickering on Windows
+	static	{
+		try {
+			System.setProperty("sun.awt.noerasebackground", "true"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		catch (NoSuchMethodError error) {
+		}
+	}
+
+
+	
+	protected Frame frame;
+	
+	//FIXME: tests
+	//protected Panel rootPanel;
+	//protected JRootPane rootPanel;
+	protected JPanel rootPanel;
+
+	
+
+	/**
+	 * @param chartEditor
+	 * @param parent
+	 * @param style
+	 */
+	public SwingChartComposite(ChartEditor<ChartResult> chartEditor, Composite parent, int style) {
+		super(chartEditor, parent, style);
+		
+		this.frame = SWT_AWT.new_Frame(this);
+		// Need to add an AWT/Swing Panel to fix mouse events and mouse cursors changes on AWT/Swing chart component panel
+		this.rootPanel = new JPanel(new BorderLayout());
+		
+		this.frame.add(this.rootPanel);
+
+		//this.frame.pack();
+		this.frame.setVisible(true);
+
+	}
+
+	// FIXME: old version; to remove if all ok
+//	@Override
+//	public void loadChart()	{
+//		
+//		// loads the chart from the result
+//		Object chart = this.chartEditor.getChart();
+//
+//		if(chart != null) {
+//			// creates components if they not exist
+//			if(this.chartComponent == null)	{
+//				
+//				// recreates the chart if not of right type
+//				if(!(chart instanceof File))	{
+//					try {
+//						this.chartEditor.getResult().clearLastRenderingParameters();
+//						this.chartEditor.getResult().compute();
+//					}
+//					catch (Exception e) {
+//						// TODO Auto-generated catch block
+//						e.printStackTrace();
+//					}
+//				}
+//				
+//				
+//				this.chartEditor.getSWTChartsComponentsProvider().createChartContainer(this.chartEditor.getEditorInput());
+//				this.chartComponent = (IChartComponent) this.chartEditor.getEditorInput().getChartContainer();
+//				
+//				this.rootPanel.add((Component) this.chartComponent);
+//
+//				this.frame.setVisible(true);
+//			}
+//			this.loadChart(chart);
+//		}
+//	}
+
+	@Override
+	public void loadChart()	{
+		
+		// loads the chart from the result
+		Object chart = this.chartEditor.getChart();
+		
+		if(chart != null) {
+			// creates components if they not exist
+			if(this.chartComponent == null) {
+
+				// recreates the chart if not of right type
+				if(!(chart instanceof JFreeChart))	{
+					try {
+						this.chartEditor.getResult().clearLastRenderingParameters();
+						this.chartEditor.getResult().compute();
+					}
+					catch (Exception e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				
+				this.chartEditor.getSWTChartsComponentsProvider().createChartContainer(this.chartEditor.getEditorInput());
+				this.chartComponent = (IChartComponent) this.chartEditor.getEditorInput().getChartContainer();
+				
+				this.rootPanel.add((Component) this.chartComponent);
+
+				this.frame.setVisible(true);
+				
+				// FIXME: useless?
+				//this.chartEditor.registerEventCallBackExtensions();
+
+			}
+			this.loadChart(this.chartEditor.getChart());
+			this.forceFocus();
+		}
+	}
+	
+
+	
+	
+	@Override
+	public void copyChartViewToClipboard() {
+		int w = ((Component) this.chartComponent).getWidth();
+		int h = ((Component) this.chartComponent).getHeight();
+		final BufferedImage bufferedImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+		Graphics2D g = bufferedImg.createGraphics();
+		((Component) this.chartComponent).paint(g);
+		
+		Transferable img = new Transferable() {
+			
+			@Override
+			public boolean isDataFlavorSupported(DataFlavor flavor) {
+				return DataFlavor.imageFlavor.equals(flavor);
+			}
+			
+			@Override
+			public DataFlavor[] getTransferDataFlavors() {
+				return new DataFlavor[] {DataFlavor.imageFlavor};
+			}
+			
+			@Override
+			public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
+				if(!DataFlavor.imageFlavor.equals(flavor))					    {
+					throw new UnsupportedFlavorException(flavor);
+				}
+				return bufferedImg;
+			}
+
+		};
+		
+		Toolkit.getDefaultToolkit().getSystemClipboard().setContents(img, null);
+		
+	}
+	
+	@Override
+	public void requestFocusInComposite()	{
+		EventQueue.invokeLater(new Runnable () {
+			public void run () {
+				((Component) chartComponent).requestFocusInWindow();
+			}
+		});
+	}
+
+	
+	
+	@Override
+	public EventCallBackHandler getMouseCallBackHandler() {
+		return super.getMouseCallBackHandler((Component) this.chartComponent);
+	}
+
+
+	@Override
+	public EventCallBackHandler getKeyCallBackHandler() {
+		return super.getKeyCallBackHandler((Component) this.chartComponent);
+	}
+
+
+	
+}

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

Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java	(revision 837)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java	(revision 838)
@@ -31,9 +31,6 @@
 import java.io.IOException;
 //import java.nio.file.Files;
 
-
-
-
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -46,7 +43,6 @@
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
-import org.txm.chartsengine.core.ChartsEngine;
 import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
 import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
 import org.txm.chartsengine.rcp.editors.ChartEditor;
@@ -90,13 +86,13 @@
 		final FileDialog dialog = new FileDialog(shell, SWT.SAVE);
 
 		// Create the file extensions from the current chart editor supported file formats
-		String extensions[] = new String[SWTChartsComponentsProvider.getCurrent().getEditorSupportedExportFileFormats().size()];
+		String extensions[] = new String[chartEditor.getSWTChartsComponentsProvider().getEditorSupportedExportFileFormats().size()];
 		int defaultChartFormatIndex = 0;
-		for(int i = 0; i < SWTChartsComponentsProvider.getCurrent().getEditorSupportedExportFileFormats().size(); i++) {
-			extensions[i] = "*." + SWTChartsComponentsProvider.getCurrent().getEditorSupportedExportFileFormats().get(i); //$NON-NLS-1$
+		for(int i = 0; i < chartEditor.getSWTChartsComponentsProvider().getEditorSupportedExportFileFormats().size(); i++) {
+			extensions[i] = "*." + chartEditor.getSWTChartsComponentsProvider().getEditorSupportedExportFileFormats().get(i); //$NON-NLS-1$
 
 			// Store the default chart export file format index
-			if(TXMPreferences.getString(ChartsEnginePreferences.DEFAULT_EXPORT_FORMAT, ChartsEnginePreferences.PREFERENCES_NODE).equals(SWTChartsComponentsProvider.getCurrent().getEditorSupportedExportFileFormats().get(i)))	{
+			if(TXMPreferences.getString(ChartsEnginePreferences.DEFAULT_EXPORT_FORMAT, ChartsEnginePreferences.PREFERENCES_NODE).equals(chartEditor.getSWTChartsComponentsProvider().getEditorSupportedExportFileFormats().get(i)))	{
 				defaultChartFormatIndex = i;
 			}
 		}
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java	(revision 837)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java	(revision 838)
@@ -1,6 +1,9 @@
 package org.txm.chartsengine.rcp;
 
 
+import java.awt.Color;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
@@ -11,6 +14,7 @@
 import java.util.Properties;
 
 import javax.swing.JComponent;
+import javax.swing.border.LineBorder;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.runtime.CoreException;
@@ -39,8 +43,8 @@
 import org.txm.chartsengine.core.ChartsEngine;
 import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
 import org.txm.chartsengine.core.results.ChartResult;
-import org.txm.chartsengine.rcp.editors.ChartEditorInput;
 import org.txm.chartsengine.rcp.editors.ChartEditor;
+import org.txm.chartsengine.rcp.editors.ChartEditorInput;
 import org.txm.chartsengine.rcp.events.EventCallBack;
 import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
 import org.txm.chartsengine.rcp.preferences.___KeyboardBindingProperties;
@@ -195,6 +199,7 @@
 	 * @return
 	 */
 	public boolean createChartContainer(ChartEditorInput chartEditorInput)	{
+		Log.finest(this.getClass().getName() + ": creating a chart container...");
 		return this.createChartContainer(this.getChartsEngine(), chartEditorInput);
 	}
 	
@@ -306,73 +311,8 @@
 		}
 		return provider;
 	}
-	
 
-//	/**
-//	 * Creates and return a SWT EditorPart for the specified CA result.
-//	 * @param ca
-//	 * @return a SWT EditorPart
-//	 */
-//	public abstract ChartEditor createCAFactorialMapChartEditorPart(CA ca);
-//
-//
-//	/**
-//	 * Creates and return a SWT EditorPart for the singular values of the specified CA result.
-//	 * @param ca
-//	 * @return a SWT EditorPart
-//	 */
-//	public abstract ChartEditor createCASingularValuesBarChartEditorPart(CA ca);
-//
-
 	/**
-	 * Creates and return a SWT EditorPart for the specified CAH result.
-	 * @param cah
-	 * @return a SWT EditorPart
-	 */
-//	public abstract ChartEditor createCAHChartEditorPart(Image titleImage, CAH cah);
-
-
-	/**
-	 * Creates and return a SWT EditorPart for the specified dimensions of partition result.
-	 * @param titleImage
-	 * @param partition
-	 * @param sortPartsBySize
-	 * @return a SWT EditorPart
-	 */
-//	public abstract ChartEditor createDimensionsPartitionChartEditorPart(Image titleImage, Partition partition, boolean sortPartsBySize);
-
-
-	/**
-	 * Creates and return a SWT EditorPart for the specified specificities result.
-	 * @param titleImage the editor title image
-	 * @param specificitiesResult the specificities result
-	 * @param typeNames the type names
-	 * @param partNames the part names
-	 * @param specIndex the specificities indices
-	 * @param transpose the transpose
-	 * @param drawBars the draw bar chart state
-	 * @param drawLines the draw line chart state
-	 * @param banalite
-	 * @param monochrome
-	 * @return
-	 */
-//	public abstract ChartEditor createSpecificitiesChartEditorPart(Image titleImage, SpecificitesResult specificitiesResult, boolean transpose, boolean drawBars, boolean drawLines, float banalite, boolean monochrome);
-
-
-	/**
-	 * Creates and return a SWT EditorPart for the specified progression result.
-	 * @param titleImage
-	 * @param progression
-	 * @param monochrome
-	 * @param monostyle
-	 * @param doCumulative
-	 * @param file
-	 * @return
-	 */
-	//public abstract ChartEditor createProgressionChartEditorPart(Image titleImage, Progression progression, boolean monochrome, boolean monostyle, boolean doCumulative);
-
-
-	/**
 	 * Set the current charts engine.
 	 * @param chartsEngine the chartsEngine to set
 	 */
@@ -977,7 +917,7 @@
 
 					case SWT.Activate:
 						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT activate");
-
+						chartEditor.getComposite().requestFocusInComposite();
 						break;
 				}
 		   }
@@ -989,6 +929,22 @@
 	//	chartEditor.getComposite().addListener(SWT.Activate, listener); // TODO : test AWT delegation
 
 
+		// FIXME: For Swing focus debug
+		swingComponent.addFocusListener(new FocusListener() {
+			
+			@Override
+			public void focusLost(FocusEvent e) {
+				// TODO Auto-generated method stub
+				swingComponent.setBorder(javax.swing.BorderFactory.createEmptyBorder());
+			}
+			
+			@Override
+			public void focusGained(FocusEvent e) {
+				// TODO Auto-generated method stub
+				swingComponent.setBorder(new LineBorder(Color.red, 2));
+			}
+		});
+		
 
 		// FIXME: SWT tool tips test rather than using Swing
 		//chartEditor.getComposite().addListener(SWT.MouseMove, listener);
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java	(revision 837)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java	(revision 838)
@@ -176,23 +176,31 @@
 	 * Opens an editor where id is the specified result class name, computes the result then refreshes the editor components.
 	 * @param result
 	 */
-	public static void openEditor(ChartResult result) {
-		openEditor(result, result.getClass().getName());
+	public static ChartEditor openEditor(ChartResult result) {
+		return openEditor(result, false);
 	}
 
+	public static ChartEditor openEditor(ChartResult result, boolean alwaysRecreateEditor)	{
+		return openEditor(result, result.getClass().getName(), alwaysRecreateEditor);
+	}
 	
+	public static ChartEditor openEditor(ChartResult result, String editorPartId)	{
+		return openEditor(result, editorPartId, false);
+	}
+	
+	
 	/**
 	 * Opens an editor specified by its id, computes the specified result then refreshes the editor components.
 	 * @param result
 	 * @param editorPartId
 	 * @return
 	 */
-	public static ChartEditor openEditor(ChartResult result, String editorPartId)	{
+	public static ChartEditor openEditor(ChartResult result, String editorPartId, boolean alwaysRecreateEditor)	{
 		
-		// FIXME: voir si on peut pas revenir à l'ouverture de l'éditeur ICI plutot que dans le compute, ca permettrait de retourner le TXMEditor dans openEditor()
-		return (ChartEditor) openEditor(new ChartEditorInput<ChartResult>(result), editorPartId);
-				
-		//compute(new ChartEditorInput<ChartResult>(result), editorPartId, false, null);
+		ChartEditorInput<ChartResult> editorInput = new ChartEditorInput<ChartResult>(result);
+		editorInput.setAlwaysRecreateEditor(alwaysRecreateEditor);
+		
+		return (ChartEditor) openEditor(editorInput, editorPartId);
 	}
 
 
@@ -214,8 +222,11 @@
 		
 		this.updateEditorFromChart(update);
 		
-		// check that the charts engine used for the result matches the SWT components provider otherwise fin a suitable components provider
+		// check that the charts engine used for the result matches the SWT components provider otherwise find a suitable components provider
 		if(this.getResult().getChartsEngine() != this.getSWTChartsComponentsProvider().getChartsEngine())	{
+			
+			Log.warning("ChartEditor.__updateEditorFromResult(): result charts engine  = " + this.getResult().getChartsEngine().getName() + " / Editor charts engine = " + this.getSWTChartsComponentsProvider().getChartsEngine().getName() + "."); //$NON-NLS-1$
+			
 			this.getEditorInput().setSWTChartsComponentsProvider(SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()));
 			this.getSWTChartsComponentsProvider().setChartsEngine(this.getResult().getChartsEngine());
 			
@@ -239,6 +250,8 @@
 		this.getResult().subTask("Loading chart.");
 		this.loadChart();
 		
+		
+		// FIXME: this code should be moved in ChartComposit.loadChart()?
 		// if editor wasn't exist:
 		// hiding command parameters, updating tool bar buttons states, registering context menus and event user callbacks 
 		if(needInit
@@ -277,6 +290,11 @@
 //				}
 //			});
 		}
+		
+		
+		if(this.parentMultiPagesEditor == null)	{
+			this.forceFocus();			
+		}
 	}
 	
 	
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java	(revision 837)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java	(revision 838)
@@ -12,7 +12,6 @@
 import org.txm.chartsengine.core.results.ChartResult;
 import org.txm.core.results.Parameter;
 import org.txm.core.results.TXMParameters;
-import org.txm.core.results.TXMResult;
 import org.txm.partition.core.messages.PartitionCoreMessages;
 import org.txm.partition.core.preferences.PartitionDimensionsPreferences;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/preferences/ConcordancePreferences.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/preferences/ConcordancePreferences.java	(revision 837)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/preferences/ConcordancePreferences.java	(revision 838)
@@ -18,13 +18,14 @@
 	// auto populate the preference node qualifier from the current bundle id
 	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(ConcordancePreferences.class).getSymbolicName();
 	
-	public static final String PREFERENCES_PREFIX = "concordance_"; //$NON-NLS-1$
+	// FIXME: tests
+	//public static final String PREFERENCES_PREFIX = "concordance_"; //$NON-NLS-1$
+	public static final String PREFERENCES_PREFIX = ""; //$NON-NLS-1$
 	
 	public static final String N_LINES_PER_PAGE = PREFERENCES_PREFIX + "n_lines_per_page"; //$NON-NLS-1$
 	public static final String LEFT_CONTEXT_SIZE = PREFERENCES_PREFIX + "left_context_size"; //$NON-NLS-1$
 	public static final String RIGHT_CONTEXT_SIZE = PREFERENCES_PREFIX + "right_context_size"; //$NON-NLS-1$
 
-	public static final String QUERY = PREFERENCES_PREFIX + "query"; //$NON-NLS-1$
 	public static final String LEFT_ANALYSIS_PROPERTIES = PREFERENCES_PREFIX + "left_analysis_properties"; //$NON-NLS-1$
 	public static final String KEYWORD_ANALYSIS_PROPERTIES = PREFERENCES_PREFIX + "keyword_analysis_properties"; //$NON-NLS-1$
 	public static final String RIGHT_ANALYSIS_PROPERTIES = PREFERENCES_PREFIX + "right_analysis_properties"; //$NON-NLS-1$
@@ -38,8 +39,6 @@
 	public static final String LIMIT_CQL = "limit_cql"; //$NON-NLS-1$
 	public static final String TOP_INDEX = "top_index"; //$NON-NLS-1$
 	
-	public static final String WORD = "word"; //$NON-NLS-1$
-	
 	@Override
 	public void initializeDefaultPreferences() {
 		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
@@ -49,12 +48,12 @@
 		preferences.putInt(LEFT_CONTEXT_SIZE, 8);
 		preferences.putInt(RIGHT_CONTEXT_SIZE, 12);
 		
-		preferences.put(LEFT_ANALYSIS_PROPERTIES, WORD);
-		preferences.put(KEYWORD_ANALYSIS_PROPERTIES, WORD);
-		preferences.put(RIGHT_ANALYSIS_PROPERTIES, WORD);
-		preferences.put(LEFT_VIEW_PROPERTIES, WORD);
-		preferences.put(KEYWORD_VIEW_PROPERTIES, WORD);
-		preferences.put(RIGHT_VIEW_PROPERTIES, WORD);
+		preferences.put(LEFT_ANALYSIS_PROPERTIES, TXMPreferences.DEFAULT_UNIT_PROPERTY);
+		preferences.put(KEYWORD_ANALYSIS_PROPERTIES, TXMPreferences.DEFAULT_UNIT_PROPERTY);
+		preferences.put(RIGHT_ANALYSIS_PROPERTIES, TXMPreferences.DEFAULT_UNIT_PROPERTY);
+		preferences.put(LEFT_VIEW_PROPERTIES, TXMPreferences.DEFAULT_UNIT_PROPERTY);
+		preferences.put(KEYWORD_VIEW_PROPERTIES, TXMPreferences.DEFAULT_UNIT_PROPERTY);
+		preferences.put(RIGHT_VIEW_PROPERTIES, TXMPreferences.DEFAULT_UNIT_PROPERTY);
 		
 		preferences.put(VIEW_REFERENCE_PATTERN, "*"); //$NON-NLS-1$
 		preferences.put(ANALYSIS_REFERENCE_PATTERN, "*"); //$NON-NLS-1$
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java	(revision 837)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java	(revision 838)
@@ -170,17 +170,41 @@
 	@Parameter
 	private QueryResult pQueryResult;
 	
+	
+	
+
 	/**
 	 * 
 	 * @param corpus
 	 */
-	public Concordance(Corpus corpus) {
-		super(corpus);
-		if (corpus != null) {
-			this.setCQLSeparator(corpus.getCQLLimitQuery());
+	public Concordance(Corpus corpus)	{
+		this(null, corpus);
+	}
+
+	/**
+	 * 
+	 * @param uuid
+	 */
+	public Concordance(String uuid)	{
+		this(uuid, null);
+	}
+	
+	/**
+	 * 
+	 * @param corpus
+	 */
+	public Concordance(String uuid, Corpus corpus) {
+		super(uuid, corpus);
+		if (this.parent != null) {
+			this.setCQLSeparator(this.getCorpus().getCQLLimitQuery());
 		}
 	}
 
+	/**
+	 * Checks if this concordance is equal to specified concordance.
+	 * @param other
+	 * @return
+	 */
 	public boolean equals(Concordance other) {
 		if (other == null) return false;
 		
@@ -1630,7 +1654,6 @@
 	 * @param query the query to set
 	 */
 	public void setQuery(Query query) {
-		//updateDirty(pQuery, query);
 		this.pQuery = query;
 	}
 
@@ -1678,6 +1701,12 @@
 	public boolean loadParameters() {
 
 		try {
+			
+			if(!this.getStringParameterValue(ConcordancePreferences.QUERY).isEmpty())	{
+				this.setQuery(this.getStringParameterValue(ConcordancePreferences.QUERY));
+			}
+			
+			
 //			this.pTopIndex = this.getIntParameterValue(ConcordancePreferences.TOP_INDEX);
 //			this.pNLinesPerPage = this.getIntParameterValue(ConcordancePreferences.N_LINE_PER_PAGE);
 //
Index: tmp/org.txm.ahc.core/src/org/txm/ahc/core/functions/AHC.java
===================================================================
--- tmp/org.txm.ahc.core/src/org/txm/ahc/core/functions/AHC.java	(revision 837)
+++ tmp/org.txm.ahc.core/src/org/txm/ahc/core/functions/AHC.java	(revision 838)
@@ -627,11 +627,12 @@
 
 	@Override
 	public String getSimpleName() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(this.columnsComputing ? "cols" : "rows"); //$NON-NLS-1$
-		buffer.append(this.method);
-		buffer.append(this.metric);
-		buffer.append(this.numberOfClusters);
+		// FIXME: to define
+//		StringBuffer buffer = new StringBuffer();
+//		buffer.append(this.columnsComputing ? "cols" : "rows"); //$NON-NLS-1$
+//		buffer.append(this.method);
+//		buffer.append(this.metric);
+//		buffer.append(this.numberOfClusters);
 		return this.getName();
 	}
 
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java	(revision 837)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java	(revision 838)
@@ -1,7 +1,6 @@
 package org.txm.specificities.rcp.editors;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.ToolItem;
 import org.txm.chartsengine.rcp.editors.ChartEditor;
Index: tmp/org.txm.information.rcp/plugin.xml
===================================================================
--- tmp/org.txm.information.rcp/plugin.xml	(revision 837)
+++ tmp/org.txm.information.rcp/plugin.xml	(revision 838)
@@ -42,7 +42,7 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="toolbar:org.txm.rcp.toolbarcorpus?after=org.txm.synopticedition.rcp.handlers.OpenEdition">
+            locationURI="toolbar:org.txm.rcp.toolbarcorpus?after=org.txm.edition.rcp.handlers.OpenEdition">
          <command
                commandId="org.txm.properties.rcp.handlers.ComputeProperties"
                icon="icons/functions/properties.png"
Index: tmp/org.txm.chartsengine.jfreechart.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.rcp/META-INF/MANIFEST.MF	(revision 837)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/META-INF/MANIFEST.MF	(revision 838)
@@ -1,16 +1,17 @@
 Manifest-Version: 1.0
-Require-Bundle: org.txm.chartsengine.jfreechart.core;bundle-version="1
- .0.0";visibility:=reexport,org.txm.chartsengine.rcp;bundle-version="1
- .0.0";visibility:=reexport,org.txm.rcp;bundle-version="0.7.8";visibil
- ity:=reexport,org.txm.ca.core;bundle-version="1.0.0";visibility:=reex
- port
-Export-Package: org.txm.chartsengine.jfreechart.rcp,org.txm.chartsengi
- ne.jfreechart.rcp.events,org.txm.chartsengine.jfreechart.rcp.handlers
- ,org.txm.chartsengine.jfreechart.rcp.preferences,org.txm.chartsengine
- .jfreechart.rcp.swt,org.txm.chartsengine.jfreechart.rcp.themes.base.s
- wing,org.txm.chartsengine.jfreechart.rcp.themes.highcharts,org.txm.ch
- artsengine.jfreechart.rcp.themes.highcharts.events,org.txm.chartsengi
- ne.jfreechart.rcp.themes.highcharts.swing
+Require-Bundle: org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.chartsengine.rcp;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.rcp;bundle-version="0.7.8";visibility:=reexport,
+ org.txm.ca.core;bundle-version="1.0.0";visibility:=reexport
+Export-Package: org.txm.chartsengine.jfreechart.rcp,
+ org.txm.chartsengine.jfreechart.rcp.events,
+ org.txm.chartsengine.jfreechart.rcp.handlers,
+ org.txm.chartsengine.jfreechart.rcp.preferences,
+ org.txm.chartsengine.jfreechart.rcp.swt,
+ org.txm.chartsengine.jfreechart.rcp.themes.base.swing,
+ org.txm.chartsengine.jfreechart.rcp.themes.highcharts,
+ org.txm.chartsengine.jfreechart.rcp.themes.highcharts.events,
+ org.txm.chartsengine.jfreechart.rcp.themes.highcharts.swing
 Bundle-Vendor: Textometrie.org
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: JFreeChart Charts Engine RCP
Index: tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/JFCChartsSwingComponentsProvider.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/JFCChartsSwingComponentsProvider.java	(revision 837)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/JFCChartsSwingComponentsProvider.java	(revision 838)
@@ -1,108 +0,0 @@
-package org.txm.chartsengine.jfreechart.rcp;
-
-import java.awt.Color;
-
-import org.jfree.chart.ChartPanel;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.LegendItemSource;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.CategoryPlot;
-import org.jfree.chart.plot.Marker;
-import org.jfree.chart.plot.Plot;
-import org.jfree.chart.plot.ValueMarker;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.data.category.DefaultCategoryDataset;
-import org.jfree.data.general.DatasetUtilities;
-import org.jfree.data.xy.XYIntervalSeries;
-import org.jfree.data.xy.XYIntervalSeriesCollection;
-import org.jfree.data.xy.XYSeries;
-import org.jfree.data.xy.XYSeriesCollection;
-import org.jfree.ui.RectangleAnchor;
-import org.jfree.ui.TextAnchor;
-import org.txm.chartsengine.jfreechart.core.JFCChartsEngine;
-import org.txm.chartsengine.jfreechart.core.themes.base.ExtendedNumberAxis;
-import org.txm.chartsengine.jfreechart.core.themes.base.JFCTheme;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers.ItemSelectionCategoryLineAndShapeRenderer;
-import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
-
-/**
- * Swing components provider.
- * @author sjacquot
- *
- */
-public class JFCChartsSwingComponentsProvider {
-
-	/**
-	 * The chart production engine.
-	 */
-	protected JFCChartsEngine chartsEngine;
-
-
-	/**
-	 * The linked SWT Charts Component Provider.
-	 */
-	protected SWTChartsComponentsProvider swtChartsComponentProvider;
-
-	
-	/**
-	 *
-	 * @param chartsEngine
-	 */
-	public JFCChartsSwingComponentsProvider(SWTChartsComponentsProvider swtChartsComponentProvider, JFCChartsEngine chartsEngine) {
-		this.swtChartsComponentProvider = swtChartsComponentProvider;
-		this.chartsEngine = chartsEngine;
-	}
-
-
-
-	/**
-	 * Creates an empty chart panel.
-	 * @return
-	 */
-	public ChartPanel createDefaultEmptyChartPanel()	{
-		return this.getTheme().createChartPanel(this.swtChartsComponentProvider, null);
-	}
-
-
-	/**
-	 * Gets the charts engine.
-	 * @return the chartsEngine
-	 */
-	public JFCChartsEngine getChartsEngine() {
-		return chartsEngine;
-	}
-
-
-	public JFCTheme getTheme()	{
-		return this.chartsEngine.getJFCTheme();
-	}
-	
-	
-	/**
-	 * Gets the items renderer of the specified plot.
-	 * @param plot
-	 * @return
-	 */
-	public static LegendItemSource getRenderer(Plot plot)	{
-		LegendItemSource renderer = null;
-
-		if(plot instanceof XYPlot) {
-			renderer = ((XYPlot) plot).getRenderer();
-		}
-		else if(plot instanceof CategoryPlot)	{
-			renderer = ((CategoryPlot) plot).getRenderer();
-		}
-		
-		return renderer;
-	}
-	
-	/**
-	 * Gets the items renderer associated to the plot linked to the specified chart panel.
-	 * @param panel
-	 * @return
-	 */
-	public static LegendItemSource getRenderer(ChartPanel panel)	{
-		return getRenderer(panel.getChart().getPlot());
-	}
-	
-}
Index: tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java	(revision 837)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java	(revision 838)
@@ -61,8 +61,8 @@
 
 		// output formats
 		ArrayList<String> supportedOutputFormats = new ArrayList<String>();
-		supportedOutputFormats.addAll(JFCChartsEngine.getSupportedOutputDisplayFormatsStatic());
-		supportedOutputFormats.addAll(JFCChartsEngine.getSupportedOutputFileFormatsStatic());
+		supportedOutputFormats.addAll(((ChartsEngine) Toolbox.getEngineManager(EngineType.CHARTS).getEngine(JFCChartsEngine.class)).getSupportedOutputDisplayFormats());
+		supportedOutputFormats.addAll(((ChartsEngine) Toolbox.getEngineManager(EngineType.CHARTS).getEngine(JFCChartsEngine.class)).getSupportedOutputFileFormats());
 		
 		// Sort the set
 		TreeSet<String> formatsSet = new TreeSet <String>(supportedOutputFormats);
Index: tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/themes/highcharts/events/JFCItemsKeyboardSelectionCallBack.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/themes/highcharts/events/JFCItemsKeyboardSelectionCallBack.java	(revision 837)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/themes/highcharts/events/JFCItemsKeyboardSelectionCallBack.java	(revision 838)
@@ -9,7 +9,7 @@
 import org.jfree.chart.ChartPanel;
 import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
 import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.rcp.JFCChartsSwingComponentsProvider;
+import org.txm.chartsengine.jfreechart.rcp.JFCSWTChartsComponentsProvider;
 import org.txm.chartsengine.rcp.events.ItemsKeyboardSelectionCallBack;
 import org.txm.chartsengine.rcp.events.ZoomAndPanCallBack;
 
@@ -55,7 +55,7 @@
 			}
 			
 			if(keyEvent.getKeyCode() == KeyEvent.VK_LEFT || keyEvent.getKeyCode() == KeyEvent.VK_RIGHT)	{
-				IRendererWithItemSelection renderer = (IRendererWithItemSelection) JFCChartsSwingComponentsProvider.getRenderer((ChartPanel) customData);
+				IRendererWithItemSelection renderer = (IRendererWithItemSelection) JFCSWTChartsComponentsProvider.getRenderer((ChartPanel) customData);
 				
 				// Select next item or add it to selection
 				if(keyEvent.getKeyCode() == KeyEvent.VK_RIGHT)	{
Index: tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/JFCSWTChartsComponentsProvider.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/JFCSWTChartsComponentsProvider.java	(revision 837)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/JFCSWTChartsComponentsProvider.java	(revision 838)
@@ -1,11 +1,13 @@
 package org.txm.chartsengine.jfreechart.rcp;
 
+import java.awt.Component;
 import java.io.File;
 import java.util.ArrayList;
 
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
+import org.jfree.chart.LegendItemSource;
 import org.jfree.chart.plot.CategoryPlot;
 import org.jfree.chart.plot.Plot;
 import org.jfree.chart.plot.XYPlot;
@@ -30,15 +32,8 @@
 
 
 	/**
-	 * The Swing component provider.
+	 * Default constructor. 
 	 */
-	protected JFCChartsSwingComponentsProvider swingComponentsProvider;
-
-	
-	
-	/**
-	 * 
-	 */
 	public JFCSWTChartsComponentsProvider() {
 		super();
 	}
@@ -49,7 +44,6 @@
 		super.setChartsEngine(chartsEngine);
 		// Redefine the TBX theme to manage UI
 		((JFCChartsEngine) chartsEngine).setTheme(new HighchartsThemeSwing((JFCChartsEngine) chartsEngine));
-		this.swingComponentsProvider = new JFCChartsSwingComponentsProvider(this, (JFCChartsEngine) chartsEngine);;
 	}
 	
 
@@ -74,7 +68,9 @@
 				((IRendererWithItemSelection) chart.getCategoryPlot().getRenderer()).getItemsSelector().setChartPanel(chartPanel);
 			}
 			
+			
 			// update for shared preferences, show title, show legend, colors rendering mode, etc.
+			// FIXME: became uselss?
 //			chartsEngine.updateChart(chart, chartEditorInput.getResult());
 
 			// sets and updates the local preferences node qualifier from the result data
@@ -96,21 +92,11 @@
 
 	@Override
 	public ChartComposite createComposite(ChartEditor chartEditor, Composite parent)	{
-		return JFCSWTChartsComponentsProvider.createCompositeStatic(chartEditor, parent);
+		return new JFCComposite(chartEditor, parent);
 	}
 
 
-	/**
-	 * Creates the chart drawing area composite.
-	 * @param chartEditor
-	 * @param parent
-	 * @return
-	 */
-	public static JFCComposite createCompositeStatic(ChartEditor chartEditor, Composite parent)	{
-		return new JFCComposite(chartEditor, parent);
-	}
 
-
 	@Override
 	public ArrayList<String> getEditorSupportedExportFileFormats()	{
 		return this.chartsEngine.getSupportedOutputFileFormats();
@@ -155,7 +141,7 @@
 		}
 
 		// Export the chart
-		file = JFCChartsEngine.export(composite.getChart(), file, fileFormat, composite.getChartPanel().getWidth(), composite.getChartPanel().getHeight());
+		file = JFCChartsEngine.export(composite.getChart(), file, fileFormat, ((Component) composite.getChartComponent()).getWidth(), ((Component) composite.getChartComponent()).getHeight());
 
 		// Enable back the item selection
 		if(mouseOverItemSelector != null)	{
@@ -167,11 +153,31 @@
 
 
 	/**
-	 * @return the swingComponentsProvider
+	 * Gets the items renderer of the specified plot.
+	 * @param plot
+	 * @return
 	 */
-	public JFCChartsSwingComponentsProvider getSwingComponentsProvider() {
-		return swingComponentsProvider;
+	public static LegendItemSource getRenderer(Plot plot)	{
+		LegendItemSource renderer = null;
+
+		if(plot instanceof XYPlot) {
+			renderer = ((XYPlot) plot).getRenderer();
+		}
+		else if(plot instanceof CategoryPlot)	{
+			renderer = ((CategoryPlot) plot).getRenderer();
+		}
+		
+		return renderer;
 	}
+	
+	/**
+	 * Gets the items renderer associated to the plot linked to the specified chart panel.
+	 * @param panel
+	 * @return
+	 */
+	public static LegendItemSource getRenderer(ChartPanel panel)	{
+		return getRenderer(panel.getChart().getPlot());
+	}
 
 	
 	
Index: tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/swt/JFCComposite.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/swt/JFCComposite.java	(revision 837)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/swt/JFCComposite.java	(revision 838)
@@ -1,57 +1,29 @@
 package org.txm.chartsengine.jfreechart.rcp.swt;
 
-import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.EventQueue;
-import java.awt.Frame;
-import java.io.File;
-import java.util.EventListener;
 
-import javax.swing.JPanel;
-
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.awt.SWT_AWT;
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.chart.ChartMouseListener;
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.CategoryPlot;
 import org.jfree.chart.plot.XYPlot;
-import org.txm.chartsengine.jfreechart.core.JFCChartsEngine;
 import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
 import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
 import org.txm.chartsengine.rcp.IChartComponent;
 import org.txm.chartsengine.rcp.editors.ChartEditor;
 import org.txm.chartsengine.rcp.events.EventCallBackHandler;
-import org.txm.chartsengine.rcp.swt.ChartComposite;
+import org.txm.chartsengine.rcp.swt.SwingChartComposite;
 
 /**
  * JFreeChart SWT composite.
  * @author sjacquot
  *
  */
-public class JFCComposite extends ChartComposite {
+public class JFCComposite extends SwingChartComposite {
 
 
-	// For reducing resize flickering on Windows
-	static	{
-		try {
-			System.setProperty("sun.awt.noerasebackground", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		catch (NoSuchMethodError error) {
-		}
-	}
-
-
-
-	protected Frame frame;
-	
-	//FIXME: tests
-	//protected Panel rootPanel;
-	//protected JRootPane rootPanel;
-	protected JPanel rootPanel;
-	
-
 	/**
 	 * Creates a JFreeChart composite.
 	 * @param parent
@@ -61,214 +33,196 @@
 		//super(chartEditor, parent, SWT.EMBEDDED | SWT.NO_BACKGROUND);
 		super(chartEditor, parent, SWT.EMBEDDED);
 		//super(parent, SWT.EMBEDDED | SWT.NO_MERGE_PAINTS | SWT.NO_BACKGROUND); // do not fix the transparency problem
-
-		//this.chartComponent = (IChartComponent) panel;
-		// FIXME : transparency doesn't work with tool tips
-		// The problem here is that we normally need a JFrame but it seems to be impossible to embed a JFrame
-//		this.setBackgroundMode(SWT.INHERIT_FORCE); // do not fix
-//		ToolTipManager.sharedInstance().setLightWeightPopupEnabled(true); // do not fix
-
-		this.frame = SWT_AWT.new_Frame(this);
-		// Need to add an AWT Panel to fix mouse events and mouse cursors changes on Swing JPanel
-		//this.rootPanel = new Panel(new BorderLayout());
-		//this.rootPanel = new JRootPane();
-		this.rootPanel = new JPanel(new BorderLayout());
-		
-		
-		
-		this.frame.add(this.rootPanel);
-
-
-		
-		this.frame.setVisible(true);
-//		this.frame.pack();
-//		this.pack(true);
-//		parent.pack();
-//		this.layout(true);
-//		parent.layout(true);
-		
-		// To fix MAC OS X + Java 1.7/1.8 SWT_AWT BUG
-		// see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=418245#c12
-//		SwingUtilities.invokeLater(new Runnable() {
 //
+//		//this.chartComponent = (IChartComponent) panel;
+//		// FIXME : transparency doesn't work with tool tips
+//		// The problem here is that we normally need a JFrame but it seems to be impossible to embed a JFrame
+////		this.setBackgroundMode(SWT.INHERIT_FORCE); // do not fix
+////		ToolTipManager.sharedInstance().setLightWeightPopupEnabled(true); // do not fix
 //
-//		   @Override
-//		   public void run() {
+//		this.frame = SWT_AWT.new_Frame(this);
+//		// Need to add an AWT Panel to fix mouse events and mouse cursors changes on Swing JPanel
+//		//this.rootPanel = new Panel(new BorderLayout());
+//		//this.rootPanel = new JRootPane();
+//		this.rootPanel = new JPanel(new BorderLayout());
+//		
+//		
+//		
+//		this.frame.add(this.rootPanel);
+//
+//
+//		
+//		this.frame.setVisible(true);
+////		this.frame.pack();
+////		this.pack(true);
+////		parent.pack();
+////		this.layout(true);
+////		parent.layout(true);
+//		
+//		// To fix MAC OS X + Java 1.7/1.8 SWT_AWT BUG
+//		// see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=418245#c12
+////		SwingUtilities.invokeLater(new Runnable() {
+////
+////
+////		   @Override
+////		   public void run() {
+//
+//
+//
+//
+////			// Need to add an AWT Panel to fix mouse events and mouse cursors changes on Swing JPanel
+////			this.rootPanel = new Panel(new BorderLayout());
+////			//rootPanel.add(this.getChartPanel()); // commenter cette ligne pour le test de scrolling ci-dessous
+////			this.frame.add(this.rootPanel);
+//
+//
+//			// FIXME: test, smarter way to embed the frame ? Actually it doesn't fix neither the tooltip transparency nor the cursor change on pan under Mac OS X
+//	//		// Need to add an AWT Panel to fix mouse events and mouse cursors changes on Swing JPanel
+//	//		Panel rootPanel = new Panel(new BorderLayout());
+//	////		rootPanel.add(this.chartPanel); // commenter cette ligne pour le test de scrolling ci-dessous
+//	//		frame.add(rootPanel);
+//	//		JRootPane rootPane = new JRootPane();
+//	//		rootPanel.add(rootPane);
+//	//		rootPane.getContentPane().add(this.chartPanel);
+//
+//
+//
+//			// FIXME: tests with a JApplet as Rootpane rather than Panel
+//	//		JApplet rootPanel = new JApplet();
+//	//		rootPanel.add(this.chartPanel); // commenter cette ligne pour le test de scrolling ci-dessous
+//	//		frame.add(rootPanel);
+//
+//
+//
+//
+//			// FIXME : tests scroll Swing: les width des panel sont définies dans les méthodes de JFCChartsSwingComponentsProvider
+//			// FIXME : ce code fait bugger le changement de couleur des barres au mouse over et la bordure colorée des tooltips
+//			// FIXME : ce code augmente à fond la RAM consommée, il y a un prob de composants en double ?
+//			// En fait c'est un problème Java2D apparemment et qui semble "normal"
+//			//panel.setPreferredSize(new Dimension(20000, 300));
+//	//		JScrollPane scrollpane = new JScrollPane(panel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+//	//		frame.add(scrollpane);
+//
+//
+//
+//			// FIXME : version AWT
+//			// FIXME : ce code aussi n'augmente pas la RAM consommée ? à moins que ce soit uniquement quand la largeur du panel est large (bug de JFC sur les larges plots ?)
+//	//		ScrollPane scrollpane = new ScrollPane();
+//	//		scrollpane.add(panel);
+//	//		frame.add(scrollpane);
+//
+//			//frame.pack();
+//
+//
+//			// FIXME : test scroll SWT : fonctionne presque
+//	//		ScrolledComposite scrolledComposite = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
+//	//		scrolledComposite.setExpandHorizontal(true);
+//	//		scrolledComposite.setExpandVertical(true);
+//	//		//parent.setLayout(new GridLayout(1, true));
+//	//		parent.setLayout(new FillLayout(SWT.VERTICAL));
+//	//		//parent.setLayout(new FormLayout());
+//	//		this.setParent(scrolledComposite);
+//	//		//this.setLayout(new FillLayout());
+//	//
+//	//		scrolledComposite.setContent(this);
+//	//		scrolledComposite.setAlwaysShowScrollBars(true);
+//	//
+//	//		scrolledComposite.setMinSize(16000, 0);
+//			// ********** Fin test 1
+//
+//
+//
+//			// FIXME : test scroll SWT
+//	//		ScrolledComposite scrolledComposite = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
+//	//		scrolledComposite.setExpandHorizontal(true);
+//	//		scrolledComposite.setExpandVertical(true);
+//	//		//parent.setLayout(new GridLayout(1, true));
+//	//		parent.setLayout(new FormLayout());
+//	//		this.setParent(scrolledComposite);
+//	//		this.setLayout(new FillLayout());
+//	//
+//	//		scrolledComposite.setContent(this);
+//	//		scrolledComposite.setAlwaysShowScrollBars(true);
+//	//
+//	//		scrolledComposite.setMinSize(16000, 500);
+//	//
+//	//		this.setSize(16000, 500);
+//
+//
+//			//scrolledComposite.pack(true);
+//			//scrolledComposite.setMinSize(parent.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+//
+//	//		frame.pack();
+//	//		System.err.println("JFCComposite.JFCComposite() frame: " + frame.getWidth() + " - " + frame.getHeight());
+//
+//			//scrolledComposite.setMinSize(new Point(2000, 500));
+//			//frame.setSize(2000, 500);
+//
+//
+//
+//			// Test tool tips transparency : do not fix transparency and create error
+//	//		JFrame jFrame = new JFrame();
+//	//		//jFrame.setContentPane(panel);
+//	//		jFrame.add(panel);
+//	//		frame.add(jFrame);
+//
+//
+//			// FIXME: tests fix bug "Reset view" + Java 6 focus bugs
+//	//		this.chartPanel.addFocusListener(new FocusListener() {
+//	//
+//	//			@Override
+//	//			public void focusLost(FocusEvent e) {
+//	//				// TODO Auto-generated method stub
+//	//				System.err.println("JFCComposite.JFCComposite(...).new FocusListener() {...}.focusLost() chart panel");
+//	//			}
+//	//
+//	//			@Override
+//	//			public void focusGained(FocusEvent e) {
+//	//				// TODO Auto-generated method stub
+//	//				System.err.println("JFCComposite.JFCComposite(...).new FocusListener() {...}.focusGained() chart panel");
+//	//			}
+//	//		});
+//
+//
+//			// FIXME : axis unit square ratio tests
+//	//		this.addListener(SWT.Resize, new Listener() {
+//	//
+//	//			@Override
+//	//			public void handleEvent(Event e) {
+//	//				switch (e.type) {
+//	//					case SWT.Resize:
+//	//						System.err.println("ChartComposite.ChartComposite(...).new Listener() {...}.handleEvent()");
+//	//						resetView();
+//	//						break;
+//	//				}
+//	//
+//	//			}
+//	//		});
+//
+//
+//			//this.frame.setVisible(true);
+//			//parent.pack();
+//
+////		   }
+////	   });
 
 
-
-
-//			// Need to add an AWT Panel to fix mouse events and mouse cursors changes on Swing JPanel
-//			this.rootPanel = new Panel(new BorderLayout());
-//			//rootPanel.add(this.getChartPanel()); // commenter cette ligne pour le test de scrolling ci-dessous
-//			this.frame.add(this.rootPanel);
-
-
-			// FIXME: test, smarter way to embed the frame ? Actually it doesn't fix neither the tooltip transparency nor the cursor change on pan under Mac OS X
-	//		// Need to add an AWT Panel to fix mouse events and mouse cursors changes on Swing JPanel
-	//		Panel rootPanel = new Panel(new BorderLayout());
-	////		rootPanel.add(this.chartPanel); // commenter cette ligne pour le test de scrolling ci-dessous
-	//		frame.add(rootPanel);
-	//		JRootPane rootPane = new JRootPane();
-	//		rootPanel.add(rootPane);
-	//		rootPane.getContentPane().add(this.chartPanel);
-
-
-
-			// FIXME: tests with a JApplet as Rootpane rather than Panel
-	//		JApplet rootPanel = new JApplet();
-	//		rootPanel.add(this.chartPanel); // commenter cette ligne pour le test de scrolling ci-dessous
-	//		frame.add(rootPanel);
-
-
-
-
-			// FIXME : tests scroll Swing: les width des panel sont définies dans les méthodes de JFCChartsSwingComponentsProvider
-			// FIXME : ce code fait bugger le changement de couleur des barres au mouse over et la bordure colorée des tooltips
-			// FIXME : ce code augmente à fond la RAM consommée, il y a un prob de composants en double ?
-			// En fait c'est un problème Java2D apparemment et qui semble "normal"
-			//panel.setPreferredSize(new Dimension(20000, 300));
-	//		JScrollPane scrollpane = new JScrollPane(panel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-	//		frame.add(scrollpane);
-
-
-
-			// FIXME : version AWT
-			// FIXME : ce code aussi n'augmente pas la RAM consommée ? à moins que ce soit uniquement quand la largeur du panel est large (bug de JFC sur les larges plots ?)
-	//		ScrollPane scrollpane = new ScrollPane();
-	//		scrollpane.add(panel);
-	//		frame.add(scrollpane);
-
-			//frame.pack();
-
-
-			// FIXME : test scroll SWT : fonctionne presque
-	//		ScrolledComposite scrolledComposite = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
-	//		scrolledComposite.setExpandHorizontal(true);
-	//		scrolledComposite.setExpandVertical(true);
-	//		//parent.setLayout(new GridLayout(1, true));
-	//		parent.setLayout(new FillLayout(SWT.VERTICAL));
-	//		//parent.setLayout(new FormLayout());
-	//		this.setParent(scrolledComposite);
-	//		//this.setLayout(new FillLayout());
-	//
-	//		scrolledComposite.setContent(this);
-	//		scrolledComposite.setAlwaysShowScrollBars(true);
-	//
-	//		scrolledComposite.setMinSize(16000, 0);
-			// ********** Fin test 1
-
-
-
-			// FIXME : test scroll SWT
-	//		ScrolledComposite scrolledComposite = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
-	//		scrolledComposite.setExpandHorizontal(true);
-	//		scrolledComposite.setExpandVertical(true);
-	//		//parent.setLayout(new GridLayout(1, true));
-	//		parent.setLayout(new FormLayout());
-	//		this.setParent(scrolledComposite);
-	//		this.setLayout(new FillLayout());
-	//
-	//		scrolledComposite.setContent(this);
-	//		scrolledComposite.setAlwaysShowScrollBars(true);
-	//
-	//		scrolledComposite.setMinSize(16000, 500);
-	//
-	//		this.setSize(16000, 500);
-
-
-			//scrolledComposite.pack(true);
-			//scrolledComposite.setMinSize(parent.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
-	//		frame.pack();
-	//		System.err.println("JFCComposite.JFCComposite() frame: " + frame.getWidth() + " - " + frame.getHeight());
-
-			//scrolledComposite.setMinSize(new Point(2000, 500));
-			//frame.setSize(2000, 500);
-
-
-
-			// Test tool tips transparency : do not fix transparency and create error
-	//		JFrame jFrame = new JFrame();
-	//		//jFrame.setContentPane(panel);
-	//		jFrame.add(panel);
-	//		frame.add(jFrame);
-
-
-			// FIXME: tests fix bug "Reset view" + Java 6 focus bugs
-	//		this.chartPanel.addFocusListener(new FocusListener() {
-	//
-	//			@Override
-	//			public void focusLost(FocusEvent e) {
-	//				// TODO Auto-generated method stub
-	//				System.err.println("JFCComposite.JFCComposite(...).new FocusListener() {...}.focusLost() chart panel");
-	//			}
-	//
-	//			@Override
-	//			public void focusGained(FocusEvent e) {
-	//				// TODO Auto-generated method stub
-	//				System.err.println("JFCComposite.JFCComposite(...).new FocusListener() {...}.focusGained() chart panel");
-	//			}
-	//		});
-
-
-			// FIXME : axis unit square ratio tests
-	//		this.addListener(SWT.Resize, new Listener() {
-	//
-	//			@Override
-	//			public void handleEvent(Event e) {
-	//				switch (e.type) {
-	//					case SWT.Resize:
-	//						System.err.println("ChartComposite.ChartComposite(...).new Listener() {...}.handleEvent()");
-	//						resetView();
-	//						break;
-	//				}
-	//
-	//			}
-	//		});
-
-
-			//this.frame.setVisible(true);
-			//parent.pack();
-
-//		   }
-//	   });
-
-
 	}
 	
 
-	@Override
-	public void requestFocusInComposite()	{
-		EventQueue.invokeLater(new Runnable () {
-			public void run () {
-				getChartPanel().requestFocusInWindow();
-			}
-		});
-	}
 
 	/**
 	 * Gets the chart.
 	 * @return the chart
 	 */
 	public JFreeChart getChart()	{
-		return this.getChartPanel().getChart();
+		return ((ChartPanel) this.chartComponent).getChart();
 	}
 
-	/**
-	 * @return the chartPanel
-	 */
-	public ChartPanel getChartPanel() {
-		return (ChartPanel) this.chartComponent;
-	}
-	
 
 	@Override
 	public void loadChart(Object data) {
-		this.getChartPanel().setChart((JFreeChart) data);
-
-		// FIXME: for updating chart. The problem here is the theme is applied twice? one time at the creation and one time at the update?
-		//((JFCChartsEngine) this.chartEditor.getChartsEngine()).getJFCTheme().applyThemeToChart(this.chartEditor.getResultData());
+		((ChartPanel) this.chartComponent).setChart((JFreeChart) data);
 		
 		// FIXME: tests, restore the zoom from local node
 		//this.zoom(x, y, zoomIn);
@@ -282,45 +236,8 @@
 		
 	}
 
-	@Override
-	public void loadChart()	{
-		
-		// loads the chart from the result
-		Object chart = this.chartEditor.getChart();
-		
-		if(chart != null) {
-			// creates components if they not exist
-			if(this.chartComponent == null) {
-
-				// recreates the chart if not of right type
-				if(!(chart instanceof JFreeChart))	{
-					try {
-						this.chartEditor.getResult().clearLastRenderingParameters();
-						this.chartEditor.getResult().compute();
-					}
-					catch (Exception e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				
-				this.chartEditor.getSWTChartsComponentsProvider().createChartContainer(this.chartEditor.getEditorInput());
-				this.chartComponent = (IChartComponent) this.chartEditor.getEditorInput().getChartContainer();
-				
-				this.rootPanel.add((Component) this.chartComponent);
-
-				this.frame.setVisible(true);
-				
-				// FIXME: useless?
-				//this.chartEditor.registerEventCallBackExtensions();
-
-			}
-			this.loadChart(this.chartEditor.getChart());
-			this.forceFocus();
-		}
-	}
-
 	
+	
 	@Override
 	public void clearChartItemsSelection() {
 		IRendererWithItemSelection renderer = null;
@@ -340,26 +257,10 @@
 	
 	@Override
 	public void copyChartViewToClipboard() {
-		this.getChartPanel().doCopy();
+		((ChartPanel) this.chartComponent).doCopy();
 	}
 
-	/**
-	 * Gets the event call back handler of the specified class.
-	 * @param listenerType
-	 * @return
-	 */
-	public EventCallBackHandler getCallBackHandler(Class listenerType)	{
-		EventCallBackHandler handler = null;
-		EventListener[] listeners = this.getChartPanel().getListeners(listenerType);
 
-		for(int i = 0; i < listeners.length; i++) {
-			if(listeners[i] instanceof EventCallBackHandler)	{
-				handler = (EventCallBackHandler) listeners[i];
-				break;
-			}
-		}
-		return handler;
-	}
 
 	@Override
 	public EventCallBackHandler getMouseCallBackHandler()	{
@@ -367,13 +268,6 @@
 	}
 
 
-	@Override
-	public EventCallBackHandler getKeyCallBackHandler() {
-		return super.getKeyCallBackHandler(this.getChartPanel());
-	}
 
 
-
-
-
 }
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java	(revision 837)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java	(revision 838)
@@ -232,5 +232,10 @@
 	public boolean isDrawingLines() {
 		return drawLines;
 	}
+	
+	@Override
+	public void setHasBeenComputedOnce(boolean hasBeenComputedOnce) {
+		// redefined to not reset the chart
+	}
 
 }
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/handlers/ComputePartitionDimensionsBarChart.java
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/handlers/ComputePartitionDimensionsBarChart.java	(revision 837)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/handlers/ComputePartitionDimensionsBarChart.java	(revision 838)
@@ -32,7 +32,6 @@
 import org.txm.chartsengine.rcp.editors.ChartEditor;
 import org.txm.partition.core.functions.PartitionDimensions;
 import org.txm.rcp.handlers.BaseAbstractHandler;
-import org.txm.rcp.views.corpora.CorporaView;
 import org.txm.searchengine.cqp.corpus.Partition;
 
 
@@ -46,13 +45,6 @@
 public class ComputePartitionDimensionsBarChart extends BaseAbstractHandler {
 
 
-	// FIXME: adds a double click listener to the Corpus View
-//	static	{
-//		CorporaView.addDoubleClickListener(PartitionDimensions.class, ComputePartitionDimensionsBarChart.class);
-//	}
-	
-	
-	
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
Index: tmp/org.txm.chartsengine.r.core/src/org/txm/chartsengine/r/core/RChartsEngine.java
===================================================================
--- tmp/org.txm.chartsengine.r.core/src/org/txm/chartsengine/r/core/RChartsEngine.java	(revision 837)
+++ tmp/org.txm.chartsengine.r.core/src/org/txm/chartsengine/r/core/RChartsEngine.java	(revision 838)
@@ -158,11 +158,9 @@
 
 
 	
-	/**
-	 * 
-	 * @return
-	 */
-	public static ArrayList<String> getSupportedOutputDisplayFormatsStatic() {
+
+	@Override
+	public ArrayList<String> getSupportedOutputDisplayFormats() {
 		ArrayList<String> formats = new ArrayList<String>(1);
 
 		// FIXME: UI display output format, only SVG
@@ -170,18 +168,10 @@
 		
 		return formats;
 	}
-	
 
+	
 	@Override
-	public ArrayList<String> getSupportedOutputDisplayFormats() {
-		return getSupportedOutputDisplayFormatsStatic();
-	}
-
-	/**
-	 * 
-	 * @return
-	 */
-	public static ArrayList<String> getSupportedOutputFileFormatsStatic() {
+	public ArrayList<String> getSupportedOutputFileFormats() {
 	ArrayList<String> formats = new ArrayList<String>(5);
 		
 		formats.add(OUTPUT_FORMAT_SVG);
@@ -193,11 +183,6 @@
 		return formats;
 	}
 	
-	@Override
-	public ArrayList<String> getSupportedOutputFileFormats() {
-		return getSupportedOutputFileFormatsStatic();
-	}
-	
 
 
 
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/DictionnaryEditor.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/DictionnaryEditor.java	(revision 837)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/DictionnaryEditor.java	(revision 838)
@@ -2,7 +2,6 @@
 package org.txm.index.rcp.editors;
 
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
 
 /**
  * extends the index editor to : 
@@ -13,9 +12,8 @@
  */
 public class DictionnaryEditor extends IndexEditor {
 
-	/* (non-Javadoc)
-	 * @see org.txm.rcp.editors.index.IndexEditor#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
+
+	
 	@Override
 	public void _createPartControl() {
 		super._createPartControl();
@@ -34,4 +32,5 @@
 		getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
 		
 	}
+	
 }
\ No newline at end of file
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/IndexToProgression.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/IndexToProgression.java	(revision 837)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/IndexToProgression.java	(revision 838)
@@ -1,83 +0,0 @@
-// Copyright © 2010-2013 ENS de Lyon.
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$ 
-//
-package org.txm.index.rcp.handlers;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.core.preferences.TXMPreferences;
-import org.txm.index.core.functions.Index;
-import org.txm.index.core.functions.Line;
-import org.txm.rcp.editors.TXMEditor;
-import org.txm.rcp.handlers.BaseAbstractHandler;
-import org.txm.searchengine.cqp.corpus.Corpus;
-import org.txm.searchengine.cqp.corpus.query.Query;
-
-/**
- * Sends the lines of an index to compute a progression.
- * 
- * @author mdecorde
- * @author sjacquot
- * 
- */
-public class IndexToProgression extends BaseAbstractHandler {
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-
-		IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
-
-		if (selection != null && selection.getFirstElement() instanceof Line) {
-
-			List<Query> queries = Index.createQueries(selection.toList());
-
-			TXMEditor editor = (TXMEditor) HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActivePart();
-			Corpus corpus = Corpus.getFirstParentCorpus(editor.getResult());
-
-			// FIXME: tests:
-			// 1) create an UUID for the future TXMResult
-			// 2) store some parameters in the local preference node
-			// 3) call the command in the command target plug-in
-			String uuid = "test_link_index_to_progression"; 
-			TXMPreferences.put(uuid, TXMPreferences.PARENT_UUID, corpus.getUUID());
-			TXMPreferences.put(uuid, TXMPreferences.QUERIES, Query.queriesToString(queries));
-			BaseAbstractHandler.executeCommand("org.txm.progression.rcp.handlers.ComputeProgression", uuid); //$NON-NLS-1$
-		}
-		else	{
-			this.logCanNotCompute(selection);
-		}
-		return null;
-	}
-
-
-	
-	
-}
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/IndexToConcordance.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/IndexToConcordance.java	(revision 837)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/IndexToConcordance.java	(revision 838)
@@ -1,163 +0,0 @@
-// Copyright © 2010-2013 ENS de Lyon.
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$ 
-//
-package org.txm.index.rcp.handlers;
-
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.index.core.functions.Index;
-import org.txm.index.core.functions.Line;
-import org.txm.index.rcp.editors.IndexEditor;
-import org.txm.rcp.editors.TXMResultEditorInput;
-import org.txm.searchengine.cqp.corpus.Corpus;
-import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
-import org.txm.searchengine.cqp.corpus.query.Query;
-
-// TODO: Auto-generated Javadoc
-/**
- * use the lines of a index to compute a concordance @ author mdecorde.
- */
-public class IndexToConcordance extends AbstractHandler {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IWorkbenchWindow window;
-		IStructuredSelection selection;
-		TXMResultEditorInput editorInput;
-		window = HandlerUtil.getActiveWorkbenchWindow(event);
-		selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
-
-		assert (selection.getFirstElement() instanceof Line);
-
-		String query = getQuery(selection);
-
-		IndexEditor voceditor = (IndexEditor) HandlerUtil
-				.getActiveWorkbenchWindow(event).getActivePage()
-				.getActivePart();
-
-		Corpus corpus = voceditor.getCorpus();
-
-		// FIXME: call here the ComputeConcordance command passing the UUID of the result and of the parent
-		
-		
-//		Concordance concordance = new Concordance(corpus);
-//		concordance.setParameters(new Query(query), null, null, null, null, null, null, null, null, null, null);
-//		editorInput = new TXMResultEditorInput(concordance);
-//
-//		IWorkbenchPage page = window.getActivePage();
-//		try {
-//			ConcordanceEditor conceditor = (ConcordanceEditor) page
-//					.openEditor(editorInput, ConcordanceEditor.ID); //$NON-NLS-1$
-//		} catch (PartInitException e) {
-//			System.err.println("Error: "+e.getLocalizedMessage());
-//		}
-
-		return null;
-	}
-
-//	/**
-//	 * Link.
-//	 *
-//	 * @param voceditor the voceditor
-//	 * @param selection the selection
-//	 * @return the object
-//	 */
-//	public static Object link(IndexEditor voceditor,
-//			IStructuredSelection selection) {
-//		assert (selection.getFirstElement() instanceof Line);
-//		String query = getQuery(selection);
-//		if (query.length() == 0)
-//			return null;
-//		Corpus corpus = voceditor.getCorpus();
-//		Concordance concordance = new Concordance(corpus);
-//		concordance.setParameters(new Query(query), null, null, null, null, null, null, null, null, null, null);
-//		TXMResultEditorInput editorInput = new TXMResultEditorInput(concordance);
-////		try {
-////			System.out.println("Compute indexResult query: "+voceditor.getQuery());
-////			QueryResult indexResult = corpus.query(voceditor.getQuery(), "Index", false);
-////			System.out.println("N result: "+indexResult.getNMatch());
-////
-////			System.out.println("Compute indexOccResult query: "+query);
-////			QueryResult indexOccResult = corpus.query(new Query(query), "IndexOcc", false);
-////			System.out.println("N result: "+indexOccResult.getNMatch());
-////
-////			String queryname = "Q"+Corpus.getNextQueryCounter();
-////			String interQueryString = queryname+"=intersect "+indexResult.getQualifiedCqpId()+" "+indexOccResult.getQualifiedCqpId()+";"; 
-////			System.out.println("Compute inter query: "+interQueryString);
-////			((MemCqiClient)CQPSearchEngine.getCqiClient()).query(interQueryString);
-////			
-////			QueryResult inter = new QueryResult(queryname, queryname, corpus, new Query(interQueryString));
-////			System.out.println("indexResult size: "+indexResult.getNMatch());
-////			System.out.println("indexOccResult size: "+indexOccResult.getNMatch());
-////			System.out.println("inter size: "+inter.getNMatch());
-////			
-////			QueryResult inter2 = corpus.query(new Query("intersect "+indexResult.getQualifiedCqpId()+" "+indexOccResult.getQualifiedCqpId()), "Q"+Corpus.getNextQueryCounter(),false);
-////			System.out.println("inter2 size: "+inter2.getNMatch());
-////		} catch (Exception e) {
-////			e.printStackTrace();
-////			try {
-////				System.out.println("CQP error: "+CQPSearchEngine.getCqiClient().getLastError());
-////			} catch (Exception e1) {
-////				e1.printStackTrace();
-////			}
-////		}
-////		
-////		return null;
-//
-//		IWorkbenchPage page = voceditor.getEditorSite().getWorkbenchWindow()
-//				.getActivePage();
-//		try {
-//			ConcordanceEditor conceditor = (ConcordanceEditor) page
-//					.openEditor(editorInput, ConcordanceEditor.ID); //$NON-NLS-1$
-//		} catch (PartInitException e) {
-//			System.err.println("Error: "+e.getLocalizedMessage());
-//		}
-//
-//		return null;
-//	}
-
-
-	/**
-	 * Gets the query.
-	 *
-	 * @param selection the selection
-	 * @return the query
-	 */
-	private static String getQuery(IStructuredSelection selection) {
-		return Index.createQuery(selection.toList());
-	}
-}
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/SendToProgression.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/SendToProgression.java	(revision 0)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/SendToProgression.java	(revision 838)
@@ -0,0 +1,83 @@
+// Copyright © 2010-2013 ENS de Lyon.
+// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
+// Lyon 2, University of Franche-Comté, University of Nice
+// Sophia Antipolis, University of Paris 3.
+// 
+// The TXM platform is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation,
+// either version 2 of the License, or (at your option) any
+// later version.
+// 
+// The TXM platform is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE. See the GNU General Public License for more
+// details.
+// 
+// You should have received a copy of the GNU General
+// Public License along with the TXM platform. If not, see
+// http://www.gnu.org/licenses.
+// 
+// 
+// 
+// $LastChangedDate:$
+// $LastChangedRevision:$
+// $LastChangedBy:$ 
+//
+package org.txm.index.rcp.handlers;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.txm.core.preferences.TXMPreferences;
+import org.txm.core.results.TXMResult;
+import org.txm.index.core.functions.Index;
+import org.txm.index.core.functions.Line;
+import org.txm.rcp.editors.TXMEditor;
+import org.txm.rcp.handlers.BaseAbstractHandler;
+import org.txm.searchengine.cqp.corpus.query.Query;
+
+/**
+ * Sends the lines of an index to compute a progression.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ * 
+ */
+public class SendToProgression extends BaseAbstractHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
+
+		if (selection != null && selection.getFirstElement() instanceof Line) {
+
+			List<Query> queries = Index.createQueries(selection.toList());
+
+			TXMEditor editor = (TXMEditor) HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActivePart();
+
+			// FIXME: tests:
+			// 1) create an UUID for the future TXMResult
+			// 2) store some parameters in the local preference node
+			// 3) call the command in the command target plug-in
+			//String uuid = "test_link_index_to_progression"; 
+			String uuid = TXMResult.createUUID();
+			TXMPreferences.put(uuid, TXMPreferences.PARENT_UUID, editor.getResult().getParent().getUUID());
+			TXMPreferences.put(uuid, TXMPreferences.QUERIES, Query.queriesToString(queries));
+			BaseAbstractHandler.executeCommand("org.txm.progression.rcp.handlers.ComputeProgression", uuid); //$NON-NLS-1$
+		}
+		else	{
+			this.logCanNotCompute(selection);
+		}
+		return null;
+	}
+
+
+	
+	
+}

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

Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/SendToConcordance.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/SendToConcordance.java	(revision 0)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/SendToConcordance.java	(revision 838)
@@ -0,0 +1,141 @@
+// Copyright © 2010-2013 ENS de Lyon.
+// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
+// Lyon 2, University of Franche-Comté, University of Nice
+// Sophia Antipolis, University of Paris 3.
+// 
+// The TXM platform is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation,
+// either version 2 of the License, or (at your option) any
+// later version.
+// 
+// The TXM platform is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE. See the GNU General Public License for more
+// details.
+// 
+// You should have received a copy of the GNU General
+// Public License along with the TXM platform. If not, see
+// http://www.gnu.org/licenses.
+// 
+// 
+// 
+// $LastChangedDate:$
+// $LastChangedRevision:$
+// $LastChangedBy:$ 
+//
+package org.txm.index.rcp.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.txm.core.preferences.TXMPreferences;
+import org.txm.core.results.TXMResult;
+import org.txm.index.core.functions.Index;
+import org.txm.index.core.functions.Line;
+import org.txm.rcp.editors.TXMEditor;
+import org.txm.rcp.handlers.BaseAbstractHandler;
+import org.txm.searchengine.cqp.corpus.Corpus;
+
+/**
+ * Sends the lines of an index to compute a concordance.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ * 
+ */
+public class SendToConcordance extends BaseAbstractHandler {
+
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		
+		IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
+
+		if (selection != null && selection.getFirstElement() instanceof Line) {
+			
+			String query = Index.createQuery(selection.toList());
+
+			TXMEditor editor = (TXMEditor) HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActivePart();
+
+			// FIXME: tests:
+			// 1) create an UUID for the future TXMResult
+			// 2) store some parameters in the local preference node
+			// 3) call the command in the command target plug-in
+			//String uuid = "test_link_index_to_concordance";
+			String uuid = TXMResult.createUUID();
+			TXMPreferences.put(uuid, TXMPreferences.PARENT_UUID, editor.getResult().getParent().getUUID());
+			TXMPreferences.put(uuid, TXMPreferences.QUERY, query);
+			BaseAbstractHandler.executeCommand("org.txm.concordance.rcp.handlers.ComputeConcordance", uuid); //$NON-NLS-1$
+		}
+		else	{
+			this.logCanNotCompute(selection);
+		}
+		return null;
+	}
+
+//	/**
+//	 * Link.
+//	 *
+//	 * @param voceditor the voceditor
+//	 * @param selection the selection
+//	 * @return the object
+//	 */
+//	public static Object link(IndexEditor voceditor,
+//			IStructuredSelection selection) {
+//		assert (selection.getFirstElement() instanceof Line);
+//		String query = getQuery(selection);
+//		if (query.length() == 0)
+//			return null;
+//		Corpus corpus = voceditor.getCorpus();
+//		Concordance concordance = new Concordance(corpus);
+//		concordance.setParameters(new Query(query), null, null, null, null, null, null, null, null, null, null);
+//		TXMResultEditorInput editorInput = new TXMResultEditorInput(concordance);
+////		try {
+////			System.out.println("Compute indexResult query: "+voceditor.getQuery());
+////			QueryResult indexResult = corpus.query(voceditor.getQuery(), "Index", false);
+////			System.out.println("N result: "+indexResult.getNMatch());
+////
+////			System.out.println("Compute indexOccResult query: "+query);
+////			QueryResult indexOccResult = corpus.query(new Query(query), "IndexOcc", false);
+////			System.out.println("N result: "+indexOccResult.getNMatch());
+////
+////			String queryname = "Q"+Corpus.getNextQueryCounter();
+////			String interQueryString = queryname+"=intersect "+indexResult.getQualifiedCqpId()+" "+indexOccResult.getQualifiedCqpId()+";"; 
+////			System.out.println("Compute inter query: "+interQueryString);
+////			((MemCqiClient)CQPSearchEngine.getCqiClient()).query(interQueryString);
+////			
+////			QueryResult inter = new QueryResult(queryname, queryname, corpus, new Query(interQueryString));
+////			System.out.println("indexResult size: "+indexResult.getNMatch());
+////			System.out.println("indexOccResult size: "+indexOccResult.getNMatch());
+////			System.out.println("inter size: "+inter.getNMatch());
+////			
+////			QueryResult inter2 = corpus.query(new Query("intersect "+indexResult.getQualifiedCqpId()+" "+indexOccResult.getQualifiedCqpId()), "Q"+Corpus.getNextQueryCounter(),false);
+////			System.out.println("inter2 size: "+inter2.getNMatch());
+////		} catch (Exception e) {
+////			e.printStackTrace();
+////			try {
+////				System.out.println("CQP error: "+CQPSearchEngine.getCqiClient().getLastError());
+////			} catch (Exception e1) {
+////				e1.printStackTrace();
+////			}
+////		}
+////		
+////		return null;
+//
+//		IWorkbenchPage page = voceditor.getEditorSite().getWorkbenchWindow()
+//				.getActivePage();
+//		try {
+//			ConcordanceEditor conceditor = (ConcordanceEditor) page
+//					.openEditor(editorInput, ConcordanceEditor.ID); //$NON-NLS-1$
+//		} catch (PartInitException e) {
+//			System.err.println("Error: "+e.getLocalizedMessage());
+//		}
+//
+//		return null;
+//	}
+
+
+}

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

Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/ComputeLexicon.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/ComputeLexicon.java	(revision 837)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/ComputeLexicon.java	(revision 838)
@@ -40,6 +40,7 @@
 			try {
 				index.setQuery(new Query("[]")); //$NON-NLS-1$
 				index.setProperties(Arrays.asList(corpus.getWordProperty()));
+				index.setVisible(false);
 			} catch (CqiClientException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
Index: tmp/org.txm.index.rcp/plugin.xml
===================================================================
--- tmp/org.txm.index.rcp/plugin.xml	(revision 837)
+++ tmp/org.txm.index.rcp/plugin.xml	(revision 838)
@@ -115,15 +115,15 @@
                <menuContribution
             locationURI="popup:org.txm.index.rcp.editors.IndexEditor">
          <command
-               commandId="org.txm.rcp.commands.link.ToConcordance"
+               commandId="org.txm.links.rcp.commands.SendToConcordance"
                style="push">
          </command>
          <command
-               commandId="org.txm.rcp.commands.link.IndexToCooccurrence"
+               commandId="org.txm.links.rcp.commands.SendToCooccurrence"
                style="push">
          </command>
          <command
-               commandId="org.txm.index.rcp.handlers.IndexToProgression"
+               commandId="org.txm.links.rcp.commands.SendToProgression"
                style="push">
          </command>
       </menuContribution>
@@ -186,7 +186,7 @@
       </command>
 
       <command
-            defaultHandler="org.txm.index.rcp.handlers.IndexToProgression"
+            defaultHandler="org.txm.index.rcp.handlers.SendToProgression"
             id="org.txm.index.rcp.handlers.IndexToProgression"
             name="%command.label.103">
       </command>
@@ -245,5 +245,16 @@
             name="%page.name">
       </page>
    </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.txm.index.rcp.handlers.SendToProgression"
+            commandId="org.txm.links.rcp.commands.SendToProgression">
+      </handler>
+      <handler
+            class="org.txm.index.rcp.handlers.SendToConcordance"
+            commandId="org.txm.links.rcp.commands.SendToConcordance">
+      </handler>
+   </extension>
 
 </plugin>
Index: tmp/org.txm.index.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.index.rcp/META-INF/MANIFEST.MF	(revision 837)
+++ tmp/org.txm.index.rcp/META-INF/MANIFEST.MF	(revision 838)
@@ -1,16 +1,17 @@
 Manifest-Version: 1.0
-Require-Bundle: org.txm.utils;bundle-version="1.0.0";visibility:=reexp
- ort,org.eclipse.osgi;bundle-version="3.10.2";visibility:=reexport,org
- .eclipse.core.runtime;bundle-version="3.10.0";visibility:=reexport, o
- rg.txm.statsengine.core;bundle-version="1.0.0";visibility:=reexport,o
- rg.txm.statsengine.r.core;bundle-version="1.0.0";visibility:=reexport
- ,org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=ree
- xport,org.txm.core;bundle-version="0.7.0";visibility:=reexport,org.tx
- m.index.core;bundle-version="1.0.0";visibility:=reexport,org.txm.stat
- sengine.r.rcp;visibility:=reexport,org.eclipse.ui;bundle-version="3.1
- 06.1";visibility:=reexport,org.txm.rcp;visibility:=reexport,org.eclip
- se.core.expressions;bundle-version="3.4.600";visibility:=reexport,org
- .txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport
+Require-Bundle: org.txm.utils;bundle-version="1.0.0";visibility:=reexport,
+ org.eclipse.osgi;bundle-version="3.10.2";visibility:=reexport,
+ org.eclipse.core.runtime;bundle-version="3.10.0";visibility:=reexport,
+ org.txm.statsengine.core;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.statsengine.r.core;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport,
+ org.txm.core;bundle-version="0.7.0";visibility:=reexport,
+ org.txm.index.core;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.statsengine.r.rcp;visibility:=reexport,
+ org.eclipse.ui;bundle-version="3.106.1";visibility:=reexport,
+ org.txm.rcp;visibility:=reexport,
+ org.eclipse.core.expressions;bundle-version="3.4.600";visibility:=reexport,
+ org.txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport
 Export-Package: org.txm.index.rcp.adapters,org.txm.index.rcp.editors,o
  rg.txm.index.rcp.handlers,org.txm.index.rcp.messages
 Bundle-Vendor: Textometrie.org
Index: tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java
===================================================================
--- tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java	(revision 837)
+++ tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java	(revision 838)
@@ -61,8 +61,8 @@
 		ArrayList<String> supportedOutputFormats = new ArrayList<String>();
 		
 		
-		supportedOutputFormats.addAll(RChartsEngine.getSupportedOutputDisplayFormatsStatic());
-		supportedOutputFormats.addAll(RChartsEngine.getSupportedOutputFileFormatsStatic());
+		supportedOutputFormats.addAll(((ChartsEngine) Toolbox.getEngineManager(EngineType.CHARTS).getEngine(RChartsEngine.class)).getSupportedOutputDisplayFormats());
+		supportedOutputFormats.addAll(((ChartsEngine) Toolbox.getEngineManager(EngineType.CHARTS).getEngine(RChartsEngine.class)).getSupportedOutputFileFormats());
 		
 		// Sort the set
 		TreeSet<String> formatsSet = new TreeSet <String>(supportedOutputFormats);
Index: tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java
===================================================================
--- tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java	(revision 837)
+++ tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java	(revision 838)
@@ -7,8 +7,6 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.Version;
 import org.osgi.service.prefs.Preferences;
-import org.txm.core.messages.TXMCoreMessages;
-import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.utils.BundleUtils;
 import org.txm.utils.logger.Log;
@@ -59,8 +57,6 @@
 	public void initializeDefaultPreferences() {
 		
 		
-		Log.info(TXMCoreMessages.Toolbox_4 + TBXPreferences.getID()); 
-
 		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
 
 		preferences.put(CQI_SERVER_ADDITIONAL_OPTIONS, "-b 1000000 -d OFF"); //$NON-NLS-1$
Index: tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java
===================================================================
--- tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java	(revision 837)
+++ tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java	(revision 838)
@@ -27,14 +27,9 @@
 //
 package org.txm.properties.core.functions;
 
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -593,7 +588,7 @@
 	}
 
 	@Override
-	synchronized protected boolean _compute() throws Exception {
+	protected boolean _compute() throws Exception {
 		
 		this.beginTask("Computing properties...", 3);
 		this.stepGeneralInfos();
Index: tmp/org.txm.information.core/src/org/txm/properties/core/preferences/PropertiesPreferences.java
===================================================================
--- tmp/org.txm.information.core/src/org/txm/properties/core/preferences/PropertiesPreferences.java	(revision 837)
+++ tmp/org.txm.information.core/src/org/txm/properties/core/preferences/PropertiesPreferences.java	(revision 838)
@@ -16,7 +16,7 @@
 	// auto populate the preference node qualifier from the current bundle id
 	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(PropertiesPreferences.class).getSymbolicName();
 	
-	public static final String PREFERENCES_PREFIX = "information_"; //$NON-NLS-1$
+	public static final String PREFERENCES_PREFIX = "properties_"; //$NON-NLS-1$
 	
 	
 	/**
@@ -29,7 +29,7 @@
 	public void initializeDefaultPreferences() {
 		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
 		
-		preferences.putInt(MAX_PROPERTIES_TO_DISPLAY, 10);
+		preferences.putInt(MAX_PROPERTIES_TO_DISPLAY, 100);
 		
 	}
 	
