Révision 1342

tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties (revision 1342)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)

2 2
#TXM messages generated by the PluginMessagesManager class
3 3
#Mon Nov 12 17:18:22 CET 2018
4 4

  
......
149 149

  
150 150
corpusNameOnlyCapsAndNoDigitAtBeginning = Имя корпуса*
151 151

  
152
couldNotCreateBackupDirectoryDDot = ** Ошибка: не удалсоь создать папку для сохранения корпуса
152
couldNotCreateBackupDirectoryDDot = ** Ошибка: не удалсоь создать папку для сохранения корпуса: {0}.
153 153

  
154 154
couldNotFindDirectoryDDotP0 = ** Библиография: не удается найти папку {0}
155 155

  
......
157 157

  
158 158
couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator = Не удается запустить встроенные браузер. Вы должны отрегулировать соответствующий параметр в Настройках, с помощью меню Общие / Веб браузер
159 159

  
160
couldNotReadInstallPreferencesFile = ** Ошибка чтения файла опций установки
160
couldNotReadInstallPreferencesFile = ** Ошибка чтения файла опций установки: {0}.
161 161

  
162 162
couldNotUnzipBinaryCorpusDDot = ** Не удалось загрузить бинарный корпус: {0}
163 163

  
......
175 175

  
176 176
creatingASubcorpusOnP0 = Создать новый подокорпус для {0}
177 177

  
178
creatingTXMUserWorkingDirectory = Создание рабочего пространства пользователя TXM.
178
creatingTXMUserWorkingDirectory = Создание рабочего пространства пользователя TXM...
179 179

  
180 180
dDot = : 
181 181

  
......
313 313

  
314 314
extractingBinaryCorpus = Извлечение бинарного корпуса
315 315

  
316
failedToBackupExistingCorporaDDot = ** Невозможно сохранить существующие корпусы:
316
failedToBackupExistingCorporaDDot = ** Невозможно сохранить существующие корпусы: {0}.
317 317

  
318 318
failedToCancel = N/A_Failed to cancel 
319 319

  
......
337 337

  
338 338
failedToLoadCorpusP0 = ** Не удалось загрузить корпус {0}
339 339

  
340
failedToMoveCorpus = ** Невозможно перенести корпус 
340
failedToMoveCorpus = ** Невозможно перенести корпус {0} to {1}.
341 341

  
342 342
failedToRename = ** Не удалось переименовать 
343 343

  
......
661 661

  
662 662
startsWith = начинается с
663 663

  
664
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Запуск платформы прерван. Пожалуйста, отрегулируйте опции (в меню 'Файл>Опции')
664
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Запуск платформы прерван. Пожалуйста, отрегулируйте опции (в меню 'Файл>Опции'): {0}.
665 665

  
666 666
string = Цепочка знаков
667 667

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties (revision 1342)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)

