Index: tmp/org.txm.utils/src/org/txm/utils/logger/Log.java
===================================================================
--- tmp/org.txm.utils/src/org/txm/utils/logger/Log.java	(revision 666)
+++ tmp/org.txm.utils/src/org/txm/utils/logger/Log.java	(revision 667)
@@ -249,7 +249,9 @@
 	 * @param flag where to print the message
 	 */
 	public static void severe(String message, int flag) {
-		if ((flag & CONSOLE) == CONSOLE) printConsoleError(message);
+		if ((flag & CONSOLE) == CONSOLE) {
+			printConsoleError(message);
+		}
 		txm.severe(message);
 	}
 
@@ -373,7 +375,7 @@
 		if (Level.SEVERE.intValue() < txm.getLevel().intValue()) {
             return;
         }
-		System.out.println(message);
+		System.err.println(message);
 //		txm.log(Level.SEVERE, message);
 	}
 
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 666)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 667)
@@ -87,7 +87,6 @@
 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.2=\u0412\u044b\u0439\u0442\u0438 \u0438\u0437 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u044b TXM
 command.tooltip.0=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-page.name.9=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
 page.name.8=NLP
 page.name.7=TreeTagger
 page.name.6=\ TXM
@@ -130,7 +129,6 @@
 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
 command.label.89=\u0421\u043b\u043e\u0432\u0430\u0440\u043d\u0430\u044f \u0442\u0430\u0431\u043b\u0438\u0446\u0430
 command.label.87=\u042d\u043a\u0441\u043f\u043e\u0440\u0442
-command.label.85=\u0424\u0410\u0421
 command.label.84=\u0421\u043b\u043e\u0432\u0430\u0440\u044c
 command.label.80=\u0424\u0410\u0421
 category.name=TXM
@@ -192,8 +190,6 @@
 command.name.31=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u044f\u0437\u044b\u043a
 command.name.30=IndexToConcordances
 command.label.39=\u0414\u043e\u0431\u0430\u0432\u0442\u044c \u0441\u043a\u0440\u0438\u043f\u0442
-command.label.37=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0431\u0430\u0437\u0443
-command.label.36=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u043e\u0435\u043a\u0442
 command.name.29=\u041e\u0442\u043a\u0440\u044b\u0432\u0430\u0435\u0442 \u0438\u0437\u0434\u0430\u043d\u0438\u0435
 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.26=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 666)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 667)
@@ -140,7 +140,6 @@
 command.tooltip.2=Quitter la plateforme TXM
 command.tooltip.1=Import au format XML-PPS de Factiva
 command.tooltip.0=Afficher les pr�f�rences
-page.name.9=Description
 page.name.8=TAL
 page.name.7=TreeTagger
 editor.name.22=Navigateur
@@ -218,7 +217,6 @@
 command.label.89=Table lexicale
 command.label.88=Tout sauvegarder
 command.label.86=Sauvegarder
-command.label.85=AFC
 command.label.84=Lexique
 command.label.83=Nouveau fichier
 command.label.82=CQP
@@ -325,8 +323,6 @@
 command.name.32=Progression
 command.name.31=Changer la langue
 command.name.30=IndexToConcordances
-command.label.37=Ajouter une Base
-command.label.36=Ajouter un Projet
 command.label.31=Nils
 command.label.30=Encodage des caract�res
 command.label.169=Show Control characters
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru_utf-8.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru_utf-8.properties	(revision 666)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru_utf-8.properties	(revision 667)
@@ -85,7 +85,6 @@
 command.tooltip.3=Выбрать часть употреблений
 command.tooltip.2=Выйти из платформы TXM
 command.tooltip.0=Показать настройки
-page.name.9=Описание
 page.name.8=NLP
 page.name.7=TreeTagger
 page.name.6=\ TXM
@@ -126,7 +125,6 @@
 category.description=Текстометрические команды
 command.label.89=Словарная таблица
 command.label.87=Экспорт
-command.label.85=ФАС
 command.label.84=Словарь
 category.name=TXM
 command.label.79=Словарь
@@ -188,8 +186,6 @@
 command.name.31=Изменить язык
 command.name.30=IndexToConcordances
 command.label.39=Добавть скрипт
