Révision 1335

tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java (revision 1335)
78 78
					firstCorpusDiag = false;
79 79
					for (MainCorpus corpus : corpora) {
80 80
						if (corpus.getProject() == null) {
81
							System.out.println(NLS.bind(TXMUIMessages.AdapterFactory_0, corpus));
81
							System.out.println(NLS.bind(TXMUIMessages.warningDDotTheCorpusP0IsCorruptedSomeCommandsWontWorkCorrectly, corpus));
82 82
						}
83 83
					}
84 84
				}
......
240 240
		return new Class[] { IWorkbenchAdapter.class };
241 241
	}
242 242

  
243
}
243
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java (revision 1335)
185 185
	@Override
186 186
	public void createPartControl(Composite parent) {
187 187
		treeViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
188
		PlatformUI.getWorkbench().getHelpSystem().setHelp(treeViewer.getControl(), TXMUIMessages.CorporaView_0);
188
		PlatformUI.getWorkbench().getHelpSystem().setHelp(treeViewer.getControl(), TXMUIMessages.corpus);
189 189
		getSite().setSelectionProvider(treeViewer);
190 190
		treeViewer.setColumnProperties(new String[]{"name"}); // mandatory to enable edit mode -> used to identify columns
191 191

  
......
591 591
			corporaView.treeViewer.expandToLevel(obj, 1);
592 592
		}
593 593
	}
594
}
594
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java (revision 1335)
169 169
					return;
170 170
			}
171 171
		} catch (Exception e) {
172
			textArea.append(TXMUIMessages.GroovyConsole_4);
173
			textArea.append(TXMUIMessages.GroovyConsole_5 + e);
172
			textArea.append(TXMUIMessages.consoleReportsAnInternalError);
173
			textArea.append(TXMUIMessages.theErrorIsDDot + e);
174 174
		}
175 175
	}
176 176

  
......
214 214

  
215 215
	}
216 216

  
217
}
217
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java (revision 1335)
154 154
		Button export = new Button(parent, SWT.PUSH);
155 155
		export.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
156 156
				false));
157
		export.setText(TXMUIMessages.QueriesView_1);
157
		export.setText(TXMUIMessages.exportAll);
