Author: tchemit Date: 2013-03-15 11:59:47 +0100 (Fri, 15 Mar 2013) New Revision: 631 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/631 Log: fixes #1843: [AIDE] - Aide de type infobulle sur les champs d'action Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigProvider.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EnterMelagWeightDialog.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java 2013-03-15 10:59:47 UTC (rev 631) @@ -47,7 +47,7 @@ @Override public String getDescription(Locale locale) { - return l_(locale, "tutti.persistence.config"); + return l_(locale, "tutti.config.persistence"); } @Override Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-03-15 10:59:47 UTC (rev 631) @@ -13,6 +13,7 @@ tutti.config.option.persistence.jdbc.url.description= tutti.config.option.persistence.jdbc.username.description= tutti.config.option.persistence.protocol.directory.description= +tutti.config.persistence= tutti.persistence.batch.validation.horsVracBenthosNotFound= tutti.persistence.batch.validation.horsVracSpeciesNotFound= tutti.persistence.batch.validation.onlySpeciesBatchStructure= @@ -24,4 +25,3 @@ tutti.persistence.batch.validation.vracSpeciesInertNotFound= tutti.persistence.batch.validation.vracSpeciesLifeNotFound= tutti.persistence.batch.validation.vracSpeciesNotFound= -tutti.persistence.config= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-03-15 10:59:47 UTC (rev 631) @@ -13,6 +13,7 @@ tutti.config.option.persistence.jdbc.url.description=URL de connexion à la base de données tutti.config.option.persistence.jdbc.username.description=Login de l'utilisateur pour se connecter à la base de données tutti.config.option.persistence.protocol.directory.description=Répertoire où sont conservés les protocoles +tutti.config.persistence=Configuration de la persistence de Tutti tutti.persistence.batch.validation.horsVracBenthosNotFound=Lot 'Hors Vrac > Benthos' non trouvé ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.horsVracNotFound=Lot 'Hors Vrac' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.horsVracSpeciesNotFound=Lot 'Hors Vrac > Espèces' non trouvé ou configuré avec d'autres critères de classement. @@ -25,4 +26,3 @@ tutti.persistence.batch.validation.vracSpeciesInertNotFound=Lot 'Vrac > Espèces > Inerte' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracSpeciesLifeNotFound=Lot 'Vrac > Espèces > Biota' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracSpeciesNotFound=Lot 'Vrac > Espèces' non trouvé, ou configuré avec d'autres critères de classement. -tutti.persistence.config=Configuration de la persistence de Tutti Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java 2013-03-15 10:59:47 UTC (rev 631) @@ -47,7 +47,7 @@ @Override public String getDescription(Locale locale) { - return l_(locale, "tutti.service.config"); + return l_(locale, "tutti.config.service"); } @Override Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-03-15 10:59:47 UTC (rev 631) @@ -6,6 +6,7 @@ tutti.config.option.site.url.description= tutti.config.option.tmp.directory.description= tutti.config.option.version.description= +tutti.config.service= tutti.property.attachment= tutti.property.caracteristic= tutti.property.country= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-03-15 10:59:47 UTC (rev 631) @@ -6,6 +6,7 @@ tutti.config.option.site.url.description=Url du site internet de l'application tutti.config.option.tmp.directory.description=Répertoire temporaire utilisée par l'application (est nettoyé à chaque démarrage de l'application). tutti.config.option.version.description=Version courante de l'application +tutti.config.service=Configuration des services de Tutti tutti.property.attachment=Pièce jointe tutti.property.caracteristic=Caractéristique tutti.property.country=Pays @@ -43,4 +44,3 @@ tutti.propety.no.vessel.name=Nom inconnu tutti.propety.no.zone=Pas de zone tutti.propety.vessel.nation.registrationCode=%s (nat.) -tutti.service.config=Configuration des services de Tutti Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-15 10:59:47 UTC (rev 631) @@ -1,6 +1,8 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Mar 15 10:49:19 CET 2013 +#Fri Mar 15 11:27:22 CET 2013 tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions +tutti.createSpeciesBatch.action.cancel.help=createSpeciesBatch.html\#actions +tutti.createSpeciesBatch.action.save.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.field.batchWeight.help=createSpeciesBatch.html\#fields tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=createSpeciesBatch.html\#fields tutti.createSpeciesBatch.field.species.help=createSpeciesBatch.html\#fields @@ -75,13 +77,13 @@ tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.location.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html -tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#fields tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.comment.help=editProgram.html\#fields @@ -120,19 +122,19 @@ tutti.editSpeciesBatch.field.speciesTotalWeight.help=editSpeciesBatch.html\#fields tutti.editSpeciesBatch.filterSpeciesBatch.help=editSpeciesBatch.html tutti.editSpeciesBatch.help=editSpeciesBatch.html -tutti.editSpeciesFrequencies.action.cancel.help=editSpeciesFrequencies.html#actions -tutti.editSpeciesFrequencies.action.generate.help=editSpeciesFrequencies.html#actions -tutti.editSpeciesFrequencies.action.save.help=editSpeciesFrequencies.html#actions -tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.maxStep.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.minStep.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.mode.autoGen.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.mode.rafale.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.mode.simple.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.action.cancel.help=editSpeciesFrequencies.html\#actions +tutti.editSpeciesFrequencies.action.generate.help=editSpeciesFrequencies.html\#actions +tutti.editSpeciesFrequencies.action.save.help=editSpeciesFrequencies.html\#actions +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.maxStep.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.minStep.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.mode.autoGen.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.mode.rafale.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.mode.simple.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-15 10:59:47 UTC (rev 631) @@ -1,6 +1,8 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Mar 15 10:49:19 CET 2013 +#Fri Mar 15 11:27:22 CET 2013 tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions +tutti.createSpeciesBatch.action.cancel.help=createSpeciesBatch.html\#actions +tutti.createSpeciesBatch.action.save.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.field.batchWeight.help=createSpeciesBatch.html\#fields tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=createSpeciesBatch.html\#fields tutti.createSpeciesBatch.field.species.help=createSpeciesBatch.html\#fields @@ -75,13 +77,13 @@ tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.location.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html -tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#fields tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.comment.help=editProgram.html\#fields @@ -120,19 +122,19 @@ tutti.editSpeciesBatch.field.speciesTotalWeight.help=editSpeciesBatch.html\#fields tutti.editSpeciesBatch.filterSpeciesBatch.help=editSpeciesBatch.html tutti.editSpeciesBatch.help=editSpeciesBatch.html -tutti.editSpeciesFrequencies.action.cancel.help=editSpeciesFrequencies.html#actions -tutti.editSpeciesFrequencies.action.generate.help=editSpeciesFrequencies.html#actions -tutti.editSpeciesFrequencies.action.save.help=editSpeciesFrequencies.html#actions -tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.maxStep.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.minStep.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.mode.autoGen.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.mode.rafale.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.mode.simple.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html#fields -tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.action.cancel.help=editSpeciesFrequencies.html\#actions +tutti.editSpeciesFrequencies.action.generate.help=editSpeciesFrequencies.html\#actions +tutti.editSpeciesFrequencies.action.save.help=editSpeciesFrequencies.html\#actions +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.maxStep.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.minStep.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.mode.autoGen.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.mode.rafale.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.mode.simple.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigProvider.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigProvider.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigProvider.java 2013-03-15 10:59:47 UTC (rev 631) @@ -47,7 +47,7 @@ @Override public String getDescription(Locale locale) { - return l_(locale, "tutti.application.config"); + return l_(locale, "tutti.config.application"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-03-15 10:59:47 UTC (rev 631) @@ -29,7 +29,7 @@ } #mainFrame { - title: "tutti.application.name"; + title: "tutti.main.title.applicationName"; defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-15 10:59:47 UTC (rev 631) @@ -265,7 +265,7 @@ String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; AboutPanel about = new AboutPanel(); - about.setTitle(_("tutti.title.about")); + about.setTitle(_("tutti.about.title")); about.setAboutText(_("tutti.about.message")); TuttiApplicationConfig config = context.getConfig(); @@ -298,7 +298,7 @@ String text = _("tutti.about.translate.content"); translateArea.setText(text); component.getViewport().add(translateArea); - about.getTabs().add(_("tutti.title.about.translate"), component); + about.getTabs().add(_("tutti.about.translate.title"), component); about.init(); about.showInDialog(ui, true); @@ -419,7 +419,7 @@ case CONFIG: screenUI = new TuttiConfigUI(ui); - screenTitle = _("tutti.title.config"); + screenTitle = _("tutti.config.title"); icon = ui.getMenuFileConfiguration().getIcon(); break; @@ -427,14 +427,14 @@ case MANAGE_DB: screenUI = new DbManagerUI(ui); - screenTitle = _("tutti.title.manageDb"); + screenTitle = _("tutti.dbMabager.title"); icon = ui.getMenuActionManageDb().getIcon(); break; case SELECT_CRUISE: screenUI = new SelectCruiseUI(ui); - screenTitle = _("tutti.title.home"); + screenTitle = _("tutti.selectCruise.title"); icon = ui.getMenuActionSelectCruise().getIcon(); break; @@ -473,12 +473,12 @@ if (TuttiUIContext.VALIDATION_CONTEXT_EDIT.equals(validationContext)) { // edit catches - screenTitle = _("tutti.title.edit.operations", getSelectedCruiseTitle()); + screenTitle = _("tutti.fishingOperations.title.edit.operations", getSelectedCruiseTitle()); icon = ui.getMenuActionEditCatches().getIcon(); } else { // validate catches - screenTitle = _("tutti.title.validate.operations", getSelectedCruiseTitle()); + screenTitle = _("tutti.fishingOperations.title.validate.operations", getSelectedCruiseTitle()); icon = ui.getMenuActionValidateCatches().getIcon(); } screenUI = new FishingOperationsUI(ui); @@ -486,7 +486,7 @@ break; case IMPORT_TEMPORARY_REFERENTIAL: - screenTitle = _("tutti.title.import.temporary.referential"); + screenTitle = _("tutti.manageTemporaryReferential.title"); screenUI = new ManageTemporaryReferentialUI(ui); icon = ui.getMenuImportTemporaryReferential().getIcon(); break; @@ -532,7 +532,7 @@ Program program = getDataContext().getProgram(); - title = _("tutti.title.selectedProgram", program.getName()) + " / "; + title = _("tutti.main.title.selectedProgram", program.getName()) + " / "; if (context.isCruiseFilled()) { @@ -541,13 +541,13 @@ cruise = getDataContext().getCruise(); if (cruise != null) { - title += _("tutti.title.selectedCruise", cruise.getName()); + title += _("tutti.main.title.selectedCruise", cruise.getName()); } } else { // no selected cruise - title += _("tutti.title.noSelectedCruise"); + title += _("tutti.main.title.noSelectedCruise"); } title += " / "; @@ -557,26 +557,26 @@ // selected protocol TuttiProtocol protocol = getDataContext().getProtocol(); - title += _("tutti.title.selectedProtocol", protocol.getName()); + title += _("tutti.main.title.selectedProtocol", protocol.getName()); } else { // no selected protocol - title += _("tutti.title.noSelectedProtocol"); + title += _("tutti.main.title.noSelectedProtocol"); } } else { // no program selected (so neither cruise) - title = _("tutti.title.noSelectedProgram"); + title = _("tutti.main.title.noSelectedProgram"); } } else { // no db loaded - title = _("tutti.title.nodb"); + title = _("tutti.main.title.nodb"); } return title; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUI.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUI.css 2013-03-15 10:59:47 UTC (rev 631) @@ -27,7 +27,7 @@ } #sampleOrderEditorTopPanel { - title: "tutti.title.sampleOrder"; + title: "tutti.config.sampleOrder.title"; } #list { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-03-15 10:59:47 UTC (rev 631) @@ -61,9 +61,9 @@ String result; if (exist) { - result = _("tutti.title.edit.cruise"); + result = _("tutti.editCruise.title.edit.cruise"); } else { - result = _("tutti.title.create.cruise"); + result = _("tutti.editCruise.title.create.cruise"); } return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-03-15 10:59:47 UTC (rev 631) @@ -279,17 +279,17 @@ if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabCreateBatch(); titlePanel = ui.getSpeciesTabCreateBatchReminderLabel(); - title = n_("tutti.title.createBatch"); + title = n_("tutti.createSpeciesBatch.title"); } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabSplitBatch(); titlePanel = ui.getSpeciesTabSplitBatchReminderLabel(); - title = n_("tutti.title.splitBatch"); + title = n_("tutti.splitSpeciesBatch.title"); } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabFrequencyEditor(); titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); - title = n_("tutti.title.editFrequency"); + title = n_("tutti.editSpeciesFrequencies.title"); } if (tuttiUi != null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EnterMelagWeightDialog.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EnterMelagWeightDialog.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EnterMelagWeightDialog.css 2013-03-15 10:59:47 UTC (rev 631) @@ -21,6 +21,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ + #dialog { title: "tutti.createMelag.title"; } @@ -39,10 +40,14 @@ } #cancelButton { - text: "tutti.action.cancel"; + text: "tutti.createMelag.action.cancel"; + toolTipText: "tutti.createMelag.action.cancel.tip"; + mnemonic:A; } #validateButton { - text: "tutti.action.validate"; + text: "tutti.createMelag.action.validate"; + toolTipText: "tutti.createMelag.action.validate.tip"; + mnemonic:V; enabled: { editor.getModel() != null }; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-03-15 10:59:47 UTC (rev 631) @@ -65,7 +65,7 @@ row.getSortedUnsortedCategoryValue())); selectedSpecies = getHandler().openAddSpeciesDialog( - _("tutti.title.selectSpecies"), + _("tutti.selectSpecies.title"), speciesList ); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css 2013-03-15 10:59:47 UTC (rev 631) @@ -31,14 +31,16 @@ } #cancelButton { - text: "tutti.action.cancel"; actionIcon: cancel; + text: "tutti.selectSpecies.action.cancel"; + toolTipText: "tutti.selectSpecies.action.cancel.tip"; mnemonic:A; } #validateButton { - text: "tutti.action.validate"; actionIcon: accept; + text: "tutti.selectSpecies.action.validate"; + toolTipText: "tutti.selectSpecies.action.validate.tip"; mnemonic:V; enabled: {model.getSelectedSpecies() != null}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-03-15 10:59:47 UTC (rev 631) @@ -68,7 +68,7 @@ species.removeAll(model.getAvailableSpecies()); selectedSpecies = getHandler().openAddSpeciesDialog( - _("tutti.title.selectSpecies"), species); + _("tutti.selectSpecies.title"), species); canContinue = selectedSpecies != null; } return canContinue; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 2013-03-15 10:59:47 UTC (rev 631) @@ -57,14 +57,6 @@ data: {model.getAvailableSpecies()}; } -#addSpeciesButton { - text: "tutti.createSpeciesBatch.action.addSpecies"; - toolTipText: "tutti.createSpeciesBatch.action.addSpecies.tip"; - mnemonic: A; - _tuttiAction: {AddSpeciesAction.class}; - _help: {"tutti.createSpeciesBatch.action.addSpecies.help"}; -} - #sortedUnsortedCategoryLabel { text: "tutti.createSpeciesBatch.field.sortedUnsortedCategory"; toolTipText: "tutti.createSpeciesBatch.field.sortedUnsortedCategory.tip"; @@ -92,12 +84,21 @@ bean: {model}; } +#addSpeciesButton { + text: "tutti.createSpeciesBatch.action.addSpecies"; + toolTipText: "tutti.createSpeciesBatch.action.addSpecies.tip"; + mnemonic: A; + _tuttiAction: {AddSpeciesAction.class}; + _help: {"tutti.createSpeciesBatch.action.addSpecies.help"}; +} + #saveButton { actionIcon: save; text: "tutti.createSpeciesBatch.action.save"; toolTipText: "tutti.createSpeciesBatch.action.save.tip"; mnemonic: E; enabled: {model.isValid()}; + _help: {"tutti.createSpeciesBatch.action.save.help"}; } #cancelButton { @@ -105,4 +106,5 @@ text: "tutti.createSpeciesBatch.action.cancel"; toolTipText: "tutti.createSpeciesBatch.action.cancel.tip"; mnemonic: A; + _help: {"tutti.createSpeciesBatch.action.cancel.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-03-15 10:59:47 UTC (rev 631) @@ -44,13 +44,10 @@ sortable: false; } -#tablePopup { - label: "tutti.title.batchActions"; -} - #removeCaracteristicMenu { - text: "tutti.action.removeCaracteristic"; - mnemonic: R; actionIcon: batch-delete; + text: "tutti.gearUseFeatureTable.action.removeCaracteristic"; + toolTipText: "tutti.gearUseFeatureTable.action.removeCaracteristic.tip"; + mnemonic: R; enabled: {model.isRemoveCaracteristicEnabled()}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java 2013-03-15 10:59:47 UTC (rev 631) @@ -36,7 +36,7 @@ private static final long serialVersionUID = 1L; public static final String TITLE = - n_("tutti.editFishingOperation.tab.gearUseFeature"); + n_("tutti.gearUseFeatureTable.title"); @Override public String getTitle() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2013-03-15 10:59:47 UTC (rev 631) @@ -40,13 +40,13 @@ public static final ColumnIdentifier<GearUseFeatureRowModel> KEY = ColumnIdentifier.newId( GearUseFeatureRowModel.PROPERTY_KEY, - n_("tutti.table.fishing.gearUseFeature.header.key"), - n_("tutti.table.fishing.gearUseFeature.header.key")); + n_("tutti.gearUseFeatureTable.table.header.key"), + n_("tutti.gearUseFeatureTable.table.header.key")); public static final ColumnIdentifier<GearUseFeatureRowModel> VALUE = ColumnIdentifier.newId( GearUseFeatureRowModel.PROPERTY_VALUE, - n_("tutti.table.fishing.gearUseFeature.header.value"), - n_("tutti.table.fishing.gearUseFeature.header.value")); + n_("tutti.gearUseFeatureTable.table.header.value"), + n_("tutti.gearUseFeatureTable.table.header.value")); public GearUseFeatureTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-03-15 10:59:47 UTC (rev 631) @@ -44,13 +44,10 @@ sortable: false; } -#tablePopup { - label: "tutti.title.batchActions"; -} - #removeCaracteristicMenu { - text: "tutti.action.removeCaracteristic"; - mnemonic: R; actionIcon: batch-delete; + text: "tutti.vesselUseFeatureTable.action.removeCaracteristic"; + toolTipText: "tutti.vesselUseFeatureTable.action.removeCaracteristic.tip"; + mnemonic: R; enabled: {model.isRemoveCaracteristicEnabled()}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java 2013-03-15 10:59:47 UTC (rev 631) @@ -35,7 +35,7 @@ private static final long serialVersionUID = 1L; public static final String TITLE = - n_("tutti.editFishingOperation.tab.vesselUseFeature"); + n_("tutti.vesselUseFeatureTable.title"); @Override public String getTitle() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2013-03-15 10:59:47 UTC (rev 631) @@ -40,13 +40,13 @@ public static final ColumnIdentifier<VesselUseFeatureRowModel> KEY = ColumnIdentifier.newId( VesselUseFeatureRowModel.PROPERTY_KEY, - n_("tutti.table.fishing.vesselUseFeature.header.key"), - n_("tutti.table.fishing.vesselUseFeature.header.key")); + n_("tutti.vesselUseFeatureTable.table.header.key"), + n_("tutti.vesselUseFeatureTable.table.header.key")); public static final ColumnIdentifier<VesselUseFeatureRowModel> VALUE = ColumnIdentifier.newId( VesselUseFeatureRowModel.PROPERTY_VALUE, - n_("tutti.table.fishing.vesselUseFeature.header.value"), - n_("tutti.table.fishing.vesselUseFeature.header.value")); + n_("tutti.vesselUseFeatureTable.table.header.value"), + n_("tutti.vesselUseFeatureTable.table.header.value")); public VesselUseFeatureTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-15 10:59:47 UTC (rev 631) @@ -49,7 +49,7 @@ } #commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; + border: {BorderFactory.createTitledBorder(_("tutti.editProgram.field.comment"))}; toolTipText: "tutti.editProgram.field.comment.tip"; _help: {"tutti.editProgram.field.comment.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-03-15 10:59:47 UTC (rev 631) @@ -54,9 +54,9 @@ String result; if (exist) { - result = _("tutti.title.edit.program"); + result = _("tutti.editProgram.title.edit.program"); } else { - result = _("tutti.title.create.program"); + result = _("tutti.editProgram.title.create.program"); } return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-15 10:59:47 UTC (rev 631) @@ -54,7 +54,7 @@ } #commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; + border: {BorderFactory.createTitledBorder(_("tutti.editProgram.field.comment"))}; toolTipText: "tutti.editProtocol.field.comment.tip"; _help: {"tutti.editProtocol.field.comment.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-03-15 10:59:47 UTC (rev 631) @@ -85,9 +85,9 @@ String result; if (exist) { - result = _("tutti.title.edit.protocol"); + result = _("tutti.editProtocol.title.edit.protocol"); } else { - result = _("tutti.title.create.protocol"); + result = _("tutti.editProtocol.title.create.protocol"); } return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherSpeciesAction.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherSpeciesAction.java 2013-03-15 10:59:47 UTC (rev 631) @@ -62,7 +62,7 @@ List<Species> species = Lists.newArrayList(model.getAllSynonyms()); selectedSpecies = getHandler().openSelectOtherSpeciesDialog( - _("tutti.title.selectSpecies"), species); + _("tutti.selectSpecies.title"), species); if (log.isInfoEnabled()) { log.info("SelectedSpecies: " + selectedSpecies); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-03-15 10:59:47 UTC (rev 631) @@ -58,12 +58,12 @@ if (cause instanceof TuttiBusinessException) { JOptionPane.showMessageDialog(context.getMainUI(), cause.getMessage(), - _("tutti.ui.common.error"), + _("tutti.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else { JXErrorPane pane = new JXErrorPane(); - ErrorInfo info = new ErrorInfo(_("tutti.common.error"), + ErrorInfo info = new ErrorInfo(_("tutti.error.ui.other.error"), _("tutti.error.errorpane.htmlmessage", message), null, null, cause, null, null); pane.setErrorInfo(info); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css 2013-03-15 10:59:47 UTC (rev 631) @@ -28,7 +28,7 @@ } #commentEditorTopPanel { - title: "tutti.title.comment"; + title: "tutti.commentEditor.title"; } #closeButton { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-15 10:59:47 UTC (rev 631) @@ -2,13 +2,12 @@ swing.error.desktop.not.supported= tutti.about.bottomText= tutti.about.message= +tutti.about.title= tutti.about.translate.content= +tutti.about.translate.title= tutti.action.cancel= tutti.action.removeCaracteristic= -tutti.config.action.sampleOrder.tip= tutti.action.validate= -tutti.application.config= -tutti.application.name= tutti.attachmentEditor.action.closeAttachment.tip= tutti.attachmentEditor.action.open.tip= tutti.attachmentEditor.action.remove.tip= @@ -34,10 +33,22 @@ tutti.commentEditor.action.close.tip= tutti.commentEditor.action.tip= tutti.commentEditor.none.tip= -tutti.common.error= +tutti.commentEditor.title= +tutti.common.askCancelEditBeforeLeaving.help= +tutti.common.askCancelEditBeforeLeaving.title= +tutti.common.askOverwriteFile.help= +tutti.common.askOverwriteFile.message= +tutti.common.askOverwriteFile.title= +tutti.common.askSaveBeforeLeaving.help= +tutti.common.askSaveBeforeLeaving.title= +tutti.common.file.csv= +tutti.common.file.protocol= +tutti.common.file.zip= tutti.config.action.reload.actions= tutti.config.action.reload.application= tutti.config.action.reload.ui= +tutti.config.action.sampleOrder.tip= +tutti.config.application= tutti.config.category.applications= tutti.config.category.applications.description= tutti.config.category.shortcuts= @@ -67,6 +78,12 @@ tutti.config.option.ui.showNumberEditorButton.description= tutti.config.option.update.url.description= tutti.config.option.weights.rate.difference.totalAndSorted.description= +tutti.config.sampleOrder.title= +tutti.config.title= +tutti.createMelag.action.cancel= +tutti.createMelag.action.cancel.tip= +tutti.createMelag.action.validate= +tutti.createMelag.action.validate.tip= tutti.createMelag.error.message= tutti.createMelag.error.title= tutti.createMelag.message= @@ -83,6 +100,8 @@ tutti.createSpeciesBatch.field.sortedUnsortedCategory.tip= tutti.createSpeciesBatch.field.species= tutti.createSpeciesBatch.field.species.tip= +tutti.createSpeciesBatch.title= +tutti.dbMabager.title= tutti.dbManager.action.chooseDbExportFile= tutti.dbManager.action.chooseDbFile= tutti.dbManager.action.closeDb= @@ -104,13 +123,6 @@ tutti.dbManager.info.no.db.loaded= tutti.dbManager.title.choose.dbExportFile= tutti.dbManager.title.choose.dbImportFile= -tutti.common.askCancelEditBeforeLeaving.help= -tutti.common.askCancelEditBeforeLeaving.title= -tutti.common.askOverwriteFile.help= -tutti.common.askOverwriteFile.message= -tutti.common.askOverwriteFile.title= -tutti.common.askSaveBeforeLeaving.help= -tutti.common.askSaveBeforeLeaving.title= tutti.editAccidentalBatch.table.header.comment= tutti.editAccidentalBatch.table.header.file= tutti.editAccidentalBatch.table.header.speciesByCode= @@ -224,6 +236,8 @@ tutti.editCruise.filterVesselType.fishing.tip= tutti.editCruise.filterVesselType.scientific= tutti.editCruise.filterVesselType.scientific.tip= +tutti.editCruise.title.create.cruise= +tutti.editCruise.title.edit.cruise= tutti.editFishingOperation.action.attachments.tip= tutti.editFishingOperation.action.cancelEditFishingOperation= tutti.editFishingOperation.action.cancelEditFishingOperation.tip= @@ -308,9 +322,7 @@ tutti.editFishingOperation.label.traitReminder= tutti.editFishingOperation.label.traitReminder.inCreation= tutti.editFishingOperation.pane.other= -tutti.editFishingOperation.tab.gearUseFeature= tutti.editFishingOperation.tab.general= -tutti.editFishingOperation.tab.vesselUseFeature= tutti.editMacroWasteBatch.table.header.comment= tutti.editMacroWasteBatch.table.header.file= tutti.editMacroWasteBatch.table.header.macroWasteCategory= @@ -336,6 +348,8 @@ tutti.editProgram.field.program.name= tutti.editProgram.field.program.zone= tutti.editProgram.field.zone.tip= +tutti.editProgram.title.create.program= +tutti.editProgram.title.edit.program= tutti.editProtocol.action.addSpeciesProtocol.tip= tutti.editProtocol.action.chooseProtocolCaracteristicFile= tutti.editProtocol.action.chooseProtocolSpeciesFile= @@ -364,6 +378,7 @@ tutti.editProtocol.field.comment.tip= tutti.editProtocol.field.protocol.name= tutti.editProtocol.field.protocol.name.tip= +tutti.editProtocol.field.species.tip= tutti.editProtocol.tab.accidental= tutti.editProtocol.tab.benthos= tutti.editProtocol.tab.caracteristic= @@ -397,13 +412,16 @@ tutti.editProtocol.title.choose.caracteristicImportFile= tutti.editProtocol.title.choose.speciesExportFile= tutti.editProtocol.title.choose.speciesImportFile= +tutti.editProtocol.title.create.protocol= +tutti.editProtocol.title.edit.protocol= tutti.editProtocol.warn.clone= tutti.editProtocol.warn.import= tutti.editSpeciesBatch.action.createMelag.tip= +tutti.editSpeciesBatch.action.createSpeciesBatch.tip= tutti.editSpeciesBatch.action.removeSpeciesBatch.tip= tutti.editSpeciesBatch.action.removeSpeciesSubBatch.tip= +tutti.editSpeciesBatch.action.renameSpeciesBatch.tip= tutti.editSpeciesBatch.action.splitSpeciesBatch.tip= -tutti.editSpeciesBatch.action.createSpeciesBatch.tip= tutti.editSpeciesBatch.field.speciesTotalInertWeight= tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip= tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight= @@ -424,7 +442,6 @@ tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.all= tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.leaf= tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.root= -tutti.editSpeciesBatch.action.renameSpeciesBatch.tip= tutti.editSpeciesBatch.split.weightNotNull.help= tutti.editSpeciesBatch.split.weightNotNull.message= tutti.editSpeciesBatch.split.weightNotNull.title= @@ -475,12 +492,14 @@ tutti.editSpeciesFrequencies.table.header.lengthStep= tutti.editSpeciesFrequencies.table.header.number= tutti.editSpeciesFrequencies.table.header.weight= +tutti.editSpeciesFrequencies.title= tutti.error.errorpane.htmlmessage= -tutti.common.file.csv= -tutti.common.file.protocol= -tutti.common.file.zip= +tutti.error.ui.business.error= +tutti.error.ui.other.error= tutti.fishingOperations.action.newFishingOperation.tip= tutti.fishingOperations.info.no.fishingOperation.selected= +tutti.fishingOperations.title.edit.operations= +tutti.fishingOperations.title.validate.operations= tutti.fishingOperations.warn.invalid.batch.model= tutti.flash.info.all.caractristic.exported= tutti.flash.info.caracteristic.imported.in.protocol= @@ -504,9 +523,13 @@ tutti.flash.info.species.imported.in.protocol.severalReplaced= tutti.flash.info.species.remove.from.protocol= tutti.flash.info.species.replaced= +tutti.gearUseFeatureTable.action.removeCaracteristic= +tutti.gearUseFeatureTable.action.removeCaracteristic.tip= +tutti.gearUseFeatureTable.table.header.key= +tutti.gearUseFeatureTable.table.header.value= +tutti.gearUseFeatureTable.title= tutti.label.catches.planktonTotalSampleWeight= tutti.label.catches.planktonTotalWeight= -tutti.label.comment= tutti.label.tab.accidentel= tutti.label.tab.benthos= tutti.label.tab.catches= @@ -561,6 +584,14 @@ tutti.main.menu.file.tip= tutti.main.menu.help= tutti.main.menu.help.tip= +tutti.main.title.applicationName= +tutti.main.title.noSelectedCruise= +tutti.main.title.noSelectedProgram= +tutti.main.title.noSelectedProtocol= +tutti.main.title.nodb= +tutti.main.title.selectedCruise= +tutti.main.title.selectedProgram= +tutti.main.title.selectedProtocol= tutti.manageTemporaryReferential.action.chooseReferentialGearFile= tutti.manageTemporaryReferential.action.chooseReferentialPersonFile= tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile= @@ -589,6 +620,7 @@ tutti.manageTemporaryReferential.field.species.tip= tutti.manageTemporaryReferential.field.vessel= tutti.manageTemporaryReferential.field.vessel.tip= +tutti.manageTemporaryReferential.title= tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile= tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile= tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile= @@ -636,9 +668,15 @@ tutti.selectCruise.field.program.tip= tutti.selectCruise.field.protocol= tutti.selectCruise.field.protocol.tip= +tutti.selectCruise.title= tutti.selectCruise.title.choose.exportFile= tutti.selectCruise.title.choose.importFile= tutti.selectCruise.warn.invalid.selected.data= +tutti.selectSpecies.action.cancel= +tutti.selectSpecies.action.cancel.tip= +tutti.selectSpecies.action.validate= +tutti.selectSpecies.action.validate.tip= +tutti.selectSpecies.title= tutti.splitSpeciesBatch.action.cancel= tutti.splitSpeciesBatch.action.cancel.tip= tutti.splitSpeciesBatch.action.save= @@ -654,40 +692,9 @@ tutti.splitSpeciesBatch.table.header.category= tutti.splitSpeciesBatch.table.header.selected= tutti.splitSpeciesBatch.table.header.weight= -tutti.table.fishing.gearUseFeature.header.key= -tutti.table.fishing.gearUseFeature.header.value= -tutti.table.fishing.vesselUseFeature.header.key= -tutti.table.fishing.vesselUseFeature.header.value= +tutti.splitSpeciesBatch.title= tutti.timeeditor.H= -tutti.title.about= -tutti.title.about.translate= -tutti.title.comment= -tutti.title.config= -tutti.title.create.cruise= -tutti.title.create.program= -tutti.title.create.protocol= -tutti.title.createBatch= -tutti.title.edit.cruise= -tutti.title.edit.operations= -tutti.title.edit.program= -tutti.title.edit.protocol= -tutti.title.editFrequency= -tutti.title.home= -tutti.title.import.temporary.referential= -tutti.title.manageDb= -tutti.title.noSelectedCruise= -tutti.title.noSelectedProgram= -tutti.title.noSelectedProtocol= -tutti.title.nodb= -tutti.title.sampleOrder= -tutti.title.selectSpecies= -tutti.title.selectedCruise= -tutti.title.selectedProgram= -tutti.title.selectedProtocol= -tutti.title.splitBatch= -tutti.title.validate.operations= tutti.to.be.done= -tutti.ui.common.error= tutti.validator.error.comment.too.long= tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue= tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required= @@ -748,3 +755,8 @@ tutti.validator.warning.longitude.minute.outOfBounds= tutti.validator.warning.longitude.outOfBounds= tutti.validator.warning.longitude.second.outOfBounds= +tutti.vesselUseFeatureTable.action.removeCaracteristic= +tutti.vesselUseFeatureTable.action.removeCaracteristic.tip= +tutti.vesselUseFeatureTable.table.header.key= +tutti.vesselUseFeatureTable.table.header.value= +tutti.vesselUseFeatureTable.title= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-15 10:20:17 UTC (rev 630) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-15 10:59:47 UTC (rev 631) @@ -2,16 +2,9 @@ swing.error.desktop.not.supported= tutti.about.bottomText=Copyright %s - %s - version %s tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>.</p> +tutti.about.title=À propos de Tutti tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/><br/><ul><li>Récupérer le fichier <strong>tutti-i18n.csv</strong> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur (le caractère séprateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul><br/>Nous intégrerons vos modifications avant la prochaine version. -tutti.action.cancel=Annuler -tutti.action.cancelEditCruise=Annuler -tutti.action.cancelEditProgram=Annuler -tutti.action.cancelEditProtocol=Annuler -tutti.action.removeCaracteristic=Supprimer la caractéristique -tutti.config.action.sampleOrder.tip=Réordonner les catégories d'échantilonnage -tutti.action.validate=Valider -tutti.application.config=Configuration de l'application Tutti -tutti.application.name=Tutti +tutti.about.translate.title=Traduire Tutti tutti.attachmentEditor.action.close=Fermer tutti.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes tutti.attachmentEditor.action.open.tip=Ouvrir la pièce jointe @@ -38,10 +31,22 @@ tutti.commentEditor.action.close.tip=Fermer la fenêtre des commentaires tutti.commentEditor.action.tip=Commentaire tutti.commentEditor.none.tip=Pas de commentaire -tutti.common.error=Erreur +tutti.commentEditor.title=Commentaire +tutti.common.askCancelEditBeforeLeaving.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour rester sur cet écran</li><li><strong>OK</strong> pour quitter l'écran en abandonnant les modifications</li></ul> +tutti.common.askCancelEditBeforeLeaving.title=Modifications non enregistrées mais invalides +tutti.common.askOverwriteFile.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour ne pas écraser le fichier et annuler l'opération</li><li><strong>Oui</strong> pour écraser le fichier et continuer l'opération</li></ul> +tutti.common.askOverwriteFile.message=Le fichier %s existe déjà, confirmer pour l'écraser. +tutti.common.askOverwriteFile.title=Confirmer l'écrasement d'un fichier... +tutti.common.askSaveBeforeLeaving.help=Que voulez-vous faire?<ul><li><strong>Annuler</strong> pour rester sur cet écran</li><li><strong>Non</strong> pour quitter l'écran en abandonnant les modifications en cours</li><li><strong>Oui</strong> pour quitter l'écran après enregistrement des modifications</li></ul> +tutti.common.askSaveBeforeLeaving.title=Modifications non enregistrées +tutti.common.file.csv=Extension d'un fichier csv +tutti.common.file.protocol=Extension d'un fichier de protocole Tutti +tutti.common.file.zip=Extension d'une archive zip tutti.config.action.reload.actions=Recharger les actions tutti.config.action.reload.application=Recharger l'application tutti.config.action.reload.ui=Recharger l'interface graphique +tutti.config.action.sampleOrder.tip=Réordonner les catégories d'échantilonnage +tutti.config.application=Configuration de l'application Tutti tutti.config.category.applications=Application tutti.config.category.applications.description=Application tutti.config.category.shortcuts=Raccourcis @@ -71,6 +76,12 @@ tutti.config.option.ui.showNumberEditorButton.description=Afficher le pavé numérique de saisie tutti.config.option.update.url.description=URL de mise à jour tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie. +tutti.config.sampleOrder.title=Catégorie d'échantillonnage +tutti.config.title=Configuration +tutti.createMelag.action.cancel=Annuler +tutti.createMelag.action.cancel.tip= +tutti.createMelag.action.validate=Valider +tutti.createMelag.action.validate.tip= tutti.createMelag.error.message=Erreur à la ligne %s tutti.createMelag.error.title=Erreur tutti.createMelag.message=Combien pesait le MELAG (kg) ? @@ -87,6 +98,8 @@ tutti.createSpeciesBatch.field.sortedUnsortedCategory.tip= tutti.createSpeciesBatch.field.species=Espèce du lot tutti.createSpeciesBatch.field.species.tip= +tutti.createSpeciesBatch.title=Créer un lot +tutti.dbMabager.title=Gérer les bases de données tutti.dbManager.action.chooseDbExportFile=Exporter la base de données tutti.dbManager.action.chooseDbFile=Choisir la base à importer tutti.dbManager.action.closeDb=Fermer @@ -108,13 +121,6 @@ tutti.dbManager.info.no.db.loaded=Tutti possède une base mais elle n'est pas actuellement ouverte. tutti.dbManager.title.choose.dbExportFile=Exporter la base de données tutti.dbManager.title.choose.dbImportFile=Importer la base de données -tutti.common.askCancelEditBeforeLeaving.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour rester sur cet écran</li><li><strong>OK</strong> pour quitter l'écran en abandonnant les modifications</li></ul> -tutti.common.askCancelEditBeforeLeaving.title=Modifications non enregistrées mais invalides -tutti.common.askOverwriteFile.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour ne pas écraser le fichier et annuler l'opération</li><li><strong>Oui</strong> pour écraser le fichier et continuer l'opération</li></ul> -tutti.common.askOverwriteFile.message=Le fichier %s existe déjà, confirmer pour l'écraser. -tutti.common.askOverwriteFile.title=Confirmer l'écrasement d'un fichier... -tutti.common.askSaveBeforeLeaving.help=Que voulez-vous faire?<ul><li><strong>Annuler</strong> pour rester sur cet écran</li><li><strong>Non</strong> pour quitter l'écran en abandonnant les modifications en cours</li><li><strong>Oui</strong> pour quitter l'écran après enregistrement des modifications</li></ul> -tutti.common.askSaveBeforeLeaving.title=Modifications non enregistrées tutti.editAccidentalBatch.table.header.comment=Commentaire tutti.editAccidentalBatch.table.header.file=Pièces-jointes tutti.editAccidentalBatch.table.header.speciesByCode=Espèce @@ -230,6 +236,8 @@ tutti.editCruise.filterVesselType.fishing.tip=Uniquement les navires pro tutti.editCruise.filterVesselType.scientific=Scientifique tutti.editCruise.filterVesselType.scientific.tip=Uniquement les navires scientifiques +tutti.editCruise.title.create.cruise=Créer une nouvelle campagne +tutti.editCruise.title.edit.cruise=Éditer une campagne existante tutti.editFishingOperation.action.attachments.tip= tutti.editFishingOperation.action.cancelEditFishingOperation=Annuler tutti.editFishingOperation.action.cancelEditFishingOperation.tip=Annuler la création du trait @@ -314,9 +322,7 @@ tutti.editFishingOperation.label.traitReminder=Trait \: %s tutti.editFishingOperation.label.traitReminder.inCreation=en cours de création tutti.editFishingOperation.pane.other=Autres caractéristiques -tutti.editFishingOperation.tab.gearUseFeature=Mise en oeuvre de l'engin tutti.editFishingOperation.tab.general=Trait -tutti.editFishingOperation.tab.vesselUseFeature=Hydrologie et paramètres environnementaux tutti.editMacroWasteBatch.table.header.comment=Commentaire tutti.editMacroWasteBatch.table.header.file=Pièces jointes tutti.editMacroWasteBatch.table.header.macroWasteCategory=Catégorie @@ -342,6 +348,8 @@ tutti.editProgram.field.program.name=Nom tutti.editProgram.field.program.zone=Zone tutti.editProgram.field.zone.tip= +tutti.editProgram.title.create.program=Créer une nouvelle série de campagne +tutti.editProgram.title.edit.program=Éditer une série de campagne existante tutti.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole tutti.editProtocol.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques tutti.editProtocol.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces @@ -370,6 +378,7 @@ tutti.editProtocol.field.comment.tip= tutti.editProtocol.field.protocol.name=Nom tutti.editProtocol.field.protocol.name.tip= +tutti.editProtocol.field.species.tip= tutti.editProtocol.tab.accidental=Accidental tutti.editProtocol.tab.benthos=Benthos tutti.editProtocol.tab.caracteristic=Caractéristiques @@ -403,13 +412,16 @@ tutti.editProtocol.title.choose.caracteristicImportFile=Importer les caractéristiques tutti.editProtocol.title.choose.speciesExportFile=Exporter les espèces tutti.editProtocol.title.choose.speciesImportFile=Importer les espèces +tutti.editProtocol.title.create.protocol=Créer un nouveau protocol de saisie +tutti.editProtocol.title.edit.protocol=Éditer un protocol de saisie existant tutti.editProtocol.warn.clone=Le protocole que vous venez de cloner ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.editProtocol.warn.import=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG +tutti.editSpeciesBatch.action.createSpeciesBatch.tip= tutti.editSpeciesBatch.action.removeSpeciesBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils tutti.editSpeciesBatch.action.removeSpeciesSubBatch.tip=Supprimer tous les lots fils du lot sélectionné +tutti.editSpeciesBatch.action.renameSpeciesBatch.tip= tutti.editSpeciesBatch.action.splitSpeciesBatch.tip=Catégoriser le lot courant (celui de la ligne sélectionné) -tutti.editSpeciesBatch.action.createSpeciesBatch.tip= tutti.editSpeciesBatch.field.speciesTotalInertWeight=Poids inerte trié (kg) tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip= tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg) @@ -430,7 +442,6 @@ tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.all=Aucun tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.leaf=Feuilles tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.root=Parents (%s) -tutti.editSpeciesBatch.action.renameSpeciesBatch.tip= tutti.editSpeciesBatch.split.weightNotNull.help=Que voulez-vous faire ? <ul><li><strong>Annuler</strong> pour ne pas catégoriser le lot et garder le poids sous-échantilloné</li><li><strong>OK</strong> pour catégoriser le lot et supprimer le poids sous-échantillonné</li></ul>. tutti.editSpeciesBatch.split.weightNotNull.message=Pour catégoriser un lot, il ne doit pas avoir de poids sous-échantillonné. tutti.editSpeciesBatch.split.weightNotNull.title=Poids sous-échantillonné non nul @@ -482,12 +493,14 @@ tutti.editSpeciesFrequencies.table.header.lengthStep=Classe de taille tutti.editSpeciesFrequencies.table.header.number=Nombre tutti.editSpeciesFrequencies.table.header.weight=Poids observé (kg) +tutti.editSpeciesFrequencies.title=Mensuration tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> -tutti.common.file.csv=Extension d'un fichier csv -tutti.common.file.protocol=Extension d'un fichier de protocole Tutti -tutti.common.file.zip=Extension d'une archive zip +tutti.error.ui.business.error=Erreur +tutti.error.ui.other.error=Erreur tutti.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > +tutti.fishingOperations.title.edit.operations=Saisie des opérations de pêches (%s) +tutti.fishingOperations.title.validate.operations=Validation des opérations de pêches (%s) tutti.fishingOperations.warn.invalid.batch.model=L'arbre d'échantillonage n'est pas compatible. Les captures ne seront pas visibles. tutti.flash.info.all.caractristic.exported=Toutes les caractéristiques exportées dans le fichier <strong>%s</strong>. tutti.flash.info.caracteristic.imported.in.protocol=Caractéristiques importées dans le protocole depuis le fichier <strong>%s</strong>. @@ -511,9 +524,13 @@ tutti.flash.info.species.imported.in.protocol.severalReplaced=Espèces importées dans le protocole depuis le fichier <strong>%s</strong>. %s remplacées par leur référent. tutti.flash.info.species.remove.from.protocol=L'espèce <strong>%s</strong> a été retirée du protocole. tutti.flash.info.species.replaced=L'espèce <strong>%s</strong> a été remplacée par son référent <strong>%s</strong>. +tutti.gearUseFeatureTable.action.removeCaracteristic=Supprimer la caractéristique +tutti.gearUseFeatureTable.action.removeCaracteristic.tip= +tutti.gearUseFeatureTable.table.header.key=Caractéristique +tutti.gearUseFeatureTable.table.header.value=Valeur +tutti.gearUseFeatureTable.title=Mise en oeuvre de l'engin tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total -tutti.label.comment=Commentaire tutti.label.tab.accidentel=Captures accidentelles tutti.label.tab.benthos=Benthos tutti.label.tab.catches=Captures @@ -568,6 +585,14 @@ tutti.main.menu.file.tip=Fichier tutti.main.menu.help=Aide tutti.main.menu.help.tip=Aide +tutti.main.title.applicationName=Tutti +tutti.main.title.noSelectedCruise=Pas de campagne sélectionné +tutti.main.title.noSelectedProgram=Pas de série de campagne sélectionné +tutti.main.title.noSelectedProtocol=Pas de protocol sélectionné +tutti.main.title.nodb=Pas de base chargée +tutti.main.title.selectedCruise=Campagne %s +tutti.main.title.selectedProgram=Série de campagne %s +tutti.main.title.selectedProtocol=Protocole %s tutti.manageTemporaryReferential.action.chooseReferentialGearFile=Choisir le fichier de référentiel engin tutti.manageTemporaryReferential.action.chooseReferentialPersonFile=Choisir le fichier de référentiel personne tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile=Choisir le fichier de référentiel espèce @@ -596,6 +621,7 @@ tutti.manageTemporaryReferential.field.species.tip= tutti.manageTemporaryReferential.field.vessel=Référentiel Navire tutti.manageTemporaryReferential.field.vessel.tip= +tutti.manageTemporaryReferential.title=importer des référentiels temporaires tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile=Exporter un exemple de référentiel Engin tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile=Exporter un exemple de référentiel Personne tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile=Exporter un exemple de référentiel Espèce @@ -643,9 +669,15 @@ tutti.selectCruise.field.program.tip= tutti.selectCruise.field.protocol=Protocol de saisie tutti.selectCruise.field.protocol.tip= +tutti.selectCruise.title=Sélection de la campagne tutti.selectCruise.title.choose.exportFile=Exporter le protocole tutti.selectCruise.title.choose.importFile=Importer le protocole tutti.selectCruise.warn.invalid.selected.data=Les données sélectionnées ne sont pas valides, impossible de saisir ou valider les captures. +tutti.selectSpecies.action.cancel=Annuler +tutti.selectSpecies.action.cancel.tip= +tutti.selectSpecies.action.validate=Valider +tutti.selectSpecies.action.validate.tip= +tutti.selectSpecies.title=Choisissez une espèce tutti.splitSpeciesBatch.action.cancel=Annuler tutti.splitSpeciesBatch.action.cancel.tip= tutti.splitSpeciesBatch.action.save=Enregistrer @@ -661,40 +693,9 @@ tutti.splitSpeciesBatch.table.header.category=Catégorie tutti.splitSpeciesBatch.table.header.selected=Sélection tutti.splitSpeciesBatch.table.header.weight=Poids (kg) -tutti.table.fishing.gearUseFeature.header.key=Caractéristique -tutti.table.fishing.gearUseFeature.header.value=Valeur -tutti.table.fishing.vesselUseFeature.header.key=Caractéristique -tutti.table.fishing.vesselUseFeature.header.value=Valeur +tutti.splitSpeciesBatch.title=Catégorisation du lot tutti.timeeditor.H=H -tutti.title.about=À propos de Tutti -tutti.title.about.translate=Traduire Tutti -tutti.title.comment=Commentaire -tutti.title.config=Configuration -tutti.title.create.cruise=Créer une nouvelle campagne -tutti.title.create.program=Créer une nouvelle série de campagne -tutti.title.create.protocol=Créer un nouveau protocol de saisie -tutti.title.createBatch=Créer un lot -tutti.title.edit.cruise=Éditer une campagne existante -tutti.title.edit.operations=Saisie des opérations de pêches (%s) -tutti.title.edit.program=Éditer une série de campagne existante -tutti.title.edit.protocol=Éditer un protocol de saisie existant -tutti.title.editFrequency=Mensuration -tutti.title.home=Sélection de la campagne -tutti.title.import.temporary.referential=importer des référentiels temporaires -tutti.title.manageDb=Gérer les bases de données -tutti.title.noSelectedCruise=Pas de campagne sélectionné -tutti.title.noSelectedProgram=Pas de série de campagne sélectionné -tutti.title.noSelectedProtocol=Pas de protocol sélectionné -tutti.title.nodb=Pas de base chargée -tutti.title.sampleOrder=Catégorie d'échantillonnage -tutti.title.selectSpecies=Choisissez une espèce -tutti.title.selectedCruise=Campagne %s -tutti.title.selectedProgram=Série de campagne %s -tutti.title.selectedProtocol=Protocole %s -tutti.title.splitBatch=Catégorisation du lot -tutti.title.validate.operations=Validation des opérations de pêches (%s) tutti.to.be.done=< A FAIRE > -tutti.ui.common.error=Erreur tutti.validator.error.comment.too.long=Taille de commentaire trop longue (limitée à %s caractères) tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue=Le poids du lot doit être strictement positif tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required=La catégorie Vrac / Hors Vrac est obligatoire @@ -755,3 +756,8 @@ tutti.validator.warning.longitude.minute.outOfBounds=La minute de la latitude doit être comprise entre 0 et 60 tutti.validator.warning.longitude.outOfBounds=La Latitude doit être comprise entre -180.0 et 180.0 tutti.validator.warning.longitude.second.outOfBounds=La seconde de la longitude doit être comprise entre 0 et 60 +tutti.vesselUseFeatureTable.action.removeCaracteristic=Supprimer la caractéristique +tutti.vesselUseFeatureTable.action.removeCaracteristic.tip= +tutti.vesselUseFeatureTable.table.header.key=Caractéristique +tutti.vesselUseFeatureTable.table.header.value=Valeur +tutti.vesselUseFeatureTable.title=Hydrologie et paramètres environnementaux