-command.label.37=Добавить базу
-command.label.36=Добавить проект
 command.name.29=Открывает издание
 command.name.28=Импортирует корпус из буфера обмена (FR)
 command.name.26=Удалить
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle.properties	(revision 666)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle.properties	(revision 667)
@@ -115,7 +115,6 @@
 command.tooltip.2=Exit the TXM platform
 command.tooltip.1=Import with the XML-PPS format
 command.tooltip.0=Open the settings windows
-page.name.9=Description
 page.name.8=NLP
 page.name.7=TreeTagger
 editor.name.22=Browser
@@ -179,7 +178,6 @@
 command.label.89=LexicalTable
 command.label.88=Save All
 command.label.86=Save
-command.label.85=CA
 command.label.84=Lexicon
 command.label.83=New file
 command.label.82=CQP
Index: tmp/org.txm.rcp/plugin.xml
===================================================================
--- tmp/org.txm.rcp/plugin.xml	(revision 666)
+++ tmp/org.txm.rcp/plugin.xml	(revision 667)
@@ -315,12 +315,6 @@
       </page>
       <page
             category="org.txm.rcp.preferences.UserPreferencePage"
-            class="org.txm.rcp.preferences.DiagnosticPreferencePage"
-            id="org.txm.rcp.preferences.DiagnosticPreferencePage"
-            name="%page.name.9">
-      </page>
-      <page
-            category="org.txm.rcp.preferences.UserPreferencePage"
             class="org.txm.rcp.preferences.ExportPreferencePage"
             id="org.txm.rcp.preferences.ExportPreferencePage"
             name="%page.name.12">
@@ -1313,7 +1307,7 @@
             allPopups="true"
             locationURI="toolbar:org.eclipse.ui.main.toolbar">
          <toolbar
-               id="org.txm.rcp.toolbarresult">
+               id="org.txm.rcp.toolbars.result">
             <command
                   commandId="org.txm.rcp.commands.function.ExportResult"
                   icon="icons/functions/export_data.png"
@@ -1451,7 +1445,7 @@
                   tooltip="%command.tooltip.0">
             </command>
             <separator
-                  name="org.txm.rcp.toolbartools.extensions"
+                  name="org.txm.rcp.toolbars.tools.separators.extensions"
                   visible="true">
             </separator>
          </toolbar>
@@ -2060,28 +2054,6 @@
       </menuContribution>
       <menuContribution
             locationURI="popup:org.txm.rcp.views.BasesView">
-         <command
-               commandId="HIDEorg.txm.rcp2.commands.workspace.AddProject"
-               label="%command.label.36"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <reference
-                     definitionId="OneProjectSelected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.txm.rcp.commands.workspace.AddBase"
-               label="%command.label.37"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <reference
-                     definitionId="OneProjectSelected">
-               </reference>
-            </visibleWhen>
-         </command>       
          <separator
                name="org.txm.rcp.separator1">
          </separator>
@@ -2312,17 +2284,6 @@
             name="%category.name.0">
       </category>
       <command
-            categoryId="org.eclipse.ui.category.edit"
-            defaultHandler="org.txm.rcp.commands.EditFile"
-            id="org.txm.rcp.commands.EditFile"
-            name="%command.name">
-         <commandParameter
-               id="org.txm.rcp.commands.commandParameter2"
-               name="%commandParameter.name"
-               optional="true">
-         </commandParameter>
-      </command>
-      <command
             defaultHandler="org.txm.rcp.commands.ExecuteGroovyScript"
             id="org.txm.rcp.commands.ExecuteScriptGroovy"
             name="%command.name.0">
@@ -2383,16 +2344,6 @@
       </command>
             
       <command
-            defaultHandler="org.txm.rcp.commands.CreateFile"
-            id="org.txm.rcp.commands.CreateFile"
-            name="%command.name.47">
-      </command>
-      <command
-            defaultHandler="org.txm.rcp.commands.CreateFolder"
-            id="org.txm.rcp.commands.CreateFolder"
-            name="%command.name.48">
-      </command>
-      <command
             categoryId="org.eclipse.ui.category.edit"
             defaultHandler="org.txm.rcp.commands.OpenImportForm"
             id="org.txm.rcp.commands.OpenImportForm"
@@ -2442,36 +2393,6 @@
             name="%command.name.50">
       </command>
       <command