2 2
#TXM messages generated by the PluginMessagesManager class
3 3
#Mon Nov 12 17:18:22 CET 2018
4 4

  
......
177 177

  
178 178
corpusNameOnlyCapsAndNoDigitAtBeginning = Nom du corpus* (majuscules et pas de chiffre en début)
179 179

  
180
couldNotCreateBackupDirectoryDDot = ** Échec : le dossier de sauvegarde des corpus n'a pas pu être créé
180
couldNotCreateBackupDirectoryDDot = ** Échec : le dossier de sauvegarde des corpus n'a pas pu être créé: {0}.
181 181

  
182 182
couldNotFindDirectoryDDotP0 = ** Bibliographie : dossier {0} introuvable
183 183

  
......
185 185

  
186 186
couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator = Impossible de lancer le navigateur interne. Vous devez régler ce paramètre dans les préférences, au menu : Général / Navigateur web
187 187

  
188
couldNotReadInstallPreferencesFile = ** Échec de lecture du fichier des préférences d'installation
188
couldNotReadInstallPreferencesFile = ** Échec de lecture du fichier des préférences d'installation: {0}.
189 189

  
190 190
couldNotUnzipBinaryCorpusDDot = ** Échec de l''extraction du corpus binaire : {0}
191 191

  
......
203 203

  
204 204
creatingASubcorpusOnP0 = Créer un nouveau sous-corpus de {0}
205 205

  
206
creatingTXMUserWorkingDirectory = Création de l'espace de travail utilisateur de TXM.
206
creatingTXMUserWorkingDirectory = Création de l'espace de travail utilisateur de TXM...
207 207

  
208 208
dDot = : 
209 209

  
......
361 361

  
362 362
extractingBinaryCorpus = Extraction du corpus binaire
363 363

  
364
failedToBackupExistingCorporaDDot = ** Impossible de sauvegarder les corpus existants : 
364
failedToBackupExistingCorporaDDot = ** Impossible de sauvegarder les corpus existants : {0}.
365 365

  
366 366
failedToCancel = Impossible d'annuler  
367 367

  
......
389 389

  
390 390
failedToLoadCorpusP0 = ** Échec du chargement du corpus {0}
391 391

  
392
failedToMoveCorpus = ** Impossible de déplacer le corpus 
392
failedToMoveCorpus = ** Impossible de déplacer le corpus {0} vers {1}.
393 393

  
394 394
failedToRename = ** Échec du renommage 
395 395

  
......
761 761

  
762 762
startsWith = commence par
763 763

  
764
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu 'Fichier>Préférences')
764
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu 'Fichier>Préférences') : {0}.
765 765

  
766 766
string = Chaîne de caractères
767 767

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 1342)
183 183

  
184 184
corpusNameOnlyCapsAndNoDigitAtBeginning = Corpus name* (only caps and no digit at beginning)
185 185

  
186
couldNotCreateBackupDirectoryDDot = ** Could not create backup directory :
186
couldNotCreateBackupDirectoryDDot = ** Could not create backup directory: {0}.
187 187

  
188 188
couldNotFindDirectoryDDotP0 = Could not find directory: {0}
189 189

  
......
191 191

  
192 192
couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator = Could not launch the internal web browser. You must set that parameter in the preferences, menu: General>WebNavigator
193 193

  
194
couldNotReadInstallPreferencesFile = ** Could not read install preferences file
194
couldNotReadInstallPreferencesFile = ** Could not read install preferences file: {0}.
195 195

  
196 196
couldNotStartProxyConfigurationDDot = Could not start proxy configuration: {0}.
197 197

  
......
211 211

  
212 212
creatingASubcorpusOnP0 = Creating a sub-corpus on {0}
213 213

  
214
creatingTXMUserWorkingDirectory = Creating TXM user working directory.
214
creatingTXMUserWorkingDirectory = Creating TXM user working directory...
215 215

  
216 216
dDot = :
217 217

  
......
343 343

  
344 344
errorWhileGettingCurrentPositionValueDDot = Error while getting current position value:
345 345

  
346
errorWhileLoadingTXMDDot = Error while loading TXM: 
346
errorWhileLoadingTXMDDot = Error while loading TXM: {0}.
347 347

  
348 348
errorWhileOpeningBibliographicRecordP0WithURLEqualsP1 = ** Error while opening bibliographic record {0} with URL={1}
349 349

  
......
353 353

  
354 354
errorWhileRunningScriptDDotP0 = Error while running script: {0}
355 355

  
356
errorWhileUpdatingTXMDDot = Error while updating TXM: 
356
errorWhileUpdatingTXMDDot = Error while updating TXM: {0}.
357 357

  
358 358
errorWhileUpdatingTXMDDotNoHandlerServiceFound = Error while updating TXM: no handler service found
359 359

  
......
395 395

  
396 396
extractingBinaryCorpus = Extracting binary corpus
397 397

  
398
failedToBackupExistingCorporaDDot = ** Failed to backup existing corpora:
398
failedToBackupExistingCorporaDDot = ** Failed to backup existing corpora: {0}.
399 399

  
400 400
failedToCancel = Failed to cancel
401 401

  
......
423 423

  
424 424
failedToLoadCorpusP0 = ** Failed to load corpus  {0}
425 425

  
426
failedToMoveCorpus = ** Failed to move corpus
426
failedToMoveCorpus = ** Failed to move corpus {0} to {1}.
427 427

  
428 428
failedToRename = ** Failed to rename
429 429

  
......
841 841

  
842 842
startsWith = starts with
843 843

  
844
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Startup failed, please check TXM preferences (in the 'File>Preferences' menu) or contact txm-users mailing list (menu: Help>
844
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup = ** Startup failed, please check TXM preferences (in the 'File>Preferences' menu) or contact txm-users mailing list (menu: Help>): {0}.
845 845

  
846 846
string = String
847 847

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 1342)
82 82
import org.osgi.framework.ServiceReference;
83 83
import org.osgi.framework.Version;
84 84
import org.txm.Toolbox;
85
import org.txm.core.messages.TXMCoreMessages;
85 86
import org.txm.core.preferences.TBXPreferences;
86 87
import org.txm.core.preferences.TXMPreferences;
87 88
import org.txm.objects.Project;
......
186 187
			CGUMessageDialog dialog = new CGUMessageDialog(Display.getCurrent().getActiveShell(), 
187 188
					TXMUIMessages.termsOfService, 
188 189
					IImageKeys.getImage(IImageKeys.TXM_ICON), 
189
					TXMUIMessages.infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt, 
190
					TXMUIMessages.infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt,
190 191
					IImageKeys.getImage(IImageKeys.TXM), 
191 192
					TXMUIMessages.iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpDDottextometrieenslyonfrspipphprubrique61SupPage, 
192 193
					dialogButtonLabels, 0) {
193 194
			};