158 158
		export.addSelectionListener(new SelectionListener() {
159 159
			@Override
160 160
			public void widgetSelected(SelectionEvent arg0) {
......
167 167
					dialog.setFilterPath(LastOpened.getFolder(ID));
168 168
					dialog.setFileName(LastOpened.getFile(ID));
169 169
				} else {
170
					dialog.setFilterPath(new File(txmhome, TXMUIMessages.Explorer_3).getAbsolutePath());
170
					dialog.setFilterPath(new File(txmhome, TXMUIMessages.tXM).getAbsolutePath());
171 171
				}
172 172
				String path = dialog.open();
173 173
				if (path == null) return;
......
181 181
				
182 182
				try {
183 183
					FileWriter writer = new FileWriter(output);
184
					writer.write(TXMUIMessages.QueriesView_5);
184
					writer.write(TXMUIMessages.queriesDDot);
185 185
					for (MainCorpus b : CorpusManager.getCorpusManager().getCorpora()) {
186 186
						writer.write(" " + b.getID() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
187 187
						for (SavedQuery q : b.getQueriesLog()) {
......
288 288
				return ((TXMResult) element).getName();
289 289
			else if (element instanceof SavedQuery)
290 290
				return ((SavedQuery) element).toString();
291
			return NLS.bind(TXMUIMessages.QueriesView_10, element);
291
			return NLS.bind(TXMUIMessages.errorWithElementP0, element);
292 292
		}
293 293

  
294 294
		/* (non-Javadoc)
......
374 374
		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
375 375
		}
376 376
	}
377
}
377
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java (revision 1335)
156 156
				tv.expandToLevel(selectedProps.size()+1);
157 157
			}
158 158
		} catch (Exception e) {
159
			System.out.println(TXMUIMessages.InternalCorpusView_0);
159
			System.out.println(TXMUIMessages.errorWhileComputingCorpusSummary);
160 160
			org.txm.rcp.utils.Logger.printStackTrace(e);
161 161
		} 
162 162
	}
......
309 309
		//Button reload
310 310
		Button openeditdialog = new Button(parent, SWT.PUSH);
311 311
		openeditdialog.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
312
		openeditdialog.setText(TXMUIMessages.InternalCorpusView_1);
312
		openeditdialog.setText(TXMUIMessages.reload);
313 313
		openeditdialog.addSelectionListener(new SelectionListener() {
314 314
			@Override
315 315
			public void widgetSelected(SelectionEvent e) {
......
348 348
						}
349 349
						attachedBrowserEditor.showPage(openedPage);
350 350
					} else {
351
						System.out.println(TXMUIMessages.SummaryView_0+node);
351
						System.out.println(TXMUIMessages.noDefaultEditionPageFoundForElementDDot+node);
352 352
					}
353 353

  
354 354
					if (progresslistener != null) {
......
448 448
				if (s == null || s.length() == 0) return ((Summary.TreeNode) element).toString();
449 449
				return s;
450 450
			}
451
			return NLS.bind(TXMUIMessages.InternalCorpusView_2, element);
451
			return NLS.bind(TXMUIMessages.errorDDotGetTextDDotP0, element);
452 452
		}
453 453

  
454 454
		/* (non-Javadoc)
......
528 528
		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
529 529
		}
530 530
	}
531
}
531
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeContentProvider.java (revision 1335)
56 56
		p = null;
57 57
		try {
58 58
		p = Pattern.compile(regex);
59
		} catch(Exception e) { System.out.println(TXMUIMessages.FileTreeContentProvider_1+regex+TXMUIMessages.FileTreeContentProvider_2+e);}
59
		} catch(Exception e) { System.out.println(TXMUIMessages.fileExplorerDDotIncorrectPattern+regex+TXMUIMessages.eRROR+e);}
60 60
		
61 61
		Object[] kids = ((File) element).listFiles(new FileFilter() {	
62 62
			@Override
......
102 102
	public Object getParent(Object element) {
103 103
		if (element instanceof File)
104 104
			return ((File) element).getParentFile();
105
		System.out.println(TXMUIMessages.FileTreeContentProvider_3+element+TXMUIMessages.FileTreeContentProvider_4);
105
		System.out.println(TXMUIMessages.errorElementDDot+element+TXMUIMessages.FileTreeContentProvider_4);
106 106
		return null;
107 107
	}
108 108

  
......
119 119
	@Override
120 120
	public void inputChanged(Viewer viewer, Object old_input, Object new_input) {
121 121
	}
122
}
122
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java (revision 1335)
132 132
		// its widgets
133 133
		Button go_up = new Button(controls, SWT.NONE);
134 134
		go_up.setText(TXMUIMessages.Explorer_4);
135
		go_up.setToolTipText(TXMUIMessages.Explorer_1);
135
		go_up.setToolTipText(TXMUIMessages.goToParentFolder);
136 136
		go_up.addSelectionListener(new SelectionAdapter() {
137 137
			@Override
138 138
			public void widgetSelected(SelectionEvent e) {
......
147 147
		if (currentPath == null)
148 148
			currentPath = "/"; //$NON-NLS-1$
149 149
		address.setText(currentPath);
150
		address.setToolTipText(TXMUIMessages.Explorer_2);
150
		address.setToolTipText(TXMUIMessages.goToTXMHome);
151 151
		address.addKeyListener(new KeyAdapter() {
152 152
			@Override
153 153
			public void keyPressed(KeyEvent e) {
......
162 162

  
163 163
		Button go = new Button(controls, SWT.NONE);
164 164
		go.setText(TXMUIMessages.Explorer_5);
165
		go.setToolTipText(TXMUIMessages.Explorer_6);
165
		go.setToolTipText(TXMUIMessages.common_refresh);
166 166
		go.addSelectionListener(new SelectionAdapter() {
167 167
			@Override
168 168
			public void widgetSelected(SelectionEvent e) {
......
175 175
		
176 176
		Button homeBtn = new Button(controls, SWT.NONE);
177 177
		homeBtn.setText(TXMUIMessages.Explorer_7);
178
		homeBtn.setToolTipText(TXMUIMessages.Explorer_8);
178
		homeBtn.setToolTipText(TXMUIMessages.goToTXMHome_2);
179 179
		homeBtn.addSelectionListener(new SelectionAdapter() {
180 180
			@Override
181 181
			public void widgetSelected(SelectionEvent e) {
......
311 311
				selectedItem.equals(samples) ||
312 312
				selectedItem.equals(xsl))
313 313
		{
314
			System.out.println(NLS.bind(TXMUIMessages.Explorer_0, selectedItem));
314
			System.out.println(NLS.bind(TXMUIMessages.folderP0ShouldNotBeDeleted, selectedItem));
315 315
			return false;
316 316
		}
317 317
		return false;
......
370 370

  
371 371
	}
372 372

  
373
}
373
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java (revision 1335)
158 158
		
159 159
		Button refresh = new Button(controls, SWT.NONE);
160 160
		refresh.setText(TXMUIMessages.Explorer_5);
161
		refresh.setToolTipText(TXMUIMessages.Explorer_6);
161
		refresh.setToolTipText(TXMUIMessages.common_refresh);
162 162
		refresh.setLayoutData(new GridData());
163 163
		refresh.addSelectionListener(new SelectionAdapter() {
164 164
			@Override
......
171 171
		
172 172
		Button newMacro = new Button(controls, SWT.NONE);
173 173
		newMacro.setLayoutData(new GridData());
174
		newMacro.setText(TXMUIMessages.MacrosExplorer_0);
175
		newMacro.setToolTipText(TXMUIMessages.MacrosExplorer_1);
174
		newMacro.setText(TXMUIMessages.newMacro);
175
		newMacro.setToolTipText(TXMUIMessages.createANewMacroFromATemplate);
176 176
		newMacro.addSelectionListener(new SelectionAdapter() {
177 177
			@Override
178 178
			public void widgetSelected(SelectionEvent e) {
179 179
				
180 180
				currentRootDir.mkdirs();
181 181
				
182
				InputDialog dialog = new InputDialog(e.display.getActiveShell(), TXMUIMessages.CreateMacro_0, TXMUIMessages.CreateMacro_1, "", null); //$NON-NLS-1$
182
				InputDialog dialog = new InputDialog(e.display.getActiveShell(), TXMUIMessages.macroName, TXMUIMessages.pleaseWriteTheMacroName, "", null); //$NON-NLS-1$
183 183
				
184 184
				dialog.open();
185 185
				String name = dialog.getValue();
......
314 314
				selectedItem.equals(samples) ||
315 315
				selectedItem.equals(xsl))
316 316
		{
317
			System.out.println(NLS.bind(TXMUIMessages.Explorer_0, selectedItem));
317
			System.out.println(NLS.bind(TXMUIMessages.folderP0ShouldNotBeDeleted, selectedItem));
318 318
			return false;
319 319
		}
320 320
		return false;
......
366 366
	public void setFocus() {
367 367
		tv.getTree().setFocus();
368 368
	}
369
}
369
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreatePartitionDialog.java (revision 1335)
151 151
	@Override
152 152
	protected void configureShell(Shell newShell) {
153 153
		super.configureShell(newShell);
154
		newShell.setText(TXMUIMessages.CreatePartitionDialog_0);
154
		newShell.setText(TXMUIMessages.createPartition);
155 155
		newShell.setMinimumSize(400, 400);
156 156
	}
157 157

  
......
171 171
		FontData defaultFont = f.getFontData()[0];
172 172
		defaultFont.setStyle(SWT.BOLD);
173 173
		Font newf = new Font(nameLabel.getDisplay(), defaultFont);
174
		nameLabel.setText(TXMUIMessages.CreatePartitionDialog_6);
174
		nameLabel.setText(TXMUIMessages.ampNameDDot);
175 175
		nameLabel.setLayoutData(new GridData(GridData.FILL, GridData.CENTER,
176 176
				false, false));
177 177
		nameLabel.setFont(newf);
......
189 189

  
190 190
		TabItem simpleTab = new TabItem(tabFolder, SWT.NONE);
191 191

  
192
		simpleTab.setText(TXMUIMessages.CreatePartitionDialog_1);
192
		simpleTab.setText(TXMUIMessages.simple);
193 193

  
194 194
		Composite composite = new Composite(tabFolder, SWT.NONE);
195 195
		simpleTab.setControl(composite);
......
201 201
		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
202 202

  
203 203
		Label structureLabel = new Label(composite, SWT.NONE);
204
		structureLabel.setText(TXMUIMessages.CreatePartitionDialog_2);
204
		structureLabel.setText(TXMUIMessages.ampStructureDDot);
205 205
		structureLabel.setLayoutData(new GridData(GridData.END,
206 206
				GridData.CENTER, false, false));
207 207

  
......
255 255
		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
256 256

  
257 257
		Label propertyLabel = new Label(composite, SWT.NONE);
258
		propertyLabel.setText(TXMUIMessages.CreatePartitionDialog_4);
258
		propertyLabel.setText(TXMUIMessages.ampPropertyDDot);
259 259
		propertyLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
260 260
				false, false));
261 261

  
......
300 300
		// Second Tab : assisted mode
301 301
		TabItem assistedTab = new TabItem(tabFolder, SWT.NONE);
302 302

  
303
		assistedTab.setText(TXMUIMessages.CreatePartitionDialog_3);
303
		assistedTab.setText(TXMUIMessages.assisted);
304 304

  
305 305
		compositeForAssisted = new PartitionComposer(tabFolder, SWT.NONE,
306 306
				this.corpus);
......
310 310
		// --------------------------------------------------------
311 311

  
312 312
		TabItem advancedTab = new TabItem(tabFolder, SWT.NONE);
313
		advancedTab.setText(TXMUIMessages.CreatePartitionDialog_5);
313
		advancedTab.setText(TXMUIMessages.advanced);
314 314

  
315 315
		Composite advanceContainer = new Composite(tabFolder, SWT.NONE);
316 316
		GridLayout advanceLayout = new GridLayout(1, true);
......
450 450
	 */
451 451
	private void addQueryField(final Composite composite) {
452 452
		final Text advancedPartLabel = new Text(composite, SWT.NONE);
453
		advancedPartLabel.setText(TXMUIMessages.CreatePartitionDialog_7
453
		advancedPartLabel.setText(TXMUIMessages.part
454 454
				+ (partNames.size() + 1)); 
455 455
		advancedPartLabel.setLayoutData(new GridData(GridData.END,
456 456
				GridData.CENTER, false, false));
......
498 498
			{
499 499
				String name = "partition"+(this.corpus.getPartitions().size()+1); //$NON-NLS-1$
500 500
				nameText.setText(name);
501
				System.out.println(TXMUIMessages.CreatePartitionDialog_9);
501
				System.out.println(TXMUIMessages.noPartitionNameWasSpecifiedTheNameIsP0);
502 502
			}
503 503
			else if (isAssistedSelected)
504 504
			{
505 505
				String name = this.corpus.getName()+"_"+compositeForAssisted.getProperty().getFullName(); //$NON-NLS-1$
506 506
				nameText.setText(name);
507
				System.out.println(TXMUIMessages.CreatePartitionDialog_9);
507
				System.out.println(TXMUIMessages.noPartitionNameWasSpecifiedTheNameIsP0);
508 508
			}
509 509
			//return;
510 510
		}
511 511

  
512 512
		if (isAdvancedSelected() && noquery()) {
513 513
			MessageDialog.openError(getShell(),
514
					TXMUIMessages.CreateSubcorpusDialog_13,
515
					TXMUIMessages.CreatePartitionDialog_16);
514
					TXMUIMessages.invalidQuery,
515
					TXMUIMessages.queriesCannotBeLeftEmpty);
516 516
			return;
517 517
		}
518 518

  
......
549 549
	public StructuralUnit getStructuralUnit() {
550 550
		if (isAdvancedSelected())
551 551
			throw new IllegalStateException(
552
					TXMUIMessages.Cannot_ask_simple_when_advance);
552
					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
553 553
		return selectedStructuralUnit;
554 554
	}
555 555

  
......
561 561
	public StructuralUnitProperty getStructuralUnitProperty() {
562 562
		if (isAdvancedSelected())
563 563
			throw new IllegalStateException(
564
					TXMUIMessages.Cannot_ask_simple_when_advance);
564
					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
565 565
		return selectedStructuralUnitProperty;
566 566
	}
567 567

  
......
573 573
	public List<String> getQueries() {
574 574
		if (!isAdvancedSelected())
575 575
			throw new IllegalStateException(
576
					TXMUIMessages.Cannot_ask_simple_when_advance);
576
					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
577 577
		return queriesString;
578 578
	}
579 579

  
......
620 620
		}
621 621

  
622 622
		if (p == null) {
623
			Log.severe(TXMUIMessages.CreatePartitionDialog_8);
623
			Log.severe(TXMUIMessages.noPartWasDefined);
624 624
			return null;
625 625
		}
626 626
		
......
633 633
		}
634 634
		
635 635
		if (p.getPartsCount() == 0) {
636
			Log.severe(TXMUIMessages.CreatePartitionDialog_10);
636
			Log.severe(TXMUIMessages.errorDDotThePartitionCreatedHasNoPart);
637 637
			return null;
638 638
		}		
639 639
		return p;
......
650 650
		for (Text t: partNames) {
651 651
			String name = t.getText().trim();
652 652
			if (name.length() == 0)
653
				name = TXMUIMessages.CreatePartitionDialog_7+count++; 
653
				name = TXMUIMessages.part+count++; 
654 654
			values.add(name);
655 655
		}
656 656
		return values;
......
664 664
	public Partition getPartition() {
665 665
		return partition;
666 666
	}
667
}
667
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___CreateFrequencyListDialog.java (revision 1335)
85 85
	@Override
86 86
	protected void configureShell(Shell newShell) {
87 87
		super.configureShell(newShell);
88
		newShell.setText(TXMUIMessages.FrequencyListEditorInput_0);
88
		newShell.setText(TXMUIMessages.lexicon);
89 89
	}
90 90

  
91 91
	/**
......
107 107
		composite.setLayout(layout);
108 108

  
109 109
		Label anaPropLabel = new Label(composite, SWT.NONE);
110
		anaPropLabel.setText(TXMUIMessages.CreatePartitionDialog_4);
110
		anaPropLabel.setText(TXMUIMessages.ampPropertyDDot);
111 111
		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
112 112
				false, false));
113 113

  
......
131 131
		int propIndex = anaPropCombo.getSelectionIndex();
132 132
		if (propIndex == -1) {
133 133
			MessageDialog.openError(getShell(),
134
					TXMUIMessages.Invalid_analysis_property,
135
					TXMUIMessages.Structure_field_not_empty);
134
					TXMUIMessages.invalidProperty,
135
					TXMUIMessages.structureFieldIsMandatory);
136 136
			return;
137 137
		}
138 138
		property = properties.get(propIndex);
139 139
		super.okPressed();
140 140
	}
141 141

  
142
}
142
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java (revision 1335)
78 78
	public RunGroovyScript(IWorkbenchWindow window) {
79 79
		this.window = window;
80 80
		setId(ID);
81
		setText(TXMUIMessages.RunGroovyScript_1);
82
		setToolTipText(TXMUIMessages.RunGroovyScript_2);
81
		setText(TXMUIMessages.ampRunScript);
82
		setToolTipText(TXMUIMessages.runScript);
83 83
		setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
84 84
				Application.PLUGIN_ID, IImageKeys.ACTION_RUN_SCRIPT));
85 85
	}
......
102 102
	public void run() {
103 103

  
104 104
		FileDialog dialog = new FileDialog(window.getShell(), SWT.OPEN);
105
		dialog.setFilterExtensions(new String[] { TXMUIMessages.RunGroovyScript_3 });
105
		dialog.setFilterExtensions(new String[] { TXMUIMessages.groovy });
106 106
		String scriptRootDir = Toolbox.getTxmHomePath() + "/scripts";
107 107
		String scriptCurrentDir = Toolbox.getTxmHomePath() + "/scripts";
108 108
		
......
122 122
			classPath.add(new File(scriptRootDir));
123 123
			gse = new GroovyImportScriptRunner(script, classPath);
124 124
		} catch (IOException e) {
125
			System.err.println(NLS.bind(TXMUIMessages.RunGroovyScript_4, e));
125
			System.err.println(NLS.bind(TXMUIMessages.errorWhileOpeningGroovyScriptDDotP0, e));
126 126
			System.err.println(e);
127 127
		}
128 128

  
129 129
		if (gse != null) {
130
			JobHandler jobhandler = new JobHandler(TXMUIMessages.RunGroovyScript_0,
130
			JobHandler jobhandler = new JobHandler(TXMUIMessages.scriptExecution,
131 131
					null) {
132 132
				@Override
133 133
				protected IStatus run(IProgressMonitor monitor) {
134 134
					this.runInit(monitor);
135 135
					try {
136
						monitor.beginTask(TXMUIMessages.RunGroovyScript_9, 100);
136
						monitor.beginTask(TXMUIMessages.executeScript, 100);
137 137
						new Binding();
138 138
						// gse.run(binding);
139 139
						monitor.worked(100);
......
141 141
					} catch (ThreadDeath td) {
142 142
						return Status.CANCEL_STATUS;
143 143
					} catch (Exception e) {
144
						System.out.println(NLS.bind(TXMUIMessages.RunGroovyScript_8,
144
						System.out.println(NLS.bind(TXMUIMessages.errorWhileRunningScriptDDotP0,
145 145
								e));
146 146
					} finally {
147 147
						monitor.done();
......
152 152
			jobhandler.startJob();
153 153
		}
154 154
	}
155
}
155
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/SaveBeforeExecutionDialog.java (revision 1335)
61 61
	@Override
62 62
	protected void configureShell(Shell newShell) {
63 63
		super.configureShell(newShell);
64
		newShell.setText(org.txm.rcp.messages.TXMUIMessages.SaveBeforeExecutionDialog_0);
64
		newShell.setText(org.txm.rcp.messages.TXMUIMessages.saveBeforeExecution);
65 65
		newShell.setMinimumSize(300, 460);
66 66

  
67 67
	}
......
82 82
	protected void okPressed() {
83 83
		super.okPressed();
84 84
	}
85
}
85
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___DeleteInCorporaView.java (revision 1335)
99 99
			try {
100 100
				subcorpus.getMainCorpus().dropSubcorpus(subcorpus);
101 101
			} catch (CqiClientException e) {
102
				System.err.println(NLS.bind(TXMUIMessages.DeleteInCorporaView_1, e));
102
				System.err.println(NLS.bind(TXMUIMessages.failedToDeleteSubcorpusP0, e));
103 103
			}
104 104
		}
105 105
		if (selection.getFirstElement() instanceof Partition) {
......
112 112
//			}
113 113
		}
114 114
	}
115
}
115
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateSubcorpusDialog.java (revision 1335)
115 115
	@Override
116 116
	protected void configureShell(Shell newShell) {
117 117
		super.configureShell(newShell);
118
		newShell.setText(TXMUIMessages.CreateSubcorpusDialog_0);
118
		newShell.setText(TXMUIMessages.createSubcorpus);
119 119
		newShell.setMinimumSize(300, 300);
120 120
	}
121 121

  
......
151 151
		nameComposite.setLayout(layout4nameComposite);
152 152

  
153 153
		Label nameLabel = new Label(nameComposite, SWT.NONE);
154
		nameLabel.setText(TXMUIMessages.CreatePartitionDialog_6);
154
		nameLabel.setText(TXMUIMessages.ampNameDDot);
155 155
		nameLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
156 156

  
157 157
		name = new Text(nameComposite, SWT.BORDER);
......
163 163
		
164 164
		// First tab
165 165
		TabItem simpleTab = new TabItem(tabFolder, SWT.NONE);
166
		simpleTab.setText(TXMUIMessages.CreatePartitionDialog_1);
166
		simpleTab.setText(TXMUIMessages.simple);
167 167
		simplePanel = new SimpleSubcorpusPanel(tabFolder, SWT.NONE, this, corpus);
168 168
		simpleTab.setControl(simplePanel);
169 169
		
170 170
		//Second tab: assisted mode
171 171
		TabItem secondTab = new TabItem(tabFolder, SWT.NONE);
172
		secondTab.setText(TXMUIMessages.CreatePartitionDialog_3);
172
		secondTab.setText(TXMUIMessages.assisted);
173 173
		this.complexPanel = new ComplexSubcorpusPanel(tabFolder, SWT.NONE, this.corpus);
174 174
		secondTab.setControl(complexPanel);
175 175

  
176 176
		// Third tab: advanced mode
177 177
		TabItem advancedTab = new TabItem(tabFolder, SWT.NONE);
178
		advancedTab.setText(TXMUIMessages.CreatePartitionDialog_5);
178
		advancedTab.setText(TXMUIMessages.advanced);
179 179

  
180 180
		Composite compositeForAdvanced = new Composite(tabFolder, SWT.NONE);
181 181
		advancedTab.setControl(compositeForAdvanced);
......
184 184
		compositeForAdvanced.setLayout(layoutForAdvanced);
185 185

  
186 186
		Label advancedPartLabel = new Label(compositeForAdvanced, SWT.NONE);
187
		advancedPartLabel.setText(TXMUIMessages.CreateSubcorpusDialog_10);
187
		advancedPartLabel.setText(TXMUIMessages.ampQuery);
188 188
		advancedPartLabel.setLayoutData(new GridData(GridData.END,
189 189
				GridData.CENTER, false, false));
190 190

  
......
236 236
		if (name.getText().length() == 0) {
237 237
			String generated = "subcorpus"; //$NON-NLS-1$
238 238

  
239
			System.out.println(TXMUIMessages.CreateSubcorpusDialog_8);
239
			System.out.println(TXMUIMessages.noSubcorpusNameWasSpecifiedWeveGeneratedOne);
240 240
			if (isAdvancedSelected()) {
241 241
				generated += ""+(this.corpus.getSubcorpora().size()+1); //$NON-NLS-1$
242 242
			} else if (assistedSelected) {
......
250 250
		// test if a query has been set
251 251
		if ((isAdvancedSelected()) && queryText.getText().length() == 0) {
252 252
			MessageDialog.openError(getShell(),
253
					TXMUIMessages.CreateSubcorpusDialog_13,
254
					TXMUIMessages.CreateSubcorpusDialog_14);
253
					TXMUIMessages.invalidQuery,
254
					TXMUIMessages.queryCannotBeLeftEmpty);
255 255
			return;
256 256
		}
257 257

  
......
267 267
				//System.out.println("3 "+queryString);
268 268
				if (queryString == null || queryString.trim().length() == 0) {
269 269
					MessageDialog.openError(getShell(),
270
							TXMUIMessages.CreateSubcorpusDialog_13,
271
							TXMUIMessages.CreateSubcorpusDialog_14);
270
							TXMUIMessages.invalidQuery,
271
							TXMUIMessages.queryCannotBeLeftEmpty);
272 272
					return;
273 273
				}
274 274
			}
......
304 304
	public StructuralUnit getStructuralUnit() {
305 305
		if (isAdvancedSelected())
306 306
			throw new IllegalStateException(
307
					TXMUIMessages.Cannot_ask_simple_when_advance);
307
					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
308 308
		return simplePanel.selectedStructuralUnit;
309 309
	}
310 310

  
......
316 316
	public StructuralUnitProperty getStructuralUnitProperty() {
317 317
		if (isAdvancedSelected())
318 318
			throw new IllegalStateException(
319
					TXMUIMessages.Cannot_ask_simple_when_advance);
319
					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
320 320
		return simplePanel.selectedStructuralUnitProperty;
321 321
	}
322 322

  
......
328 328
	public List<String> getValues() {
329 329
		if (isAdvancedSelected())
330 330
			throw new IllegalStateException(
331
					TXMUIMessages.Cannot_ask_simple_when_advance);
331
					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
332 332
		return simplePanel.selectedValues;
333 333
	}
334 334

  
......
340 340
	public String getQuery() {
341 341
		if (isAdvancedSelected() == false && isAssistedSelected() == false)
342 342
			throw new IllegalStateException(
343
					TXMUIMessages.Cannot_ask_simple_when_advance);
343
					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
344 344
		return queryString;
345 345
	}
346 346

  
......
361 361
	public String getSubCorpusName() {
362 362
		return name.getText();
363 363
	}
364
}
364
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java (revision 1335)
149 149
	@Override
150 150
	protected void configureShell(Shell newShell) {
151 151
		super.configureShell(newShell);
152
		newShell.setText(NLS.bind(TXMUIMessages.ImportDialog_0, loadername)); 
152
		newShell.setText(NLS.bind(TXMUIMessages.importSetupP0, loadername)); 
153 153
		newShell.setMinimumSize(300, 200);
154 154
	}
155 155

  
......
172 172

  
173 173
			// directory
174 174
			Label dirLabel = new Label(mainPanel, SWT.NONE);
175
			dirLabel.setText(TXMUIMessages.ImportDialog_1);
175
			dirLabel.setText(TXMUIMessages.sourceDirectoryDDot);
176 176
			dirLabel.setAlignment(SWT.CENTER);
177 177
			dirLabel.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
178 178
					false, false));
......
203 203
						if (new File(srcdir, "html").exists() && new File(srcdir, "data").exists() && new File(srcdir, "registry").exists()) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
204 204
						{	
205 205
							TXMMessageBox.show(parent
206
									.getShell(), TXMUIMessages.AddBase_19, TXMUIMessages.ImportDialog_13, SWT.ICON_WARNING);
206
									.getShell(), TXMUIMessages.warning, TXMUIMessages.thisDirectorySeemsToContainABinaryCorpus, SWT.ICON_WARNING);
207 207
						}
208 208
						
209 209
						directory = new File(path);
......
243 243

  
244 244
			// encoding
245 245
			Group encodingGroup = new Group(optionsPanel, SWT.SHADOW_ETCHED_IN);
246
			encodingGroup.setText(TXMUIMessages.ImportDialog_4);
246
			encodingGroup.setText(TXMUIMessages.sourcesCharactersEncodingDDot);
247 247
			encodingGroup.setLayout(new GridLayout(2, false));
248 248
			encodingGroup.setLayoutData(new GridData(GridData.FILL,
249 249
					GridData.FILL, true, false, 3, 1));
250 250

  
251 251
			btnDefaultEncoding = new Button(encodingGroup, SWT.RADIO);
252
			btnDefaultEncoding.setText(TXMUIMessages.ImportDialog_14
252
			btnDefaultEncoding.setText(TXMUIMessages.thisComputerEncodingDDot
253 253
					+ System.getProperty("file.encoding")); //$NON-NLS-1$
254 254
			btnDefaultEncoding.setLayoutData(new GridData(GridData.FILL,
255 255
					GridData.FILL, true, false, 2, 1));
256 256
			btnDefaultEncoding.setSelection(true);
257 257

  
258 258
			btnGuessEncoding = new Button(encodingGroup, SWT.RADIO);
259
			btnGuessEncoding.setText(TXMUIMessages.ImportDialog_16);
259
			btnGuessEncoding.setText(TXMUIMessages.guessDDot);
260 260

  
261 261
			btnGuess2Encoding = new Button(encodingGroup, SWT.PUSH);
262 262
			btnGuess2Encoding.setText("??"); //$NON-NLS-1$
263 263

  
264 264
			btnSelectEncoding = new Button(encodingGroup, SWT.RADIO);
265
			btnSelectEncoding.setText(TXMUIMessages.ImportDialog_22);
265
			btnSelectEncoding.setText(TXMUIMessages.selectDDot);
266 266

  
267 267
			encodingCombo = new Combo(encodingGroup, SWT.BORDER);
268 268
			encodingCombo.setLayoutData(new GridData(GridData.FILL,
......
294 294

  
295 295
			// lang
296 296
			Group langGroup = new Group(optionsPanel, SWT.SHADOW_ETCHED_IN);
297
			langGroup.setText(TXMUIMessages.ImportDialog_5);
297
			langGroup.setText(TXMUIMessages.mainLanguageDDot);
298 298
			langGroup.setLayout(new GridLayout(2, false));
299 299
			langGroup.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
300 300
					true, false, 3, 1));
301 301

  
302 302
			btnDefaultLang = new Button(langGroup, SWT.RADIO);
303
			btnDefaultLang.setText(TXMUIMessages.ImportDialog_19
303
			btnDefaultLang.setText(TXMUIMessages.thisComputerLanguageDDot
304 304
					+ Locale.getDefault().getLanguage());
305 305
			btnDefaultLang.setLayoutData(new GridData(GridData.FILL,
306 306
					GridData.FILL, true, false, 2, 1));
307 307
			btnDefaultLang.setSelection(true);
308 308

  
309 309
			btnGuessLang = new Button(langGroup, SWT.RADIO);
310
			btnGuessLang.setText(TXMUIMessages.ImportDialog_16); 
310
			btnGuessLang.setText(TXMUIMessages.guessDDot); 
311 311

  
312 312
			btnGuess2Lang = new Button(langGroup, SWT.PUSH);
313 313
			btnGuess2Lang.setText("??"); //$NON-NLS-1$
314 314

  
315 315
			btnSelectLang = new Button(langGroup, SWT.RADIO);
316
			btnSelectLang.setText(TXMUIMessages.ImportDialog_22);
316
			btnSelectLang.setText(TXMUIMessages.selectDDot);
317 317

  
318 318
			langcombo = new Combo(langGroup, SWT.BORDER);
319 319
			langcombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
......
350 350
			selectTokenizerPanel.setLayout(new GridLayout(4, false));
351 351
			selectTokenizerPanel.setLayoutData(new GridData(GridData.FILL,
352 352
					GridData.FILL, true, false, 3, 1));
353
			selectTokenizerPanel.setText(TXMUIMessages.ImportDialog_6);
353
			selectTokenizerPanel.setText(TXMUIMessages.tokenizerParameterFileDDot);
354 354

  
355 355
			final Text tokenizerValue = new Text(selectTokenizerPanel,
356 356
					SWT.SINGLE | SWT.BORDER);
......
387 387
			tokenizerButton = new Button(selectTokenizerPanel, SWT.PUSH);
388 388
			// tokenizerButton.setLayoutData(new GridData(GridData.FILL,
389 389
			// GridData.FILL, false, false));
390
			tokenizerButton.setText(TXMUIMessages.PropertiesSelector_2);
390
			tokenizerButton.setText(TXMUIMessages.edit);
391 391
			tokenizerButton.addSelectionListener(new SelectionListener() {
392 392
				@Override
393 393
				public void widgetSelected(SelectionEvent e) {
......
405 405
			});
406 406

  
407 407
			final ExpandItem item0 = new ExpandItem(bar, SWT.NONE, 0);
408
			item0.setText(TXMUIMessages.ImportDialog_23);
408
			item0.setText(TXMUIMessages.options);
409 409
			item0.setHeight(optionsPanel.computeSize(SWT.DEFAULT,SWT.DEFAULT).y);
410 410
			item0.setControl(optionsPanel);
411 411
						
......
509 509
		super.okPressed();
510 510
	}
511 511

  
512
}
512
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java (revision 1335)
57 57
	protected IStatus run(final IProgressMonitor monitor) {
58 58
		this.runInit(monitor);
59 59
		//this.setCurrentMonitor(monitor);
60
		monitor.beginTask(TXMUIMessages.DownloadJobHandler_0, contentLength);
60
		monitor.beginTask(TXMUIMessages.downloading, contentLength);
61 61
		long size = file.length();
62 62
		while (!done) {
63 63
			try {
tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/OpenURI.java (revision 1335)
50 50
		try
51 51
		{
52 52
			if ( !java.awt.Desktop.isDesktopSupported() ) {
53
				System.err.println( TXMUIMessages.OpenURI_0 );
53
				System.err.println( TXMUIMessages.desktopIsNotSupportedFatal );
54 54
				return false;
55 55
			}
56 56

  
......
75 75
		catch(Exception e)
76 76
		{
77 77
			System.out.println(e.getLocalizedMessage());
78
			StatusLine.error(NLS.bind(TXMUIMessages.OpenURI_1, file));
78
			StatusLine.error(NLS.bind(TXMUIMessages.errorWhileOpeningFileP0, file));
79 79
		}
80 80
		return false;
81 81
	}
......
88 88
	 */
89 89
	public static boolean browse(File file) {
90 90
		if ( !java.awt.Desktop.isDesktopSupported() ) {
91
			System.err.println( TXMUIMessages.OpenURI_0 );
91
			System.err.println( TXMUIMessages.desktopIsNotSupportedFatal );
92 92
			return false;
93 93
		}
94 94
		
......
107 107
		return false;
108 108
	}
109 109

  
110
}
110
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java (revision 1335)
90 90
		values.add("fr"); //$NON-NLS-1$
91 91
		values.add("en"); //$NON-NLS-1$
92 92
		values.add("ru"); //$NON-NLS-1$
93
		ComboDialog d = new ComboDialog(shell, TXMUIMessages.LanguageSwitchHandler_3, values,
93
		ComboDialog d = new ComboDialog(shell, TXMUIMessages.chooseTheLanguage, values,
94 94
				service.getString(Application.PLUGIN_ID,
95 95
						RCPPreferences.UI_LOCALE, "fr", null)); //$NON-NLS-1$
96 96
		if (d.open() == Window.OK) {
......
101 101
		String locale = service.getString(Application.PLUGIN_ID,
102 102
				RCPPreferences.UI_LOCALE, "fr", null); //$NON-NLS-1$
103 103
		if (locale.length() == 0)
104
			Log.warning(TXMUIMessages.LanguageSwitchHandler_0);
104
			Log.warning(TXMUIMessages.interfaceLanguageLOCALEWasNotSet);
105 105
		// Does not work:
106 106
		//System.getProperties().setProperty("eclipse.exitdata", "-nl " + locale);
107 107
		//changeLocaleTXMIni(locale);
......
130 130
			String path = System.getProperty("osgi.instance.area"); //$NON-NLS-1$
131 131
			location = new URL(path + "TXM.ini"); //$NON-NLS-1$
132 132
		} catch (MalformedURLException e) {
133
			System.err.println(NLS.bind(TXMUIMessages.LanguageSwitchHandler_5, location));
133
			System.err.println(NLS.bind(TXMUIMessages.switchLanguageDDotMalformedUrlDDotP0, location));
134 134
			return;
135 135
		}
136 136
		
137 137
		String fileName = location.getFile();
138 138
		File file = new File(fileName);
139 139
		if (!file.exists()) {
140
			MessageBox.error(NLS.bind(TXMUIMessages.LanguageSwitchHandler_1, file.getAbsolutePath()));
140
			MessageBox.error(NLS.bind(TXMUIMessages.theFileP0DoesNotExist, file.getAbsolutePath()));
141 141
			return;
142 142
		}
143 143
		fileName += ".bak"; //$NON-NLS-1$
144 144
		file.renameTo(new File(fileName));
145 145
		
146 146
		// update TXM.ini
147
		System.out.println(TXMUIMessages.LanguageSwitchHandler_7+location);
148
		Log.severe(TXMUIMessages.LanguageSwitchHandler_7+location);
147
		System.out.println(TXMUIMessages.tXMiniDDot+location);
148
		Log.severe(TXMUIMessages.tXMiniDDot+location);
149 149
		try {
150 150

  
151 151
			BufferedReader in = new BufferedReader(new FileReader(fileName));
......
233 233

  
234 234
		File file = new File(fileName);
235 235
		if (!file.exists()) {
236
			MessageBox.error(NLS.bind(TXMUIMessages.LanguageSwitchHandler_1, file.getAbsolutePath()));
236
			MessageBox.error(NLS.bind(TXMUIMessages.theFileP0DoesNotExist, file.getAbsolutePath()));
237 237
			return;
238 238
		}
239 239
		String fileNameBackup = fileName + ".bak"; //$NON-NLS-1$
......
291 291
			org.txm.rcp.utils.Logger.printStackTrace(e);
292 292
		}
293 293
	}
294
}
294
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java (revision 1335)
237 237
		if (!this.canBeInterrupted) // Prevent thread system interruption (ThreadDeath not handled by the programmer)
238 238
			return;
239 239
		
240
		Log.info(this.getName() + TXMUIMessages.JobHandler_2);
240
		Log.info(this.getName() + TXMUIMessages.cancelingRequested);
241 241
		
242 242
		try {
243
			System.out.println(TXMUIMessages.JobHandler_1 + " " + this.getName()); //$NON-NLS-1$
243
			System.out.println(TXMUIMessages.canceling_2 + " " + this.getName()); //$NON-NLS-1$
244 244
			this.syncExec(new Runnable() {
245 245
				@Override
246 246
				public void run() {
247
					StatusLine.setMessage(TXMUIMessages.JobHandler_0);
247
					StatusLine.setMessage(TXMUIMessages.canceling);
248 248
				}
249 249
			});
250
			if (currentMonitor != null) this.currentMonitor.setTaskName(TXMUIMessages.JobHandler_0);
250
			if (currentMonitor != null) this.currentMonitor.setTaskName(TXMUIMessages.canceling);
251 251
			this.mySemaphore.acquire();
252 252
			this.myThread.stop();
253 253
		} catch (Exception e) {
254 254
			org.txm.rcp.utils.Logger.printStackTrace(e);
255
			Log.severe(TXMUIMessages.JobHandler_3 + this.getName());
255
			Log.severe(TXMUIMessages.failedToCancel + this.getName());
256 256
		}
257 257
	}
258 258

  
......
284 284
	public void setTaskName(String name) {
285 285
		if (currentMonitor != null) currentMonitor.setTaskName(name);
286 286
	}
287
}
287
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java (revision 1335)
128 128
				boolean doit = RCPPreferences.getInstance().getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION);
129 129
				//System.out.println("Save file? "+doit);
130 130
				if (!doit) { // ask user
131
					MessageDialog dialog = new MessageDialog(shell, TXMUIMessages.ExecuteScript_0+result, null,
132
							TXMUIMessages.ExecuteScript_1, MessageDialog.QUESTION, new String[] {TXMUIMessages.ExecuteScript_2, TXMUIMessages.ExecuteScript_4,
133
									TXMUIMessages.ExecuteScript_5}, 0) {
131
					MessageDialog dialog = new MessageDialog(shell, TXMUIMessages.executionOfP0+result, null,
132
							TXMUIMessages.saveFileBeforeExecution, MessageDialog.QUESTION, new String[] {TXMUIMessages.saveAndRun, TXMUIMessages.abort,
133
									TXMUIMessages.dontSaveAndRun}, 0) {
134 134
						Button checkDefault;
135 135
						@Override
136 136
						protected Control createDialogArea(Composite parent) {
137 137
							Composite container = (Composite) super.createDialogArea(parent);
138 138
							checkDefault = new Button(container, SWT.CHECK);
139
							checkDefault.setText(TXMUIMessages.ExecuteScript_6);
139
							checkDefault.setText(TXMUIMessages.alwaysSaveBeforeLaunching);
140 140
							boolean b = RCPPreferences.getInstance().getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION);
141 141
							checkDefault.setSelection(b);
142 142

  
......
156 156
					};
157 157
					int c = dialog.open();
158 158
					if (c == 1) {
159
						System.out.println(TXMUIMessages.ExecuteScript_7);
159
						System.out.println(TXMUIMessages.executionCanceled);
160 160
						return null;
161 161
					} else if (c == 2) {
162 162
						//System.out.println("Don't save and run.");
......
204 204
				env.put("selection", selection); // selection
205 205
				se.executeScript(script, env);
206 206
			} else {
207
				System.out.println(TXMUIMessages.ExecuteScript_3+script.getName());
207
				System.out.println(TXMUIMessages.noInterpreterFoundForScriptFileExtension+script.getName());
208 208
			}
209 209
		}
210 210
	}
211
}
211
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteText.java (revision 1335)
88 88
			System.out.println("Execute R text selection not implemented");
89 89
			//ExecuteRText.executeText(text);
90 90
		} else {
91
			System.out.println(TXMUIMessages.ExecuteScript_3+script.getName());
91
			System.out.println(TXMUIMessages.noInterpreterFoundForScriptFileExtension+script.getName());
92 92
		}
93 93
		return null;
94 94
	}
95
}
95
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java (revision 1335)
176 176
		// check script
177 177
		final File scriptfile = new File(scriptpath);
178 178
		if (!scriptfile.exists()) {
179
			System.err.println(NLS.bind(TXMUIMessages.ExecuteScriptImport_1, scriptpath));
179
			System.err.println(NLS.bind(TXMUIMessages.p0ScriptFileDoesntExist, scriptpath));
180 180
			return;
181 181
		}
182 182
		ExecuteLastGroovyScript.setLastScript(scriptfile, currentRootDir.getName().equals("macro")); // register last groovy script //$NON-NLS-1$
......
205 205
		String dir = currentRootDir.getAbsolutePath();
206 206
		String path = scriptfile.getAbsolutePath();
207 207
		if (!path.startsWith(dir)) {
208
			System.out.println(TXMUIMessages.bind(TXMUIMessages.ExecuteGroovyScriptFromFile_2, dir, path));
208
			System.out.println(TXMUIMessages.bind(TXMUIMessages.theP1GroovyScriptMustBeInTheP0Folder, dir, path));
209 209
			return;
210 210
		}
211 211
		final String relativepath = path.substring(dir.length()+1);
......
214 214
			
215 215
		//}
216 216

  
217
		JobHandler jobhandler = new JobHandler(NLS.bind(TXMUIMessages.ExecuteScript_0, scriptfile.getName())) {
217
		JobHandler jobhandler = new JobHandler(NLS.bind(TXMUIMessages.executionOfP0, scriptfile.getName())) {
218 218
			@Override
219 219
			protected IStatus run(IProgressMonitor monitor) {
220 220
				this.runInit(monitor);
221 221
				//this.setCurrentMonitor(monitor);
222
				monitor.beginTask(NLS.bind(TXMUIMessages.ExecuteScript_0, scriptfile.getName()), 100);
222
				monitor.beginTask(NLS.bind(TXMUIMessages.executionOfP0, scriptfile.getName()), 100);
223 223

  
224 224
				try {
225 225
					gse = GSERunner.buildDefaultGSE();
......
238 238
					binding.setProperty("MONITOR", this); //$NON-NLS-1$
239 239
					binding.setProperty("gse", gse);
240 240
					
241
					System.out.println(NLS.bind(TXMUIMessages.ExecuteScript_11, scriptfile.getName()));
241
					System.out.println(NLS.bind(TXMUIMessages.executingGroovyScript, scriptfile.getName()));
242 242
					long time = System.currentTimeMillis();
243 243
					System.out.println(relativepath);
244 244
					gse.run(relativepath, binding);
245 245
					
246
					System.out.println(TXMUIMessages.bind(TXMUIMessages.ExecuteScript_12, System.currentTimeMillis()-time));
246
					System.out.println(TXMUIMessages.bind(TXMUIMessages.doneP0Ms, System.currentTimeMillis()-time));
247 247
				} catch (ThreadDeath td) {
248 248
					return Status.CANCEL_STATUS;
249 249
				} catch (UIParameterException e) {
250 250
					if (e.isError()) {
251
						System.out.println(TXMUIMessages.ExecuteGroovyScript_1);
251
						System.out.println(TXMUIMessages.errorDuringParametersInitialisation);
252 252
					} else {
253
						System.out.println(TXMUIMessages.ExecuteGroovyScript_2);
253
						System.out.println(TXMUIMessages.theUserCanceledTheScriptExecution);
254 254
					}
255 255
				} catch (Exception e) {
256
					System.out.println(TXMUIMessages.ExecuteGroovyScript_9+e);
256
					System.out.println(TXMUIMessages.errorDuringScriptExecutionDDot+e);
257 257
					org.txm.rcp.utils.Logger.printStackTrace(e);
258 258
				} finally {
259 259
					monitor.done();			
......
339 339
		 * {org.txm.rcp.utils.Logger.printStackTrace(e);}
340 340
		 */
341 341
	}
342
}
342
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyText.java (revision 1335)
103 103
	 */
104 104
	public static Object executeText(final String text, final String scriptfile) {
105 105
		if (!new File(scriptfile).exists()) {
106
			System.err.println(NLS.bind(TXMUIMessages.ExecuteScriptImport_1, scriptfile));
106
			System.err.println(NLS.bind(TXMUIMessages.p0ScriptFileDoesntExist, scriptfile));
107 107
			return null;
108 108
		}
109 109
		final String scriptRootDir = Toolbox.getTxmHomePath() + "/scripts";
......
153 153
					System.out.println("Executing text selection..."); //$NON-NLS-1$
154 154
					long time = System.currentTimeMillis();
155 155
					shell.evaluate(text);
156
					Log.info(NLS.bind(TXMUIMessages.ExecuteScript_12, (System.currentTimeMillis() - time)));
156
					Log.info(NLS.bind(TXMUIMessages.doneP0Ms, (System.currentTimeMillis() - time)));
157 157
				} catch (ThreadDeath td) { 
158 158
					return Status.CANCEL_STATUS;
159 159
				} catch (CompilationFailedException e) {
......
168 168
		jobhandler.startJob();
169 169
		return null;
170 170
	}
171
}
171
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteLastGroovyScript.java (revision 1335)
77 77
	public static void execute(IWorkbenchPart page, ISelection selection) {
78 78
		if (lastScript == null) return; // no last script
79 79
		if (macro)
80
			System.out.println(TXMUIMessages.ExecuteLastGroovyScript_0+lastScript);
80
			System.out.println(TXMUIMessages.executingLastMacroDDot+lastScript);
81 81
		else 
82
			System.out.println(TXMUIMessages.ExecuteLastGroovyScript_1+lastScript);
82
			System.out.println(TXMUIMessages.executingLastScriptDDot+lastScript);
83 83
		
84 84
		//IPreferencesService service = Platform.getPreferencesService();
85 85
		String scriptRootDir = Toolbox.getTxmHomePath() + "/scripts"; //$NON-NLS-1$
86 86
		File currentRootDir = new File(scriptRootDir, "groovy/user"); //$NON-NLS-1$
87 87
		
88 88
		if (!currentRootDir.exists()) {
89
			System.out.println(TXMUIMessages.ExecuteLastGroovyScript_3+currentRootDir);
89
			System.out.println(TXMUIMessages.errorDDotCurrentGroovyScriptDirectoryDoesNotExistDDot+currentRootDir);
90 90
			return;
91 91
		}
92 92
		
93 93
		ExecuteGroovyScript.executeScript(currentRootDir, lastScript.getAbsolutePath(), page, selection, false);
94 94
	}
95
}
95
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java (revision 1335)
138 138
		}