-            defaultHandler="org.txm.rcp.commands.editor.SaveAs"
-            id="org.txm.rcp.commands.editor.SaveAs"
-            name="%command.name.67">
-      </command>
-      <command
-            defaultHandler="org.txm.rcp.commands.DeleteFile"
-            id="org.txm.rcp.commands.DeleteFile"
-            name="%command.name.68">
-      </command>
-      <command
-            defaultHandler="org.txm.rcp.commands.CopyFile"
-            id="org.txm.rcp.commands.CopyFile"
-            name="%command.name.69">
-      </command>
-      <command
-            defaultHandler="org.txm.rcp.commands.PasteFile"
-            id="org.txm.rcp.commands.PasteFile"
-            name="%command.name.70">
-      </command>
-      <command
-            defaultHandler="org.txm.rcp.commands.CutFile"
-            id="org.txm.rcp.commands.CutFile"
-            name="%command.name.71">
-      </command>
-      <command
-            defaultHandler="org.txm.rcp.commands.RenameFile"
-            id="org.txm.rcp.commands.RenameFile"
-            name="%command.name.108">
-      </command>
-      <command
             defaultHandler="org.txm.rcp.commands.editor.SetEncoding"
             id="org.txm.rcp.commands.editor.SetEncoding"
             name="%command.name.72">
@@ -2559,12 +2480,6 @@
       </command>
 
       <command
-            categoryId="org.eclipse.ui.category.edit"
-            defaultHandler="org.txm.rcp.commands.EditSelectedFile"
-            id="org.txm.rcp.commands.EditSelectedFile"
-            name="%command.name.106">
-      </command>
-      <command
             categoryId="org.txm.rcp.category.txm"
             defaultHandler="org.txm.rcp.commands.ReloadCorporaView"
             id="org.txm.rcp.commands.ReloadCorporaView"
@@ -2677,6 +2592,81 @@
       </command>
    </extension>
    <extension
+         id="file"
+         name="file"
+         point="org.eclipse.ui.commands">
+      <category
+            description="File"
+            id="org.txm.rcp.categories.file"
+            name="File">
+      </category>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.CutFile"
+            id="org.txm.rcp.commands.CutFile"
+            name="%command.name.71">
+      </command>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.editor.SaveAs"
+            id="org.txm.rcp.commands.editor.SaveAs"
+            name="%command.name.67">
+      </command>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.DeleteFile"
+            id="org.txm.rcp.commands.DeleteFile"
+            name="%command.name.68">
+      </command>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.CopyFile"
+            id="org.txm.rcp.commands.CopyFile"
+            name="%command.name.69">
+      </command>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.PasteFile"
+            id="org.txm.rcp.commands.PasteFile"
+            name="%command.name.70">
+      </command>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.RenameFile"
+            id="org.txm.rcp.commands.RenameFile"
+            name="%command.name.108">
+      </command>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.CreateFile"
+            id="org.txm.rcp.commands.CreateFile"
+            name="%command.name.47">
+      </command>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.CreateFolder"
+            id="org.txm.rcp.commands.CreateFolder"
+            name="%command.name.48">
+      </command>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.EditSelectedFile"
+            id="org.txm.rcp.commands.EditSelectedFile"
+            name="%command.name.106">
+      </command>
+      <command
+            categoryId="org.txm.rcp.categories.file"
+            defaultHandler="org.txm.rcp.commands.EditFile"
+            id="org.txm.rcp.commands.EditFile"
+            name="%command.name">
+         <commandParameter
+               id="org.txm.rcp.commands.commandParameter2"
+               name="%commandParameter.name"
+               optional="true">
+         </commandParameter>
+      </command>
+   </extension>
+   <extension
          point="org.eclipse.core.expressions.definitions">
       <definition
             id="OneMainCorpusSelected">
@@ -2715,18 +2705,6 @@
          </with>
       </definition>
       <definition
-            id="OnePartitionSelected">
-        <with variable="selection">
-            <iterate
-                  ifEmpty="false"
-                  operator="and">
-               <instanceof
-                     value="org.txm.searchengine.cqp.corpus.Partition">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-      <definition
             id="OneFileSelected">
          <with
                variable="selection">
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 666)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 667)
@@ -117,7 +117,7 @@
 	
 	/** The string used to separated property values. */
 	@Parameter(key=IndexPreferences.PROPERTIES_SEPARATOR)
-	protected String pPropertiesSeparator; // the separator of properties values //$NON-NLS-1$
+	protected String pPropertiesSeparator;
 	
 	/** The CQP query. */
 	@Parameter
@@ -165,7 +165,8 @@
 
 		if (parent instanceof Corpus && "[]".equals(pQuery.getQueryString()) &&  pProperties.size() == 1) {
 			computeWithCorpusAndNoQuery(); // internally using a lexicon
-		} else {
+		}
+		else {
 			this.lexicon = null;
 
 			if (parent instanceof Corpus) {
@@ -183,7 +184,8 @@
 
 				getAllLines();
 
-			} else if (parent instanceof Partition) {
+			}
+			else if (parent instanceof Partition) {
 
 				Partition partition = (Partition)parent;
 				partnames.clear();
@@ -197,7 +199,8 @@
 
 				getAllLines();
 
-			} else {
+			}
+			else {
 				System.out.println("Error: Index parent is neither a Corpus nor a partition.");
 				return false;
 			}
@@ -226,7 +229,9 @@
 	 */
 	public static String createQuery(List<Line> lines) {
 		String query = ""; //$NON-NLS-1$
-		if (lines.size() == 0) return query;
+		if (lines.size() == 0) {
+			return query;
+		}
 		
 		Line line = lines.get(0);
 		int nbToken = line.getUnitsProperties().get(0).size();
@@ -238,7 +243,8 @@
 			for (int p = 0; p < nbProps; p++) {
 				if (props.get(p) instanceof StructuralUnitProperty) {
 					query += "_."+((StructuralUnitProperty)props.get(p)).getFullName() + "=\""; //$NON-NLS-1$ //$NON-NLS-2$
-				} else {
+				}
+				else {
 					query += props.get(p) + "=\""; //$NON-NLS-1$
 				}
 				for (int l = 0; l < nbLines; l++) {
@@ -278,7 +284,9 @@
 			return false;
 		}
 		HashMap<String, Integer> ref_counts = new HashMap<String, Integer>();
-		for(int i = 0 ; i < ref_forms.length ; i++) ref_counts.put(ref_forms[i], ref_freqs[i]);
+		for(int i = 0 ; i < ref_forms.length ; i++) {
+			ref_counts.put(ref_forms[i], ref_freqs[i]);
+		}
 
 		for (org.txm.index.core.functions.Line l : this.getAllLines()) {
 			String key = l.toString();
@@ -295,17 +303,17 @@
 	@Override
 	public boolean canCompute() {
 		if (getCorpus() == null && getPartition() == null) {
-			System.out.println("Corpus or partition not set");
+			Log.severe("Corpus or partition not set."); //$NON-NLS-1$
 			return false;
 		}
 
 		if (pProperties == null || pProperties.size() == 0) {
-			System.out.println("No property set.");
+			Log.severe("No property set."); //$NON-NLS-1$
 			return false;
 		}
 
 		if (pQuery == null || pQuery.getQueryString().length() == 0) {
-			System.out.println("No query set.");
+			Log.severe("No query set."); //$NON-NLS-1$
 			return false;
 		}
 		
@@ -381,10 +389,12 @@
 
 					lines.add(l);
 
-					if (Fmin > freqs[i])
+					if (Fmin > freqs[i]) {
 						Fmin = freqs[i];
-					if (Fmax < freqs[i])
+					}
+					if (Fmax < freqs[i]) {
 						Fmax = freqs[i];
+					}
 
 					// getAllLines();
 				}
@@ -399,7 +409,9 @@
 	 *
 	 */
 	public void cut() {
-		if (pVmaxFilter == null) return;
+		if (pVmaxFilter == null) {
+			return;
+		}
 
 		this.acquireSemaphore();
 
@@ -643,6 +655,10 @@
 		return "";
 	}
 
+	/**
+	 * Gets the number of lines per page.
+	 * @return the number of lines per page
+	 */
 	public Integer getNLinesPerPage() {
 		return pNLinesPerPage ;
 	}
@@ -651,7 +667,7 @@
 	/**
 	 * Gets the partition.
 	 *
-	 * @return the partition
+	 * @return the partition if exists otherwise null
 	 */
 	public Partition getPartition() {
 		try {
@@ -663,9 +679,9 @@
 	}
 
 	/**
-	 * Gets the partnames.
+	 * Gets the part names.
 	 *
-	 * @return the partnames
+	 * @return the part names
 	 */
 	public List<String> getPartnames() {
 		return partnames;
@@ -681,7 +697,10 @@
 	}
 
 
-
+	/**
+	 * 
+	 * @return
+	 */
 	public String getPropertySeparator() {
 		return pPropertiesSeparator ;
 	}
@@ -725,6 +744,10 @@
 		return nTotalTokens;
 	}
 
+	/**
+	 * 
+	 * @return
+	 */
 	public int getTopIndex() {
 		return pTopIndex;
 	}
@@ -767,20 +790,12 @@
 
 		// System.out.println("nLines : "+nLines);
 		List<Match> matches = null;
-		if (nbresults > 0)
-			matches = result.getMatches(0, nbresults - 1); // get the
-		// indexes
-		// sequences of
-		// result's
-		// tokens
-		else
+		if (nbresults > 0) {
+			matches = result.getMatches(0, nbresults - 1); // get the indexes sequences of result's tokens
+		}
+		else {
 			matches = new ArrayList<Match>();
-		// List<Integer> beginingOfKeywordsPositions = new
-		// ArrayList<Integer>();
-		// List<Integer> lengthOfKeywords = new ArrayList<Integer>();
-		// Map<Property, List<List<String>>> keywordsViewPropValues = new
-		// HashMap<Property, List<List<String>>>();
-
+		}
 		// count matches
 		// time = System.currentTimeMillis();
 		List<Integer> allpositions = new ArrayList<Integer>();
@@ -791,9 +806,11 @@
 			// lengthOfKeywords.add(match.size());// get the last index
 			if (isTargetUsed) {
 				allpositions.add(match.getTarget());
-			} else {
-				for (int i = match.getStart(); i <= match.getEnd(); i++)
+			}
+			else {
+				for (int i = match.getStart(); i <= match.getEnd(); i++) {
 					allpositions.add(i);
+				}
 			}
 		}
 		// System.out.println("get string data");
@@ -810,24 +827,20 @@
 
 		int[] allpositionsarray = new int[allpositions.size()];
 		int pcount = 0;
-		for (int p : allpositions)
+		for (int p : allpositions) {
 			allpositionsarray[pcount++] = p;
+		}
 
 		// time = System.currentTimeMillis();
 		HashMap<Property, int[]> propsId = new HashMap<Property, int[]>();
 		for (Property property : pProperties) {
 			try {
 				if (property instanceof StructuralUnitProperty) {
-					int[] structs = CorpusManager.getCorpusManager()
-							.getCqiClient().cpos2Struc(
-									property.getQualifiedName(),
-									allpositionsarray);
+					int[] structs = CorpusManager.getCorpusManager().getCqiClient().cpos2Struc(property.getQualifiedName(), allpositionsarray);
 					propsId.put(property, structs);
-				} else {
-					int[] indices = CorpusManager.getCorpusManager()
-							.getCqiClient().cpos2Id(
-									property.getQualifiedName(),
-									allpositionsarray);
+				}
+				else {
+					int[] indices = CorpusManager.getCorpusManager().getCqiClient().cpos2Id(property.getQualifiedName(), allpositionsarray);
 					propsId.put(property, indices);
 				}
 			} catch (Exception e) {
@@ -855,19 +868,21 @@
 
 			String signature = line.getSignature();
 
-			if (counts.containsKey(signature)) // if the counts contains the
-				// signature, increment its corresponding value
-			{
-				while (counts.get(signature).size() <= currentpartid)
+			 // if the counts contains the signature, increment its corresponding value
+			if (counts.containsKey(signature)) {
+				while (counts.get(signature).size() <= currentpartid) {
 					counts.get(signature).add(0);
+				}
 				int c = counts.get(signature).get(currentpartid) + 1;
 				counts.get(signature).set(currentpartid, c);
-			} else // else initialize count of the signature to 1
-			{
+			}
+			// else initialize count of the signature to 1
+			else {
 				// System.out.println("add new sign "+signature+" of line "+line.toString());
 				ArrayList<Integer> tmp = new ArrayList<Integer>();
-				for (int j = 0; j < currentpartid + 1; j++)
+				for (int j = 0; j < currentpartid + 1; j++) {
 					tmp.add(0);
+				}
 				counts.put(signature, tmp);
 				counts.get(signature).set(currentpartid, 1);
 
@@ -891,11 +906,14 @@
 	protected void setLineCounts() {
 		for (Line line : lines) {// for each Line set its count
 			int[] c = new int[partnames.size()];
-			for (int i = 0; i < partnames.size(); i++)
-				if (counts.get(line.getSignature()).size() <= i)
+			for (int i = 0; i < partnames.size(); i++) {
+				if (counts.get(line.getSignature()).size() <= i) {
 					c[i] = 0;
-				else
+				}
+				else {
 					c[i] = counts.get(line.getSignature()).get(i);
+				}
+			}
 			line.setCounts(c, -1);
 		}
 	}
@@ -905,7 +923,7 @@
 	}
 
 	public void setParameters(List<Property> props) {
-		this.pQuery = new Query("[]");
+		this.pQuery = new Query("[]"); //$NON-NLS-1$
 		this.pProperties = props;
 		this.lexicon = null;
 	}
@@ -948,18 +966,19 @@
 		if (nLinesPerPage != null) this.pNLinesPerPage = nLinesPerPage;
 	}
 
+	@Override
 	public boolean setParameters(TXMParameters parameters) {
 		try {
-			List<Property> props = (List<Property>) parameters.get("props");
-			Query query = (Query) parameters.get("query");
-			Integer filterFmin = (Integer) parameters.get("filterFmin");
-			Integer filterFmax = (Integer) parameters.get("filterFmax");
-			Integer filterVmax = (Integer) parameters.get("filterVmax");
-			Integer nLinesPerPage = (Integer) parameters.get("nLinesPerPage");
+			List<Property> props = (List<Property>) parameters.get("props"); //$NON-NLS-1$
+			Query query = (Query) parameters.get("query"); //$NON-NLS-1$
+			Integer filterFmin = (Integer) parameters.get("filterFmin"); //$NON-NLS-1$
+			Integer filterFmax = (Integer) parameters.get("filterFmax"); //$NON-NLS-1$
+			Integer filterVmax = (Integer) parameters.get("filterVmax"); //$NON-NLS-1$
+			Integer nLinesPerPage = (Integer) parameters.get("nLinesPerPage"); //$NON-NLS-1$
 
 			this.setParameters(query, props, filterFmin, filterFmax, filterVmax, nLinesPerPage);
 		} catch (Exception e) {
-			System.out.println("Error while setting parameters of Index: "+e.getLocalizedMessage());
+			Log.severe("Error while setting parameters of Index: " + e.getLocalizedMessage()); //$NON-NLS-1$
 			Log.printStackTrace(e);
 			return false;
 		}
Index: tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle.properties
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle.properties	(revision 666)
+++ tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle.properties	(revision 667)
@@ -11,5 +11,7 @@
 command.tooltip.4=Divide the selected item in several parts
 command.tooltip.71=Export as a binary file
 
-command.label.49=Description
-command.label.48=Description
\ No newline at end of file
+command.label.49=Information
+command.label.48=Information
+
+page.name.9=Information
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_ru.properties
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 0)
+++ tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 667)
@@ -0,0 +1,14 @@
+#Properties file for org.txm.searchengine.cqp.rcp
+Bundle-Name = CQP RCP
+command.label.37=Добавить базу
+command.label.36=Добавить проект
+command.label.65=Delete
+command.label.148=Open biblio
+command.name.52=Corpus in binary format...
+command.label.8=Partition
+command.name.63=Open Biblio
+command.name.2=Create Partition
+command.tooltip.4=Divide the selected item in several parts
+command.tooltip.71=Export as a binary file
+
+page.name.9=Описание
\ No newline at end of file

Property changes on: tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_ru.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_fr.properties
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 666)
+++ tmp/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 667)
@@ -1,7 +1,7 @@
 #Properties file for org.txm.searchengine.cqp.rcp
 Bundle-Name = CQP RCP
-command.label.36=Add Project
-command.label.37=Add Base
+command.label.37=Ajouter une Base
+command.label.36=Ajouter un Projet
 command.label.65=Delete
 command.label.148=Open biblio
 command.name.52=Corpus in binary format...
@@ -11,5 +11,7 @@
 command.tooltip.4=Divide the selected item in several parts
 command.tooltip.71=Export as a binary file
 
-command.label.49=Description
-command.label.48=Description
\ No newline at end of file
+command.label.49=Information
+command.label.48=Information
+
+page.name.9=Information
Index: tmp/org.txm.searchengine.cqp.rcp/plugin.xml
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/plugin.xml	(revision 666)
+++ tmp/org.txm.searchengine.cqp.rcp/plugin.xml	(revision 667)
@@ -45,7 +45,7 @@
             <menuContribution
             locationURI="popup:org.txm.rcp.views.BasesView">
          <command
-               commandId="HIDEorg.txm.rcp2.commands.workspace.AddProject"
+               commandId="org.txm.rcp.commands.workspace.AddProject"
                label="%command.label.36"
                style="push">
             <visibleWhen
@@ -310,6 +310,12 @@
             id="org.txm.searchengine.cqp.rcp.preferences.CQPPreferencePage"
             name="CQP">
       </page>
+      <page
+            category="org.txm.rcp.preferences.UserPreferencePage"
+            class="org.txm.rcp.preferences.DiagnosticPreferencePage"
+            id="org.txm.rcp.preferences.DiagnosticPreferencePage"
+            name="%page.name.9">
+      </page>
    </extension>
    <extension
          point="org.eclipse.ui.editors">
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/DiagnosticPreferencePage.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/DiagnosticPreferencePage.java	(revision 666)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/DiagnosticPreferencePage.java	(revision 667)
@@ -1,80 +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.searchengine.cqp.rcp.preferences;
-
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-import org.txm.rcp.Application;
-import org.txm.rcp.RCPMessages;
-import org.txm.rcp.preferences.TXMPreferencePage;
-import org.txm.rcp.preferences.TXMPreferenceStore;
-import org.txm.searchengine.cqp.CQPPreferences;
-// TODO: Auto-generated Javadoc
-/**
- * This class represents a preference page that is contributed to the
- * Preferences dialog. By subclassing <samp>FieldEditorPreferencePage</samp>, we
- * can use the field support built into JFace that allows us to create a page
- * that is small and knows how to save, restore and apply itself.
- * <p>
- * This page is used to modify preferences only. They are stored in the
- * preference store that belongs to the main plug-in class. That way,
- * preferences can be accessed directly via the preference store.
- */
-
-public class DiagnosticPreferencePage extends TXMPreferencePage {
-
-	/** The diag_maxvalue. */
-	private IntegerFieldEditor diag_maxvalue;
-		
-	@Override
-	public void init(IWorkbench workbench) {
-		this.setPreferenceStore(new TXMPreferenceStore(CQPPreferences.PREFERENCES_NODE));
-	}
-	
-	/**
-	 * Instantiates a new diagnostic preference page.
-	 */
-	public DiagnosticPreferencePage() {
-		super();
-		setTitle(RCPMessages.DiagnosticPreferencePage_1);
-	}
-
-	/**
-	 * Creates the field editors. Field editors are abstractions of the common
-	 * GUI blocks needed to manipulate various types of preferences. Each field
-	 * editor knows how to save and restore itself.
-	 */
-	@Override
-	public void createFieldEditors() {
-		
-		diag_maxvalue = new IntegerFieldEditor(CQPPreferences.MAXVALUE, RCPMessages.DiagnosticPreferencePage_2, getFieldEditorParent());
-		diag_maxvalue.setValidRange(1, 9999);
-		addField(diag_maxvalue);
-	}
-}
Index: tmp/org.txm.partition.rcp/plugin.xml
===================================================================
--- tmp/org.txm.partition.rcp/plugin.xml	(revision 666)
+++ tmp/org.txm.partition.rcp/plugin.xml	(revision 667)
@@ -113,5 +113,21 @@
          </adapter>
       </factory>
    </extension>
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="OnePartitionSelected">
+         <with
+               variable="selection">
+            <iterate
+                  ifEmpty="false"
+                  operator="and">
+               <instanceof
+                     value="org.txm.searchengine.cqp.corpus.Partition">
+               </instanceof>
+            </iterate>
+         </with>
+      </definition>
+   </extension>
 
 </plugin>