194 195
			boolean ret = (dialog.open() == MessageDialog.OK) && dialog.hasCheckBeenPressed();
195 196
			if (ret) {
196
				TBXPreferences.getInstance().put("cgu", "true");
197
				TBXPreferences.getInstance().put("cgu", true); //$NON-NLS-1$
197 198
			} else {
198 199
				System.exit(0);
199 200
			}
......
210 211

  
211 212
		try {			
212 213
			// create the Toolbox initialization job
213
			JobHandler jobhandler = new JobHandler(
214
					TXMUIMessages.initializationOfThePlatform, true) {
214
			JobHandler jobhandler = new JobHandler(TXMUIMessages.initializationOfThePlatform, true) {
215 215
				@Override
216 216
				protected IStatus run(final IProgressMonitor monitor) {
217 217
					JobsTimer.start();
......
276 276

  
277 277
						monitor.done();
278 278
					} catch (Exception e) {
279
						System.out.println(TXMUIMessages.errorWhileLoadingTXMDDot+e);
279
						System.out.println(TXMCoreMessages.bind(TXMUIMessages.errorWhileLoadingTXMDDot, e));
280 280
						org.txm.rcp.utils.Logger.printStackTrace(e);
281 281
					} catch(ThreadDeath td) {
282 282
						System.out.println("TXM initialization has been canceled by user. Please restart TXM.");
......
292 292
			startUpdateLookUpJob(false);
293 293

  
294 294
		} catch (Exception e) {
295
			Log.severe(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup+" "+e.getMessage());
296
			System.out.println(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup+" "+e.getMessage());
295
			Log.severe(TXMCoreMessages.bind(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup, e.getMessage()));
296
			System.out.println(TXMCoreMessages.bind(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup, e.getMessage()));
297 297
			Log.printStackTrace(e);
298 298
		}
299 299
	}
......
376 376
			//					public void run() {
377 377

  
378 378
			try {
379
				URL url = new URL("http://textometrie.ens-lyon.fr/dist/index.html");
380
				Log.warning("Test if update site is available: "+url);
379
				URL url = new URL("http://textometrie.ens-lyon.fr/dist/index.html"); //$NON-NLS-1$
380
				Log.warning(TXMCoreMessages.bind("Testing if update site is available: {0}.", url));
381 381
				url.openStream().read();
382 382
			} catch(Exception e){
383
				Log.warning("TXM cannot fetch updates ("+e+")");
383
				Log.warning(TXMCoreMessages.bind("TXM cannot fetch updates ({0}).", e));
384 384
				doUpdate = false;
385 385
				return;
386 386
			}
......
397 397
							e.display = Display.getDefault();
398 398
							handlerService.executeCommand(TXMUpdateHandler.ID, e);
399 399
						} catch (Exception e) {
400
							System.out.println(TXMUIMessages.errorWhileUpdatingTXMDDot+e);
400
							System.out.println(TXMCoreMessages.bind(TXMUIMessages.errorWhileUpdatingTXMDDot, e));
401 401
							Log.printStackTrace(e);
402 402
						}
403 403
					} else {
......
416 416
		String path = Toolbox.getTxmHomePath();
417 417

  
418 418
		if (path == null || path.trim().equals("")) {
419
			Log.warning("TXM user directory is not set ('" + TBXPreferences.USER_TXM_HOME + "' preference is not set).");
419
			Log.warning(TXMCoreMessages.bind("TXM user directory is not set ('{0}' preference is not set).", TBXPreferences.USER_TXM_HOME));
420 420
			return true;
421 421
		}
422 422
		File dir = new File(Toolbox.getTxmHomePath().trim());
423 423
		if (!dir.exists()) {
424
			Log.warning("TXM user directory is set to '"+dir+"' but does not exist.");
424
			Log.warning(TXMCoreMessages.bind("TXM user directory is set to '{0}' but does not exist.", dir));
425 425
			return true;
426 426
		} else if (!dir.canWrite()) {
427
			Log.warning("TXM user directory is set to '"+dir+"' but TXM can't write in this directory.");
427
			Log.warning(TXMCoreMessages.bind("TXM user directory is set to '{0}' but TXM can't write in this directory.", dir));
428 428
			return true;
429 429
		} else if (!dir.canExecute()) {
430
			Log.warning("TXM user directory is set to '"+dir+"' but TXM can't cd in this directory.");
430
			Log.warning(TXMCoreMessages.bind("TXM user directory is set to '{0}' but TXM can't cd in this directory.", dir));
431 431
			return true;
432 432
		}
433 433

  
......
437 437
	public static boolean testTXMINSTALLPreferenceAndDirectory() {
438 438
		//		TxmPreferences.dump();
439 439
		if (Toolbox.getInstallDirectory() == null) {
440
			Log.warning("TXM install directory is not set ('"+TBXPreferences.INSTALL_DIR+"' preference is not set).");
440
			Log.warning(TXMCoreMessages.bind("TXM install directory is not set ('{0}' preference is not set).", TBXPreferences.INSTALL_DIR));
441 441
			return true;
442 442
		}
443 443

  
......
446 446
			Log.warning("TXM install directory is set to ''.");
447 447
			return true;
448 448
		} else if (!installdir.exists()) {
449
			Log.warning("TXM install directory is set to '"+installdir+"' but does not exists.");
449
			Log.warning(TXMCoreMessages.bind("TXM install directory is set to '{0}' but does not exists.", installdir));
450 450
			return true;
451 451
		} else if (!installdir.canRead()) {
452
			Log.warning("TXM install directory is set to '"+installdir+"' but is not readable.");
452
			Log.warning(TXMCoreMessages.bind("TXM install directory is set to '{0}' but is not readable.", installdir));
453 453
			return true;
454 454
		} else if (!installdir.canExecute()) {
455
			Log.warning("TXM install directory is set to '"+installdir+"' but is not cdable.");
455
			Log.warning(TXMCoreMessages.bind("TXM install directory is set to '{0}' but is not cdable.", installdir));
456 456
			return true;
457 457
		}
458 458
		return false;
......
589 589
				return true;
590 590
			}