139 139
		
140 140
		Display.getDefault().syncExec(new Runnable() {
141
			public void run() {	StatusLine.setMessage(TXMUIMessages.ExecuteScriptImport_0); }
141
			public void run() {	StatusLine.setMessage(TXMUIMessages.importStarted); }
142 142
		});
143 143

  
144 144
		final String txmhome = Toolbox.getTxmHomePath();
145 145
		final File corporadir = new File(txmhome,"corpora"); //$NON-NLS-1$
146 146
		corporadir.mkdir(); // the binary corpus are stored here
147 147
		if (!corporadir.exists()) {
148
			System.out.println(TXMUIMessages.ExecuteScriptImport_2+corporadir);
149
			Log.severe(TXMUIMessages.ExecuteScriptImport_2+corporadir);
148
			System.out.println(TXMUIMessages.errorDDotCorporaDirectoryDoesntExistDDot+corporadir);
149
			Log.severe(TXMUIMessages.errorDDotCorporaDirectoryDoesntExistDDot+corporadir);
150 150
			return null;
151 151
		}
152 152
		
153 153
		if (CQPSearchEngine.isInitialized()) Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
154 154
		
155
		JobHandler jobhandler = new JobHandler(TXMUIMessages.RunGroovyScript_0
155
		JobHandler jobhandler = new JobHandler(TXMUIMessages.scriptExecution
156 156
				+ project.getImportModuleName()) { //$NON-NLS-1$
157 157
			@Override
158 158
			protected IStatus run(IProgressMonitor monitor) {
......
214 214
		return BundleUtils.replaceFilesIfNewer("org.txm.groovy.core", "src/groovy", scriptPackage, 
215 215
				script.getName(), script);
216 216
	}
217
}
218

  
217
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/CreateMacro.java (revision 1335)
96 96
		
97 97
		//ask new file name
98 98
		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event).getShell();
99
		InputDialog dialog = new InputDialog(shell, TXMUIMessages.CreateMacro_0, TXMUIMessages.CreateMacro_1, "", null); //$NON-NLS-1$
99
		InputDialog dialog = new InputDialog(shell, TXMUIMessages.macroName, TXMUIMessages.pleaseWriteTheMacroName, "", null); //$NON-NLS-1$
100 100
		
101 101
		dialog.open();
102 102
		String name = dialog.getValue();
......
138 138
		if (!newfile.exists() && newfile.getParentFile().canWrite()) {
139 139
			try {
140 140
				if (newfile.createNewFile()) {
141
					System.out.println(NLS.bind(TXMUIMessages.CreateFile_1, newfile.getAbsolutePath()));
141
					System.out.println(NLS.bind(TXMUIMessages.newFileDDotP0, newfile.getAbsolutePath()));
142 142
					
143 143
					PrintWriter writer = IOUtils.getWriter(newfile, "UTF-8"); //$NON-NLS-1$
144 144
					writer.println("// STANDARD DECLARATIONS"); //$NON-NLS-1$
......
204 204
		
205 205
		return true;
206 206
	}
207
}
207
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportResult.java (revision 1335)
92 92
		}
93 93

  
94 94
		if (dialog.open() != null) {
95
			StatusLine.setMessage(TXMUIMessages.ExportResult_0);
95
			StatusLine.setMessage(TXMUIMessages.exportingResults);
96 96
			String filepath = dialog.getFilterPath()
97 97
					+ "/" + dialog.getFileName(); //$NON-NLS-1$
98 98
			if (!(filepath.endsWith(extensions[0].substring(1))))
......
103 103
			try {
104 104
				outfile.createNewFile();
105 105
			} catch (IOException e1) {
106
				System.err.println(NLS.bind(TXMUIMessages.ExportResult_3, outfile, e1));
106
				System.err.println(NLS.bind(TXMUIMessages.exportDDotCantCreateFileP0DDotP1, outfile, e1));
107 107
			}
108 108
			if (!outfile.canWrite()) {
109
				System.out.println(NLS.bind(TXMUIMessages.ExportResult_5, outfile));
109
				System.out.println(NLS.bind(TXMUIMessages.impossibleToReadP0, outfile));
110 110
				return null;
111 111
			}
112 112
			if (!outfile.isFile()) {
......
120 120
			String _txtseparator = TBXPreferences.getInstance().getString(TBXPreferences.EXPORT_TXT_SEPARATOR);
121 121
			final String txtseparator = _txtseparator;
122 122

  
123
			JobHandler jobhandler = new JobHandler(TXMUIMessages.ExportResult_0) {
123
			JobHandler jobhandler = new JobHandler(TXMUIMessages.exportingResults) {
124 124
				@Override
125 125
				protected IStatus run(IProgressMonitor monitor) {
126 126
					try {
127 127
						this.runInit(monitor);
128
						monitor.beginTask(TXMUIMessages.ExportResult_1, 100);
128
						monitor.beginTask(TXMUIMessages.exporting, 100);
129 129

  
130 130
						if (s instanceof TXMResult) {
131 131
							((TXMResult)s).setCurrentMonitor(this); // Allows Functions to protect themselves from interruption
......
148 148

  
149 149
							System.out.println(NLS.bind("", outfile.getAbsolutePath())); //$NON-NLS-1$
150 150
						} else {
151
							System.out.println(NLS.bind(TXMUIMessages.ExportResult_6, outfile.getAbsolutePath()));
151
							System.out.println(NLS.bind(TXMUIMessages.failedToExportResultP0DDotP1, outfile.getAbsolutePath()));
152 152
						}
153 153
					} catch (ThreadDeath td) {
154 154
						if (s instanceof TXMResult)
155 155
							((TXMResult)s).clean();
156 156
						return Status.CANCEL_STATUS;
157 157
					} catch (Exception e) {
158
						System.out.println(NLS.bind(TXMUIMessages.ExportResult_6, s, e));
158
						System.out.println(NLS.bind(TXMUIMessages.failedToExportResultP0DDotP1, s, e));
159 159
						org.txm.rcp.utils.Logger.printStackTrace(e);
160 160
						return Status.CANCEL_STATUS;
161 161
					} finally {
......
172 172
		}
173 173
		return null;
174 174
	}
175
}
175
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportSVG.java (revision 1335)
176 176
		}
177 177

  
178 178
		if (outfile.exists()) {
179
			System.out.println(NLS.bind(TXMUIMessages.ExportSVG_1, outfile, ""));  //$NON-NLS-1$
179
			System.out.println(NLS.bind(TXMUIMessages.p1FileSavedInP0, outfile, ""));  //$NON-NLS-1$
180 180
		} else {
181
			System.out.println(NLS.bind(TXMUIMessages.ExportSVG_3 + outfile, "")); //$NON-NLS-1$
181
			System.out.println(NLS.bind(TXMUIMessages.failedToExportFileP0WithDeviceP1 + outfile, "")); //$NON-NLS-1$
182 182
		}
183 183
	}
184 184

  
185
}
185
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java (revision 1335)
120 120
				@Override
121 121
				public void run() {
122 122
					MessageBox messageBox = new MessageBox(Display.getDefault().getActiveShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO);
123
					messageBox.setMessage(NLS.bind(TXMUIMessages.DeleteObject_0, selection.toList()));
123
					messageBox.setMessage(NLS.bind(TXMUIMessages.deletingP0Continue, selection.toList()));
124 124
					int response = messageBox.open();
125 125
					if (response != SWT.YES) {
126 126
						StatusLine.setMessage(""); //$NON-NLS-1$
......
158 158
	 * @return 
159 159
	 */
160 160
	public synchronized static HashSet<Object> delete(final List<Object> objects) {
161
		StatusLine.setMessage(NLS.bind(TXMUIMessages.DeleteObject_5, objects));
161
		StatusLine.setMessage(NLS.bind(TXMUIMessages.deletingP0, objects));
162 162
		
163 163
		final HashSet<Object> allObjectDeleted = new HashSet<Object>();
164 164
		shouldRestartToolbox = false;
......
168 168
				List<Object> deleted = delete(o);
169 169
				allObjectDeleted.addAll(deleted);
170 170
				if (deleted.size() == 0) {
171
					StatusLine.setMessage(TXMUIMessages.DeleteObject_3+" : "+o);
171
					StatusLine.setMessage(TXMUIMessages.errorDDotDeleteReturnedFalse+" : "+o);
172 172
					return new HashSet<Object>();
173 173
				}
174 174
				// remove results already deleted
175 175
				objects.removeAll(deleted);
176 176
			} catch(Exception e) {
177
				Log.info(NLS.bind(TXMUIMessages.DeleteObject_4, o, e)); 
178
				StatusLine.error(NLS.bind(TXMUIMessages.DeleteObject_4, o, e)); 
177
				Log.info(NLS.bind(TXMUIMessages.errorWhileDeletingP0DDotP1, o, e)); 
178
				StatusLine.error(NLS.bind(TXMUIMessages.errorWhileDeletingP0DDotP1, o, e)); 
179 179
				org.txm.rcp.utils.Logger.printStackTrace(e);
180 180
				return new HashSet<Object>();
181 181
			}
......
226 226
	public static List<Object> delete(Object o) {
227 227
		ArrayList<Object> deleted = new ArrayList<Object>();
228 228
//		if (o instanceof TXMResult) {
229
//			Log.info(NLS.bind(TXMUIMessages.DeleteObject_10, ((TXMResult) o).getName()));
229
//			Log.info(NLS.bind(TXMUIMessages.deletedDDotP0, ((TXMResult) o).getName()));
230 230
//
231 231
//			try {
232 232
//				if (o instanceof CQPCorpus) {
......
239 239
//					deleted.addAll(c.getPartitions());
240 240
//
241 241
//					if (!((TXMResult) o).delete()) {
242
//						Log.info(TXMUIMessages.DeleteObject_3);
242
//						Log.info(TXMUIMessages.errorDDotDeleteReturnedFalse);
243 243
//						return new ArrayList<Object>(0);
244 244
//					}
245 245
//				} else if (o instanceof Partition) {
......
249 249
//						i--;
250 250
//					}
251 251
//					if (!((TXMResult) o).delete()) {
252
//						Log.info(TXMUIMessages.DeleteObject_3);
252
//						Log.info(TXMUIMessages.errorDDotDeleteReturnedFalse);
253 253
//						return new ArrayList<Object>(0);
254 254
//					}
255 255
//				}
......
264 264
			} else {
265 265
				((TXMResult) o).delete();
266 266
			}
267
			Log.info(NLS.bind(TXMUIMessages.DeleteObject_10, ((TXMResult) o)));
267
			Log.info(NLS.bind(TXMUIMessages.deletedDDotP0, ((TXMResult) o)));
268 268
			deleted.add(o);
269 269
		} else {
270 270
			System.out.println("Cant delete: "+o);
......
304 304
		}
305 305
		return new IWorkbenchPage[0];
306 306
	}
307
}
307
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/PasteFile.java (revision 1335)
80 80
				}
81 81
				try {
82 82
					if (!org.txm.utils.io.FileCopy.copy(source, dest))
83
						System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest);
83
						System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest);
84 84
				} catch (IOException e) {
85
					System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest+TXMUIMessages.PasteFile_4+e);
85
					System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest+TXMUIMessages.dDot+e);
86 86
				}
87 87
			} else if (CutFile.toCut != null) {
88 88
				File source = CutFile.toCut;
......
93 93
				}
94 94
				try {
95 95
					if (!org.txm.utils.io.FileCopy.copy(source, dest))
96
						System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest);
96
						System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest);
97 97
					if (!source.delete()) 
98
						System.out.println(TXMUIMessages.PasteFile_3+source);
98
						System.out.println(TXMUIMessages.failedToDelete+source);
99 99
					CutFile.toCut = null;
100 100
				} catch (IOException e) {
101
					System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest+TXMUIMessages.PasteFile_4+e);
101
					System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest+TXMUIMessages.dDot+e);
102 102
				}
103 103
			} else {
104 104
				// check clipboard content
......
117 117
							org.txm.utils.io.FileCopy.copyFiles(source, dest);
118 118
						} else {
119 119
							if (!org.txm.utils.io.FileCopy.copy(source, dest))
120
								System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest);
120
								System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest);
121 121
						}
122 122
						
123 123
					} catch (IOException e) {
124
						System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest+TXMUIMessages.PasteFile_4+e);
124
						System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest+TXMUIMessages.dDot+e);
125 125
					}
126 126
				}
127 127
			}
......
131 131
			MacroExplorer.refresh();
132 132
		}
133 133
	}
134
}
134
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/CreateFolder.java (revision 1335)
98 98
		LastOpened.set(ID, newfile.getParent(), newfile.getName());
99 99
		if (!newfile.exists() && newfile.getParentFile().canWrite()) {
100 100
			if (newfile.mkdir())
101
				System.out.println(NLS.bind(TXMUIMessages.CreateFolder_1, newfile.getAbsolutePath()));
101
				System.out.println(NLS.bind(TXMUIMessages.newFolderDDotP0, newfile.getAbsolutePath()));
102 102

  
103 103
		}
104 104
		Explorer.refresh();
......
106 106

  
107 107
		return null;
108 108
	}
109
}
109
}
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff