Révision 2702

tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages_fr.properties (revision 2702)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)

2 2
#TXM messages generated by the PluginMessagesManager class
3 3
#Tue Dec 18 10:24:08 CET 2018
4 4

  
......
47 47
frequency = Fréquence
48 48

  
49 49
info_caOfTheP0LexcialTable             = AFC de la table lexicale {0}...
50
info_caOfTheP0PartitionCommaP1Property = AFC de la partition {0}, propriété [{1}]...
50
info_caOfTheP0PartitionCommaP1Property = AFC de la partition {0}, propriété {1}...
51
info_caOfTheP0PartitionIndex           = AFC de l'index de partition {0}...
51 52

  
52 53
percent = %
53 54

  
tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages.properties (revision 2702)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)

2 2
#TXM messages generated by the PluginMessagesManager class
3 3
#Tue Dec 18 10:24:08 CET 2018
4 4

  
......
47 47
frequency = Frequency
48 48

  
49 49
info_caOfTheP0LexcialTable             = CA of the {0} lexical table...
50
info_caOfTheP0PartitionCommaP1Property = CA of the {0} partition, [{1}] property...
50
info_caOfTheP0PartitionCommaP1Property = CA of the {0} partition, {1} property...
51
info_caOfTheP0PartitionIndex           = CA of the {0} partition index...
51 52

  
52 53
percent = %
53 54

  
tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java (revision 2702)
48 48
	
49 49
	public static String info_caOfTheP0LexcialTable;
50 50
	
51
	public static String info_caOfTheP0PartitionIndex;
51 52
	
53
	
52 54
	public static String common_c1;
53 55
	
54 56
	public static String common_c2;
tmp/org.txm.ca.core/src/org/txm/ca/core/functions/CA.java (revision 2702)
42 42
import org.txm.ca.core.statsengine.r.functions.ICA;
43 43
import org.txm.chartsengine.core.results.ChartResult;
44 44
import org.txm.core.messages.TXMCoreMessages;
45
import org.txm.core.preferences.TXMPreferences;
45 46
import org.txm.core.results.Parameter;
46 47
import org.txm.core.results.TXMParameters;
48
import org.txm.index.core.functions.PartitionIndex;
47 49
import org.txm.lexicaltable.core.functions.LexicalTable;
48 50
import org.txm.searchengine.cqp.corpus.Property;
49 51
import org.txm.statsengine.core.StatException;
......
765 767
	@Override