591 591
		} catch (Exception e) {
592
			System.err.println(TXMUIMessages.couldNotReadInstallPreferencesFile+ " " +e.getLocalizedMessage());
592
			System.err.println(TXMCoreMessages.bind(TXMUIMessages.couldNotReadInstallPreferencesFile, e.getLocalizedMessage()));
593 593
			Log.printStackTrace(e);
594 594
			return false;
595 595
		}
......
627 627
				if (record.getLevel() != Level.SEVERE) return;
628 628

  
629 629
				final IWorkbench w = PlatformUI.getWorkbench();
630
				if (w == null) {System.out.println("no workbench");return;}
630
				if (w == null) {
631
					System.out.println("no workbench");
632
					return;
633
				}
631 634

  
632 635
				w.getDisplay().syncExec(new Runnable() {
633 636
					@Override
......
684 687
			try {
685 688
				Log.info(NLS.bind(TXMUIMessages.installPathDDotP0, Toolbox.getInstallDirectory()));
686 689

  
687
				Log.info("Checking TXM user directory.");
690
				Log.info("Checking TXM user directory...");
688 691
				if (Toolbox.getTxmHomePath().trim().isEmpty()) {
689
					Version v = BundleUtils.getBundleVersion("org.txm.rcp");
692
					Version v = BundleUtils.getBundleVersion("org.txm.rcp");//$NON-NLS-1$
690 693
					if (v == null) {
691 694
						System.out.println("Error: no 'org.txm.rcp' version found.");
692 695
						return false;
693 696
					}
694 697
					String version = v.getMajor()+"."+v.getMinor()+"."+v.getMicro();
695
					if ("qualifier".equals(v.getQualifier())) {
698
					if ("qualifier".equals(v.getQualifier())) { //$NON-NLS-1$
696 699
						System.out.println("RUNNING TXM FROM ECLIPSE - DEV MODE ACTIVATED");
697 700
						version += "-dev";
698 701
					}
......
704 707
				txmhomedir.mkdirs(); // creates the directory if needed
705 708

  
706 709
				if (!txmhomedir.exists()) {
707
					Log.severe("Error: The provided TXMHOME directory does not exists: "+txmhomedir+". Aborting");
710
					Log.severe(TXMCoreMessages.bind("Error: The provided TXMHOME directory does not exists: {0}. Aborting.", txmhomedir));
708 711
					return false;
709 712
				}
710 713

  
......
713 716
				TBXPreferences.getInstance().flush();
714 717
				//TXMPreferences.saveAll();
715 718

  
716
				Log.info("TXM User directory is set to: "+txmhomedir);
719
				Log.info(TXMCoreMessages.bind("TXM User directory is set to: {0}.", txmhomedir));
717 720

  
718 721
				txmHomeRestored = true;
719 722
			} catch (Exception e) {
720 723
				org.txm.rcp.utils.Logger.printStackTrace(e);
721
				System.out.println(TXMUIMessages.failedToBackupExistingCorporaDDot+" "+e.getLocalizedMessage()); //$NON-NLS-1$
722
				Log.severe(TXMUIMessages.failedToBackupExistingCorporaDDot+e.getLocalizedMessage());
724
				System.out.println(TXMCoreMessages.bind(TXMUIMessages.failedToBackupExistingCorporaDDot, e.getLocalizedMessage()));
725
				Log.severe(TXMCoreMessages.bind(TXMUIMessages.failedToBackupExistingCorporaDDot, e.getLocalizedMessage()));
723 726
				return false;
724 727
			}
725 728

  
......
756 759
				backup.mkdir();
757 760

  
758 761
				if (!backup.exists()) {
759
					System.out.println(TXMUIMessages.couldNotCreateBackupDirectoryDDot + backup);
762
					System.out.println(TXMCoreMessages.bind(TXMUIMessages.couldNotCreateBackupDirectoryDDot, backup));
760 763
					return;
761 764
				}
762 765

  
......
791 794
					System.out.println();
792 795
				}
793 796
				if (moved.size() > 0) {
794
					Log.info(TXMUIMessages.bind(TXMUIMessages.corporaBackupedDDotP0,oldbackup,StringUtils.join(moved,", "))); //$NON-NLS-1$
797
					Log.info(TXMCoreMessages.bind(TXMUIMessages.corporaBackupedDDotP0, oldbackup, StringUtils.join(moved, ", "))); //$NON-NLS-1$
795 798
				}
796 799
				if (failed.size() > 0) {
797
					System.out.println(TXMUIMessages.failedToMoveCorpus+failed+TXMUIMessages.to+backup);
800
					System.out.println(TXMCoreMessages.bind(TXMUIMessages.failedToMoveCorpus, failed, backup));
798 801
				}
799 802
			}
800 803
		}

Formats disponibles : Unified diff