Révision 695

tmp/org.txm.chartsengine.r.core/src/org/txm/stat/engine/r/RWorkspaceRenderer.java (revision 695)
112 112
		String devicename = device.getName();
113 113

  
114 114
		String name;
115
		Log.info(RCoreMessages.RWorkspace_3 + file.getAbsolutePath());
115
		Log.info(RCoreMessages.bind(RCoreMessages.info_savingChartToFile, file.getAbsolutePath()));
116 116
		if (OSDetector.isFamilyWindows()) { //$NON-NLS-1$ //$NON-NLS-2$
117 117
			try {
118 118
				name = StringEscapeUtils.escapeJava(file.getCanonicalPath());
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColRowInfosLabelProvider.java (revision 695)
78 78
		super();
79 79
		this.names = names;
80 80
		for (int i = 0; i < names.length; i++) {
81
			if (names[i].startsWith(CACoreMessages.mass)) {
81
			if (names[i].startsWith(CACoreMessages.common_mass)) {
82 82
				String pattern = TXMPreferences.getString(CAPreferences.MASS_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
83 83
			if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
84 84
					masspattern = new DecimalFormat(pattern);
......
86 86
				String pattern = TXMPreferences.getString(CAPreferences.CHI_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
87 87
				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
88 88
					chipattern = new DecimalFormat(pattern);
89
			} else if (names[i].startsWith(CACoreMessages.dist)) {
89
			} else if (names[i].startsWith(CACoreMessages.common_dist)) {
90 90
				String pattern = TXMPreferences.getString(CAPreferences.DIST_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
91 91
				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
92 92
					distpattern = new DecimalFormat(pattern);
93
			} else if (names[i].startsWith(CACoreMessages.cos2)) {
93
			} else if (names[i].startsWith(CACoreMessages.common_cos2)) {
94 94
				String pattern = TXMPreferences.getString(CAPreferences.COS2_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
95 95
				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
96 96
					cos2pattern = new DecimalFormat(pattern);
......
99 99
				String pattern = TXMPreferences.getString(CAPreferences.COORD_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
100 100
				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
101 101
					coordpattern = new DecimalFormat(pattern);
102
			} else if (names[i].startsWith(CACoreMessages.cont)) {
102
			} else if (names[i].startsWith(CACoreMessages.common_cont)) {
103 103
				String pattern = TXMPreferences.getString(CAPreferences.CONTRIB_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
104 104
				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
105 105
					contribpattern = new DecimalFormat(pattern);
......
126 126
	@Override
127 127
	@SuppressWarnings("unchecked") //$NON-NLS-1$
128 128
	public String getColumnText(Object element, int columnIndex) {
129
		// names[columnIndex] = Rows,Q12,Q13,Q23,Mass,Chi²,Contrib,Cos²,c1,c2,c3
129
		// names[columnIndex] = Rows,Q12,Q13,Q23,Mass,Chi²,Contrib,Cos²,common_c1,common_c2,common_c3
130 130

  
131 131
		Object o = ((List<Object>) element).get(columnIndex);
132 132
		if (o instanceof Double || o instanceof Float) {
133 133
			DecimalFormat f;
134 134
			String name = names[columnIndex];
135 135
			f = new DecimalFormat("###.00"); //$NON-NLS-1$
136
			if (name.startsWith(CACoreMessages.mass)) {
136
			if (name.startsWith(CACoreMessages.common_mass)) {
137 137
				f = masspattern;
138 138
			} else if (name.startsWith(CAUIMessages.ColRowInfosLabelProvider_9)) {
139 139
				f = chipattern;
140
			} else if (name.startsWith(CACoreMessages.dist)) {
140
			} else if (name.startsWith(CACoreMessages.common_dist)) {
141 141
				f = distpattern;
142
			} else if (name.startsWith(CACoreMessages.cos2)) {
142
			} else if (name.startsWith(CACoreMessages.common_cos2)) {
143 143
				f = cos2pattern;
144 144
			} else if (name.startsWith("c") && name.length() == 2) //$NON-NLS-1$
145 145
			{
146 146
				f = coordpattern;
147
			} else if (name.startsWith(CACoreMessages.cont)) {
147
			} else if (name.startsWith(CACoreMessages.common_cont)) {
148 148
				f = contribpattern;
149 149
			} else if (name.startsWith(CAUIMessages.ColRowInfosLabelProvider_19)
150 150
					&& name.length() == 3) {
tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties (revision 695)
14 14
common_structuralUnit = Структурная единица: 
15 15
common_structure      = Структура
16 16
common_units          = Единицы
17

  
18
error_error = 
tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 695)
15 15
	private static final String BUNDLE_NAME = "org.txm.core.messages.messages"; //$NON-NLS-1$
16 16
	
17 17
	
18
	public static String common_cols;
19
	public static String common_rows;
20

  
18 21
	
19
	
20 22
	public static String common_strucutralUnit;
21 23
	public static String common_description;
22 24
	public static String common_structure;
......
30 32
	
31 33
	public static String common_pleaseWait;
32 34

  
35
	public static String error_error;
33 36
	
37
	
34 38
	public static String ApplicationWorkbenchAdvisor_15;
35 39
	public static String ApplicationWorkbenchAdvisor_14;
36 40
	public static String ApplicationWorkbenchAdvisor_6;
tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties (revision 695)
375 375
Workspace_7  = \ pages
376 376
Workspace_8  = Le fichier XML d'espace de travail est mal formé. Un nouveau doit être regénéré...
377 377

  
378
common_cols           = Colonnes
378 379
common_delete         = Supprimer
379 380
common_description    = Description
380 381
common_mode           = Mode
381 382
common_ok             = OK
382 383
common_pleaseWait     = Veuillez patienter...
383 384
common_queries        = Requêtes : 
385
common_rows           = Lignes
384 386
common_structuralUnit = Unité structurelle : 
385 387
common_structure      = Structure
386 388
common_units          = Unités
389

  
390
error_error = ** Erreur : {0}.
tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 695)
387 387
Workspace_7  = \ pages
388 388
Workspace_8  = Workspace XML file is mal formed. We need to recreate one...
389 389

  
390
common_cols           = Cols
390 391
common_delete         = Delete
391 392
common_description    = Description
392 393
common_mode           = Mode
393 394
common_ok             = OK
394 395
common_pleaseWait     = Please wait...
395 396
common_queries        = Queries:
397
common_rows           = Rows
396 398
common_structuralUnit = Structural Unit:
397 399
common_structure      = Structure
398 400
common_units          = Units
401

  
402
error_error = ** Error: {0}.
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/CooccurrenceCoreMessages.java (revision 695)
10 10
	public static String Cooccurrence_10;
11 11
	public static String Cooccurrence_102;
12 12
	public static String Cooccurrence_103;
13
	public static String Cooccurrence_107;
14 13
	public static String Cooccurrence_11;
15 14
	public static String Cooccurrence_12;
16 15
	public static String Cooccurrence_13;
17 16
	public static String Cooccurrence_14;
18 17
	public static String Cooccurrence_15;
19
	public static String Cooccurrence_22;
20 18
	public static String Cooccurrence_23;
21 19
	public static String Cooccurrence_4;
22
	public static String Cooccurrence_5;
23 20
	public static String Cooccurrence_6;
24 21
	public static String Cooccurrence_7;
25 22
	public static String Cooccurrence_8;
26 23
	public static String Cooccurrence_9;
27 24

  
28
	public static String CooccurrencesEditor_23;
29
	public static String CooccurrencesEditor_24;
30
	public static String CooccurrencesEditor_27;
31
	public static String CooccurrencesEditor_28;
32
	public static String CooccurrencesEditor_29;
33
	public static String CooccurrencesEditor_30;
34
	public static String CooccurrencesEditor_31;
35
	public static String CooccurrencesEditor_32;
25
	public static String info_buildingQueries;
26
	public static String info_retreivingMatches;
27
	public static String info_buildingLineSignatures;
28
	public static String info_counting;
29
	public static String info_buildingLexicalTable;
30
	public static String info_computingSpecificitiesScores;
36 31
	
37 32
	static {
38 33
		// initialize resource bundle
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages.properties (revision 695)
1 1

  
2
Cooccurrence_10        = \ propriétés : 
3
Cooccurrence_102       = ** Erreur : argument négatif dans la fonction 'factln'
4
Cooccurrence_103       = ** Erreur : argument négatif dans la fonction 'rbicoln'
5
Cooccurrence_107       = ** Erreur : 
6
Cooccurrence_11        = Occ
7
Cooccurrence_12        = Fréq
8
Cooccurrence_13        = CoFréq
9
Cooccurrence_14        = Indice
10
Cooccurrence_15        = DistMoy
11
Cooccurrence_22        = Erreur: ref_forms.length ! ref_freqs.length
12
Cooccurrence_23        = Erreur: pas de cooccurrents
13
Cooccurrence_4         = \ F : 
14
Cooccurrence_5         = ** Impossible de calculer des cooccurrences avec cette concordance
15
Cooccurrence_6         = Occ\	Fréq\	CoFréq\	Indice\	DistMoy\	Mode
16
Cooccurrence_7         = \ Occ :
17
Cooccurrence_8         = \ Indice:
18
Cooccurrence_9         = \ DistMoy:
2
Cooccurrence_10  = \ properties: 
3
Cooccurrence_102 = ** Error: negative argument in 'factln' function
4
Cooccurrence_103 = ** Error: negative argument in 'rbicoln' function
5
Cooccurrence_11  = Occ
6
Cooccurrence_12  = Freq
7
Cooccurrence_13  = CoFreq
8
Cooccurrence_14  = Score
9
Cooccurrence_15  = MeanDist
10
Cooccurrence_23  = Error: no cooccurrents
11
Cooccurrence_4   = \ F: 
12
Cooccurrence_6   = Occ\	Freq\	CoFreq\	Score\	MeanDist\	Mode
13
Cooccurrence_7   = \ Occ:
14
Cooccurrence_8   = \ Score:
15
Cooccurrence_9   = \ MeanDist:
19 16

  
20
CooccurrencesEditor_27 = build queries
21
CooccurrencesEditor_28 = get matches
22
CooccurrencesEditor_29 = build line signatures
23
CooccurrencesEditor_30 = counting
24
CooccurrencesEditor_31 = build lexical table
25
CooccurrencesEditor_32 = get specif scores
17
info_buildingLexicalTable         = Building lexical table.
18
info_buildingLineSignatures       = Building line signatures.
19
info_buildingQueries              = Building queries.
20
info_computingSpecificitiesScores = Computing specificities scores.
21
info_counting                     = Counting.
22
info_retreivingMatches            = Retreiving matches.
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages_ru.properties (revision 695)
1 1

  
2
CooccurrencesEditor_27 = Расчет запроса
3
CooccurrencesEditor_28 = Расчет ответов
4
CooccurrencesEditor_29 = Расчет подписей к строкам
5
CooccurrencesEditor_30 = Подсчет
6
CooccurrencesEditor_31 = Расчет словарной таблицы
7
CooccurrencesEditor_32 = Расчет показателей специфичности\	
2
info_buildingLexicalTable         = Расчет словарной таблицы
3
info_buildingLineSignatures       = Расчет подписей к строкам
4
info_buildingQueries              = Расчет запроса
5
info_computingSpecificitiesScores = Расчет показателей специфичности\	
6
info_counting                     = Подсчет
7
info_retreivingMatches            = Расчет ответов
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages_fr.properties (revision 695)
1 1

  
2
Cooccurrence_10        = \ properties: 
3
Cooccurrence_102       = ** Error: negative argument in 'factln' function
4
Cooccurrence_103       = ** Error: negative argument in 'rbicoln' function
5
Cooccurrence_107       = ** Error: 
6
Cooccurrence_11        = Occ
7
Cooccurrence_12        = Freq
8
Cooccurrence_13        = CoFreq
9
Cooccurrence_14        = Score
10
Cooccurrence_15        = MeanDist
11
Cooccurrence_22        = Error: ref_forms.length ! ref_freqs.length
12
Cooccurrence_23        = Error: no cooccurrents
13
Cooccurrence_4         = \ F: 
14
Cooccurrence_5         = ** Impossible to compute cooccurrences with this concordance 
15
Cooccurrence_6         = Occ\	Freq\	CoFreq\	Score\	MeanDist\	Mode
16
Cooccurrence_7         = \ Occ:
17
Cooccurrence_8         = \ Score:
18
Cooccurrence_9         = \ MeanDist:
2
Cooccurrence_10  = \ propriétés : 
3
Cooccurrence_102 = ** Erreur : argument négatif dans la fonction 'factln'
4
Cooccurrence_103 = ** Erreur : argument négatif dans la fonction 'rbicoln'
5
Cooccurrence_11  = Occ
6
Cooccurrence_12  = Fréq
7
Cooccurrence_13  = CoFréq
8
Cooccurrence_14  = Indice
9
Cooccurrence_15  = DistMoy
10
Cooccurrence_23  = Erreur: pas de cooccurrents
11
Cooccurrence_4   = \ F : 
12
Cooccurrence_6   = Occ\	Fréq\	CoFréq\	Indice\	DistMoy\	Mode
13
Cooccurrence_7   = \ Occ :
14
Cooccurrence_8   = \ Indice:
15
Cooccurrence_9   = \ DistMoy:
19 16

  
20
CooccurrencesEditor_27 = Calcul des requêtes
21
CooccurrencesEditor_28 = Calcul des retours
22
CooccurrencesEditor_29 = Calcul des signatures de lignes
23
CooccurrencesEditor_30 = Comptage
24
CooccurrencesEditor_31 = Calcul de la table lexicale
25
CooccurrencesEditor_32 = Calcul des indices de spécificité\	
17
info_buildingLexicalTable         = Calcul de la table lexicale.
18
info_buildingLineSignatures       = Calcul des signatures de lignes.
19
info_buildingQueries              = Calcul des requêtes.
20
info_computingSpecificitiesScores = Calcul des indices de spécificité.
21
info_counting                     = Comptage.
22
info_retreivingMatches            = Calcul des retours.
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java (revision 695)
47 47
import org.txm.cooccurrence.core.functions.comparators.CLineComparator;
48 48
import org.txm.cooccurrence.core.messages.CooccurrenceCoreMessages;
49 49
import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
50
import org.txm.core.messages.TXMCoreMessages;
50 51
import org.txm.core.results.Parameter;
51 52
import org.txm.core.results.TXMParameters;
52 53
import org.txm.core.results.TXMResult;
......
257 258
		//FIXME: debug
258 259
		//System.out.println("cooc: "+corpus+" "+query+" "+properties+" "+limit+" "+maxLeft+" "+minLeft+" "+minRight+" "+maxRight+" "+minFreq+" "+minCof+" "+minScore+" "+includeXpivot);
259 260

  
260
		this.subTask(CooccurrenceCoreMessages.CooccurrencesEditor_27);
261
		this.subTask(CooccurrenceCoreMessages.info_buildingQueries);
261 262
		try {
262 263
			if (lines != null) this.lines.clear();
263 264
			if (allsignaturesstr != null) this.allsignaturesstr.clear();
......
276 277
				return false;
277 278
			}	
278 279

  
279
			this.subTask(CooccurrenceCoreMessages.CooccurrencesEditor_28);
280
			this.subTask(CooccurrenceCoreMessages.info_retreivingMatches);
280 281
			if (!this.stepGetMatches()) {
281 282
				return false;
282 283
			}
283 284
			this.worked(10);
284 285

  
285
			this.subTask(CooccurrenceCoreMessages.CooccurrencesEditor_29);
286
			this.subTask(CooccurrenceCoreMessages.info_buildingLineSignatures);
286 287
			if (!this.stepBuildSignatures())
287 288
				return false;
288 289
			this.worked(10);
289 290

  
290
			this.subTask(CooccurrenceCoreMessages.CooccurrencesEditor_30);
291
			this.subTask(CooccurrenceCoreMessages.info_counting);
291 292
			if (!this.stepCount())	{
292 293
				return false;
293 294
			}
294 295
			this.worked(10);
295 296

  
296
			this.subTask(CooccurrenceCoreMessages.CooccurrencesEditor_31);
297
			this.subTask(CooccurrenceCoreMessages.info_buildingLexicalTable);
297 298
			if (!this.stepBuildLexicalTable())	{
298 299
				return false;
299 300
			}
300 301
			this.worked(10);
301 302

  
302
			this.subTask(CooccurrenceCoreMessages.CooccurrencesEditor_32);
303
			this.subTask(CooccurrenceCoreMessages.info_computingSpecificitiesScores);
303 304
			if (!this.stepGetScores())	{
304 305
				return false;
305 306
			}
......
1373 1374
			// if ("UTF-8".equals(encoding)) writer.write('\ufeff'); // UTF-8 BOM
1374 1375
			toTxt(writer, colseparator, txtseparator);
1375 1376
		} catch (Exception e) {
1376
			Log.severe(CooccurrenceCoreMessages.Cooccurrence_107 + e);
1377
			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.error_error, e));
1377 1378
			return false;
1378 1379
		}
1379 1380
		return true;
......
1399 1400
				writer.write(line.resume(colseparator, txtseparator) + "\n"); //$NON-NLS-1$
1400 1401
			writer.close();
1401 1402
		} catch (IOException e) {
1402
			Log.severe(CooccurrenceCoreMessages.Cooccurrence_107 + e);
1403
			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.error_error, e));
1403 1404
			return false;
1404 1405
		}
1405 1406

  
......
1521 1522
			this.score = (this.nbocc + this.freq + this.distmoyenne);
1522 1523
		}
1523 1524

  
1524
		/* (non-Javadoc)
1525
		 * @see java.lang.Object#toString()
1526
		 */
1527 1525
		@Override
1528 1526
		public String toString() {
1529 1527
			return occ+CooccurrenceCoreMessages.Cooccurrence_4+freq+CooccurrenceCoreMessages.Cooccurrence_7+nbocc+CooccurrenceCoreMessages.Cooccurrence_8+score+CooccurrenceCoreMessages.Cooccurrence_9+distmoyenne+CooccurrenceCoreMessages.Cooccurrence_10+props;
tmp/org.txm.synopticeditor.rcp/src/org/txm/synopticedition/rcp/messages/messages.properties (revision 695)
1
BackToText_0=Opening with first edition (no default edition set): 
2
BackToText_1=Aborting: selection is not a concordance line: 
3
BackToText_2=Aborting: error during selection.
4
BackToText_3=Error: could not retrieve line word ids. Aborting back to text.
5
BackToText_4=No edition to open.
6
BackToText_5=Opening default editions: 
7
EditionPanel_0=No edition found for text=
8
EditionPanel_1=Fail to retrieve first page of edition 
9
EditionPanel_2=\ and text 
10
EditionPanel_5=\ edition=
11
EditionPanel_6=No edition with name 
12
EditionPanel_7=\ available for text 
13
EditionSelectorDialog_0=Editions
14
EditionSelectorDialog_1=Select one or more editions
15
OpenEdition_0=Opening with first edition (no default edition set): 
16
OpenEdition_1=No edition to open.
17
OpenEdition_10=Error while opening editor: 
18
OpenEdition_2=No edition found
19
OpenEdition_3=Opening default editions: 
20
OpenEdition_4=Error while opening edition: 
21
OpenEdition_7=\ in the corpus
22
OpenEdition_9=Aborting: selection is not a corpus
23
SynopticEditionEditor_0=First text of the corpus
24
SynopticEditionEditor_1=Previous text
25
SynopticEditionEditor_10=Next text
26
SynopticEditionEditor_11=Last text of the corpus
27
SynopticEditionEditor_2=Editions...
28
SynopticEditionEditor_3=First page of the text
29
SynopticEditionEditor_4=Previous page
30
SynopticEditionEditor_5=No edition found
31
SynopticEditionEditor_6=Error while getting available editions: 
32
SynopticEditionEditor_7=Next page
33
SynopticEditionEditor_8=Last page of the text
34
SynopticEditionEditor_9=Warning: could not find edition for name: 
1

  
2
BackToText_0 = Opening with first edition (no default edition set): 
3
BackToText_1 = Aborting: selection is not a concordance line: 
4
BackToText_2 = Aborting: error during selection.
5
BackToText_3 = Error: could not retrieve line word ids. Aborting back to text.
6
BackToText_4 = No edition to open.
7
BackToText_5 = Opening default editions: 
8

  
9
EditionPanel_0 = No edition found for text=
10
EditionPanel_1 = Fail to retrieve first page of edition 
11
EditionPanel_2 = \ and text 
12
EditionPanel_5 = \ edition=
13
EditionPanel_6 = No edition with name 
14
EditionPanel_7 = \ available for text 
15

  
16
EditionSelectorDialog_0 = Editions
17
EditionSelectorDialog_1 = Select one or more editions
18

  
19
OpenEdition_0  = Opening with first edition (no default edition set): 
20
OpenEdition_1  = No edition to open.
21
OpenEdition_10 = Error while opening editor: 
22
OpenEdition_3  = Opening default editions: 
23
OpenEdition_4  = Error while opening edition: 
24
OpenEdition_7  = \ in the corpus
25
OpenEdition_9  = Aborting: selection is not a corpus
26

  
27
SynopticEditionEditor_0  = First text of the corpus
28
SynopticEditionEditor_1  = Previous text
29
SynopticEditionEditor_10 = Next text
30
SynopticEditionEditor_11 = Last text of the corpus
31
SynopticEditionEditor_3  = First page of the text
32
SynopticEditionEditor_4  = Previous page
33
SynopticEditionEditor_5  = No edition found
34
SynopticEditionEditor_6  = Error while getting available editions: 
35
SynopticEditionEditor_7  = Next page
36
SynopticEditionEditor_8  = Last page of the text
37
SynopticEditionEditor_9  = Warning: could not find edition for name: 
tmp/org.txm.synopticeditor.rcp/src/org/txm/synopticedition/rcp/messages/messages_fr.properties (revision 695)
1
BackToText_0=Ouverture avec la premi?re ?dition (pas de d?faut) : 
2
BackToText_1=Abandon : la s?lection courante n''est pas une ligne de concordance : 
3
BackToText_2=Abandon : erreur de s?lection
4
BackToText_3=Abandon : erreur pendant la r?cup?ration des identifiants de mot.
5
BackToText_4=Pas d'?dition disponible.
6
BackToText_5=Ouverture de l'?dition par d?faut : 
7
EditionPanel_0=Pas d''?dition trouv?e pour le texte : 
8
EditionPanel_1=?chec de la r?cup?ration de la premi?re page d'?dition
9
EditionPanel_2=\ pour le texte  
10
EditionPanel_5=\ ?dition=
11
EditionPanel_6=Pas d''?dition nomm?e   
12
EditionPanel_7=\ disponible pour le texte  
13
EditionSelectorDialog_0=?ditions
14
EditionSelectorDialog_1=S?lectionner une ou plusieurs ?ditions.
15
OpenEdition_0=Ouverture avec la premi?re ?dition (pas de d?faut) : 
16
OpenEdition_1=Pas d'?dition disponible.
17
OpenEdition_10=Erreur lors de l''ouverture de l''?diteur : 
18
OpenEdition_2=Pas d''?dition trouv?e 
19
OpenEdition_3=Ouverture de l'?dition par d?faut : 
20
OpenEdition_4=Erreur lors de l''ouverture de l''?dition : 
21
OpenEdition_7=\ dans le corpus
22
OpenEdition_9=Abandon : la s?lection n''est pas un corpus
23
SynopticEditionEditor_0=Premier texte du corpus
24
SynopticEditionEditor_1=Texte pr?c?dent
25
SynopticEditionEditor_10=Texte suivant
26
SynopticEditionEditor_11=Dernier texte du corpus
27
SynopticEditionEditor_2=?ditions...
28
SynopticEditionEditor_3=Premi?re page du texte
29
SynopticEditionEditor_4=Page pr?c?dente
30
SynopticEditionEditor_5=Pas d''?dition trouv?e 
31
SynopticEditionEditor_6=Erreur lors de la r?cup?ration des ?ditions disponibles : 
32
SynopticEditionEditor_7=Page suivante
33
SynopticEditionEditor_8=Derni?re page du texte
34
SynopticEditionEditor_9=Attention: ?chec de la r?cup?ration de l''?dition  
1

  
2
BackToText_0 = Ouverture avec la première édition (pas de défaut) : 
3
BackToText_1 = Abandon : la sélection courante n'est pas une ligne de concordance : 
4
BackToText_2 = Abandon : erreur de sélection
5
BackToText_3 = Abandon : erreur pendant la récupération des identifiants de mot.
6
BackToText_4 = Pas d'édition disponible.
7
BackToText_5 = Ouverture de l'édition par défaut : 
8

  
9
EditionPanel_0 = Pas d'édition trouvée pour le texte : 
10
EditionPanel_1 = échec de la récupération de la première page d'édition
11
EditionPanel_2 = \ pour le texte  
12
EditionPanel_5 = \ édition=
13
EditionPanel_6 = Pas d'édition nommée   
14
EditionPanel_7 = \ disponible pour le texte  
15

  
16
EditionSelectorDialog_0 = éditions
17
EditionSelectorDialog_1 = Sélectionner une ou plusieurs éditions.
18

  
19
OpenEdition_0  = Ouverture avec la première édition (pas de défaut) : 
20
OpenEdition_1  = Pas d'édition disponible.
21
OpenEdition_10 = Erreur lors de l'ouverture de l'éditeur : 
22
OpenEdition_3  = Ouverture de l'édition par défaut : 
23
OpenEdition_4  = Erreur lors de l''ouverture de l'édition : 
24
OpenEdition_7  = \ dans le corpus
25
OpenEdition_9  = Abandon : la sélection n'est pas un corpus
26

  
27
SynopticEditionEditor_0  = Premier texte du corpus
28
SynopticEditionEditor_1  = Texte précédent
29
SynopticEditionEditor_10 = Texte suivant
30
SynopticEditionEditor_11 = Dernier texte du corpus
31
SynopticEditionEditor_3  = Première page du texte
32
SynopticEditionEditor_4  = Page précédente
33
SynopticEditionEditor_5  = Pas d'édition trouvée 
34
SynopticEditionEditor_6  = Erreur lors de la récupération des éditions disponibles : 
35
SynopticEditionEditor_7  = Page suivante
36
SynopticEditionEditor_8  = Dernière page du texte
37
SynopticEditionEditor_9  = Attention: échec de la récupération de l'édition  
tmp/org.txm.synopticeditor.rcp/src/org/txm/synopticedition/rcp/messages/SynopticEditionUIMessages.java (revision 695)
24 24
	public static String OpenEdition_0;
25 25
	public static String OpenEdition_1;
26 26
	public static String OpenEdition_10;
27
	public static String OpenEdition_2;
28 27
	public static String OpenEdition_3;
29 28
	public static String OpenEdition_4;
30 29
	public static String OpenEdition_7;
......
33 32
	public static String SynopticEditionEditor_1;
34 33
	public static String SynopticEditionEditor_10;
35 34
	public static String SynopticEditionEditor_11;
36
	public static String SynopticEditionEditor_2;
37 35
	public static String SynopticEditionEditor_3;
38 36
	public static String SynopticEditionEditor_4;
39 37
	public static String SynopticEditionEditor_5;
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/SendToRCommand.java (revision 695)
123 123
	 */
124 124
	public abstract void send(TXMResult o) throws Exception;
125 125
	
126
	//TODO: create the SendToRCommands commands in all plugins that manage the following TXMResult classes
126
	//TODO: MD: create the SendToRCommands commands in all plugins that manage the following TXMResult classes
127 127
	/*{
128 128

  
129 129
		if (o instanceof Lexicon) 
tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages_fr.properties (revision 695)
1 1

  
2
c1 = c1
3

  
4
c2 = c2
5

  
6
c3 = c3
7

  
8
charts_error_factorialMap_cantCreateCAChartFile           = Impossible de créer le fichier du graphique du plan factoriel de l'AFC (moteur de production de graphiques: {0})
9
charts_error_singularValues_cantCreateSingularValuesChart = Impossible de créer l'histogramme des valeurs propres de l'AFC
2
charts_error_factorialMap_cantCreateCAChartFile           = Impossible de créer le fichier du graphique du plan factoriel de l'AFC (moteur de production de graphiques: {0}).
3
charts_error_singularValues_cantCreateSingularValuesChart = Impossible de créer l'histogramme des valeurs propres de l'AFC.
10 4
charts_factorialMap_axisLabelPrefix                       = Axe
11 5
charts_factorialMap_legendColumnsLabel                    = Colonnes
12 6
charts_factorialMap_legendRowsLabel                       = Lignes
......
21 15
charts_singularValues_xAxisLabel                          = Axe
22 16
charts_singularValues_yAxisLabel                          = Valeur propre
23 17

  
24
cols = Colonnes
18
common_c1   = c1
19
common_c2   = c2
20
common_c3   = c3
21
common_cont = Cont
22
common_cos2 = Cos²
23
common_dist = Dist
24
common_mass = Mass
25
common_q12  = Q12
26
common_q13  = Q13
27
common_q23  = Q23
25 28

  
26
cont = Cont
27

  
28
cos2 = Cos²
29

  
30
dist = Dist
31

  
32
error_canNotLoadCALibrary             = ** Impossible de charger la librairie 'ca'
29
error_canNotLoadCALibrary             = ** Impossible de charger la librairie 'ca'.
33 30
error_errorWhileComputingCA           = ** Erreur lors du calcul de l'analyse factorielle des correspondances : 
34 31
error_failedToGetConstributionRow     = ** Echec d'accès à la ligne des contributions : 
35 32
error_failedToGetContributionColumn   = ** Echec d'accès à la colonne des contributions : 
36 33
error_failedToGetCos2Column           = ** Echec d'accès à la colonne des cos² : 
37 34
error_failedToGetCos2Row              = ** Echec d'accès à la ligne des cos² : 
38 35
error_lexicalTableNotFoundInWorkspace = ** La table lexicale n'a pas été trouvée dans l'espace de travail R.
39
error_unableToExtractSingularValues   = ** Impossible d'extraire les valeurs propres 
40

  
41
mass = Mass
42

  
43
q12 = Q12
44

  
45
q13 = Q13
46

  
47
q23 = Q23
48

  
49
rows = Lignes
36
error_unableToExtractSingularValues   = ** Impossible d'extraire les valeurs propres.
tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages.properties (revision 695)
1 1

  
2
c1 = c1
3

  
4
c2 = c2
5

  
6
c3 = c3
7

  
8
charts_error_factorialMap_cantCreateCAChartFile           = Can't create CA chart file (charts engine: {0})
9
charts_error_singularValues_cantCreateSingularValuesChart = Can't create bar chart of the CA singular values
2
charts_error_factorialMap_cantCreateCAChartFile           = Can't create CA chart file (charts engine: {0}).
3
charts_error_singularValues_cantCreateSingularValuesChart = Can't create bar chart of the CA singular values.
10 4
charts_factorialMap_axisLabelPrefix                       = Axis
11 5
charts_factorialMap_legendColumnsLabel                    = Columns
12 6
charts_factorialMap_legendRowsLabel                       = Rows
......
21 15
charts_singularValues_xAxisLabel                          = Axis
22 16
charts_singularValues_yAxisLabel                          = Eigenvalue
23 17

  
24
cols = Cols
18
common_c1   = c1
19
common_c2   = c2
20
common_c3   = c3
21
common_cont = Cont
22
common_cos2 = Cos²
23
common_dist = Dist
24
common_mass = Mass
25
common_q12  = Q12
26
common_q13  = Q13
27
common_q23  = Q23
25 28

  
26
cont = Cont
27

  
28
cos2 = Cos²
29

  
30
dist = Dist
31

  
32
error_canNotLoadCALibrary             = ** Cannot load the 'ca' library
29
error_canNotLoadCALibrary             = ** Cannot load the 'ca' library.
33 30
error_errorWhileComputingCA           = ** Error while computing correspondence analysis: 
34 31
error_failedToGetConstributionRow     = ** Failed to get contribution row: 
35 32
error_failedToGetContributionColumn   = ** Failed to get contribution column: 
36 33
error_failedToGetCos2Column           = ** Failed to get cos² column: 
37 34
error_failedToGetCos2Row              = ** Failed to get cos² row: 
38 35
error_lexicalTableNotFoundInWorkspace = ** The lexical table was not found in the R workspace.
39
error_unableToExtractSingularValues   = ** Unable to extract singular values
40

  
41
mass = Mass
42

  
43
q12 = Q12
44

  
45
q13 = Q13
46

  
47
q23 = Q23
48

  
49
rows = Rows
36
error_unableToExtractSingularValues   = ** Unable to extract singular values.
tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java (revision 695)
14 14

  
15 15
	private static final String BUNDLE_NAME = "org.txm.ca.core.messages.messages"; //$NON-NLS-1$
16 16

  
17

  
17 18
	public static String charts_error_factorialMap_cantCreateCAChartFile;
18
	
19 19
	public static String charts_error_singularValues_cantCreateSingularValuesChart;
20
	
20

  
21 21
	public static String charts_factorialMap_axisLabelPrefix;
22 22
	public static String charts_factorialMap_legendColumnsLabel;
23 23
	public static String charts_factorialMap_legendRowsLabel;
......
25 25
	public static String charts_factorialMap_tooltipColsLabel;
26 26
	public static String charts_factorialMap_tooltipCoordinates;
27 27
	public static String charts_factorialMap_tooltipRowsLabel;
28

  
28
	
29 29
	public static String charts_singularValues_title;
30 30
	public static String charts_singularValues_tooltipPercent;
31 31
	public static String charts_singularValues_tooltipSum;
......
33 33
	public static String charts_singularValues_xAxisLabel;
34 34
	public static String charts_singularValues_yAxisLabel;
35 35
	
36
	public static String c1;
37
	public static String c2;
38
	public static String c3;
39
	public static String cols;
40
	public static String cont;
41
	public static String cos2;
42
	public static String dist;
43
	public static String mass;
44
	public static String q12;
45
	public static String q13;
46
	public static String q23;
47
	public static String rows;
48

  
36
	public static String common_c1;
37
	public static String common_c2;
38
	public static String common_c3;
39
	public static String common_cont;
40
	public static String common_cos2;
41
	public static String common_dist;
42
	public static String common_mass;
43
	public static String common_q12;
44
	public static String common_q13;
45
	public static String common_q23;
49 46
	
50 47
	public static String error_canNotLoadCALibrary;
51 48
	public static String error_errorWhileComputingCA;
tmp/org.txm.ca.core/src/org/txm/ca/core/functions/CA.java (revision 695)
39 39
import org.txm.ca.core.statsengine.r.functions.FactoMineRCA;
40 40
import org.txm.ca.core.statsengine.r.functions.ICA;
41 41
import org.txm.chartsengine.core.results.ChartResult;
42
import org.txm.core.messages.TXMCoreMessages;
42 43
import org.txm.core.results.Parameter;
43 44
import org.txm.core.results.TXMParameters;
44 45
import org.txm.lexicaltable.core.functions.LexicalTable;
......
351 352
	public String[] getColInfosTitles() {
352 353
		if (coltitles == null) {
353 354
			List<String> colnames = new ArrayList<String>();
354
			colnames.add(CACoreMessages.cols); // entry
355
			colnames.add(TXMCoreMessages.common_cols); // entry
355 356
			colnames.add(" "); //$NON-NLS-1$
356
			colnames.add(CACoreMessages.q12); // Q12
357
			colnames.add(CACoreMessages.q13); // Q13
358
			colnames.add(CACoreMessages.q23); // Q23
359
			colnames.add(CACoreMessages.mass); // Mass
360
			colnames.add(CACoreMessages.dist); // Dist
357
			colnames.add(CACoreMessages.common_q12); // Q12
358
			colnames.add(CACoreMessages.common_q13); // Q13
359
			colnames.add(CACoreMessages.common_q23); // Q23
360
			colnames.add(CACoreMessages.common_mass); // Mass
361
			colnames.add(CACoreMessages.common_dist); // Dist
361 362
			for (int c = 0; c < 3; c++) { // seulement les 3 premiers axes
362 363
				colnames.add(" "); // separator //$NON-NLS-1$
363
				colnames.add(CACoreMessages.cont+ (c + 1)); // ContribN
364
				colnames.add(CACoreMessages.cos2+ (c + 1)); // Cos²N
364
				colnames.add(CACoreMessages.common_cont+ (c + 1)); // ContribN
365
				colnames.add(CACoreMessages.common_cos2+ (c + 1)); // Cos²N
365 366
			}
366 367
			colnames.add(" "); // separator //$NON-NLS-1$
367
			colnames.add(CACoreMessages.c1); // coord axis 1
368
			colnames.add(CACoreMessages.c2); // coord axis 2
369
			colnames.add(CACoreMessages.c3); // coord axis 3
368
			colnames.add(CACoreMessages.common_c1); // coord axis 1
369
			colnames.add(CACoreMessages.common_c2); // coord axis 2
370
			colnames.add(CACoreMessages.common_c3); // coord axis 3
370 371
			colnames.add(""); //$NON-NLS-1$
371 372

  
372 373
			coltitles = colnames.toArray(new String[] {});
......
553 554
	public String[] getRowInfosTitles() {
554 555
		if (rowtitles == null) {
555 556
			List<String> colnames = new ArrayList<String>();
556
			colnames.add(CACoreMessages.rows); // entry
557
			colnames.add(TXMCoreMessages.common_rows); // entry
557 558
			colnames.add(" "); //$NON-NLS-1$
558
			colnames.add(CACoreMessages.q12); // Q12
559
			colnames.add(CACoreMessages.q13); // Q13
560
			colnames.add(CACoreMessages.q23); // Q23
561
			colnames.add(CACoreMessages.mass); // Mass
562
			colnames.add(CACoreMessages.dist); // Dist
559
			colnames.add(CACoreMessages.common_q12); // Q12
560
			colnames.add(CACoreMessages.common_q13); // Q13
561
			colnames.add(CACoreMessages.common_q23); // Q23
562
			colnames.add(CACoreMessages.common_mass); // Mass
563
			colnames.add(CACoreMessages.common_dist); // Dist
563 564
			for (int c = 0; c < 3; c++) { // seulement les 3 premiers axes
564 565
				colnames.add(" "); // separator //$NON-NLS-1$
565
				colnames.add(CACoreMessages.cont+ (c + 1)); // ContribN
566
				colnames.add(CACoreMessages.cos2+ (c + 1)); // Cos²N
566
				colnames.add(CACoreMessages.common_cont+ (c + 1)); // ContribN
567
				colnames.add(CACoreMessages.common_cos2+ (c + 1)); // Cos²N
567 568
			}
568 569
			colnames.add(" "); // separator //$NON-NLS-1$
569
			colnames.add(CACoreMessages.c1); // coord axis 1
570
			colnames.add(CACoreMessages.c2); // coord axis 2
571
			colnames.add(CACoreMessages.c3); // coord axis 3
570
			colnames.add(CACoreMessages.common_c1); // coord axis 1
571
			colnames.add(CACoreMessages.common_c2); // coord axis 2
572
			colnames.add(CACoreMessages.common_c3); // coord axis 3
572 573
			colnames.add(""); //$NON-NLS-1$
573 574

  
574 575
			rowtitles = colnames.toArray(new String[] {});
tmp/org.txm.ca.core/src/org/txm/ca/core/functions/Eigenvalues.java (revision 695)
10 10
import org.txm.core.results.TXMResult;
11 11

  
12 12
/**
13
 * Eigenvalues chart result.
14
 * 
13 15
 * @author sjacquot
14 16
 *
15 17
 */
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java (revision 695)
182 182
	 */
183 183
	public static boolean connect(String host, int port) throws RWorkspaceException {
184 184
		try {
185
			Log.info(RCoreMessages.RWorkspace_2 + host + ":" + port); //$NON-NLS-1$
185
			Log.info(RCoreMessages.bind(RCoreMessages.info_connectingToRAt, host, port));
186 186
			connection = new RConnection(host, port);
187 187
			//connection.setStringEncoding("UTF-8");
188 188

  
......
204 204
	 */
205 205
	public static boolean connect(String host, int port, String user, String password) {
206 206
		try {
207
			Log.info(RCoreMessages.RWorkspace_2 + host + ":" + port + " user :" + user); //$NON-NLS-2$ //$NON-NLS-1$
207
			Log.info(RCoreMessages.bind(RCoreMessages.info_connectingToRAtWithUser, new Object[] {host, port, user}));
208 208
			connection = new RConnection(host, port);
209 209
			connection.login(user, password);
210 210
			return isConnected();
211 211

  
212 212
		} catch (RserveException x) {
213
			System.out.println(RCoreMessages.RWorkspace_0 + host+ ", " + port + ", " + user); //$NON-NLS-1$//$NON-NLS-2$ 
214
			Log.severe(RCoreMessages.RWorkspace_0 + host+ ", " + port + ", " + user); //$NON-NLS-1$//$NON-NLS-2$ 
213
			System.out.println(RCoreMessages.error_failedToConnectToTheRWorkspace + host+ ", " + port + ", " + user); //$NON-NLS-1$//$NON-NLS-2$ 
214
			Log.severe(RCoreMessages.error_failedToConnectToTheRWorkspace + host+ ", " + port + ", " + user); //$NON-NLS-1$//$NON-NLS-2$ 
215 215
		}
216 216
		return false;
217 217
	}
......
282 282
				connection.eval(("library(" + name + ")")); //$NON-NLS-1$ //$NON-NLS-2$
283 283
				// System.out.println("Done : load R lib : " + name);
284 284
			} catch (RserveException e) {
285
				throw new RWorkspaceException(NLS.bind(RCoreMessages.LIBRARY_NOT_LOADED, name, e));
285
				throw new RWorkspaceException(NLS.bind(RCoreMessages.error_failedToLoadLibrary, name, e));
286 286
			} catch (Exception e) {
287 287
				org.txm.utils.logger.Log.printStackTrace(e);
288 288
			}
......
337 337
			isRServerOk = StartRserve.checkLocalRserve(port, debug, rargs, rServeArgs);
338 338
			if (!isRServerOk) {
339 339
				throw new RWorkspaceException(
340
						RCoreMessages.RSERVE_PATH_NOT_SET_ERROR); 
340
						RCoreMessages.error_rservePathNotSet); 
341 341
			}
342 342
		} else {
343
			Log.info(RCoreMessages.RWorkspace_10+pathToRExecutable);
343
			Log.info(RCoreMessages.bind(RCoreMessages.info_startingRUsingPath, pathToRExecutable));
344 344
			isRServerOk = StartRserve.launchRserve(pathToRExecutable, port, debug, rargs, rServeArgs);
345 345
			// System.out.println("ap launchRserve");
346 346
			if (!isRServerOk) {
347
				throw new RWorkspaceException(RCoreMessages.RSERVE_PATH_SET_ERROR+ " : "+pathToRExecutable); //$NON-NLS-1$
347
				throw new RWorkspaceException(RCoreMessages.error_cantFindRServeInPath +  " : " + pathToRExecutable); //$NON-NLS-1$
348 348
			}
349 349
		}
350 350

  
351 351
		if (isRServerOk) {
352 352
			Log.finest("RSERVE_ACTIVATED"); //$NON-NLS-1$
353
			System.out.println(RCoreMessages.CONNECTED_TO_STATS_MODULE); 
353
			System.out.println(RCoreMessages.info_connected); 
354 354
			RserveProcess = StartRserve.Rserveprocess;
355 355
		}
356 356
		return isRServerOk;
......
403 403
	 * Prints the last safe eval expr.
404 404
	 */
405 405
	public static void printLastSafeEvalExpr() {
406
		System.out.println(RCoreMessages.RWorkspace_11+lastSafeevalExpr);
406
		Log.info(RCoreMessages.bind(RCoreMessages.info_lastSafeEvalExpression, lastSafeevalExpr));
407 407
	}
408 408

  
409 409
	/**
......
433 433
				comm = new RFileCommunication();
434 434
			} catch (IOException e) {
435 435
				filecommunication = false;
436
				Log.severe(RCoreMessages.RWorkspace_6+Log.toString(e));
436
				Log.severe(RCoreMessages.bind(RCoreMessages.error_failedToInitializeFileTransfert, Log.toString(e)));
437 437
				return false;
438 438
			}
439 439
		}
......
482 482
			initRserve(pathToRExecutable, port, debug, rArgs, rServeArgs);
483 483
			return true;
484 484
		} catch (RWorkspaceException e) {
485
			System.out.println(RCoreMessages.RWorkspace_8+e);
485
			System.out.println(RCoreMessages.error_failedToStartRServe+e);
486 486
			org.txm.utils.logger.Log.printStackTrace(e);
487 487
		}
488 488
		return false;
......
558 558
			throws RWorkspaceException {
559 559
		//System.out.println("matrix len: "+matrix.length+" test="+(matrix.length == 0));
560 560
		if (matrix.length == 0) {
561
			new RWorkspaceException(RCoreMessages.RWorkspace_7);
561
			new RWorkspaceException(RCoreMessages.error_matrixIsEmpty);
562 562
		}
563 563
		int ncol = matrix[0].length;
564 564
		int nrow = matrix.length;
......
895 895
				arguments_as_string[i] = "NULL"; //$NON-NLS-1$
896 896
			} else {
897 897
				if (!containsVariable(arguments[i].getSymbol())) {
898
					throw new RWorkspaceException(NLS.bind(RCoreMessages.REQUESTED_OBJECT_NOT_FOUND_IN_R, arguments[i].getSymbol())); 
898
					throw new RWorkspaceException(NLS.bind(RCoreMessages.error_requestedObjectNotFoundInR, arguments[i].getSymbol())); 
899 899
				}
900 900
				arguments_as_string[i] = arguments[i].getSymbol();
901 901
			}
......
1180 1180
		try {
1181 1181
			return list.asList().at(item_name);
1182 1182
		} catch (REXPMismatchException e) {
1183
			throw new RWorkspaceException(RCoreMessages.ERROR_EXTRACT_ITEM
1183
			throw new RWorkspaceException(RCoreMessages.error_errorDuringItemsListExtraction
1184 1184
					+ e.getMessage()); 
1185 1185
		}
1186 1186
	}
......
1523 1523
			System.out.println("REXPMismatchException: "+e);
1524 1524
			Log.printStackTrace(e);
1525 1525
		} catch (RserveException e) {
1526
			System.out.println(RCoreMessages.RWorkspace_1 + e.getMessage()+" : "+exp);  //$NON-NLS-1$
1526
			System.out.println(RCoreMessages.error_evaluationError + e.getMessage()+" : "+exp);  //$NON-NLS-1$
1527 1527
			Log.printStackTrace(e);
1528 1528
		}
1529 1529

  
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/exceptions/RException.java (revision 695)
64 64
	 * @param msg the msg
65 65
	 */
66 66
	public RException(String expr, String msg) {
67
		super(RCoreMessages.RException_0 + msg + RCoreMessages.RException_1 + RCoreMessages.RException_2 + expr); 
67
		super(RCoreMessages.bind(RCoreMessages.error_errorWhileEvaluating, msg, expr));
68
		
68 69
	}
69 70

  
70 71
	/**
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/StartRserve.java (revision 695)
149 149
			//if (!debug && !isWindows) Rserveprocess.waitFor();
150 150
			// System.out.println("call terminated, let us try to connect ...");
151 151
		} catch (Exception x) {
152
			System.err.println(RCoreMessages.StartRserve_21 + x.getMessage());
152
			System.err.println(RCoreMessages.error_failedToStartRServeWithCommand + x.getMessage());
153 153
			return false;
154 154
		}
155 155

  
156
		System.err.print(RCoreMessages.StartRserve_22);
156
		System.err.print(RCoreMessages.info_statisticsEngineLaunched);
157 157

  
158 158
		try {
159 159
			Thread.sleep(200);
......
190 190
	 * @return true, if successful
191 191
	 */
192 192
	protected static boolean checkLocalRserve(int port, boolean debug, String rargs, String rServeArgs) {
193
		Log.info(RCoreMessages.StartRserve_2);
193
		Log.info(RCoreMessages.info_rPathNotSetTryingToFindIt);
194 194
		if (isRserveRunning(port)) {
195
			Log.info(RCoreMessages.StartRserve_3+port);
195
			Log.info(RCoreMessages.error_rserveIsAlreadyRunningOnPort+port);
196 196
			return true;
197 197
		}
198 198
		// Windows OS
......
200 200
			// System.out.println("Windows: query registry to find where R is installed ...");
201 201
			String installPath = null;
202 202
			try {
203
				Process rp = Runtime.getRuntime().exec(
204
						"reg query HKLM\\Software\\R-core\\R"); //$NON-NLS-1$
203
				Process rp = Runtime.getRuntime().exec("reg query HKLM\\Software\\R-core\\R"); //$NON-NLS-1$
205 204
				StreamHog regHog = new StreamHog(rp.getInputStream(), true);
206 205
				rp.waitFor();
207 206
				regHog.join();
208 207
				installPath = regHog.getInstallPath();
209 208
			} catch (Exception rge) {
210
				System.err.println(RCoreMessages.StartRserve_28 + rge);
209
				System.err.println(RCoreMessages.error_failedToRunREG + rge);
211 210
				return false;
212 211
			}
213 212
			if (installPath == null) {
214
				System.err.println(RCoreMessages.StartRserve_29);
213
				System.err.println(RCoreMessages.error_youNeedRSoftware);
215 214
				return false;
216 215
			}
217 216
			// System.out.println(" Found R in : "+installPath +
......
219 218
			return launchRserve(installPath + "\\bin\\R.exe", port, debug, rargs, rServeArgs); //$NON-NLS-1$
220 219
		}
221 220

  
222
		Log.info(RCoreMessages.StartRserve_4);
223
		if (launchRserve("R", port, debug, rargs, rServeArgs)) return true; //$NON-NLS-1$
221
		Log.info(RCoreMessages.info_tryingToStartRWithRPath);
222
		if (launchRserve("R", port, debug, rargs, rServeArgs)) { //$NON-NLS-1$
223
			return true;
224
		}
224 225

  
225 226
		// R not in the PATH env, try with R common paths
226 227
		String[] paths = {
......
233 234
				"/usr/local/bin/R", //$NON-NLS-1$
234 235
				"/sw/bin/R", //$NON-NLS-1$
235 236
				"/usr/common/bin/R", //$NON-NLS-1$
236
		"/opt/bin/R" }; //$NON-NLS-1$
237
				"/opt/bin/R" }; //$NON-NLS-1$
238

  
237 239
		for (String path : paths) {
238 240
			File execFile = new File(path);
239
			Log.info(RCoreMessages.StartRserve_6+path);
240
			if (execFile.exists() && launchRserve(path, port, debug, rargs, rServeArgs)) return true;
241
			Log.info(RCoreMessages.bind(RCoreMessages.info_tryingToStartRFrom, path));
242
			if (execFile.exists() && launchRserve(path, port, debug, rargs, rServeArgs)) {
243
				return true;
244
			}
241 245
		}
242 246

  
243 247
		return false;
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RStatsEngine.java (revision 695)
55 55
			boolean debug = TXMPreferences.getBoolean(RPreferences.DEBUG, RPreferences.PREFERENCES_NODE);
56 56
			mandatory = TXMPreferences.getBoolean(RPreferences.IS_MANDATORY, RPreferences.PREFERENCES_NODE);
57 57
			
58
			Log.info(RCoreMessages.log_startingStatsEngine + user + RCoreMessages.log_remote + remote + RCoreMessages.log_port + port + RCoreMessages.log_debug + debug);
58
			Log.info(RCoreMessages.bind(RCoreMessages.info_startingStatsEngine, new Object[] {user, remote, port, debug}));
59 59
			// System.out.println("test remote :" + R_PATH_TO_EXECUTABLE + ":" + properties.getProperty(R_PATH_TO_EXECUTABLE));
60 60
			if (!remote) {
61 61
				// start Rserve executable
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java (revision 695)
3 3
import org.eclipse.osgi.util.NLS;
4 4
import org.txm.utils.messages.Utf8NLS;
5 5

  
6
/**
7
 * R statistics engine and tools core messages.
8
 * 
9
 * @author mdecorde
10
 * @author sjacquot
11
 *
12
 */
6 13
public class RCoreMessages extends NLS {
7 14

  
8 15
	private static final String BUNDLE_NAME = "org.txm.statsengine.r.core.messages.messages"; //$NON-NLS-1$
9 16

  
10
	
11
	public static String error_statsEngineNotReadyCancelingCommand;
12
	
13
	public static String log_startingStatsEngine;
14
	public static String log_remote;
15
	public static String log_port;
16
	public static String log_debug;
17

  
17
	public static String error_cantFindRServeInPath;
18 18
	public static String error_connectionFailed;
19
	public static String error_failedToKillRServe;
19
	public static String error_errorDuringItemsListExtraction;
20
	public static String error_errorWhileEvaluating;
21
	public static String error_evaluationError;
22
	public static String error_failedToConnectToTheRWorkspace;
23
	public static String error_failedToInitializeFileTransfert;
20 24
	public static String error_failedToKillRServe2;
21 25
	public static String error_failedToKillRServe3;
26
	public static String error_failedToKillRServe;
27
	public static String error_failedToLoadLibrary;
28
	public static String error_failedToRunREG;
29
	public static String error_failedToStartRServe;
30
	public static String error_failedToStartRServeWithCommand;
31
	public static String error_matrixIsEmpty;
32
	public static String error_requestedObjectNotFoundInR;
33
	public static String error_rserveIsAlreadyRunningOnPort;
34
	public static String error_rservePathNotSet;
35
	public static String error_statsEngineNotReadyCancelingCommand;
36
	public static String error_youNeedRSoftware;
37
	public static String info_connected;
38
	public static String info_connectingToRAt;
39
	public static String info_connectingToRAtWithUser;
40
	public static String info_lastSafeEvalExpression;
41
	public static String info_rPathNotSetTryingToFindIt;
42
	public static String info_savingChartToFile;
43
	public static String info_startingRUsingPath;
44
	public static String info_startingStatsEngine;
45
	public static String info_statisticsEngineLaunched;
46
	public static String info_tryingToStartRFrom;
47
	public static String info_tryingToStartRWithRPath;
22 48

  
23
	public static String StartRserve_2;
24
	public static String StartRserve_21;
25
	public static String StartRserve_22;
26
	public static String StartRserve_28;
27
	public static String StartRserve_29;
28
	public static String StartRserve_3;
29
	public static String StartRserve_4;
30
	public static String StartRserve_6;
31

  
32
	public static String RWorkspace_0;
33
	public static String RWorkspace_1;
34
	public static String RWorkspace_10;
35
	public static String RWorkspace_11;
36
	public static String RWorkspace_2;
37
	public static String RWorkspace_3;
38
	public static String RWorkspace_6;
39
	public static String RWorkspace_7;
40
	public static String RWorkspace_8;
41

  
42
	public static String LIBRARY_NOT_LOADED;
43

  
44
	public static String RException_0;
45
	public static String RException_1;
46
	public static String RException_2;
47

  
48
	public static String RSERVE_PATH_NOT_SET_ERROR;
49
	public static String RSERVE_PATH_SET_ERROR;
50
	public static String CONNECTED_TO_STATS_MODULE;
51
	public static String CHAR_VECTOR_ADDED_TO_WORKSPACE;
52
	public static String CONNECTION_OK;
53
	public static String ERROR_EXTRACT_ITEM;
54
	public static String REQUESTED_OBJECT_NOT_FOUND_IN_R;
55

  
56

  
57
	// FIXME: unused keys
58
	public static String StartRserve_0;
59
	public static String RWorkspace_21;
60
	public static String RSERVE_ACTIVATED;
61
	public static String R_EXPR;
62
	public static String R_READ_CONSOLE;
63
	public static String R_SAVE_HISTORY;
64
	public static String R_SHOW_MESSAGE;
65
	public static String R_WRITE_CONSOLE;
66
	//end of fixme
67
	
68 49
	static {
69 50
		// initialize resource bundle
70 51
		Utf8NLS.initializeMessages(BUNDLE_NAME, RCoreMessages.class);
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties (revision 695)
1 1

  
2
CHAR_VECTOR_ADDED_TO_WORKSPACE = Vector "{1}" ({0,number,integer} "character") has been transmited to the Statistics Engine.
3

  
4
CONNECTED_TO_STATS_MODULE = connected.
5

  
6
CONNECTION_OK = Connected to the Statistics Engine.
7

  
8
ERROR_EXTRACT_ITEM = ** Error extracting list item: 
9

  
10
LIBRARY_NOT_LOADED = Failed to load the {0} library: {1}
11

  
12
REQUESTED_OBJECT_NOT_FOUND_IN_R = The requested object ({0}) was not found in the R workspace.
13

  
14
RException_0 = ** R error: "
15
RException_1 = "
16
RException_2 = \nwhile evaluating: 
17

  
18
RSERVE_ACTIVATED          = Statistics Engine running 
19
RSERVE_PATH_NOT_SET_ERROR = ** The Statistics Engine program path is not set and we could not find it
20
RSERVE_PATH_SET_ERROR     = ** The Statistics Engine program path is set but we couldn't find it
21

  
22
RWorkspace_0  = ** Failed to connect to the R Workspace 
23
RWorkspace_1  = ** Evaluation Error: 
24
RWorkspace_10 = Starting R using path: 
25
RWorkspace_11 = Last safeeval: 
26
RWorkspace_2  = try : connect to R at 
27
RWorkspace_21 = Full command: 
28
RWorkspace_3  = Saving chart in file 
29
RWorkspace_6  = ** Failed to initialize file transfert: 
30
RWorkspace_7  = Matrix is empty
31
RWorkspace_8  = Failed to start RServe : 
32

  
33
R_EXPR                          = Expression sent to the Statistics Engine for evaluation: {0}.
34
R_READ_CONSOLE                  = The Statistics Engine waits for something to read from the console ({0}, {1}).
35
R_SAVE_HISTORY                  = The Statistics Engine has saved an history ({0}).
36
R_SHOW_MESSAGE                  = The Statistics Engine displayed this message: {0}.
37
R_WRITE_CONSOLE                 = The Statistics Engine displayed this message in the console: {0}.
38

  
39
StartRserve_0  = Starting R with command line: 
40
StartRserve_2  = No R path given, trying to find it...
41
StartRserve_21 = ** Failed to start Rserve with command: 
42
StartRserve_22 = Statistical Engine launched
43
StartRserve_28 = ** Failed to run REG to find the location of R program: 
44
StartRserve_29 = \ You need the 'R' software and you need to configure in the 'Tools/Preferences' window the correct path to it.
45
StartRserve_3  = Rserve already running on port 
46
StartRserve_4  = try R path : 'R'
47
StartRserve_6  = try R path : 
48

  
2
error_cantFindRServeInPath                = ** The Statistics Engine program path is set but we couldn't find it
49 3
error_connectionFailed                    = ** Error while connecting to the stat engine.
4
error_errorDuringItemsListExtraction      = ** Error during items list extraction: 
5
error_errorWhileEvaluating                = ** R error: "{0}"\nwhile evaluating:{1} 
6
error_evaluationError                     = ** Evaluation error: 
7
error_failedToConnectToTheRWorkspace      = ** Failed to connect to the R Workspace 
8
error_failedToInitializeFileTransfert     = ** Failed to initialize file transfert: {0}.
50 9
error_failedToKillRServe                  = Failed to exec 'taskkill /IM Rserve.exe /F': 
51 10
error_failedToKillRServe2                 = Failed to exec 'tskill Rserve.exe': 
52 11
error_failedToKillRServe3                 = Failed to exec 'killall -9 Rserve-bin.so': 
12
error_failedToLoadLibrary                 = Failed to load the {0} library: {1}
13
error_failedToRunREG                      = ** Failed to run REG to find the location of R program: 
14
error_failedToStartRServe                 = Failed to start RServe : 
15
error_failedToStartRServeWithCommand      = ** Failed to start Rserve with command: 
16
error_matrixIsEmpty                       = Matrix is empty
17
error_requestedObjectNotFoundInR          = The requested object ({0}) was not found in the R workspace.
18
error_rserveIsAlreadyRunningOnPort        = Rserve already running on port 
19
error_rservePathNotSet                    = ** The Statistics Engine program path is not set and we could not find it
53 20
error_statsEngineNotReadyCancelingCommand = Statistics Engine is not ready, canceling command.
21
error_youNeedRSoftware                    = You need the 'R' software and you need to configure in the 'Tools/Preferences' window the correct path to it.
54 22

  
55
log_debug               = debug:
56
log_port                = \ port: 
57
log_remote              = \ remote:
58
log_startingStatsEngine = Starting Statistics Engine: user: 
23
info_connected                 = Connected.
24
info_connectingToRAt           = Connecting to R at {0}:{1}
25
info_connectingToRAtWithUser   = Connecting to R at {0}:{1} with user {2}.
26
info_lastSafeEvalExpression    = Last safeeval expression: {0}.
27
info_rPathNotSetTryingToFindIt = R path is not set, trying to find it...
28
info_savingChartToFile         = Saving chart to file: {0}.
29
info_startingRUsingPath        = Starting R using path: {0}.
30
info_startingStatsEngine       = Starting Statistics Engine: user: {0}, remote: {1}, port: {2}, debug: {3}
31
info_statisticsEngineLaunched  = Statistical Engine launched
32
info_tryingToStartRFrom        = Try to start R from: {0}...
33
info_tryingToStartRWithRPath   = Try to start R with path: 'R'.
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_ru.properties (revision 695)
1

  
2
info_tryingToStartRWithRPath = 
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_fr.properties (revision 695)
1 1

  
2
CHAR_VECTOR_ADDED_TO_WORKSPACE = Le vecteur "{1}" ({0,number,integer} valeurs "character") a été transmis au Moteur Statistique.
3

  
4
CONNECTED_TO_STATS_MODULE = connecté.
5

  
6
CONNECTION_OK = Connexion au Moteur Statistique établie.
7

  
8
ERROR_EXTRACT_ITEM = ** Erreur lors de l'extraction de la liste d'items : \	
9

  
10
LIBRARY_NOT_LOADED = La librairie {0} n''a pu être chargée : {1}
11

  
12
REQUESTED_OBJECT_NOT_FOUND_IN_R = L'objet demandé ({0}) n'a pas été trouvé dans l'espace de travail R.
13

  
14
RException_0 = ** Erreur R : "
15
RException_1 = "
16
RException_2 = \n lors de l'évaluation de :
17

  
18
RSERVE_ACTIVATED          = Moteur Statistique lancé 
19
RSERVE_PATH_NOT_SET_ERROR = ** Le chemin du programme du serveur statistique n'a pas été renseigné et sa recherche a échoué
20
RSERVE_PATH_SET_ERROR     = ** Le chemin du programme du serveur statistique a été renseigné mais sa recherche a échoué
21

  
22
RWorkspace_0  = ** Echec de connexion à l'espace de travail R 
23
RWorkspace_1  = ** Erreur d'évaluation : 
24
RWorkspace_10 = Démarrage de R avec le chemin d'accès: 
25
RWorkspace_11 = Dernier 'safeeval'
26
RWorkspace_2  = tentative de connexion à R : 
27
RWorkspace_21 = Commande complète : 
28
RWorkspace_3  = Sauvegarde du graphique dans le fichier 
29
RWorkspace_6  = ** Echec de l'initialisation du transfert : 
30
RWorkspace_7  = La matrice est vide
31
RWorkspace_8  = Impossible de démarrer RServe : 
32

  
33
R_EXPR                          = Expression transmise au Moteur Statistique pour évaluation : {0}.
34
R_READ_CONSOLE                  = Le Moteur Statistique attend une réponse de la console ({0}, {1}).
35
R_SAVE_HISTORY                  = Le Moteur Statistique a sauvegardé un historique ({0}).
36
R_SHOW_MESSAGE                  = Le Moteur Statistique a affiché ce message : {0}.
37
R_WRITE_CONSOLE                 = Le Moteur Statistique a afiché ce message dans la console: {0}.
38

  
39
StartRserve_0  = Démarrage de R avec la ligne de commande: 
40
StartRserve_2  = Chemin d'accès à R non fourni, tentative de résolution...
41
StartRserve_21 = ** Echec du lancement de Rserve avec la commande : 
42
StartRserve_22 = Moteur statistique lancé
43
StartRserve_28 = ** Echec du lancement de REG pour localiser le programme R
44
StartRserve_29 = \ Vous avez besoin du logiciel 'R' et de configurer ses chemins via la fenêtre de préférences 'Outils/Préférences'
45
StartRserve_3  = Rserve déja démarré sur le port 
46
StartRserve_4  = Essai du chemin de R : 'R'
47
StartRserve_6  = Essai du chemin de R : 
48

  
2
error_cantFindRServeInPath                = ** Le chemin du programme du serveur statistique a été renseigné mais sa recherche a échoué
49 3
error_connectionFailed                    = ** La connexion au moteur statistique a échoué.
4
error_errorDuringItemsListExtraction      = ** Erreur lors de l'extraction de la liste d'items : \	
5
error_errorWhileEvaluating                = ** Erreur R : "{0}"\nlors de l'évaluation de : {1}
6
error_evaluationError                     = ** Erreur d'évaluation : 
7
error_failedToConnectToTheRWorkspace      = ** Echec de connexion à l'espace de travail R 
8
error_failedToInitializeFileTransfert     = ** Echec de l'initialisation du transfert : {0}.
50 9
error_failedToKillRServe                  = Echec de la commande 'taskkill /IM Rserve.exe /F': 
51 10
error_failedToKillRServe2                 = Echec de la commande 'tskill Rserve.exe': 
52 11
error_failedToKillRServe3                 = Echec de la commande 'killall -9 Rserve-bin.so': 
12
error_failedToLoadLibrary                 = La librairie {0} n''a pu être chargée : {1}
13
error_failedToRunREG                      = ** Echec du lancement de REG pour localiser le programme R
14
error_failedToStartRServe                 = Impossible de démarrer RServe : 
15
error_failedToStartRServeWithCommand      = ** Echec du lancement de Rserve avec la commande : 
16
error_matrixIsEmpty                       = La matrice est vide
17
error_requestedObjectNotFoundInR          = L'objet demandé ({0}) n'a pas été trouvé dans l'espace de travail R.
18
error_rserveIsAlreadyRunningOnPort        = Rserve déja démarré sur le port 
19
error_rservePathNotSet                    = ** Le chemin du programme du serveur statistique n'a pas été renseigné et sa recherche a échoué
53 20
error_statsEngineNotReadyCancelingCommand = Le moteur de statistiques n'est pas initialisé, annulation de la commande.
21
error_youNeedRSoftware                    = Vous avez besoin du logiciel 'R' et de configurer ses chemins via la fenêtre de préférences 'Outils/Préférences'
54 22

  
55
log_debug               = debug : 
56
log_port                = \ port : 
57
log_remote              = \ distant : 
58
log_startingStatsEngine = Démarrage du moteur de statistiques par l'utilisateur :
23
info_connected                 = Connecté.
24
info_connectingToRAt           = Connexion à R à {0}:{1}
25
info_connectingToRAtWithUser   = Connexion à R à {0}:{1} avec l'utilisateur {2}.
26
info_lastSafeEvalExpression    = Dernier 'safeeval' : {0}.
27
info_rPathNotSetTryingToFindIt = Chemin d'accès à R non fourni, tentative de résolution...
28
info_savingChartToFile         = Sauvegarde du graphique dans le fichier : {0}.
29
info_startingRUsingPath        = Démarrage de R avec le chemin d'accès : {0}.
30
info_startingStatsEngine       = Démarrage du moteur de statistiques : utilisateur : {0}, distant : {1}, port : {2}, debug : {3}
31
info_statisticsEngineLaunched  = Moteur statistique lancé
32
info_tryingToStartRFrom        = Tentative de démarrage de R depuis : {0}...
33
info_tryingToStartRWithRPath   = Tentative de démarrage de R depuis le chemin : 'R'.

Formats disponibles : Unified diff