766 768
	public String getSimpleName() {
767 769
		try {
768
			return this.getParent().getSimpleName() + " (" + this.firstDimension + "," + this.secondDimension + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
770
			return this.getParent().getProperty().asString() + " (" + this.firstDimension + "," + this.secondDimension + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
769 771
		}
770 772
		catch (Exception e) {
771 773
			return "";
......
773 775
	}
774 776
	
775 777
	@Override
778
	public String getName() {
779
		return this.getParent().getName() + TXMPreferences.PARENT_NAME_SEPARATOR + " (" + this.firstDimension + "," + this.secondDimension + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ;
780
	}
781
	
782
	
783
	@Override
776 784
	public String getDetails() {
777 785
		try {
778 786
			return this.getSimpleName() + " " + NLS.bind(TXMCoreMessages.common_fMinEquals, this.getLexicalTable().getFMin());
......
787 795
	public String getComputingStartMessage() {
788 796
		// from lexical table
789 797
		if (this.parent.isVisible()) {
790
			return TXMCoreMessages.bind(CACoreMessages.info_caOfTheP0LexcialTable, this.getParent().getSimpleName());
798
			return TXMCoreMessages.bind(CACoreMessages.info_caOfTheP0LexcialTable, this.getParent().getName());
791 799
		}
800
		// from partition index
801
		else if (this.getParent().getParent() instanceof PartitionIndex) {
802
			return TXMCoreMessages.bind(CACoreMessages.info_caOfTheP0PartitionIndex, this.getParent().getParent().getName());
803
			
804
		}
805
		// from partition
806
		else if (this.getParent().getPartition() != null) {
807
			return TXMCoreMessages.bind(CACoreMessages.info_caOfTheP0PartitionCommaP1Property, this.getParent().getPartition().getName(), this.getParent().getProperty().asString());
808
		}
809
		// from sub-corpus lexical table
810
		// FIXME: SJ: this special case is possible when creating Specificities then calling the command on the invisible Lexical Table
811
		// need to if we need a special log message here
792 812
		else {
793
			// from partition
794
			if (this.getParent().getPartition() != null) {
795
				return TXMCoreMessages.bind(CACoreMessages.info_caOfTheP0PartitionCommaP1Property, this.getParent().getPartition().getSimpleName(), this.getParent().getProperty());
796
			}
797
			// from sub-corpus lexical table
798
			// FIXME: SJ: this special case is possible when creating Specificities then calling the command on the invisible Lexical Table
799
			// need to if we need a special log message here
800
			else {
801
				return "";
802
			}
813
			return "";
803 814
		}
804 815
		
805 816
		
806 817
	}
807 818
	
808 819
	
809
	@Override
810
	public String getName() {
811
		return this.getSimpleName();
812
	}
813
	
814
	
815 820
	/**
816 821
	 * Get the singular values as array.
817 822
	 *
tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages.properties (revision 2702)
12 12

  
13 13
failedToGetTheSpecificitesColon = ** Failed to access specificities in R: {0}.
14 14

  
15
info_specificitiesBarChartForTheP0LexcialTable             = Specificities bar chart for the {0} lexical table...
16
info_specificitiesBarChartForTheP0PartitionCommaP1Property = Specificities bar chart for the {0} partition, [{1}] property...
17
info_specificitiesBarChartForTheP0Subcorpus                = Specificities bar chart for the {0} subcorpus...
18
info_specificitiesOfTheP0Corpus                            = Specificities of the {0} corpus...
15
info_specificitiesBarChartForTheP0LexcialTable             = Bar chart of the specificities of the {0} lexical table...
16
info_specificitiesBarChartForTheP0PartitionCommaP1Property = Bar chart of the specificities of the {0} partition, {1} property...
17
info_specificitiesBarChartForTheP0Subcorpus                = Bar chart of the specificities of the {0} sub-corpus...
18
info_specificitiesOfTheP0Corpus                            = Specificities of {0} sub-corpus...
19 19
info_specificitiesOfTheP0LexcialTable                      = Specificities of the {0} lexical table...
20
info_specificitiesOfTheP0PartitionCommaP1Property          = Specificities of the {0} partition, [{1}] property...
20
info_specificitiesOfTheP0PartitionCommaP1Property          = Specificities of the {0} partition, {1} property...
21
info_specificitiesOfTheP0PartitionIndex                    = Specificities of the {0} partition index...
21 22

  
22 23
noSpecificitiesIndexArray = ** No specificities index table.
23 24

  
tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/SpecificitiesCoreMessages.java (revision 2702)
28 28
	
29 29
	public static String info_specificitiesOfTheP0Corpus;
30 30
	
31
	public static String info_specificitiesOfTheP0PartitionIndex;
31 32
	
33
	
34
	
32 35
	public static String info_specificitiesBarChartForTheP0PartitionCommaP1Property;
33 36
	
34 37
	public static String info_specificitiesBarChartForTheP0LexcialTable;
tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_fr.properties (revision 2702)
12 12

  
13 13
failedToGetTheSpecificitesColon = ** Échec de l''accès aux spécificités dans R : {0}.
14 14

  
15
info_specificitiesBarChartForTheP0LexcialTable             = Diagramme de spécificités pour la table lexicale {0}...
16
info_specificitiesBarChartForTheP0PartitionCommaP1Property = Diagramme de spécificités pour la partition {0}, propriété [{1}]...
17
info_specificitiesBarChartForTheP0Subcorpus                = Diagramme de spécificités pour le sous-corpus {0}...
18
info_specificitiesOfTheP0Corpus                            = Spécificités du corpus {0}...
15
info_specificitiesBarChartForTheP0LexcialTable             = Diagramme à barres des spécificités de la table lexicale {0}...
16
info_specificitiesBarChartForTheP0PartitionCommaP1Property = Diagramme à barres des spécificités de la la partition {0}, propriété {1}...
17
info_specificitiesBarChartForTheP0Subcorpus                = Diagramme à barres des spécificités du sous-corpus {0}...
18
info_specificitiesOfTheP0Corpus                            = Spécificités du sous-corpus {0}...
19 19
info_specificitiesOfTheP0LexcialTable                      = Spécificités de la table lexicale {0}...
20
info_specificitiesOfTheP0PartitionCommaP1Property          = Spécificités de la partition {0}, propriété [{1}]...
20
info_specificitiesOfTheP0PartitionCommaP1Property          = Spécificités de la partition {0}, propriété {1}...
21
info_specificitiesOfTheP0PartitionIndex                    = Spécificités de l'index de partition {0}...
21 22

  
22 23
noSpecificitiesIndexArray = ** Pas de tableau d'index de spécificités.
23 24

  
tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java (revision 2702)
217 217
	public String getComputingStartMessage() {
218 218
		// from lexical table
219 219
		if (this.parent.getParent().isVisible()) {
220
			return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesBarChartForTheP0LexcialTable, this.parent.getParent().getSimpleName());
220
			return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesBarChartForTheP0LexcialTable, this.parent.getParent().getName());
221 221
		}
222 222
		else {
223 223
			
224 224
			// from partition
225 225
			if (((LexicalTable) this.parent.getParent()).getPartition() != null) {
226 226
				return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesBarChartForTheP0PartitionCommaP1Property, ((LexicalTable) this.parent.getParent()).getPartition()
227
						.getSimpleName(), ((LexicalTable) this.parent.getParent())
228
								.getProperty());
227
						.getName(), ((LexicalTable) this.parent.getParent()).getProperty().asString());
229 228
			}
230 229
			// from subcorpus
231 230
			else {
232
				return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesBarChartForTheP0Subcorpus, this.parent.getParent().getParent().getSimpleName());
231
				return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesBarChartForTheP0Subcorpus, this.parent.getParent().getParent().getName());
233 232
			}
234 233
		}
235 234
	}
tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificities.java (revision 2702)
41 41
import org.rosuda.REngine.REXP;
42 42
import org.txm.core.messages.TXMCoreMessages;
43 43
import org.txm.core.preferences.TBXPreferences;
44
import org.txm.core.preferences.TXMPreferences;
44 45
import org.txm.core.results.Parameter;
45 46
import org.txm.core.results.TXMParameters;
46 47
import org.txm.core.results.TXMResult;
48
import org.txm.index.core.functions.PartitionIndex;
47 49
import org.txm.lexicaltable.core.functions.LexicalTable;
48 50
import org.txm.lexicaltable.core.statsengine.data.ILexicalTable;
49 51
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
50
import org.txm.searchengine.cqp.corpus.Partition;
51 52
import org.txm.searchengine.cqp.corpus.Property;
52 53
import org.txm.searchengine.cqp.corpus.WordProperty;
53
import org.txm.specificities.core.chartsengine.r.RSpecificitiesBarChartCreator;
54 54
import org.txm.specificities.core.messages.SpecificitiesCoreMessages;
55 55
import org.txm.specificities.core.preferences.SpecificitiesPreferences;
56 56
import org.txm.specificities.core.statsengine.r.function.SpecificitiesR;
......
652 652
	
653 653
	@Override
654 654
	public String getName() {
655
		// FIXME: to define
655
		// FIXME: SJ: to define
656
		return this.getParent().getParent().getName() + TXMPreferences.PARENT_NAME_SEPARATOR + this.getSimpleName();
657
	}
658
	
659
	@Override
660
	public String getSimpleName() {
661
		// FIXME: SJ: to define
656 662
		// if (this.specificitiesResult.getLexicalTable()!= null &&
657 663
		// this.specificitiesResult.getLexicalTable().getPartition() != null) {
658 664
		// setPartName(this.specificitiesResult.getLexicalTable().getPartition().getName()+":
......
666 672
		// FIXME: to define
667 673
		try {
668 674
			// if (this.lexicalTable.getProperty() != null) {
669
			return this.lexicalTable.getProperty().getName();
675
			return this.lexicalTable.getProperty().asString();
670 676
			// }
671 677
			// else {
672 678
			// return this.lexicalTable.getParent().toString();
......
678 684
	}
679 685
	
680 686
	@Override
681
	public String getSimpleName() {
682
		return this.getName();
683
	}
684
	
685
	@Override
686 687
	public String getDetails() {
687 688
		return NLS.bind(this.getName() + " (max score={0})", this.maxScore);
688 689
	}
......
691 692
	public String getComputingStartMessage() {
692 693
		// from lexical table
693 694
		if (this.parent.isVisible()) {
694
			return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesOfTheP0LexcialTable,
695
					this.getParent().getSimpleName());
695
			return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesOfTheP0LexcialTable, this.getParent().getName());
696 696
		}
697 697
		else {
698
			
698
			// from partition index
699
			if (this.getParent().getParent() instanceof PartitionIndex) {
700
				return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesOfTheP0PartitionIndex, this.getParent().getParent().getName());
701
			}
699 702
			// from partition
700
			if (this.getParent().getPartition() != null) {
703
			else if (this.getParent().getPartition() != null) {
701 704
				return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesOfTheP0PartitionCommaP1Property,
702
						this.getParent().getPartition().getSimpleName(), this.getParent().getProperty());
705
						this.getParent().getPartition().getName(), this.getParent().getProperty().asString());
703 706
			}
704
			// from sub-corpus lexical table
705
			// FIXME: SJ: this special case is possible when creating Specificities then
706
			// calling the command on the invisible Lexical Table
707
			// need to if we need a special log message here
707
			// from sub-corpus
708 708
			else {
709 709
				return TXMCoreMessages.bind(SpecificitiesCoreMessages.info_specificitiesOfTheP0Corpus,
710
						this.getParent().getParent().getSimpleName());
710
						this.getParent().getParent().getName());
711 711
			}
712 712
		}
713 713
	}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 2702)
1075 1075
					// the main task stays the compute of the result itself, not the parent
1076 1076
					
1077 1077
					if (editorInput.getResult().isDirty()) {
1078
						StatusLine.setMessage(editorInput.getResult().getComputingStartMessage());
1078
						try {
1079
							StatusLine.setMessage(editorInput.getResult().getComputingStartMessage());
1080
						}
1081
						catch (Exception e) {
1082
							// TODO Auto-generated catch block
1083
							e.printStackTrace();
1084
						}
1079 1085
					}
1080 1086
					
1081 1087
					ComputeProgressMonitorDialog dialog = new ComputeProgressMonitorDialog(window.getShell(), editorInput.getResult());
tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ComputeProgressMonitorDialog.java (revision 2702)
65 65
	@Override
66 66
	protected void configureShell(final Shell shell) {
67 67
		super.configureShell(shell);
68
		// set window title to result start computing message
69
		shell.setText(this.result.getComputingStartMessage());
68
		try {
69
			// set window title to result start computing message
70
			try {
71
				shell.setText(this.result.getComputingStartMessage());
72
			}
73
			catch (Exception e) {
74
				// TODO Auto-generated catch block
75
				e.printStackTrace();
76
			}
77
		}
78
		catch (Exception e) {
79
			// TODO Auto-generated catch block
80
			e.printStackTrace();
81
		}
70 82
	}
71 83
	
72 84
	/**
tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java (revision 2702)
52 52
import org.txm.searchengine.cqp.corpus.CQPCorpus;
53 53
import org.txm.searchengine.cqp.corpus.StructuralUnit;
54 54
import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
55

  
55 56
// TODO: Auto-generated Javadoc
56 57
/**
57 58
 * The Class ComplexSubcorpusPanel.
58 59
 */
59
public class ComplexSubcorpusPanel extends Composite{
60

  
60
public class ComplexSubcorpusPanel extends Composite {
61
	
61 62
	/** The self. */
62 63
	ComplexSubcorpusPanel self;
63 64
	
64 65
	/** The struct combo. */
65 66
	Combo structCombo;
66

  
67
	
67 68
	/** The corpus. */
68 69
	CQPCorpus corpus;
69 70
	
......
72 73
	
73 74
	/** The btn area. */
74 75
	Composite parent, partArea, firstArea, dispoArea, btnArea;
75

  
76
	
76 77
	/** The structuralunits. */
77
	List<StructuralUnit> structuralunits; 
78
	List<StructuralUnit> structuralunits;
78 79
	
79 80
	/** The structural units properties. */
80
	HashMap<StructuralUnit, List<StructuralUnitProperty>> structuralUnitsProperties = new HashMap<StructuralUnit, List<StructuralUnitProperty>>();
81
	HashMap<StructuralUnit, List<StructuralUnitProperty>> structuralUnitsProperties = new HashMap<>();
81 82
	
82 83
	/** The query items. */
83
	ArrayList<QueryItem> queryItems = new ArrayList<QueryItem>();
84
	ArrayList<QueryItem> queryItems = new ArrayList<>();
84 85
	
85 86
	/** The queries panel. */
86 87
	Composite queriesPanel;
......
90 91
	
91 92
	/** The and btn. */
92 93
	Button andBtn;
93

  
94
	
94 95
	/**
95 96
	 * Instantiates a new complex subcorpus panel.
96 97
	 *
......
103 104
		self = this;
104 105
		this.setLayout(new GridLayout(2, false));
105 106
		this.corpus = corpus;
106

  
107
		
107 108
		try {
108
			this.structuralunits = new ArrayList<StructuralUnit>(corpus.getOrderedStructuralUnits());
109
			for (int i = 0 ; i < this.structuralunits.size() ; i++) {
109
			this.structuralunits = new ArrayList<>(corpus.getOrderedStructuralUnits());
110
			for (int i = 0; i < this.structuralunits.size(); i++) {
110 111
				if (this.structuralunits.get(i).getName().equals("txmcorpus")) { //$NON-NLS-1$
111 112
					this.structuralunits.remove(i);
112 113
					i--;
113 114
				}
114 115
			}
115
		} catch (CqiClientException e) {
116
		}
117
		catch (CqiClientException e) {
116 118
			org.txm.utils.logger.Log.printStackTrace(e);
117 119
		}
118

  
120
		
119 121
		for (StructuralUnit su : this.structuralunits) {
120
			List<StructuralUnitProperty> properties = new ArrayList<StructuralUnitProperty>(su.getOrderedProperties());
122
			List<StructuralUnitProperty> properties = new ArrayList<>(su.getOrderedProperties());
121 123
			if (su.getName().equals("text")) { //$NON-NLS-1$
122
				for (int i = 0 ; i < properties.size() ; i++) {
124
				for (int i = 0; i < properties.size(); i++) {
123 125
					if (properties.get(i).getName().equals("base") || //$NON-NLS-1$
124
						properties.get(i).getName().equals("project")) { //$NON-NLS-1$
126
							properties.get(i).getName().equals("project")) { //$NON-NLS-1$
125 127
						properties.remove(i);
126 128
						i--;
127 129
					}
......
129 131
			}
130 132
			structuralUnitsProperties.put(su, properties);
131 133
		}
132

  
134
		
133 135
		Group andorGroup = new Group(this, SWT.SHADOW_ETCHED_IN);
134 136
		andorGroup.setText(TXMUIMessages.match);
135 137
		andorGroup.setLayout(new GridLayout(2, false));
136 138
		andorGroup.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
137

  
139
		
138 140
		andBtn = new Button(andorGroup, SWT.RADIO);
139 141
		andBtn.setText(TXMUIMessages.allCriteria);
140 142
		andBtn.setSelection(true);
141

  
143
		
142 144
		Button orBtn = new Button(andorGroup, SWT.RADIO);
143 145
		orBtn.setText(TXMUIMessages.someCriteria);
144 146
		
145
		//structure choice
147
		// structure choice
146 148
		Label l = new Label(this, SWT.None);
147 149
		l.setText(TXMCoreMessages.common_structure);
148 150
		structCombo = new Combo(this, SWT.READ_ONLY);
149 151
		structCombo.addSelectionListener(new SelectionListener() {
152
			
150 153
			@Override
151 154
			public void widgetSelected(SelectionEvent e) {
152
				for(QueryItem item : queryItems)
155
				for (QueryItem item : queryItems)
153 156
					item.refreshProps();
154 157
			}
158
			
155 159
			@Override
156 160
			public void widgetDefaultSelected(SelectionEvent e) {}
157 161
		});
158

  
162
		
159 163
		int i_text = 0, i = 0;
160 164
		for (StructuralUnit su : structuralunits) {
161 165
			structCombo.add(su.getName());
......
165 169
		
166 170
		if (structuralunits.size() > 0)
167 171
			structCombo.select(i_text);
168

  
172
		
169 173
		queriesPanel = new Composite(this, SWT.NONE);
170 174
		queriesPanel.setLayout(new GridLayout(1, false));
171 175
		queriesPanel.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
......
179 183
		l = new Label(this, SWT.NONE);
180 184
		l.setText(TXMUIMessages.query);
181 185
		queryField = new Text(this, SWT.BORDER);
182
		queryField.setLayoutData(new GridData(GridData.FILL,GridData.FILL,true, false));
186
		queryField.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
183 187
		Button refreshBtn = new Button(this, SWT.PUSH);
184 188
		refreshBtn.setText(TXMUIMessages.common_refresh);
185 189
		refreshBtn.addSelectionListener(new SelectionListener() {
190
			
186 191
			@Override
187 192
			public void widgetSelected(SelectionEvent e) {
188 193
				updateQueryField();
......
190 195
			
191 196
			@Override
192 197
			public void widgetDefaultSelected(SelectionEvent e) {
193
				
198
			
194 199
			}
195 200
		});
196
		
201
			
197 202
		// first init
198 203
		updateQueryField();
199 204
	}
......
202 207
		queryField.setText(getQueryString());
203 208
		queryField.update();
204 209
	}
205

  
210
	
206 211
	/**
207 212
	 * Update display.
208 213
	 */
......
220 225
	 *
221 226
	 * @return the query string
222 227
	 */
223
	public String getQueryString()
224
	{
228
	public String getQueryString() {
225 229
		String structName = this.structCombo.getText();
226 230
		
227
		String query = "/region["+structName+",a]::"; //$NON-NLS-1$ //$NON-NLS-2$
231
		String query = "/region[" + structName + ",a]::"; //$NON-NLS-1$ //$NON-NLS-2$
228 232
		int nbitem = 0;
229 233
		for (QueryItem item : queryItems) {
230 234
			if (nbitem != 0)
......
236 240
			ISelection sel = item.valueCombo.getSelection();
237 241
			String value = ""; //$NON-NLS-1$
238 242
			if (sel instanceof IStructuredSelection) {
239
				value = ((IStructuredSelection)sel).getFirstElement().toString();
243
				value = ((IStructuredSelection) sel).getFirstElement().toString();
240 244
			}
241 245
			int equals = item.testCombo.getSelectionIndex();
242 246
			
243 247
			if (equals == 0) // is
244
				query += " a."+prop+"=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
248
				query += " a." + prop + "=\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
245 249
			else if (equals == 1) // is not
246
				query += " a."+prop+"!=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
250
				query += " a." + prop + "!=\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
247 251
			else if (equals == 2) // contains
248
				query += " a."+prop+"=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
252
				query += " a." + prop + "=\".*" + value + ".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
249 253
			else // does not contain
250
				query += " a."+prop+"!=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
254
				query += " a." + prop + "!=\".*" + value + ".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
251 255
			
252 256
			nbitem++;
253 257
		}
254 258
		
255 259
		/*
256
		String query = "["; //$NON-NLS-1$ //$NON-NLS-2$
257
		int nbitem = 0;
260
		 * String query = "["; //$NON-NLS-1$ //$NON-NLS-2$
261
		 * int nbitem = 0;
262
		 * for (QueryItem item : queryItems) {
263
		 * if (nbitem != 0)
264
		 * if (andBtn.getSelection())
265
		 * query += " &"; //$NON-NLS-1$
266
		 * else
267
		 * query += " |"; //$NON-NLS-1$
268
		 * String prop = item.selectedSup.getFullName();
269
		 * ISelection sel = item.valueCombo.getSelection();
270
		 * String value = ""; //$NON-NLS-1$
271
		 * if (sel instanceof IStructuredSelection) {
272
		 * value = ((IStructuredSelection)sel).getFirstElement().toString();
273
		 * }
274
		 * int equals = item.testCombo.getSelectionIndex();
275
		 * if (equals == 0) // is
276
		 * query += " a."+prop+"=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
277
		 * else if (equals == 1) // is not
278
		 * query += " a."+prop+"!=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
279
		 * else if (equals == 2) // contains
280
		 * query += " a."+prop+"=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
281
		 * else // does not contain
282
		 * query += " a."+prop+"!=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
283
		 * nbitem++;
284
		 * }
285
		 */
258 286
		
259
		for (QueryItem item : queryItems) {
260
			if (nbitem != 0)
261
				if (andBtn.getSelection())
262
					query += " &"; //$NON-NLS-1$
263
				else
264
					query += " |"; //$NON-NLS-1$
265
			String prop = item.selectedSup.getFullName();
266
			ISelection sel = item.valueCombo.getSelection();
267
			String value = ""; //$NON-NLS-1$
268
			if (sel instanceof IStructuredSelection) {
269
				value = ((IStructuredSelection)sel).getFirstElement().toString();
270
			}
271
			int equals = item.testCombo.getSelectionIndex();
272
			
273
			if (equals == 0) // is
274
				query += " a."+prop+"=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
275
			else if (equals == 1) // is not
276
				query += " a."+prop+"!=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
277
			else if (equals == 2) // contains
278
				query += " a."+prop+"=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
279
			else // does not contain
280
				query += " a."+prop+"!=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
281
			
282
			nbitem++;
283
		}
284
		*/
285
		
286
		/** // 
287
		for (QueryItem item : queryItems) {
288
			if (nbitem != 0) { // adding a constraint
289
				if (andBtn.getSelection())
290
					query += " &"; //$NON-NLS-1$
291
				else
292
					query += " |"; //$NON-NLS-1$
293
			}
294
			String prop = item.selectedSup.getFullName();
295
			ISelection sel = item.valueCombo.getSelection();
296
			String value = ""; //$NON-NLS-1$
297
			if (sel instanceof IStructuredSelection) {
298
				value = ((IStructuredSelection)sel).getFirstElement().toString();
299
			}
300
			int equals = item.testCombo.getSelectionIndex();
301
			
302
			if (equals == 0) // is
303
				query += " _."+prop+"=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
304
			else if (equals == 1) // is not
305
				query += " _."+prop+"!=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
306
			else if (equals == 2) // contains
307
				query += " _."+prop+"=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
308
			else // does not contain
309
				query += " _."+prop+"!=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
310
			
311
			nbitem++;
312
		}
313
		query += "] expand to "+structName;
314
		*/
287
		/**
288
		 * //
289
		 * for (QueryItem item : queryItems) {
290
		 * if (nbitem != 0) { // adding a constraint
291
		 * if (andBtn.getSelection())
292
		 * query += " &"; //$NON-NLS-1$
293
		 * else
294
		 * query += " |"; //$NON-NLS-1$
295
		 * }
296
		 * String prop = item.selectedSup.getFullName();
297
		 * ISelection sel = item.valueCombo.getSelection();
298
		 * String value = ""; //$NON-NLS-1$
299
		 * if (sel instanceof IStructuredSelection) {
300
		 * value = ((IStructuredSelection)sel).getFirstElement().toString();
301
		 * }
302
		 * int equals = item.testCombo.getSelectionIndex();
303
		 * 
304
		 * if (equals == 0) // is
305
		 * query += " _."+prop+"=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
306
		 * else if (equals == 1) // is not
307
		 * query += " _."+prop+"!=\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
308
		 * else if (equals == 2) // contains
309
		 * query += " _."+prop+"=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
310
		 * else // does not contain
311
		 * query += " _."+prop+"!=\".*"+value+".*\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
312
		 * 
313
		 * nbitem++;
314
		 * }
315
		 * query += "] expand to "+structName;
316
		 */
315 317
		return query;
316 318
	}
317 319
	
......
322 324
		}
323 325
		return query;
324 326
	}
325

  
327
	
326 328
	public String getGeneratedName() {
327
		String generated = this.corpus.getName(); 
328
		for (QueryItem item : queryItems)
329
			generated += "_"+item.selectedSup.getName(); //$NON-NLS-1$
329
		String generated = ""; //$NON-NLS-1$
330
		if (this.queryItems.size() > 0) {
331
			QueryItem queryItem = this.queryItems.get(0);
332
			generated += queryItem.selectedSup.asFullNameString() + "=" + queryItem.valueCombo.getList().getSelection()[0];
333
			
334
		}
330 335
		return generated;
331 336
	}
332 337
	
......
334 339
	 * The Class QueryItem.
335 340
	 */
336 341
	class QueryItem extends Composite {
337

  
342
		
338 343
		/** The prop combo. */
339 344
		Combo propCombo;
340 345
		
......
343 348
		
344 349
		/** The value combo. */
345 350
		ListViewer valueCombo;
346

  
351
		
347 352
		/** The sups. */
348 353
		List<StructuralUnitProperty> sups;
349 354
		
......
352 357
		
353 358
		/** The selected su. */
354 359
		StructuralUnit selectedSu;
355

  
360
		
356 361
		/**
357 362
		 * Instantiates a new query item.
358 363
		 *
......
361 366
		 */
362 367
		public QueryItem(Composite parent, int style) {
363 368
			super(parent, style);
364

  
369
			
365 370
			this.setLayout(new GridLayout(5, false));
366 371
			propCombo = new Combo(this, SWT.READ_ONLY);
367 372
			propCombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
368 373
			propCombo.addSelectionListener(new SelectionListener() {
374
				
369 375
				@Override
370 376
				public void widgetSelected(SelectionEvent e) {
371 377
					refreshValues();
372 378
				}
379
				
373 380
				@Override
374 381
				public void widgetDefaultSelected(SelectionEvent e) {}
375 382
			});
376

  
383
			
377 384
			testCombo = new Combo(this, SWT.READ_ONLY);
378 385
			testCombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
379 386
			testCombo.add("is"); //$NON-NLS-1$
......
381 388
			testCombo.add(TXMUIMessages.contains);
382 389
			testCombo.add(TXMUIMessages.doesNotContain);
383 390
			testCombo.select(0);
384

  
391
			
385 392
			valueCombo = new ListViewer(this, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER | SWT.VIRTUAL);
386 393
			valueCombo.setContentProvider(new ArrayContentProvider());
387
			GridData data = new GridData(GridData.FILL,GridData.FILL, true, false);
394
			GridData data = new GridData(GridData.FILL, GridData.FILL, true, false);
388 395
			data.heightHint = testCombo.getItemHeight();
389 396
			valueCombo.getList().setLayoutData(data);
390 397
			if (structuralunits.size() > 0) {
391 398
				refreshProps();
392 399
			}
393

  
394
			Button btnAdd  = new Button(this, SWT.PUSH);
400
			
401
			Button btnAdd = new Button(this, SWT.PUSH);
395 402
			btnAdd.setText("+"); //$NON-NLS-1$
396 403
			btnAdd.addSelectionListener(new SelectionListener() {
404
				
397 405
				@Override
398 406
				public void widgetSelected(SelectionEvent e) {
399
					//System.out.println("add constraint");
407
					// System.out.println("add constraint");
400 408
					QueryItem item = new QueryItem(queriesPanel, SWT.NONE);
401 409
					item.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
402 410
					queryItems.add(item);
403 411
					ComplexSubcorpusPanel.this.layout();
404
					//System.out.println(getQueryString());
412
					// System.out.println(getQueryString());
405 413
				}
414
				
406 415
				@Override
407 416
				public void widgetDefaultSelected(SelectionEvent e) {}
408 417
			});
409

  
410
			Button btnRmv  = new Button(this, SWT.PUSH);
418
			
419
			Button btnRmv = new Button(this, SWT.PUSH);
411 420
			btnRmv.setText("-"); //$NON-NLS-1$
412 421
			btnRmv.addSelectionListener(new SelectionListener() {
422
				
413 423
				@Override
414 424
				public void widgetSelected(SelectionEvent e) {
415 425
					if (queryItems.size() > 1) {
......
418 428
						ComplexSubcorpusPanel.this.layout();
419 429
					}
420 430
				}
431
				
421 432
				@Override
422 433
				public void widgetDefaultSelected(SelectionEvent e) {}
423 434
			});
424 435
		}
425

  
436
		
426 437
		/**
427 438
		 * Refresh props.
428 439
		 */
......
430 441
			propCombo.removeAll();
431 442
			selectedSu = structuralunits.get(structCombo.getSelectionIndex());
432 443
			sups = structuralUnitsProperties.get(selectedSu);
433

  
444
			
434 445
			for (StructuralUnitProperty sup : sups)
435 446
				propCombo.add(sup.getName());
436

  
447
			
437 448
			if (sups.size() > 0) {
438 449
				selectedSup = sups.get(0);
439 450
				propCombo.select(0);
440 451
				refreshValues();
441 452
			}
442 453
		}
443

  
454
		
444 455
		/**
445 456
		 * Refresh values.
446 457
		 */
447 458
		private void refreshValues() {
448 459
			
449
			selectedSup = sups.get(propCombo.getSelectionIndex()); 
460
			selectedSup = sups.get(propCombo.getSelectionIndex());
450 461
			try {
451 462
				valueCombo.setInput(selectedSup.getOrderedValues());
452
			} catch (CqiClientException e1) {
463
			}
464
			catch (CqiClientException e1) {
453 465
				org.txm.utils.logger.Log.printStackTrace(e1);
454 466
			}
455 467
			if (valueCombo.getList().getItemCount() > 0)
456 468
				valueCombo.getList().select(0);
457 469
		}
458

  
470
		
459 471
		/**
460 472
		 * Gets the structural unit.
461 473
		 *
......
465 477
			return null;
466 478
		}
467 479
	}
468
}
480
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 2702)
7 7
Explorer_4 = 🡅
8 8
Explorer_5 = ⭮
9 9
Explorer_7 = ⌂
10

  
11

  
12
resetAll=Reset All
13
password=Password
14
login=Login
15
loginToP0=Login to {0}
16
connect=Connect
17 10

  
18 11
FileTreeContentProvider_4 = '
19 12

  
13
LoadBinaryCorporaDirectory_aCorpusNamedP0alreadyExistsLoadingOfP1Canceled = A corpus named {0} already exists, loading of {1} canceled.
14
LoadBinaryCorporaDirectory_corporaDirectoryNotFoundAborting               = Corpora directory not found. Aborting.
15
LoadBinaryCorporaDirectory_corpusLoad                                     = Corpus load
16
LoadBinaryCorporaDirectory_loadingCorporaFromTheP0Directory               = Loading corpora from the {0} directory...
17
LoadBinaryCorporaDirectory_selectTheTXMCorpusToLoad                       = Select the '.txm' corpus to load.
18

  
20 19
P0CorpusLoaded = {0} corpus loaded.
21 20

  
21
SourceDirectoryPage_0  = Select source directory
22
SourceDirectoryPage_1  = Sources
23
SourceDirectoryPage_10 = Corpus name
24
SourceDirectoryPage_11 = The ''{0}'' corpus will be replaced.
25
SourceDirectoryPage_12 = The ''{0}'' corpus import will be resumed or restarted.
26
SourceDirectoryPage_13 = The ''{0}'' corpus will be created.
27
SourceDirectoryPage_14 = Checking corpus name validity with '[A-Z][-A-Z0-9]+': 
28
SourceDirectoryPage_2  = The source directory contains the sources files read by the import module.
29
SourceDirectoryPage_3  = Source directory
30
SourceDirectoryPage_5  = click to select the corpus source directory
31
SourceDirectoryPage_6  = Source directory to use
32
SourceDirectoryPage_8  = Warning: corpus name normalization: no valid character available to build the corpus name (try to use some American English - ASCII - characters in the folder name)
33

  
34
TXMCanNotFetchUpdatesP0 = TXM can not fetch updates ({0}).
35

  
36
TXMInitializationHasBeenCanceledByUserDotPleaseRestartTXM = TXM initialization has been canceled by user. Please restart TXM.
37

  
38
TXMInstallDirectoryIsNotSetP0PreferenceIsNotSet = TXM install directory is not set ('{0}' preference is not set).
39

  
40
TXMInstallDirectoryIsSetToP0ButDoesNotExist = TXM install directory is set to '{0}' but does not exist.
41

  
42
TXMInstallDirectoryIsSetToP0ButIsNotReadable = TXM install directory is set to '{0}' but is not readable.
43

  
44
TXMInstallDirectoryIsSetToP0ButTXMCantCdInThisDirectory = TXM install directory is set to '{0}' but is not cdable.
45

  
46
TXMInstallDirectoryIsSetToQuoteQuote = TXM install directory is set to ''.
47

  
48
TXMUserDirectoryIsNotSetP0PreferenceIsNotSet = TXM user directory is not set ('{0}' preference is not set).
49

  
50
TXMUserDirectoryIsSetToP0 = TXM User directory is set to: {0}.
51

  
52
TXMUserDirectoryIsSetToP0ButDoesNotExist = TXM user directory is set to '{0}' but does not exist.
53

  
54
TXMUserDirectoryIsSetToP0ButTXMCantCdInThisDirectory = TXM user directory is set to '{0}' but TXM can't cd in this directory.
55

  
56
TXMUserDirectoryIsSetToP0ButTXMCantWriteInThisDirectory = TXM user directory is set to '{0}' but TXM can't write in this directory.
57

  
58
TXMisDistributedUnderLicence = TXM is released under the 
59

  
22 60
_1                                                                                                                                                                  = 1.\	
23 61
_2                                                                                                                                                                  = 2.\	
24 62
_3                                                                                                                                                                  = 3.\	
......
101 139

  
102 140
buildEdition = Build edition
103 141

  
104
callingGroovyPrestartScript=Calling Groovy prestart script...
105
callingGroovyStartScript=Calling Groovy start script...
142
callingGroovyPrestartScript = Calling Groovy prestart script...
143

  
144
callingGroovyStartScript = Calling Groovy start script...
145

  
106 146
canNotCreateATableWithTheProvidedInformationColonP0 = ** Can not create a table with the information provided: {0}
107 147

  
108 148
canceling = Canceling…
......
148 188
clipboardIsEmpty = ** The clipboard is empty.
149 189

  
150 190
clipboard_2      = clipboard
151
closingColon=Closing: 
152
closingEmptyEditors=Closing empty editors
153 191

  
192
closingColon = Closing: 
193

  
194
closingEmptyEditors = Closing empty editors
195

  
154 196
columnIndexIsTooBig = Column number too big.
155 197

  
156 198
columnsSeparatedBy = Columns separated by
......
182 224

  
183 225
confirm = Confirm
184 226

  
227
connect = Connect
228

  
185 229
consoleReportsAnInternalError = \nInternal error.
186 230

  
187 231
contains = contains
......
256 300

  
257 301
deletedColonP0 = {0} deleted.
258 302

  
303
deletingOneResultP0Continue = Do you really want to delete {0}?
304

  
259 305
deletingP0 = Deleting {0}
260 306

  
261
deletingSeveralResultsP0Continue=Do you really want to delete those {0} items?

307
deletingSeveralResultsP0Continue = Do you really want to delete those {0} items?
262 308

  
263
deletingOneResultP0Continue=Do you really want to delete {0}?
264

  
265 309
description = Description
266 310

  
267 311
descriptionOfTheP0CorpusP1 = Description of the {0} corpus ({1})
......
353 397
errorDuringScriptExecutionColon = ** Error during script execution: 
354 398

  
355 399
errorDuringSortColonP0 = ** Error during sorting: {0}.
356
errorDuringUIInitializationP0=Error during UI initialization: {0}.
357 400

  
401
errorDuringUIInitializationP0 = Error during UI initialization: {0}.
402

  
358 403
errorElementColon = Error element: '
359 404

  
360 405
errorInAtOptionNameDeclarationColon = ** Error in the declaration of the name of the @Option 
361 406

  
407
errorTheProvidedInstallDirectoryDoesNotExistAborting = Error: The provided install directory does not exists. Aborting.
408

  
409
errorTheProvidedTXMHOMEDirectoryDoesNotExistsP0Aborting = Error: The provided TXMHOME directory does not exists: {0}. Aborting.
410

  
362 411
errorWhileCallingOrgeclipseuiwindowresetPerspectiveColon = ** Error while calling ''org.eclipse.ui.window.resetPerspective'': {0}.
363 412

  
364 413
errorWhileCleaningPerspectiveColonNoHandlerServiceFound = ** Error while cleaning perspective: no handler found.
......
368 417
errorWhileCreatingAPartitionColonP0 = ** Error while creating a partition: {0}
369 418

  
370 419
errorWhileDeletingP0ColonP1 = ** Error while deleting {0}: {1}
371
errorWhileFetchingUpdatesP0=Error while fetching updates: {0}
372 420

  
421
errorWhileFetchingUpdatesP0 = Error while fetching updates: {0}
422

  
373 423
errorWhileGettingCurrentPositionValueColon = ** Error while retrieving data at position: 
374 424

  
375 425
errorWhileLoadingTXMColon = ** TXM startup error: {0}.
......
389 439
errorWithElementP0 = ** Error with element {0}
390 440

  
391 441
error_invalidRegularExpression                           = Invalid regular expression: {0}
392
errorsOccuredDuringTXMPostInstallation=Errors occured during TXM post-installation.
393
errorTheProvidedInstallDirectoryDoesNotExistAborting=Error: The provided install directory does not exists. Aborting.
394
errorTheProvidedTXMHOMEDirectoryDoesNotExistsP0Aborting=Error: The provided TXMHOME directory does not exists: {0}. Aborting.
395 442

  
443
errorsOccuredDuringTXMPostInstallation = Errors occured during TXM post-installation.
444

  
396 445
execColon = Exec: {0}.
397 446

  
398 447
executeScript = Execute script
......
437 486

  
438 487
failedToDeleteSubcorpusP0 = ** Error removing sub-corpus {0}
439 488

  
440
failedToExecuteTheP0ScriptColonP1=Failed to execute '{0}' script: {1}.
489
failedToExecuteTheP0ScriptColonP1 = Failed to execute '{0}' script: {1}.
490

  
441 491
failedToExportCorpusP0 = ** Failed to export the {0} corpus.
442 492

  
443 493
failedToExportFileP0 = ** Failed to export file {0} with device {1}
......
466 516

  
467 517
fileExplorerColonIncorrectPattern = ** File Explorer: Incorrect Regular Expression
468 518

  
519
firstLaunchOfTXM = First launch of TXM
520

  
469 521
folderP0ShouldNotBeDeleted = Folder {0} should not be deleted
470 522

  
471 523
followedBy = followed by 
......
488 540

  
489 541
generalPreferencesBackup = General backup of preferences
490 542

  
543
gnuLicenceLink = https://www.gnu.org/licenses/gpl-2.0.en.html
544

  
545
gnuLicenceName = GNU General Public License version 2
546

  
491 547
goToParentFolder = Go to parent folder
492 548

  
493 549
goToTXMHome = Go to TXM workspace folder
......
502 558

  
503 559
h = h, 
504 560

  
561
iAcceptTheLicenceAndAgreeToQuoteTXMInMyWork = I accept TXM license terms and I accept to quote TXM in my publications.
562

  
505 563
iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpColontextometrieenslyonfrspipphprubrique61SupPage = I accept the licence and I undertake to cite TXM for acknowledging my use of TXM in my research work \n(see the Citation section of the <http://textometrie.ens-lyon.fr/spip.php?rubrique61> page).
506 564

  
507 565
identifiedLanguage = Identified Language: {0}.
......
510 568

  
511 569
importClipboardText = Importing the textual content of the clipboard ...
512 570

  
571
importDone = Import done.
572

  
513 573
importParametersOfP0 = Import parameters of module {0}
514 574

  
515 575
importSetupP0 = Import parameters - {0}
......
527 587
initializationOfThePlatform = Initialization of the platform...
528 588

  
529 589
initializingPlatform = Initialization of the platform...
530
initializingToolboxEnginesAndCorpora=Initializing Toolbox (engines and corpora)...
531 590

  
591
initializingToolboxEnginesAndCorpora = Initializing Toolbox (engines and corpora)...
592

  
532 593
installPathColonP0 = Install path: {0}.
533 594

  
534 595
installingPreviousCorpusFromP0 = Restoring previous TXM {0} corpora (from the {0} directory)...
......
587 648

  
588 649
logOptionDetected = '-log' option detected
589 650

  
651
login = Login
652

  
653
loginToP0 = Login to {0}
654

  
590 655
logs = Logs
591 656

  
592 657
macroName = Macro name
......
655 720

  
656 721
nextText = Next text
657 722

  
658
noActivePage=no active page
659
noActiveWorkbenchWindow=no active workbench window
723
noActivePage = no active page
724

  
725
noActiveWorkbenchWindow = no active workbench window
726

  
660 727
noDefaultEditionPageFoundForElementColon = No default edition page found for element 
661 728

  
662 729
noInterpreterFoundForScriptFileExtension = ** No interpreter found for script file extension
......
665 732

  
666 733
noPartWasDefined = No Part parameter set
667 734

  
668
noPartitionNameWasSpecifiedTheNameIsP0 = No partition name was specified. The name is ''{0}''.
735
noPartitionNameWasSpecifiedTheNameIsP0 = Computing partition name: {0}.
669 736

  
670 737
noPreviousText = No previous text
671 738

  
672 739
noSelectionForColon = No selection for: 
673 740

  
674
noSubcorpusNameWasSpecifiedWeveGeneratedOne = No sub-corpus name given, we generated one automatically.
741
noSubcorpusNameWasSpecifiedWeveGeneratedOne = Processing sub-corpus name: {0}.
675 742

  
676 743
noTextInCorpusColonP0 = ** No ''{0}'' text in the corpus.
677 744

  
......
693 760

  
694 761
openingCooccurrentsTable = Opening cooccurrents table
695 762

  
696
options = Options
763
options = Options...
697 764

  
698 765
outfileColonNone = Output file: none
699 766

  
......
722 789
parameters = Parameters
723 790

  
724 791
part = Part
725
partInitializationErrorColon=Part initialisation error: 
726 792

  
793
partInitializationErrorColon = Part initialisation error: 
794

  
795
password = Password
796

  
727 797
pleaseWriteTheMacroName = Macro name
728 798

  
729 799
preferences = Preferences
......
782 852

  
783 853
renamingByColon = renaming by: 
784 854

  
855
resetAll = Reset All
856

  
785 857
resetTheViewColonF5 = \	Reset view: F5
786 858

  
787 859
restartTXM = Restart TXM
788 860

  
789 861
restartingThePlatform = Restarting the platform
790
restoringCorpora=Restoring corpora...
791
restoringCorporaFromTheP0Directory=Restoring corpora from the {0} directory...
792 862

  
863
restoringCorpora = Restoring corpora...
864

  
865
restoringCorporaFromTheP0Directory = Restoring corpora from the {0} directory...
866

  
793 867
rightContextSize = Right context size
794 868

  
795 869
rmvAllTheParts = Delete all parts
......
818 892

  
819 893
sec = \ sec
820 894

  
895
seeTheQuoteSectionIn = (see the "How to Cite the Textometry project" section in the textometrie.org web site: 
896

  
821 897
select = Select
822 898

  
823 899
selectACompositeSorter = Select a multiple sorter
824 900

  
825 901
selectAProperty = Select a property
826 902

  
903
selectAnotherTXMCorporaToRestore = Select another TXM "corpora" directory to restore...
904

  
827 905
selectColon = Select:
828 906

  
829 907
selectTextId = Select a text
......
834 912

  
835 913
selectValuesToAssignColon = Select the values to assign: 
836 914

  
915
selectWorkingDirectory = Working directory
916

  
837 917
selectionIsNotACorpusColon = The selected object is not a corpus: 
838 918

  
839 919
separatedByAtLeast0Word = may be separated by some words
......
842 922

  
843 923
separatorCharacters = Separator characters
844 924

  
845
setDefaultTheme=Set default theme
925
setDefaultTheme = Set default theme
926

  
846 927
setImportParametersInTheSectionsBelow = Set the import parameters in the sections below.
847 928

  
848 929
settingStatusLineAndConfiguringActionSets = Retreiving status line and configuring menus and toolbars
......
887 968

  
888 969
startJobColonLoadInstallPreferences = Startup: loading installation preferences
889 970

  
890
startingTxm=Starting TXM
971
startingTxm = Starting TXM
972

  
891 973
startingUpP0 = Starting TXM {0} ({1})…
892 974

  
893 975
startingUpdateFetch = Starting updates retrieval
......
976 1058
to_3                        = to
977 1059

  
978 1060
tokenizerParameterFileColon = Tokenizer parameters: 
979
toolboxReady=Toolbox ready.
980 1061

  
1062
toolboxReady = Toolbox ready.
1063

  
981 1064
unknowedWidgetNameColon = ** Error: unknown widget name: '
982 1065

  
983
updateCanceled=Update canceled.
1066
updateCanceled = Update canceled.
1067

  
1068
updateDone = Update done.
1069

  
984 1070
updateLevel = Update level
985 1071

  
986 1072
useLeftWindow = Use the left context
......
1022 1108
zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag = \	Zoom +/-: Mouse wheel OR Shift + Right Mouse + Drag\n
1023 1109

  
1024 1110
zoomToSelectionColonCtrlPlusLeftMousePlusdrag = \	Zoom to selection: Ctrl + Left Mouse + Drag\n
1025

  
1026
importDone=Import done.
1027

  
1028
updateDone=Update done.
1029

  
1030
TXMCanNotFetchUpdatesP0=TXM can not fetch updates ({0}).
1031
TXMInitializationHasBeenCanceledByUserDotPleaseRestartTXM=TXM initialization has been canceled by user. Please restart TXM.
1032
TXMInstallDirectoryIsNotSetP0PreferenceIsNotSet=TXM install directory is not set ('{0}' preference is not set).
1033
TXMInstallDirectoryIsSetToP0ButDoesNotExist=TXM install directory is set to '{0}' but does not exist.
1034
TXMInstallDirectoryIsSetToP0ButIsNotReadable=TXM install directory is set to '{0}' but is not readable.
1035
TXMInstallDirectoryIsSetToP0ButTXMCantCdInThisDirectory=TXM install directory is set to '{0}' but is not cdable.
1036
TXMInstallDirectoryIsSetToQuoteQuote=TXM install directory is set to ''.
1037
TXMisDistributedUnderLicence=TXM is released under the 
1038
TXMUserDirectoryIsNotSetP0PreferenceIsNotSet=TXM user directory is not set ('{0}' preference is not set).
1039
TXMUserDirectoryIsSetToP0=TXM User directory is set to: {0}.
1040
TXMUserDirectoryIsSetToP0ButDoesNotExist=TXM user directory is set to '{0}' but does not exist.
1041
TXMUserDirectoryIsSetToP0ButTXMCantCdInThisDirectory=TXM user directory is set to '{0}' but TXM can't cd in this directory.
1042
TXMUserDirectoryIsSetToP0ButTXMCantWriteInThisDirectory=TXM user directory is set to '{0}' but TXM can't write in this directory.
1043
gnuLicenceLink=https://www.gnu.org/licenses/gpl-2.0.en.html
1044
gnuLicenceName=GNU General Public License version 2
1045
iAcceptTheLicenceAndAgreeToQuoteTXMInMyWork=I accept TXM license terms and I accept to quote TXM in my publications.
1046
seeTheQuoteSectionIn=(see the "How to Cite the Textometry project" section in the textometrie.org web site: 
1047
selectWorkingDirectory=Working directory
1048
options=Options...
1049
firstLaunchOfTXM=First launch of TXM
1050
LoadBinaryCorporaDirectory_aCorpusNamedP0alreadyExistsLoadingOfP1Canceled=A corpus named {0} already exists, loading of {1} canceled.
1051
LoadBinaryCorporaDirectory_corporaDirectoryNotFoundAborting=Corpora directory not found. Aborting.
1052
LoadBinaryCorporaDirectory_corpusLoad=Corpus load
1053
LoadBinaryCorporaDirectory_loadingCorporaFromTheP0Directory=Loading corpora from the {0} directory...
1054
LoadBinaryCorporaDirectory_selectTheTXMCorpusToLoad=Select the '.txm' corpus to load.
1055
selectAnotherTXMCorporaToRestore=Select another TXM "corpora" directory to restore...
1056
SourceDirectoryPage_0=Select source directory
1057
SourceDirectoryPage_1=Sources
1058
SourceDirectoryPage_10=Corpus name
1059
SourceDirectoryPage_11=The ''{0}'' corpus will be replaced.
1060
SourceDirectoryPage_12=The ''{0}'' corpus import will be resumed or restarted.
1061
SourceDirectoryPage_13=The ''{0}'' corpus will be created.
1062
SourceDirectoryPage_14=Checking corpus name validity with '[A-Z][-A-Z0-9]+': 
1063
SourceDirectoryPage_2=The source directory contains the sources files read by the import module.
1064
SourceDirectoryPage_3=Source directory
1065
SourceDirectoryPage_5=click to select the corpus source directory
1066
SourceDirectoryPage_6=Source directory to use
1067
SourceDirectoryPage_8=Warning: corpus name normalization: no valid character available to build the corpus name (try to use some American English - ASCII - characters in the folder name)
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties (revision 2702)
7 7
Explorer_4 = 🡅
8 8
Explorer_5 = ⭮
9 9
Explorer_7 = ⌂
10

  
11
resetAll=Remise à zéro
12
password=Mot de passe
13
login=Identifiant
14
loginToP0=Connexion à {0}
15
connect=Se connecter
16 10

  
17 11
FileTreeContentProvider_4 = '
18 12

  
19 13
P0CorpusLoaded = {0} corpus chargé(s).
20 14

  
15
SourceDirectoryPage_0  = Selection du répertoire des fichiers sources
16
SourceDirectoryPage_1  = Sources
17
SourceDirectoryPage_10 = Nom du corpus
18
SourceDirectoryPage_11 = Le corpus ''{0}'' sera remplacé.
19
SourceDirectoryPage_12 = L''import du corpus ''{0}'' sera repris ou redémarré.
20
SourceDirectoryPage_13 = Le corpus ''{0}'' sera créé.
21
SourceDirectoryPage_14 = Vérification du nom de corpus avec le pattern '[A-Z][-A-Z0-9]+': 
22
SourceDirectoryPage_2  = Le répertoire des fichiers sources qui seront lu par le module d'import
23
SourceDirectoryPage_3  = Répertoire des fichiers sources
24
SourceDirectoryPage_5  = Cliquer pour sélectionner le répertoire des fichiers sources
25
SourceDirectoryPage_6  = Répertoire source à utiliser
26
SourceDirectoryPage_8  = ** normalisation du nom du corpus : aucun caractère valide disponible pour construire le nom du corpus (essayez d'utiliser des caractères anglais américain - ASCII - dans le nom du dossier)
27

  
28
TXMisDistributedUnderLicence = TXM est diffusé sous licence 
29

  
21 30
_1                                                                                                                                                                  = 1.\	
22 31
_2                                                                                                                                                                  = 2.\	
23 32
_3                                                                                                                                                                  = 3.\	
......
175 184

  
176 185
confirm = Confirmer
177 186

  
187
connect = Se connecter
188

  
178 189
consoleReportsAnInternalError = \nErreur Interne.
179 190

  
180 191
contains = contient
......
249 260

  
250 261
deletedColonP0 = {0} supprimé.
251 262

  
263
deletingOneResultP0Continue = Voulez-vous vraiment supprimer {0} ?
264

  
252 265
deletingP0 = Suppression de {0}
253 266

  
254
deletingOneResultP0Continue = Voulez-vous vraiment supprimer {0} ?
255

  
256 267
deletingSeveralResultsP0Continue = Voulez-vous vraiment supprimer ces {0} éléments ?
257 268

  
258 269
description = Description
......
455 466

  
456 467
fileExplorerColonIncorrectPattern = ** Explorateur de fichiers : expression régulière incorrecte
457 468

  
469
firstLaunchOfTXM = Premier lancement de TXM
470

  
458 471
folderP0ShouldNotBeDeleted = Le dossier {0} ne devrait pas être supprimé
459 472

  
460 473
followedBy = suivi de 
......
477 490

  
478 491
generalPreferencesBackup = Sauvegarde générale des préférences
479 492

  
493
gnuLicenceLink = https://www.gnu.org/licenses/gpl-2.0.fr.html
494

  
495
gnuLicenceName = GNU General Public License version 2
496

  
480 497
goToParentFolder = Aller au dossier parent
481 498

  
482 499
goToTXMHome = Aller au dossier de l'espace de travail de TXM
......
491 508

  
492 509
h = h, 
493 510

  
511
iAcceptTheLicenceAndAgreeToQuoteTXMInMyWork = J'accepte les termes de la licence et je m'engage à citer TXM dans mes publications
512

  
494 513
iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpColontextometrieenslyonfrspipphprubrique61SupPage = J'accepte la licence et je m'engage à citer TXM dans mes publications \n(voir la section 'Citer TXM' de la page <http://textometrie.ens-lyon.fr/spip.php?rubrique61> de Téléchargement)
495 514

  
496 515
identifiedLanguage = Langue identifiée : {0}.
......
499 518

  
500 519
importClipboardText = Importation du contenu textuel du presse-papier…
501 520

  
521
importDone = Import terminé.
522

  
502 523
importParametersOfP0 = Paramètres d''import du module {0}
503 524

  
504 525
importSetupP0 = Paramètres d''import - {0}
......
575 596

  
576 597
logOptionDetected = option '-log' détectée
577 598

  
599
login = Identifiant
600

  
601
loginToP0 = Connexion à {0}
602

  
578 603
logs = Messages
579 604

  
580 605
macroName = Nom de la macro
......
651 676

  
652 677
noPartWasDefined = Aucun paramètre Part
653 678

  
654
noPartitionNameWasSpecifiedTheNameIsP0 = Le nom de la partition n''a pas été précisé. Le nom est ''{0}''.
679
noPartitionNameWasSpecifiedTheNameIsP0 = Calcul du nom de la partition : {0}.
655 680

  
656 681
noPreviousText = Pas de texte précédent
657 682

  
658 683
noSelectionForColon = Aucune sélection pour : 
659 684

  
660
noSubcorpusNameWasSpecifiedWeveGeneratedOne = Aucun nom de sous-corpus indiqué, nous avons généré un automatiquement.
685
noSubcorpusNameWasSpecifiedWeveGeneratedOne = Calcul du nom du sous-corpus : {0}.
661 686

  
662 687
noTextInCorpusColonP0 = ** Aucun texte {0} dans le corpus.
663 688

  
......
679 704

  
680 705
openingCooccurrentsTable = Chargement du tableau des cooccurrents
681 706

  
682
options = Options
707
options = Options...
683 708

  
684 709
outfileColonNone = Fichier de sortie : aucun
685 710

  
......
709 734

  
710 735
part = Partie 
711 736

  
737
password = Mot de passe
738

  
712 739
pleaseWriteTheMacroName = Nom de la macro
713 740

  
714 741
preferences = Préférences
......
767 794

  
768 795
renamingByColon = renommage par : 
769 796

  
797
resetAll = Remise à zéro
798

  
770 799
resetTheViewColonF5 = \	RAZ : F5
771 800

  
772 801
restartTXM = Redémarrer TXM
......
801 830

  
802 831
sec = \ sec
803 832

  
833
seeTheQuoteSectionIn = (voir la section 'Citer le logiciel TXM' de la page d'accueil du site 
834

  
804 835
select = Sélectionner
805 836

  
806 837
selectACompositeSorter = Sélectionner un tri multiple
807 838

  
808 839
selectAProperty = Sélectionner une propriété
809 840

  
841
selectAnotherTXMCorporaToRestore = Sélectionner un autre répertoire "corpora" de corpus à récupérer...
842

  
810 843
selectColon = Sélectionner :
811 844

  
812 845
selectTextId = Sélectionner un texte
......
817 850

  
818 851
selectValuesToAssignColon = Sélectionner les valeurs à affecter : 
819 852

  
853
selectWorkingDirectory = Répertoire de travail
854

  
820 855
selectionIsNotACorpusColon = L'objet sélectionné n'est pas un corpus : 
821 856

  
822 857
separatedByAtLeast0Word = éventuellement séparé par quelques mots
......
956 991

  
957 992
unknowedWidgetNameColon = ** Erreur : nom de widget inconnu : '
958 993

  
994
updateDone = Mise à jour terminée.
995

  
959 996
updateLevel = Niveau de mise à jour
960 997

  
961 998
useLeftWindow = Utiliser le contexte gauche
......
996 1033

  
997 1034
zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag = \	Zoom +/- : Roulette OU Maj + Clic Droit + Glisser\n
998 1035

  
999
zoomToSelectionColonCtrlPlusLeftMousePlusdrag = \	Zoomer sur la sélection : Ctrl + Clic Gauche + Glisser\n
1000

  
1001
importDone=Import terminé.
1002

  
1003
updateDone=Mise à jour terminée.
1004

  
1005
TXMisDistributedUnderLicence=TXM est diffusé sous licence 
1006
gnuLicenceLink=https://www.gnu.org/licenses/gpl-2.0.fr.html
1007
gnuLicenceName=GNU General Public License version 2
1008
iAcceptTheLicenceAndAgreeToQuoteTXMInMyWork=J'accepte les termes de la licence et je m'engage à citer TXM dans mes publications
1009
seeTheQuoteSectionIn=(voir la section 'Citer le logiciel TXM' de la page d'accueil du site 
1010
selectWorkingDirectory=Répertoire de travail
1011
options=Options...
1012
firstLaunchOfTXM=Premier lancement de TXM
1013
selectAnotherTXMCorporaToRestore=Sélectionner un autre répertoire "corpora" de corpus à récupérer...
1014

  
1015
SourceDirectoryPage_0=Selection du répertoire des fichiers sources
1016
SourceDirectoryPage_1=Sources
1017
SourceDirectoryPage_10=Nom du corpus
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff