[Tutti-commits] r629 - in trunk/tutti-ui-swing/src/main: filtered-resources java/fr/ifremer/tutti/ui/swing/content java/fr/ifremer/tutti/ui/swing/content/config java/fr/ifremer/tutti/ui/swing/content/cruise java/fr/ifremer/tutti/ui/swing/content/db java/fr/ifremer/tutti/ui/swing/content/home java/fr/ifremer/tutti/ui/swing/content/operation java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental java/fr/ifremer/tutti/ui/swing/content/operat

Author: tchemit Date: 2013-03-15 10:48:31 +0100 (Fri, 15 Mar 2013) New Revision: 629 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/629 Log: refs #1843: [AIDE] - Aide de type infobulle sur les champs d'action refs #1842: [AIDE] - Aide par ?\195?\169cran (normalisation des clefs) Added: trunk/tutti-ui-swing/src/main/resources/icons/action-sampleOrder.png Modified: 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/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 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/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 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/accidental/AccidentalBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateMelagAction.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/SpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 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/catches/species/split/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 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/VesselUseFeatureTabUIModel.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/EditProgramUI.jaxx 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/SaveProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.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/EditProtocolUI.jaxx 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/ExportAllCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.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/content/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java 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-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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-15 09:48:31 UTC (rev 629) @@ -22,184 +22,184 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu Mar 14 16:24:20 CET 2013 -tuttihelp.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions -tuttihelp.createSpeciesBatch.field.batchWeightField.help=createSpeciesBatch.html\#fields -tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.help=createSpeciesBatch.html\#fields -tuttihelp.createSpeciesBatch.field.speciesComboBox.help=createSpeciesBatch.html\#fields -tuttihelp.createSpeciesBatch.help=createSpeciesBatch.html -tuttihelp.dbManager.action.closeDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.exportDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.importDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.installDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.openDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.upgradeDb.help=dbManager.html\#actions -tuttihelp.dbManager.help=dbManager.html +#Fri Mar 15 07:24:19 CET 2013 +tuttihelp.config.help= +tutti.createSpeciesBatch.action.addSpecies.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 +tutti.createSpeciesBatch.help=createSpeciesBatch.html +tutti.dbManager.action.closeDb.help=dbManager.html\#actions +tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions +tutti.dbManager.action.exportDb.help=dbManager.html\#actions +tutti.dbManager.action.importDb.help=dbManager.html\#actions +tutti.dbManager.action.installDb.help=dbManager.html\#actions +tutti.dbManager.action.openDb.help=dbManager.html\#actions +tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions +tutti.dbManager.help=dbManager.html tuttihelp.editAccidentalBatch.help=editAccidentalBatch.html -tuttihelp.editBenthosBatch.help=editBenthosBatch.html -tuttihelp.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions -tuttihelp.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions -tuttihelp.editCatchBatch.action.importPupitri.help=editCatchBatch.html\#actions -tuttihelp.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions -tuttihelp.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.benthosTotalUnsortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.benthosTotalWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalRejectedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalSortedTremisWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.macroWasteTotalWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.speciesTotalWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.help=editCatchBatch.html -tuttihelp.editCruise.action.cancel.help=editCruise.html\#actions -tuttihelp.editCruise.action.close.help= -tuttihelp.editCruise.action.generateName.help=editCruise.html\#actions -tuttihelp.editCruise.action.save.help=editCruise.html\#actions -tuttihelp.editCruise.field.beginDate.help=editCruise.html\#fields -tuttihelp.editCruise.field.comment.help=editCruise.html\#fields -tuttihelp.editCruise.field.country.help=editCruise.html\#fields -tuttihelp.editCruise.field.endDate.help=editCruise.html\#fields -tuttihelp.editCruise.field.multirigNumber.help=editCruise.html\#fields -tuttihelp.editCruise.field.name.help=editCruise.html\#fields -tuttihelp.editCruise.field.program.help=editCruise.html\#fields -tuttihelp.editCruise.field.surveyPart.help=editCruise.html\#fields -tuttihelp.editCruise.field.year.help=editCruise.html\#fields -tuttihelp.editCruise.filterVessel.help=editCruise.html\#fields -tuttihelp.editCruise.help=editCruise.html -tuttihelp.editCruise.list.gear.help=editCruise.html\#fields -tuttihelp.editCruise.list.headOfMission.help=editCruise.html\#fields -tuttihelp.editCruise.list.headOfSortRoom.help=editCruise.html\#fields -tuttihelp.editCruise.list.vessel.help=editCruise.html\#fields -tuttihelp.editFishingOperation.action.attachments.help=editFishingOperation.html\#actions -tuttihelp.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#actions -tuttihelp.editFishingOperation.action.importCasino.help=editFishingOperation.html\#actions -tuttihelp.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#actions -tuttihelp.editFishingOperation.field.comment.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.duration.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gear.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearDate.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearTime.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.location.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.strata.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.subStrata.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.gearShootingStartLongitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.help=editFishingOperation.html -tuttihelp.editFishingOperation.list.recorderPerson.help=editFishingOperation.html\#fields +tutti.editBenthosBatch.help=editBenthosBatch.html +tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.importPupitri.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.benthosTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.macroWasteTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.speciesTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.help=editCatchBatch.html +tutti.editCruise.action.cancel.help=editCruise.html\#actions +tutti.editCruise.action.close.help= +tutti.editCruise.action.generateName.help=editCruise.html\#actions +tutti.editCruise.action.save.help=editCruise.html\#actions +tutti.editCruise.field.beginDate.help=editCruise.html\#fields +tutti.editCruise.field.comment.help=editCruise.html\#fields +tutti.editCruise.field.country.help=editCruise.html\#fields +tutti.editCruise.field.endDate.help=editCruise.html\#fields +tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields +tutti.editCruise.field.name.help=editCruise.html\#fields +tutti.editCruise.field.program.help=editCruise.html\#fields +tutti.editCruise.field.surveyPart.help=editCruise.html\#fields +tutti.editCruise.field.year.help=editCruise.html\#fields +tutti.editCruise.filterVessel.help=editCruise.html\#fields +tutti.editCruise.help=editCruise.html +tutti.editCruise.field.gear.help=editCruise.html\#fields +tutti.editCruise.field.headOfMission.help=editCruise.html\#fields +tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields +tutti.editCruise.field.vessel.help=editCruise.html\#fields +tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#actions +tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#actions +tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#actions +tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#actions +tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#fields +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.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.field.gearShootingStartLongitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.help=editFishingOperation.html +tutti.editFishingOperation.list.recorderPerson.help=editFishingOperation.html\#fields tuttihelp.editMacroWasteBatch.help=editMacroWasteBatch.html tuttihelp.editPlanktonBatch.help=editPlanktonBatch.html -tuttihelp.editProgram.action.cancelProgram.help=editProgram.html\#actions -tuttihelp.editProgram.action.saveProgram.help=editProgram.html\#actions -tuttihelp.editProgram.field.comment.help=editProgram.html\#fields -tuttihelp.editProgram.field.name.help=editProgram.html\#fields -tuttihelp.editProgram.field.zone.help=editProgram.html\#fields -tuttihelp.editProgram.help=editProgram.html -tuttihelp.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.cancelEditProtocol.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.closeEditProtocol.help= -tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions -tuttihelp.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.saveProtocol.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actions -tuttihelp.editProtocol.field.comment.help=editProtocol.html\#fields -tuttihelp.editProtocol.field.name.help=editProtocol.html\#fields -tuttihelp.editProtocol.field.species.help=editProtocol.html\#fields -tuttihelp.editProtocol.help=editProtocol.html -tuttihelp.editProtocol.list.gearUseFeature.help=editProtocol.html\#fields -tuttihelp.editProtocol.list.lengthClasses.help=editProtocol.html\#fields -tuttihelp.editProtocol.list.vesselUseFeature.help=editProtocol.html\#fields -tuttihelp.editProtocol.pane.caracteristic.help=editProtocol.html\#fields -tuttihelp.editProtocol.table.species.help=editProtocol.html\#fields -tuttihelp.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.createSpeciesBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.removeSpeciesBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.removeSpeciesSubBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.renameSpeciesBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.splitSpeciesBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.field.speciesTotalInertWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalSortedWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.filterSpeciesBatch.help=editSpeciesBatch.html -tuttihelp.editSpeciesBatch.help=editSpeciesBatch.html -tuttihelp.editSpeciesFrequencies.help=editSpeciesFrequencies.html -tuttihelp.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions -tuttihelp.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields -tuttihelp.fishingOperations.help=fishingOperations.html -tuttihelp.main.action.changeLocale.help=main.html\#menu_ -tuttihelp.main.action.changeLocaleFR.help=main.html\#menu_ -tuttihelp.main.action.changeLocaleUK.help=main.html\#menu_ -tuttihelp.main.action.showHelp.help=main.html\#menu_ -tuttihelp.main.help=main.html -tuttihelp.main.menu.action.about.help=main.html\#menu_ -tuttihelp.main.menu.action.configuration.help=main.html\#menu_ -tuttihelp.main.menu.action.editCatches.help=main.html\#menu_ -tuttihelp.main.menu.action.editCruise.help=main.html\#menu_ -tuttihelp.main.menu.action.editProgram.help=main.html\#menu_ -tuttihelp.main.menu.action.editProtocol.help=main.html\#menu_ -tuttihelp.main.menu.action.exit.help=main.html\#menu_ -tuttihelp.main.menu.action.importTemporaryReferential.help=main.html\#menu_ -tuttihelp.main.menu.action.manageDb.help=main.html\#menu_ -tuttihelp.main.menu.action.selectCruise.help=main.html\#menu_ -tuttihelp.main.menu.action.showHelp.help=main.html\#menu_ -tuttihelp.main.menu.action.site.help=main.html\#menu_ -tuttihelp.main.menu.action.updateApplication.help=main.html\#menu_ -tuttihelp.main.menu.action.validateCatches.help=main.html\#menu_ -tuttihelp.manageTemporaryReferential.action.exportTemporaryGearExample.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.exportTemporaryPersonExample.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.exportTemporaryVesselExample.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.importTemporaryGear.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.importTemporaryPerson.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.importTemporarySpecies.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.importTemporaryVessel.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.help=manageTemporaryReferential.html -tuttihelp.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.editCatches.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.editCruise.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.editProgram.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.editProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.exportProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.importProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.newCruise.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.newProgram.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.newProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.validateCatches.help=selectCruise.html\#actions -tuttihelp.selectCruise.field.cruise.help=selectCruise.html\#fields -tuttihelp.selectCruise.field.program.help=selectCruise.html\#fields -tuttihelp.selectCruise.field.protocol.help=selectCruise.html\#fields -tuttihelp.selectCruise.help=selectCruise.html -tuttihelp.splitSpeciesBatch.action.cancel.help=splitSpeciesBatch.html\#actions -tuttihelp.splitSpeciesBatch.action.save.help=splitSpeciesBatch.html\#actions -tuttihelp.splitSpeciesBatch.field.batchWeightField.help=splitSpeciesBatch.html\#fields -tuttihelp.splitSpeciesBatch.field.categoryField.help=splitSpeciesBatch.html\#fields -tuttihelp.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields -tuttihelp.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields -tuttihelp.splitSpeciesBatch.help=splitSpeciesBatch.html +tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions +tutti.editProgram.action.saveProgram.help=editProgram.html\#actions +tutti.editProgram.field.comment.help=editProgram.html\#fields +tutti.editProgram.field.name.help=editProgram.html\#fields +tutti.editProgram.field.zone.help=editProgram.html\#fields +tutti.editProgram.help=editProgram.html +tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.cancelEditProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.closeEditProtocol.help= +tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions +tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions +tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions +tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actions +tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actions +tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actions +tutti.editProtocol.field.comment.help=editProtocol.html\#fields +tutti.editProtocol.field.name.help=editProtocol.html\#fields +tutti.editProtocol.help=editProtocol.html +tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fields +tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fields +tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fields +tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fields +tutti.editProtocol.field.species.help=editProtocol.html\#fields +tutti.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.createSpeciesBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.removeSpeciesBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.removeSpeciesSubBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.renameSpeciesBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.splitSpeciesBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.filterSpeciesBatch.help=editSpeciesBatch.html +tutti.editSpeciesBatch.help=editSpeciesBatch.html +tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html +tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions +tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields +tutti.fishingOperations.help=fishingOperations.html +tutti.main.action.changeLocale.help=main.html\#menu_ +tutti.main.action.changeLocaleFR.help=main.html\#menu_ +tutti.main.action.changeLocaleUK.help=main.html\#menu_ +tutti.main.action.showHelp.help=main.html\#menu_ +tutti.main.help=main.html +tutti.main.menu.action.about.help=main.html\#menu_ +tutti.main.menu.action.configuration.help=main.html\#menu_ +tutti.main.menu.action.editCatches.help=main.html\#menu_ +tutti.main.menu.action.editCruise.help=main.html\#menu_ +tutti.main.menu.action.editProgram.help=main.html\#menu_ +tutti.main.menu.action.editProtocol.help=main.html\#menu_ +tutti.main.menu.action.exit.help=main.html\#menu_ +tutti.main.menu.action.importTemporaryReferential.help=main.html\#menu_ +tutti.main.menu.action.manageDb.help=main.html\#menu_ +tutti.main.menu.action.selectCruise.help=main.html\#menu_ +tutti.main.menu.action.showHelp.help=main.html\#menu_ +tutti.main.menu.action.site.help=main.html\#menu_ +tutti.main.menu.action.updateApplication.help=main.html\#menu_ +tutti.main.menu.action.validateCatches.help=main.html\#menu_ +tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.importTemporaryGear.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.importTemporaryPerson.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.importTemporarySpecies.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.importTemporaryVessel.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.help=manageTemporaryReferential.html +tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions +tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions +tutti.selectCruise.field.cruise.help=selectCruise.html\#fields +tutti.selectCruise.field.program.help=selectCruise.html\#fields +tutti.selectCruise.field.protocol.help=selectCruise.html\#fields +tutti.selectCruise.help=selectCruise.html +tutti.splitSpeciesBatch.action.cancel.help=splitSpeciesBatch.html\#actions +tutti.splitSpeciesBatch.action.save.help=splitSpeciesBatch.html\#actions +tutti.splitSpeciesBatch.field.batchWeightField.help=splitSpeciesBatch.html\#fields +tutti.splitSpeciesBatch.field.categoryField.help=splitSpeciesBatch.html\#fields +tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields +tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields +tutti.splitSpeciesBatch.help=splitSpeciesBatch.html 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-15 09:48:31 UTC (rev 629) @@ -22,184 +22,184 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu Mar 14 16:24:20 CET 2013 -tuttihelp.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions -tuttihelp.createSpeciesBatch.field.batchWeightField.help=createSpeciesBatch.html\#fields -tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.help=createSpeciesBatch.html\#fields -tuttihelp.createSpeciesBatch.field.speciesComboBox.help=createSpeciesBatch.html\#fields -tuttihelp.createSpeciesBatch.help=createSpeciesBatch.html -tuttihelp.dbManager.action.closeDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.exportDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.importDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.installDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.openDb.help=dbManager.html\#actions -tuttihelp.dbManager.action.upgradeDb.help=dbManager.html\#actions -tuttihelp.dbManager.help=dbManager.html +#Fri Mar 15 07:24:19 CET 2013 +tuttihelp.config.help= +tutti.createSpeciesBatch.action.addSpecies.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 +tutti.createSpeciesBatch.help=createSpeciesBatch.html +tutti.dbManager.action.closeDb.help=dbManager.html\#actions +tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions +tutti.dbManager.action.exportDb.help=dbManager.html\#actions +tutti.dbManager.action.importDb.help=dbManager.html\#actions +tutti.dbManager.action.installDb.help=dbManager.html\#actions +tutti.dbManager.action.openDb.help=dbManager.html\#actions +tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions +tutti.dbManager.help=dbManager.html tuttihelp.editAccidentalBatch.help=editAccidentalBatch.html -tuttihelp.editBenthosBatch.help=editBenthosBatch.html -tuttihelp.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions -tuttihelp.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions -tuttihelp.editCatchBatch.action.importPupitri.help=editCatchBatch.html\#actions -tuttihelp.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions -tuttihelp.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.benthosTotalUnsortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.benthosTotalWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalRejectedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalSortedTremisWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.macroWasteTotalWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.field.speciesTotalWeight.help=editCatchBatch.html\#fields -tuttihelp.editCatchBatch.help=editCatchBatch.html -tuttihelp.editCruise.action.cancel.help=editCruise.html\#actions -tuttihelp.editCruise.action.close.help= -tuttihelp.editCruise.action.generateName.help=editCruise.html\#actions -tuttihelp.editCruise.action.save.help=editCruise.html\#actions -tuttihelp.editCruise.field.beginDate.help=editCruise.html\#fields -tuttihelp.editCruise.field.comment.help=editCruise.html\#fields -tuttihelp.editCruise.field.country.help=editCruise.html\#fields -tuttihelp.editCruise.field.endDate.help=editCruise.html\#fields -tuttihelp.editCruise.field.multirigNumber.help=editCruise.html\#fields -tuttihelp.editCruise.field.name.help=editCruise.html\#fields -tuttihelp.editCruise.field.program.help=editCruise.html\#fields -tuttihelp.editCruise.field.surveyPart.help=editCruise.html\#fields -tuttihelp.editCruise.field.year.help=editCruise.html\#fields -tuttihelp.editCruise.filterVessel.help=editCruise.html\#fields -tuttihelp.editCruise.help=editCruise.html -tuttihelp.editCruise.list.gear.help=editCruise.html\#fields -tuttihelp.editCruise.list.headOfMission.help=editCruise.html\#fields -tuttihelp.editCruise.list.headOfSortRoom.help=editCruise.html\#fields -tuttihelp.editCruise.list.vessel.help=editCruise.html\#fields -tuttihelp.editFishingOperation.action.attachments.help=editFishingOperation.html\#actions -tuttihelp.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#actions -tuttihelp.editFishingOperation.action.importCasino.help=editFishingOperation.html\#actions -tuttihelp.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#actions -tuttihelp.editFishingOperation.field.comment.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.duration.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gear.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearDate.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.gearTime.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.location.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.strata.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.subStrata.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.gearShootingStartLongitude.help=editFishingOperation.html\#fields -tuttihelp.editFishingOperation.help=editFishingOperation.html -tuttihelp.editFishingOperation.list.recorderPerson.help=editFishingOperation.html\#fields +tutti.editBenthosBatch.help=editBenthosBatch.html +tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.importPupitri.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.benthosTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.macroWasteTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.speciesTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.help=editCatchBatch.html +tutti.editCruise.action.cancel.help=editCruise.html\#actions +tutti.editCruise.action.close.help= +tutti.editCruise.action.generateName.help=editCruise.html\#actions +tutti.editCruise.action.save.help=editCruise.html\#actions +tutti.editCruise.field.beginDate.help=editCruise.html\#fields +tutti.editCruise.field.comment.help=editCruise.html\#fields +tutti.editCruise.field.country.help=editCruise.html\#fields +tutti.editCruise.field.endDate.help=editCruise.html\#fields +tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields +tutti.editCruise.field.name.help=editCruise.html\#fields +tutti.editCruise.field.program.help=editCruise.html\#fields +tutti.editCruise.field.surveyPart.help=editCruise.html\#fields +tutti.editCruise.field.year.help=editCruise.html\#fields +tutti.editCruise.filterVessel.help=editCruise.html\#fields +tutti.editCruise.help=editCruise.html +tutti.editCruise.field.gear.help=editCruise.html\#fields +tutti.editCruise.field.headOfMission.help=editCruise.html\#fields +tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields +tutti.editCruise.field.vessel.help=editCruise.html\#fields +tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#actions +tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#actions +tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#actions +tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#actions +tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#fields +tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#fields +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.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.field.gearShootingStartLongitude.help=editFishingOperation.html\#fields +tutti.editFishingOperation.help=editFishingOperation.html +tutti.editFishingOperation.list.recorderPerson.help=editFishingOperation.html\#fields tuttihelp.editMacroWasteBatch.help=editMacroWasteBatch.html tuttihelp.editPlanktonBatch.help=editPlanktonBatch.html -tuttihelp.editProgram.action.cancelProgram.help=editProgram.html\#actions -tuttihelp.editProgram.action.saveProgram.help=editProgram.html\#actions -tuttihelp.editProgram.field.comment.help=editProgram.html\#fields -tuttihelp.editProgram.field.name.help=editProgram.html\#fields -tuttihelp.editProgram.field.zone.help=editProgram.html\#fields -tuttihelp.editProgram.help=editProgram.html -tuttihelp.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.cancelEditProtocol.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.closeEditProtocol.help= -tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions -tuttihelp.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.saveProtocol.help=editProtocol.html\#actions -tuttihelp.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actions -tuttihelp.editProtocol.field.comment.help=editProtocol.html\#fields -tuttihelp.editProtocol.field.name.help=editProtocol.html\#fields -tuttihelp.editProtocol.field.species.help=editProtocol.html\#fields -tuttihelp.editProtocol.help=editProtocol.html -tuttihelp.editProtocol.list.gearUseFeature.help=editProtocol.html\#fields -tuttihelp.editProtocol.list.lengthClasses.help=editProtocol.html\#fields -tuttihelp.editProtocol.list.vesselUseFeature.help=editProtocol.html\#fields -tuttihelp.editProtocol.pane.caracteristic.help=editProtocol.html\#fields -tuttihelp.editProtocol.table.species.help=editProtocol.html\#fields -tuttihelp.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.createSpeciesBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.removeSpeciesBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.removeSpeciesSubBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.renameSpeciesBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.action.splitSpeciesBatch.help=editSpeciesBatch.html\#actions -tuttihelp.editSpeciesBatch.field.speciesTotalInertWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalSortedWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.field.speciesTotalWeight.help=editSpeciesBatch.html\#fields -tuttihelp.editSpeciesBatch.filterSpeciesBatch.help=editSpeciesBatch.html -tuttihelp.editSpeciesBatch.help=editSpeciesBatch.html -tuttihelp.editSpeciesFrequencies.help=editSpeciesFrequencies.html -tuttihelp.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions -tuttihelp.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields -tuttihelp.fishingOperations.help=fishingOperations.html -tuttihelp.main.action.changeLocale.help=main.html\#menu_ -tuttihelp.main.action.changeLocaleFR.help=main.html\#menu_ -tuttihelp.main.action.changeLocaleUK.help=main.html\#menu_ -tuttihelp.main.action.showHelp.help=main.html\#menu_ -tuttihelp.main.help=main.html -tuttihelp.main.menu.action.about.help=main.html\#menu_ -tuttihelp.main.menu.action.configuration.help=main.html\#menu_ -tuttihelp.main.menu.action.editCatches.help=main.html\#menu_ -tuttihelp.main.menu.action.editCruise.help=main.html\#menu_ -tuttihelp.main.menu.action.editProgram.help=main.html\#menu_ -tuttihelp.main.menu.action.editProtocol.help=main.html\#menu_ -tuttihelp.main.menu.action.exit.help=main.html\#menu_ -tuttihelp.main.menu.action.importTemporaryReferential.help=main.html\#menu_ -tuttihelp.main.menu.action.manageDb.help=main.html\#menu_ -tuttihelp.main.menu.action.selectCruise.help=main.html\#menu_ -tuttihelp.main.menu.action.showHelp.help=main.html\#menu_ -tuttihelp.main.menu.action.site.help=main.html\#menu_ -tuttihelp.main.menu.action.updateApplication.help=main.html\#menu_ -tuttihelp.main.menu.action.validateCatches.help=main.html\#menu_ -tuttihelp.manageTemporaryReferential.action.exportTemporaryGearExample.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.exportTemporaryPersonExample.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.exportTemporaryVesselExample.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.importTemporaryGear.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.importTemporaryPerson.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.importTemporarySpecies.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.action.importTemporaryVessel.help=manageTemporaryReferential.html\#actions -tuttihelp.manageTemporaryReferential.help=manageTemporaryReferential.html -tuttihelp.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.editCatches.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.editCruise.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.editProgram.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.editProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.exportProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.importProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.newCruise.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.newProgram.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.newProtocol.help=selectCruise.html\#actions -tuttihelp.selectCruise.action.validateCatches.help=selectCruise.html\#actions -tuttihelp.selectCruise.field.cruise.help=selectCruise.html\#fields -tuttihelp.selectCruise.field.program.help=selectCruise.html\#fields -tuttihelp.selectCruise.field.protocol.help=selectCruise.html\#fields -tuttihelp.selectCruise.help=selectCruise.html -tuttihelp.splitSpeciesBatch.action.cancel.help=splitSpeciesBatch.html\#actions -tuttihelp.splitSpeciesBatch.action.save.help=splitSpeciesBatch.html\#actions -tuttihelp.splitSpeciesBatch.field.batchWeightField.help=splitSpeciesBatch.html\#fields -tuttihelp.splitSpeciesBatch.field.categoryField.help=splitSpeciesBatch.html\#fields -tuttihelp.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields -tuttihelp.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields -tuttihelp.splitSpeciesBatch.help=splitSpeciesBatch.html +tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions +tutti.editProgram.action.saveProgram.help=editProgram.html\#actions +tutti.editProgram.field.comment.help=editProgram.html\#fields +tutti.editProgram.field.name.help=editProgram.html\#fields +tutti.editProgram.field.zone.help=editProgram.html\#fields +tutti.editProgram.help=editProgram.html +tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.cancelEditProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.closeEditProtocol.help= +tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions +tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions +tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions +tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actions +tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actions +tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actions +tutti.editProtocol.field.comment.help=editProtocol.html\#fields +tutti.editProtocol.field.name.help=editProtocol.html\#fields +tutti.editProtocol.field.species.help=editProtocol.html\#fields +tutti.editProtocol.help=editProtocol.html +tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fields +tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fields +tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fields +tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fields +tutti.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.createSpeciesBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.removeSpeciesBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.removeSpeciesSubBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.renameSpeciesBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.splitSpeciesBatch.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.field.speciesTotalWeight.help=editSpeciesBatch.html\#fields +tutti.editSpeciesBatch.filterSpeciesBatch.help=editSpeciesBatch.html +tutti.editSpeciesBatch.help=editSpeciesBatch.html +tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html +tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions +tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields +tutti.fishingOperations.help=fishingOperations.html +tutti.main.action.changeLocale.help=main.html\#menu_ +tutti.main.action.changeLocaleFR.help=main.html\#menu_ +tutti.main.action.changeLocaleUK.help=main.html\#menu_ +tutti.main.action.showHelp.help=main.html\#menu_ +tutti.main.help=main.html +tutti.main.menu.action.about.help=main.html\#menu_ +tutti.main.menu.action.configuration.help=main.html\#menu_ +tutti.main.menu.action.editCatches.help=main.html\#menu_ +tutti.main.menu.action.editCruise.help=main.html\#menu_ +tutti.main.menu.action.editProgram.help=main.html\#menu_ +tutti.main.menu.action.editProtocol.help=main.html\#menu_ +tutti.main.menu.action.exit.help=main.html\#menu_ +tutti.main.menu.action.importTemporaryReferential.help=main.html\#menu_ +tutti.main.menu.action.manageDb.help=main.html\#menu_ +tutti.main.menu.action.selectCruise.help=main.html\#menu_ +tutti.main.menu.action.showHelp.help=main.html\#menu_ +tutti.main.menu.action.site.help=main.html\#menu_ +tutti.main.menu.action.updateApplication.help=main.html\#menu_ +tutti.main.menu.action.validateCatches.help=main.html\#menu_ +tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.importTemporaryGear.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.importTemporaryPerson.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.importTemporarySpecies.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.action.importTemporaryVessel.help=manageTemporaryReferential.html\#actions +tutti.manageTemporaryReferential.help=manageTemporaryReferential.html +tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions +tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions +tutti.selectCruise.field.cruise.help=selectCruise.html\#fields +tutti.selectCruise.field.program.help=selectCruise.html\#fields +tutti.selectCruise.field.protocol.help=selectCruise.html\#fields +tutti.selectCruise.help=selectCruise.html +tutti.splitSpeciesBatch.action.cancel.help=splitSpeciesBatch.html\#actions +tutti.splitSpeciesBatch.action.save.help=splitSpeciesBatch.html\#actions +tutti.splitSpeciesBatch.field.batchWeightField.help=splitSpeciesBatch.html\#fields +tutti.splitSpeciesBatch.field.categoryField.help=splitSpeciesBatch.html\#fields +tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields +tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields +tutti.splitSpeciesBatch.help=splitSpeciesBatch.html 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -26,7 +26,6 @@ useIcon:false; blockingColor: {model.getConfig().getColorBlockingLayer()}; block:{model.isBusy()}; - /*acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS};*/ } #mainFrame { @@ -35,195 +34,195 @@ } #menuFile { - text: "tutti.menu.file"; - toolTipText: "tuttihelp.main.action.file.tip"; + text: "tutti.main.menu.file"; + toolTipText: "tutti.main.menu.file.tip"; mnemonic: F; } #menuFileConfiguration { actionIcon: config; - text: "tutti.action.configuration"; - toolTipText: "tuttihelp.main.action.configuration.tip"; + text: "tutti.main.action.configuration"; + toolTipText: "tutti.main.action.configuration.tip"; mnemonic: C; enabled: {model.getScreen() != TuttiScreen.CONFIG}; _tuttiAction: {ShowConfigAction.class}; - _help: {"tuttihelp.main.menu.action.configuration.help"}; + _help: {"tutti.main.menu.action.configuration.help"}; } #menuFileExit { actionIcon: exit; - text: "tutti.action.exit"; - toolTipText: "tuttihelp.main.action.exit.tip"; + text: "tutti.main.action.exit"; + toolTipText: "tutti.main.action.exit.tip"; mnemonic: Q; _tuttiAction: {CloseApplicationAction.class}; - _help: {"tuttihelp.main.menu.action.exit.help"}; + _help: {"tutti.main.menu.action.exit.help"}; } #menuActionUpdate { actionIcon: update-application; - text: "tutti.action.updateApplication"; - toolTipText: "tuttihelp.main.action.updateApplication.tip"; + text: "tutti.main.action.updateApplication"; + toolTipText: "tutti.main.action.updateApplication.tip"; mnemonic: M; _tuttiAction: {UpdateApplicationAction.class}; - _help: {"tuttihelp.main.menu.action.updateApplication.help"}; + _help: {"tutti.main.menu.action.updateApplication.help"}; } #menuActionManageDb { actionIcon: manage-db; - text: "tutti.action.manageDb"; - toolTipText: "tuttihelp.main.action.manageDb.tip"; + text: "tutti.main.action.manageDb"; + toolTipText: "tutti.main.action.manageDb.tip"; mnemonic: D; enabled: {model.getScreen() != TuttiScreen.MANAGE_DB}; _tuttiAction: {ManageDbAction.class}; - _help: {"tuttihelp.main.menu.action.manageDb.help"}; + _help: {"tutti.main.menu.action.manageDb.help"}; } #menuChangeLocale { actionIcon: translate; - text: "tutti.menu.changeLocale"; - toolTipText: "tuttihelp.main.action.changeLocale.tip"; + text: "tutti.main.menu.changeLocale"; + toolTipText: "tutti.main.action.changeLocale.tip"; mnemonic: A; - _help: {"tuttihelp.main.action.changeLocale.help"}; + _help: {"tutti.main.action.changeLocale.help"}; } #menuChangeLocaleFR { actionIcon: i18n-fr; - text: "tutti.action.changeLocaleFR"; - toolTipText: "tuttihelp.main.action.changeLocaleFR.tip"; + text: "tutti.main.action.changeLocaleFR"; + toolTipText: "tutti.main.action.changeLocaleFR.tip"; mnemonic: F; enabled: {!handler.acceptLocale(model.getLocale(), "fr_FR")}; _tuttiAction: {ChangeToLocaleFRAction.class}; - _help: {"tuttihelp.main.action.changeLocaleFR.help"}; + _help: {"tutti.main.action.changeLocaleFR.help"}; } #menuChangeLocaleUK { actionIcon: i18n-uk; - text: "tutti.action.changeLocaleUK"; - toolTipText: "tuttihelp.main.action.changeLocaleUK.tip"; + text: "tutti.main.action.changeLocaleUK"; + toolTipText: "tutti.main.action.changeLocaleUK.tip"; mnemonic: n; enabled: {!handler.acceptLocale(model.getLocale(), "en_GB")}; _tuttiAction: {ChangeToLocaleUKAction.class}; - _help: {"tuttihelp.main.action.changeLocaleUK.help"}; + _help: {"tutti.main.action.changeLocaleUK.help"}; } #menuActions { - text: "tutti.menu.actions"; - toolTipText: "tuttihelp.main.action.actions.tip"; + text: "tutti.main.menu.actions"; + toolTipText: "tutti.main.menu.actions.tip"; mnemonic: A; enabled: {model.isDbLoaded()}; } #menuActionSelectCruise { actionIcon: home; - text: "tutti.action.selectCruise"; - toolTipText: "tuttihelp.main.action.selectCruise.tip"; + text: "tutti.main.action.selectCruise"; + toolTipText: "tutti.main.action.selectCruise.tip"; enabled: {model.getScreen() != TuttiScreen.SELECT_CRUISE}; mnemonic: S; _tuttiAction: {SelectCruiseAction.class}; - _help: {"tuttihelp.main.menu.action.selectCruise.help"}; + _help: {"tutti.main.menu.action.selectCruise.help"}; } #menuActionEditProgram { actionIcon: program; - text: "tutti.action.editSelectedProgram"; - toolTipText: "tuttihelp.main.action.editProgram.tip"; + text: "tutti.main.action.editSelectedProgram"; + toolTipText: "tutti.main.action.editProgram.tip"; mnemonic: d; enabled: {model.getScreen() != TuttiScreen.EDIT_PROGRAM && model.isProgramFilled()}; _tuttiAction: {EditSelectedProgramAction.class}; - _help: {"tuttihelp.main.menu.action.editProgram.help"}; + _help: {"tutti.main.menu.action.editProgram.help"}; } #menuActionEditCruise { actionIcon: cruise; - text: "tutti.action.editSelectedCruise"; - toolTipText: "tuttihelp.main.action.editSelectedCruise.tip"; + text: "tutti.main.action.editSelectedCruise"; + toolTipText: "tutti.main.action.editSelectedCruise.tip"; mnemonic: C; enabled: {model.getScreen() != TuttiScreen.EDIT_CRUISE && model.isCruiseFilled()}; _tuttiAction: {EditSelectedCruiseAction.class}; - _help: {"tuttihelp.main.menu.action.editCruise.help"}; + _help: {"tutti.main.menu.action.editCruise.help"}; } #menuActionEditProtocol { actionIcon: protocol; - text: "tutti.action.editSelectedProtocol"; - toolTipText: "tuttihelp.main.action.editSelectedProtocol.tip"; + text: "tutti.main.action.editSelectedProtocol"; + toolTipText: "tutti.main.action.editSelectedProtocol.tip"; mnemonic: P; enabled: {model.getScreen() != TuttiScreen.EDIT_PROTOCOL && model.isProtocolFilled()}; _tuttiAction: {EditSelectedProtocolAction.class}; - _help: {"tuttihelp.main.menu.action.editProtocol.help"}; + _help: {"tutti.main.menu.action.editProtocol.help"}; } #menuActionEditCatches { actionIcon: edit; - text: "tutti.action.editCatches"; - toolTipText: "tuttihelp.main.action.editCatches.tip"; + text: "tutti.main.action.editCatches"; + toolTipText: "tutti.main.action.editCatches.tip"; mnemonic: a; enabled: {( !TuttiUIContext.VALIDATION_CONTEXT_EDIT.equals(model.getValidationContext()) || model.getScreen() != TuttiScreen.EDIT_FISHING_OPERATION ) && model.isCruiseFilled()}; _tuttiAction: {EditSelectedCruiseCatchesAction.class}; - _help: {"tuttihelp.main.menu.action.editCatches.help"}; + _help: {"tutti.main.menu.action.editCatches.help"}; } #menuActionValidateCatches { actionIcon: validate; - text: "tutti.action.validateCatches"; - toolTipText: "tuttihelp.main.action.validateCatches.tip"; + text: "tutti.main.action.validateCatches"; + toolTipText: "tutti.main.action.validateCatches.tip"; mnemonic: V; enabled: {( !TuttiUIContext.VALIDATION_CONTEXT_VALIDATE.equals(model.getValidationContext()) || model.getScreen() != TuttiScreen.EDIT_FISHING_OPERATION ) && model.isCruiseFilled()}; _tuttiAction: {ValidateSelectedCruiseCatchesAction.class}; - _help: {"tuttihelp.main.menu.action.validateCatches.help"}; + _help: {"tutti.main.menu.action.validateCatches.help"}; } #menuAdministration { - text: "tutti.menu.administration"; - toolTipText: "tuttihelp.main.action.administration.tip"; + text: "tutti.main.menu.administration"; + toolTipText: "tutti.main.menu.administration.tip"; mnemonic: A; enabled: {model.isDbLoaded()}; } #menuImportTemporaryReferential { actionIcon: temporary-referential-import; - text: "tutti.action.importTemporaryReferential"; - toolTipText: "tuttihelp.main.action.importTemporaryReferential.tip"; + text: "tutti.main.action.importTemporaryReferential"; + toolTipText: "tutti.main.action.importTemporaryReferential.tip"; mnemonic: I; enabled: {model.getScreen() != TuttiScreen.IMPORT_TEMPORARY_REFERENTIAL}; _tuttiAction: {ImportTemporaryReferentialAction.class}; - _help: {"tuttihelp.main.menu.action.importTemporaryReferential.help"}; + _help: {"tutti.main.menu.action.importTemporaryReferential.help"}; } #menuHelp { - text: "tutti.menu.help"; - toolTipText: "tuttihelp.main.action.help.tip"; + text: "tutti.main.menu.help"; + toolTipText: "tutti.main.menu.help.tip"; mnemonic: E; } #menuShowHelp { actionIcon: help; - text: "tutti.action.showHelp"; - toolTipText: "tuttihelp.main.action.showHelp.tip"; + text: "tutti.main.action.showHelp"; + toolTipText: "tutti.main.action.showHelp.tip"; mnemonic: e; - _help: {"tuttihelp.main.action.showHelp.help"}; + _help: {"tutti.main.action.showHelp.help"}; } #menuHelpSite { actionIcon: site; - text: "tutti.action.site"; - toolTipText: "tuttihelp.main.action.site.tip"; + text: "tutti.main.action.site"; + toolTipText: "tutti.main.action.site.tip"; mnemonic: S; - _help: {"tuttihelp.main.menu.action.site.help"}; + _help: {"tutti.main.menu.action.site.help"}; } #menuHelpAbout { - text: "tutti.action.about"; - toolTipText: "tuttihelp.main.action.about.tip"; + text: "tutti.main.action.about"; + toolTipText: "tutti.main.action.about.tip"; actionIcon: about; mnemonic: A; - _help: {"tuttihelp.main.menu.action.about.help"}; + _help: {"tutti.main.menu.action.about.help"}; } #bottomBar { @@ -238,11 +237,11 @@ #showHelp { actionIcon:"show-help"; - toolTipText:"tuttihelp.main.action.showHelp.tip"; - _help: {"tuttihelp.main.menu.action.showHelp.help"}; + toolTipText:"tutti.main.action.showHelp.tip"; + _help: {"tutti.main.menu.action.showHelp.help"}; } #body { - _help: {"tuttihelp.main.help"}; + _help: {"tutti.main.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -45,7 +45,7 @@ <MainUIHandler id='handler' initializer='getContextValue(MainUIHandler.class)'/> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.main.help"'/> + constructorParams='"tutti.main.help"'/> <BlockingLayerUI id='busyBlockLayerUI'/> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -124,7 +124,7 @@ closeAction.putValue(Action.LARGE_ICON_KEY, actionIcon); closeAction.putValue(Action.ACTION_COMMAND_KEY, "close"); closeAction.putValue(Action.NAME, "close"); - closeAction.putValue(Action.SHORT_DESCRIPTION, _("tutti.action.closeCommentEditor.tip")); + closeAction.putValue(Action.SHORT_DESCRIPTION, _("tutti.commentEditor.action.close.tip")); rootPane.getActionMap().put(CLOSE_DIALOG_ACTION, closeAction); rootPane.getActionMap().put(SHOW_DIALOG_ACTION, openAction); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -57,7 +57,6 @@ <TuttiUIContext id='model' initializer='getContextValue(TuttiUIContext.class)'/> - <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.selectCruise.help"'/> + <TuttiHelpBroker id='broker' constructorParams='"tutti.config.help"'/> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -88,7 +88,7 @@ ConfigUIHelper helper = new ConfigUIHelper(config.getApplicationConfig()); helper.registerCallBack( - CALLBACK_UI, n_("tutti.action.reload.ui"), + CALLBACK_UI, n_("tutti.config.action.reload.ui"), SwingUtil.createActionIcon("reload-ui"), new Runnable() { @@ -98,7 +98,7 @@ } } ).registerCallBack( - CALLBACK_APPLICATION, n_("tutti.action.reload.application"), + CALLBACK_APPLICATION, n_("tutti.config.action.reload.application"), SwingUtil.createActionIcon("reload-application"), new Runnable() { @@ -108,7 +108,7 @@ } } ).registerCallBack( - CALLBACK_SHORTCUT, n_("tutti.action.reload.actions"), + CALLBACK_SHORTCUT, n_("tutti.config.action.reload.actions"), SwingUtil.createActionIcon("reload-shortcut"), new Runnable() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -42,26 +42,26 @@ } #editCruiseTopPanel { - _help: {"tuttihelp.editCruise.help"}; + _help: {"tutti.editCruise.help"}; } #nameLabel { - text: "tutti.label.cruise.name"; + text: "tutti.editCruise.label.cruise.name"; labelFor: {nameField}; - toolTipText: "tuttihelp.editCruise.field.name.tip"; - _help: {"tuttihelp.editCruise.field.name.help"}; + toolTipText: "tutti.editCruise.field.name.tip"; + _help: {"tutti.editCruise.field.name.help"}; } #nameField { text: {model.getName()}; - _validatorLabel : {_("tutti.label.cruise.name")}; + _validatorLabel : {_("tutti.editCruise.label.cruise.name")}; } #yearLabel { - text: "tutti.label.cruise.year"; + text: "tutti.editCruise.label.cruise.year"; labelFor: {yearField}; - toolTipText: "tuttihelp.editCruise.field.year.tip"; - _help: {"tuttihelp.editCruise.field.year.help"}; + toolTipText: "tutti.editCruise.field.year.tip"; + _help: {"tutti.editCruise.field.year.help"}; } #yearField { @@ -69,76 +69,76 @@ model: {model.getYear()}; useFloat: false; numberPattern: {INT_4_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.cruise.year")}; + _validatorLabel : {_("tutti.editCruise.label.cruise.year")}; } #surveyPartLabel { - text: "tutti.label.cruise.surveyPart"; + text: "tutti.editCruise.label.cruise.surveyPart"; labelFor: {surveyPartField}; - toolTipText: "tuttihelp.editCruise.field.surveyPart.tip"; - _help: {"tuttihelp.editCruise.field.surveyPart.help"}; + toolTipText: "tutti.editCruise.field.surveyPart.tip"; + _help: {"tutti.editCruise.field.surveyPart.help"}; } #surveyPartField { text: {model.getSurveyPart()}; - _validatorLabel : {_("tutti.label.cruise.surveyPart")}; + _validatorLabel : {_("tutti.editCruise.label.cruise.surveyPart")}; } #countryLabel { - text: "tutti.label.cruise.country"; + text: "tutti.editCruise.label.cruise.country"; labelFor: {countryComboBox}; - toolTipText: "tuttihelp.editCruise.field.country.tip"; - _help: {"tuttihelp.editCruise.field.country.help"}; + toolTipText: "tutti.editCruise.field.country.tip"; + _help: {"tutti.editCruise.field.country.help"}; } #countryComboBox { property: country; selectedItem: {model.getCountry()}; - _validatorLabel : {_("tutti.label.cruise.country")}; + _validatorLabel : {_("tutti.editCruise.label.cruise.country")}; } #programLabel { - text: "tutti.label.cruise.program"; + text: "tutti.editCruise.label.cruise.program"; labelFor: {programComboBox}; - toolTipText: "tuttihelp.editCruise.field.program.tip"; - _help: {"tuttihelp.editCruise.field.program.help"}; + toolTipText: "tutti.editCruise.field.program.tip"; + _help: {"tutti.editCruise.field.program.help"}; } #programComboBox { property: program; selectedItem: {model.getProgram()}; - _validatorLabel : {_("tutti.label.cruise.program")}; + _validatorLabel : {_("tutti.editCruise.label.cruise.program")}; } #beginDateLabel { - text: "tutti.label.cruise.beginDate"; + text: "tutti.editCruise.label.cruise.beginDate"; labelFor: {beginDateField}; - toolTipText: "tuttihelp.editCruise.field.beginDate.tip"; - _help: {"tuttihelp.editCruise.field.beginDate.help"}; + toolTipText: "tutti.editCruise.field.beginDate.tip"; + _help: {"tutti.editCruise.field.beginDate.help"}; } #beginDateField { date: {model.getBeginDate()}; - _validatorLabel : {_("tutti.label.cruise.beginDate")}; + _validatorLabel : {_("tutti.editCruise.label.cruise.beginDate")}; } #endDateLabel { - text: "tutti.label.cruise.endDate"; + text: "tutti.editCruise.label.cruise.endDate"; labelFor: {endDateField}; - toolTipText: "tuttihelp.editCruise.field.endDate.tip"; - _help: {"tuttihelp.editCruise.field.endDate.help"}; + toolTipText: "tutti.editCruise.field.endDate.tip"; + _help: {"tutti.editCruise.field.endDate.help"}; } #endDateField { date: {model.getEndDate()}; - _validatorLabel : {_("tutti.label.cruise.endDate")}; + _validatorLabel : {_("tutti.editCruise.label.cruise.endDate")}; } #multirigNumberLabel { - text: "tutti.label.cruise.multirigNumber"; + text: "tutti.editCruise.label.cruise.multirigNumber"; labelFor: {multirigNumberField}; - toolTipText: "tuttihelp.editCruise.field.multirigNumber.tip"; - _help: {"tuttihelp.editCruise.field.multirigNumber.help"}; + toolTipText: "tutti.editCruise.field.multirigNumber.tip"; + _help: {"tutti.editCruise.field.multirigNumber.help"}; } #multirigNumberField { @@ -146,36 +146,36 @@ model: {model.getMultirigNumber()}; useFloat: false; numberPattern: {INT_1_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.cruise.multirigNumber")}; + _validatorLabel : {_("tutti.editCruise.label.cruise.multirigNumber")}; } #filterVesselLabel { - text: "tutti.label.filterVesselType"; + text: "tutti.editCruise.label.filterVesselType"; _strongStyle: true; actionIcon: filter; - toolTipText: "tuttihelp.editCruise.filterVessel.tip"; - _help: {"tuttihelp.editCruise.filterVessel.help"}; + toolTipText: "tutti.editCruise.filterVessel.tip"; + _help: {"tutti.editCruise.filterVessel.help"}; } #filterVesselAllButton { - text: "tutti.label.filterVesselType.all"; - toolTipText: "tutti.label.filterVesselType.all.tip"; + text: "tutti.editCruise.label.filterVesselType.all"; + toolTipText: "tutti.editCruise.label.filterVesselType.all.tip"; value: "all"; selected: {model.isVesselTypeAll()}; buttonGroup: "filterVesselType"; } #filterVesselScientificButton { - text: "tutti.label.filterVesselType.scientific"; - toolTipText: "tutti.label.filterVesselType.scientific.tip"; + text: "tutti.editCruise.label.filterVesselType.scientific"; + toolTipText: "tutti.editCruise.label.filterVesselType.scientific.tip"; value: "scientific"; selected: {model.isVesselTypeScientific()}; buttonGroup: "filterVesselType"; } #filterVesselFishingButton { - text: "tutti.label.filterVesselType.fishing"; - toolTipText: "tutti.label.filterVesselType.fishing.tip"; + text: "tutti.editCruise.label.filterVesselType.fishing"; + toolTipText: "tutti.editCruise.label.filterVesselType.fishing.tip"; value: "fishing"; selected: {model.isVesselTypeFishing()}; buttonGroup: "filterVesselType"; @@ -183,73 +183,73 @@ #vesselList { property: vessel; - border: {BorderFactory.createTitledBorder(_("tutti.label.list.vessel"))}; - _validatorLabel : {_("tutti.label.list.vessel")}; - toolTipText: "tuttihelp.editCruise.list.vessel.tip"; - _help: {"tuttihelp.editCruise.list.vessel.help"}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.list.vessel"))}; + _validatorLabel : {_("tutti.editCruise.label.list.vessel")}; + toolTipText: "tutti.editCruise.field.vessel.tip"; + _help: {"tutti.editCruise.field.vessel.help"}; } #gearList { property: gear; - border: {BorderFactory.createTitledBorder(_("tutti.label.list.gear"))}; - _validatorLabel : {_("tutti.label.list.gear")}; - toolTipText: "tuttihelp.editCruise.list.gear.tip"; - _help: {"tuttihelp.editCruise.list.gear.help"}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.list.gear"))}; + _validatorLabel : {_("tutti.editCruise.label.list.gear")}; + toolTipText: "tutti.editCruise.field.gear.tip"; + _help: {"tutti.editCruise.field.gear.help"}; } #headOfMissionList { property: headOfMission; - border: {BorderFactory.createTitledBorder(_("tutti.label.list.headOfMission"))}; - _validatorLabel : {_("tutti.label.list.headOfMission")}; - toolTipText: "tuttihelp.editCruise.list.headOfMission.tip"; - _help: {"tuttihelp.editCruise.list.headOfMission.help"}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.list.headOfMission"))}; + _validatorLabel : {_("tutti.editCruise.label.list.headOfMission")}; + toolTipText: "tutti.editCruise.field.headOfMission.tip"; + _help: {"tutti.editCruise.field.headOfMission.help"}; } #headOfSortRoomList { property: headOfSortRoom; - border: {BorderFactory.createTitledBorder(_("tutti.label.list.headOfSortRoom"))}; - _validatorLabel : {_("tutti.label.list.headOfSortRoom")}; - toolTipText: "tuttihelp.editCruise.list.headOfSortRoom.tip"; - _help: {"tuttihelp.editCruise.list.headOfSortRoom.help"}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.list.headOfSortRoom"))}; + _validatorLabel : {_("tutti.editCruise.label.list.headOfSortRoom")}; + toolTipText: "tutti.editCruise.field.headOfSortRoom.tip"; + _help: {"tutti.editCruise.field.headOfSortRoom.help"}; } #commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; - toolTipText: "tuttihelp.editCruise.field.comment.tip"; - _help: {"tuttihelp.editCruise.field.comment.help"}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.comment"))}; + toolTipText: "tutti.editCruise.field.comment.tip"; + _help: {"tutti.editCruise.field.comment.help"}; } #commentField { text: {model.getComment()}; - _validatorLabel : {_("tutti.label.comment")}; + _validatorLabel : {_("tutti.editCruise.label.comment")}; } #saveButton { actionIcon: save; - text: "tutti.action.saveCruise"; - toolTipText: "tuttihelp.editCruise.action.saveCruise.tip"; + text: "tutti.editCruise.action.saveCruise"; + toolTipText: "tutti.editCruise.action.saveCruise.tip"; mnemonic: E; _tuttiAction: {SaveCruiseAction.class}; enabled: {model.isModify() && model.isValid()}; - _help: {"tuttihelp.editCruise.action.save.help"}; + _help: {"tutti.editCruise.action.save.help"}; } #closeButton { actionIcon: cancel; - text: "tutti.action.closeEditCruise"; - toolTipText: "tuttihelp.editCruise.action.closeEditCruise.tip"; + text: "tutti.editCruise.action.closeEditCruise"; + toolTipText: "tutti.editCruise.action.closeEditCruise.tip"; mnemonic: A; _tuttiAction: {fr.ifremer.tutti.ui.swing.content.SelectCruiseAction.class}; - _help: {"tuttihelp.editCruise.action.close.help"}; + _help: {"tutti.editCruise.action.close.help"}; } #generateNameButton { actionIcon: generate; - text: "tutti.action.generateCampaignName"; - toolTipText: "tuttihelp.editCruise.action.generateName.tip"; + text: "tutti.editCruise.action.generateCampaignName"; + toolTipText: "tutti.editCruise.action.generateName.tip"; mnemonic: G; enabled: {model.isCanGenerateName()}; - _help: {"tuttihelp.editCruise.action.generateName.help"}; + _help: {"tutti.editCruise.action.generateName.help"}; } #topToolBar { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -92,7 +92,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editCruise.help"'/> + constructorParams='"tutti.editCruise.help"'/> <JToolBar id='topToolBar'> <ButtonAttachment id='attachmentsButton' 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -243,8 +243,8 @@ boolean result = quitScreen( getModel().isValid(), getModel().isModify(), - _("tutti.dialog.askCancelEditBeforeLeaving.cancelSaveCruise"), - _("tutti.dialog.askSaveBeforeLeaving.saveCruise"), + _("tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise"), + _("tutti.editCruise.askSaveBeforeLeaving.saveCruise"), ui.getSaveButton().getAction() ); return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -62,10 +62,10 @@ saved = persistenceService.createCruise(bean); model.setId(saved.getId()); - sendMessage(_("tutti.flash.information.cruiseCreated", bean.getName())); + sendMessage(_("tutti.flash.info.cruiseCreated", bean.getName())); } else { saved = persistenceService.saveCruise(bean); - sendMessage(_("tutti.flash.information.cruiseSaved", bean.getName())); + sendMessage(_("tutti.flash.info.cruiseSaved", bean.getName())); } context.setProgramId(saved.getProgram().getId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -80,7 +80,7 @@ @Override public void postSuccessAction() { - sendMessage(_("tutti.flash.information.db.closed", jdbcUrl)); + sendMessage(_("tutti.flash.info.db.closed", jdbcUrl)); // make sure title is reloaded getUI().getHandler().changeTitle(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -23,7 +23,7 @@ */ #dbManagerTopPanel { - _help: {"tuttihelp.dbManager.help"}; + _help: {"tutti.dbManager.help"}; } #informationLabel { @@ -38,20 +38,20 @@ #installDbButton { actionIcon: install-db; - text: "tutti.action.installDb"; + text: "tutti.dbManager.action.installDb"; mnemonic: n; _tuttiAction: {InstallDbAction.class}; - toolTipText: "tuttihelp.dbManager.action.installDb.tip"; - _help: {"tuttihelp.dbManager.action.installDb.help"}; + toolTipText: "tutti.dbManager.action.installDb.tip"; + _help: {"tutti.dbManager.action.installDb.help"}; } #importDbButton { actionIcon: import-db; - text: "tutti.action.importDb"; + text: "tutti.dbManager.action.importDb"; mnemonic: I; _tuttiAction: {ImportDbAction.class}; - toolTipText: "tuttihelp.dbManager.action.importDb.tip"; - _help: {"tuttihelp.dbManager.action.importDb.help"}; + toolTipText: "tutti.dbManager.action.importDb.tip"; + _help: {"tutti.dbManager.action.importDb.help"}; } #withDbActions { @@ -60,50 +60,50 @@ #openDbButton { actionIcon: open-db; - text: "tutti.action.openDb"; + text: "tutti.dbManager.action.openDb"; mnemonic: O; enabled: {!model.isDbLoaded()}; _tuttiAction: {OpenDbAction.class}; - toolTipText: "tuttihelp.dbManager.action.openDb.tip"; - _help: {"tuttihelp.dbManager.action.openDb.help"}; + toolTipText: "tutti.dbManager.action.openDb.tip"; + _help: {"tutti.dbManager.action.openDb.help"}; } #upgradeDbButton { actionIcon: update-referential; - text: "tutti.action.upgradeDb"; + text: "tutti.dbManager.action.upgradeDb"; mnemonic: U; enabled: {model.isDbLoaded()}; _tuttiAction: {UpdateReferentialAction.class}; - toolTipText: "tuttihelp.dbManager.action.upgradeDb.tip"; - _help: {"tuttihelp.dbManager.action.upgradeDb.help"}; + toolTipText: "tutti.dbManager.action.upgradeDb.tip"; + _help: {"tutti.dbManager.action.upgradeDb.help"}; } #closeDbButton { actionIcon: close-db; - text: "tutti.action.closeDb"; + text: "tutti.dbManager.action.closeDb"; mnemonic: F; enabled: {model.isDbLoaded()}; _tuttiAction: {CloseDbAction.class}; - toolTipText: "tuttihelp.dbManager.action.closeDb.tip"; - _help: {"tuttihelp.dbManager.action.closeDb.help"}; + toolTipText: "tutti.dbManager.action.closeDb.tip"; + _help: {"tutti.dbManager.action.closeDb.help"}; } #exportDbButton { actionIcon: export-db; - text: "tutti.action.exportDb"; + text: "tutti.dbManager.action.exportDb"; mnemonic: E; enabled: {model.isDbLoaded()}; _tuttiAction: {ExportDbAction.class}; - toolTipText: "tuttihelp.dbManager.action.exportDb.tip"; - _help: {"tuttihelp.dbManager.action.exportDb.help"}; + toolTipText: "tutti.dbManager.action.exportDb.tip"; + _help: {"tutti.dbManager.action.exportDb.help"}; } #exportAndCleanDbButton { actionIcon: export-db; - text: "tutti.action.exportAndCleanDb"; + text: "tutti.dbManager.action.exportAndCleanDb"; mnemonic: E; enabled: {model.isDbLoaded()}; _tuttiAction: {ExportAndCleanDbAction.class}; - toolTipText: "tuttihelp.dbManager.action.exportAndCleanDb.tip"; - _help: {"tuttihelp.dbManager.action.exportAndCleanDb.help"}; + toolTipText: "tutti.dbManager.action.exportAndCleanDb.tip"; + _help: {"tutti.dbManager.action.exportAndCleanDb.help"}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -53,8 +53,7 @@ <TuttiUIContext id='model' initializer='getContextValue(TuttiUIContext.class)'/> - <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.dbManager.help"'/> + <TuttiHelpBroker id='broker' constructorParams='"tutti.dbManager.help"'/> <JLabel id='informationLabel' constraints='BorderLayout.CENTER'/> <JPanel id='centerPanel' layout='{new BorderLayout()}' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -61,17 +61,17 @@ String jdbcUrl = getConfig().getServiceConfig().getPersistenceConfig().getJdbcUrl(); // db loaded - message = _("tutti.information.db.loaded", jdbcUrl); + message = _("tutti.dbManager.info.db.loaded", jdbcUrl); } else { // no db loaded - message = _("tutti.information.no.db.loaded"); + message = _("tutti.dbManager.info.no.db.loaded"); } } else { // db does not exist - message = _("tutti.information.no.db.exist"); + message = _("tutti.dbManager.info.no.db.exist"); ui.getInformationLabel().setText(_(message)); } return message; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -68,8 +68,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.dbExportFile"), - _("tutti.action.chooseDbExportFile"), + _("tutti.dbManager.title.choose.dbExportFile"), + _("tutti.dbManager.action.chooseDbExportFile"), "^.*\\.zip", _("tutti.file.zip") ); if (file == null) { @@ -139,7 +139,7 @@ public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.flash.information.db.exported.and.clean", file)); + sendMessage(_("tutti.flash.info.db.exported.and.clean", file)); // make sure title is reloaded getUI().getHandler().changeTitle(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -66,8 +66,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.dbExportFile"), - _("tutti.action.chooseDbExportFile"), + _("tutti.dbManager.title.choose.dbExportFile"), + _("tutti.dbManager.action.chooseDbExportFile"), "^.*\\.zip", _("tutti.file.zip") ); if (file == null) { @@ -123,7 +123,7 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.flash.information.db.exported", file)); + sendMessage(_("tutti.flash.info.db.exported", file)); // make sure title is reloaded getUI().getHandler().changeTitle(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -64,8 +64,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.dbImportFile"), - _("tutti.action.chooseDbFile"), + _("tutti.dbManager.title.choose.dbImportFile"), + _("tutti.dbManager.action.chooseDbFile"), "^.*\\.zip", _("tutti.file.zip") ); @@ -116,6 +116,6 @@ super.postSuccessAction(); String jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); - sendMessage(_("tutti.flash.information.db.imported", jdbcUrl)); + sendMessage(_("tutti.flash.info.db.imported", jdbcUrl)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -90,7 +90,7 @@ super.postSuccessAction(); String jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); - sendMessage(_("tutti.flash.information.db.installed", jdbcUrl)); + sendMessage(_("tutti.flash.info.db.installed", jdbcUrl)); // make sure title is reloaded getUI().getHandler().changeTitle(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -46,7 +46,7 @@ public OpenDbAction(MainUIHandler handler) { super(handler, true, TuttiScreen.SELECT_CRUISE); - setActionDescription(_("tuttihelp.dbManager.action.openDb.tip")); + setActionDescription(_("tutti.dbManager.action.openDb.tip")); } @Override @@ -70,7 +70,7 @@ public void postSuccessAction() { String jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); - sendMessage(_("tutti.flash.information.db.opened", jdbcUrl)); + sendMessage(_("tutti.flash.info.db.opened", jdbcUrl)); // make sure title is reloaded getUI().getHandler().changeTitle(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -58,8 +58,8 @@ TuttiProtocol protocol = getHandler().getModel().getProtocol(); int answer = JOptionPane.showConfirmDialog( getHandler().getUI(), - _("tutti.action.deleteProtocol.message", protocol.getName()), - _("tutti.action.deleteProtocol.title"), + _("tutti.selectCruise.action.deleteProtocol.message", protocol.getName()), + _("tutti.selectCruise.action.deleteProtocol.title"), JOptionPane.OK_CANCEL_OPTION ); result &= answer == JOptionPane.OK_OPTION; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -65,8 +65,8 @@ // choose file to export file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.protocolExportFile"), - _("tutti.action.chooseProtocolFile"), + _("tutti.selectCruise.title.choose.exportFile"), + _("tutti.selectCruise.action.chooseProtocolFile"), "^.+\\.tuttiProtocol$", _("tutti.file.protocol") ); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -68,8 +68,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.protocolImportFile"), - _("tutti.action.chooseProtocolFile"), + _("tutti.selectCruise.title.choose.importFile"), + _("tutti.selectCruise.action.chooseProtocolFile"), "^.+\\.tuttiProtocol$", _("tutti.file.protocol") ); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -29,7 +29,7 @@ } #selectCruiseTopPanel { - _help: {"tuttihelp.selectCruise.help"}; + _help: {"tutti.selectCruise.help"}; } #warningContainer { @@ -40,14 +40,14 @@ #warningLabel { actionIcon: warning; border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; - text: "tutti.warn.invalid.selected.data"; + text: "tutti.selectCruise.warn.invalid.selected.data"; } #programLabel { - text: "tutti.label.program"; + text: "tutti.selectCruise.label.program"; actionIcon: program; - toolTipText: "tuttihelp.selectCruise.field.program.tip"; - _help: {"tuttihelp.selectCruise.field.program.help"}; + toolTipText: "tutti.selectCruise.field.program.tip"; + _help: {"tutti.selectCruise.field.program.help"}; } #programCombobox { @@ -55,76 +55,76 @@ beanType: {Program.class}; selectedItem: {model.getProgram()}; enabled: {!programCombobox.isEmpty()}; - _validatorLabel : {_("tutti.label.program")}; + _validatorLabel : {_("tutti.selectCruise.label.program")}; } #editProgramButton { actionIcon: edit; - text: "tutti.action.editProgram"; + text: "tutti.selectCruise.action.editProgram"; mnemonic: E; enabled: {model.isProgramFound()}; _tuttiAction: {EditProgramAction.class}; - toolTipText: "tuttihelp.selectCruise.action.editProgram.tip"; - _help: {"tuttihelp.selectCruise.action.editProgram.help"}; + toolTipText: "tutti.selectCruise.action.editProgram.tip"; + _help: {"tutti.selectCruise.action.editProgram.help"}; } #newProgramButton { actionIcon: add; - text: "tutti.action.newProgram"; + text: "tutti.selectCruise.action.newProgram"; mnemonic: N; _tuttiAction: {NewProgramAction.class}; - toolTipText: "tuttihelp.selectCruise.action.newProgram.tip"; - _help: {"tuttihelp.selectCruise.action.newProgram.help"}; + toolTipText: "tutti.selectCruise.action.newProgram.tip"; + _help: {"tutti.selectCruise.action.newProgram.help"}; } #cruiseLabel { - text: "tutti.label.cruise"; + text: "tutti.selectCruise.label.cruise"; labelFor: {cruiseCombobox}; actionIcon: cruise; - toolTipText: "tuttihelp.selectCruise.field.cruise.tip"; - _help: {"tuttihelp.selectCruise.field.cruise.help"}; + toolTipText: "tutti.selectCruise.field.cruise.tip"; + _help: {"tutti.selectCruise.field.cruise.help"}; } #cruiseCombobox { property: cruise; selectedItem: {model.getCruise()}; enabled: {!cruiseCombobox.isEmpty()}; - _validatorLabel : {_("tutti.label.cruise")}; + _validatorLabel : {_("tutti.selectCruise.label.cruise")}; } #editCruiseButton { actionIcon: edit; - text: "tutti.action.editCruise"; + text: "tutti.selectCruise.action.editCruise"; mnemonic: E; enabled: {model.isProgramFound() && model.isCruiseFound()}; _tuttiAction: {EditCruiseAction.class}; - toolTipText: "tuttihelp.selectCruise.action.editCruise.tip"; - _help: {"tuttihelp.selectCruise.action.editCruise.help"}; + toolTipText: "tutti.selectCruise.action.editCruise.tip"; + _help: {"tutti.selectCruise.action.editCruise.help"}; } #newCruiseButton { actionIcon: add; - text: "tutti.action.newCruise"; + text: "tutti.selectCruise.action.newCruise"; mnemonic: N; enabled: {model.isProgramFound()}; _tuttiAction: {NewCruiseAction.class}; - toolTipText: "tuttihelp.selectCruise.action.newCruise.tip"; - _help: {"tuttihelp.selectCruise.action.newCruise.help"}; + toolTipText: "tutti.selectCruise.action.newCruise.tip"; + _help: {"tutti.selectCruise.action.newCruise.help"}; } #protocolLabel { - text: "tutti.label.protocol"; + text: "tutti.selectCruise.label.protocol"; labelFor: {protocolCombobox}; actionIcon: protocol; - toolTipText: "tuttihelp.selectCruise.field.protocol.tip"; - _help: {"tuttihelp.selectCruise.field.protocol.help"}; + toolTipText: "tutti.selectCruise.field.protocol.tip"; + _help: {"tutti.selectCruise.field.protocol.help"}; } #protocolCombobox { property: protocol; selectedItem: {model.getProtocol()}; enabled: {!protocolCombobox.isEmpty()}; - _validatorLabel : {_("tutti.label.protocol")}; + _validatorLabel : {_("tutti.selectCruise.label.protocol")}; } #newProtocolComboBox { @@ -140,74 +140,74 @@ #newProtocolButton { actionIcon: add; - text: "tutti.action.newProtocol"; + text: "tutti.selectCruise.action.newProtocol"; mnemonic: N; _tuttiAction: {NewProtocolAction.class}; - toolTipText: "tuttihelp.selectCruise.action.newProtocol.tip"; - _help: {"tuttihelp.selectCruise.action.newProtocol.help"}; + toolTipText: "tutti.selectCruise.action.newProtocol.tip"; + _help: {"tutti.selectCruise.action.newProtocol.help"}; } #importProtocolButton { actionIcon: import; - text: "tutti.action.importProtocol"; + text: "tutti.selectCruise.action.importProtocol"; mnemonic: I; _tuttiAction: {ImportProtocolAction.class}; - toolTipText: "tuttihelp.selectCruise.action.importProtocol.tip"; - _help: {"tuttihelp.selectCruise.action.importProtocol.help"}; + toolTipText: "tutti.selectCruise.action.importProtocol.tip"; + _help: {"tutti.selectCruise.action.importProtocol.help"}; } #editProtocolButton { actionIcon: edit; - text: "tutti.action.editProtocol"; + text: "tutti.selectCruise.action.editProtocol"; mnemonic: E; _tuttiAction: {EditProtocolAction.class}; - toolTipText: "tuttihelp.selectCruise.action.editProtocol.tip"; - _help: {"tuttihelp.selectCruise.action.editProtocol.help"}; + toolTipText: "tutti.selectCruise.action.editProtocol.tip"; + _help: {"tutti.selectCruise.action.editProtocol.help"}; } #cloneProtocolButton { actionIcon: copy; - text: "tutti.action.cloneProtocol"; + text: "tutti.selectCruise.action.cloneProtocol"; mnemonic: C; _tuttiAction: {CloneProtocolAction.class}; - toolTipText: "tuttihelp.selectCruise.action.cloneProtocol.tip"; - _help: {"tuttihelp.selectCruise.action.cloneProtocol.help"}; + toolTipText: "tutti.selectCruise.action.cloneProtocol.tip"; + _help: {"tutti.selectCruise.action.cloneProtocol.help"}; } #exportProtocolButton { actionIcon: export; - text: "tutti.action.exportProtocol"; + text: "tutti.selectCruise.action.exportProtocol"; mnemonic: E; _tuttiAction: {ExportProtocolAction.class}; - toolTipText: "tuttihelp.selectCruise.action.exportProtocol.tip"; - _help: {"tuttihelp.selectCruise.action.exportProtocol.help"}; + toolTipText: "tutti.selectCruise.action.exportProtocol.tip"; + _help: {"tutti.selectCruise.action.exportProtocol.help"}; } #deleteProtocolButton { actionIcon: delete; - text: "tutti.action.deleteProtocol"; + text: "tutti.selectCruise.action.deleteProtocol"; mnemonic: D; _tuttiAction: {DeleteProtocolAction.class}; - toolTipText: "tuttihelp.selectCruise.action.deleteProtocol.tip"; - _help: {"tuttihelp.selectCruise.action.deleteProtocol.help"}; + toolTipText: "tutti.selectCruise.action.deleteProtocol.tip"; + _help: {"tutti.selectCruise.action.deleteProtocol.help"}; } #editCatchesButton { actionIcon: edit; - text: "tutti.action.editCatches"; + text: "tutti.selectCruise.action.editCatches"; mnemonic: E; _tuttiAction: {EditCatchesAction.class}; enabled: {model.isValid() && uiContext.isCruiseFilled()}; - toolTipText: "tuttihelp.selectCruise.action.editCatches.tip"; - _help: {"tuttihelp.selectCruise.action.editCatches.help"}; + toolTipText: "tutti.selectCruise.action.editCatches.tip"; + _help: {"tutti.selectCruise.action.editCatches.help"}; } #validateCatchesButton { actionIcon: validate; - text: "tutti.action.validateCatches"; - toolTipText: "tuttihelp.selectCruise.action.validateCatches.tip"; + text: "tutti.selectCruise.action.validateCatches"; + toolTipText: "tutti.selectCruise.action.validateCatches.tip"; mnemonic: V; _tuttiAction: {ValidateCatchesAction.class}; enabled: {model.isValid() && uiContext.isCruiseFilled()}; - _help: {"tuttihelp.selectCruise.action.validateCatches.help"}; + _help: {"tutti.selectCruise.action.validateCatches.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -71,7 +71,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.selectCruise.help"'/> + constructorParams='"tutti.selectCruise.help"'/> <JButton id='newProtocolButton'/> <JButton id='importProtocolButton'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -149,7 +149,7 @@ public EditFishingOperationAction(FishingOperationsUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.action.editFishingOperation.tip")); + setActionDescription(_("tutti.editFishingOperation.action.editFishingOperation.tip")); } public void setFishingOperation(FishingOperation fishingOperation) { @@ -232,11 +232,11 @@ String message; if (create) { - message = _("tutti.dialog.askSaveBeforeLeaving.createFishingOperation"); + message = _("tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation"); } else if (fishingOperationModified) { - message = _("tutti.dialog.askSaveBeforeLeaving.saveFishingOperation"); + message = _("tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation"); } else { - message = _("tutti.dialog.askSaveBeforeLeaving.saveCatchBatch"); + message = _("tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch"); } int answer = getHandler().askSaveBeforeLeaving(message); @@ -273,9 +273,9 @@ String message; if (fishingOperationValid) { - message = _("tutti.dialog.askCancelEditBeforeLeaving.cancelEditCatchBatch"); + message = _("tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch"); } else { - message = _("tutti.dialog.askCancelEditBeforeLeaving.cancelEditFishingOperation"); + message = _("tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation"); } // ok will revert any modification by @@ -480,10 +480,10 @@ if (bean == null) { fishingOperationText = null; } else if (TuttiEntities.isNew(bean)) { - fishingOperationText = _("tutti.label.traitReminder", - _("tutti.label.traitReminder.inCreation")); + fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", + _("tutti.editFishingOperation.label.traitReminder.inCreation")); } else { - fishingOperationText = _("tutti.label.traitReminder", + fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", decorator.toString(bean)); } return fishingOperationText; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -55,7 +55,7 @@ } #editFishingOperationTopPanel { - _help: {"tuttihelp.editFishingOperation.help"}; + _help: {"tutti.editFishingOperation.help"}; } #traitGeneralTabPaneToolBar { floatable: false; @@ -65,35 +65,31 @@ #fishingOperationAttachmentsButton { enabled: {model.getId() != null}; - toolTipText: "tuttihelp.editFishingOperation.action.attachments.tip"; - _help: {"tuttihelp.editFishingOperation.action.attachments.help"}; + toolTipText: "tutti.editFishingOperation.action.attachments.tip"; + _help: {"tutti.editFishingOperation.action.attachments.help"}; } #traitGeneralTabPane { rightDecoration: {traitGeneralTabPaneToolBar}; } -/*#fishingOperationTabScrollPane { - horizontalScrollBarPolicy: {javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER}; -}*/ - #stationNumberLabel { - text: "tutti.label.fishingOperation.stationNumber"; + text: "tutti.editFishingOperation.field.stationNumber"; labelFor: {stationNumberField}; - toolTipText: "tuttihelp.editFishingOperation.field.stationNumber.tip"; - _help: {"tuttihelp.editFishingOperation.field.stationNumber.help"}; + toolTipText: "tutti.editFishingOperation.field.stationNumber.tip"; + _help: {"tutti.editFishingOperation.field.stationNumber.help"}; } #stationNumberField { text: {model.getStationNumber()}; - _validatorLabel : {_("tutti.label.fishingOperation.stationNumber")}; + _validatorLabel : {_("tutti.editFishingOperation.field.stationNumber")}; } #fishingOperationNumberLabel { - text: "tutti.label.fishingOperation.fishingOperationNumber"; + text: "tutti.editFishingOperation.field.fishingOperationNumber"; labelFor: {fishingOperationNumberField}; - toolTipText: "tuttihelp.editFishingOperation.field.fishingOperationNumber.tip"; - _help: {"tuttihelp.editFishingOperation.field.fishingOperationNumber.help"}; + toolTipText: "tutti.editFishingOperation.field.fishingOperationNumber.tip"; + _help: {"tutti.editFishingOperation.field.fishingOperationNumber.help"}; } #fishingOperationNumberField { @@ -101,86 +97,86 @@ model: {model.getFishingOperationNumber()}; useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.fishingOperation.fishingOperationNumber")}; + _validatorLabel : {_("tutti.editFishingOperation.field.fishingOperationNumber")}; } #strataLabel { - text: "tutti.label.fishingOperation.strata"; + text: "tutti.editFishingOperation.field.strata"; labelFor: {strataComboBox}; - toolTipText: "tuttihelp.editFishingOperation.field.strata.tip"; - _help: {"tuttihelp.editFishingOperation.field.strata.help"}; + toolTipText: "tutti.editFishingOperation.field.strata.tip"; + _help: {"tutti.editFishingOperation.field.strata.help"}; } #strataComboBox { property: strata; selectedItem: {model.getStrata()}; - _validatorLabel : {_("tutti.label.fishingOperation.strata")}; + _validatorLabel : {_("tutti.editFishingOperation.field.strata")}; } #subStrataLabel { - text: "tutti.label.fishingOperation.subStrata"; + text: "tutti.editFishingOperation.field.subStrata"; labelFor: {subStrataComboBox}; - toolTipText: "tuttihelp.editFishingOperation.field.subStrata.tip"; - _help: {"tuttihelp.editFishingOperation.field.subStrata.help"}; + toolTipText: "tutti.editFishingOperation.field.subStrata.tip"; + _help: {"tutti.editFishingOperation.field.subStrata.help"}; } #subStrataComboBox { property: subStrata; selectedItem: {model.getSubStrata()}; - _validatorLabel : {_("tutti.label.fishingOperation.subStrata")}; + _validatorLabel : {_("tutti.editFishingOperation.field.subStrata")}; } #locationLabel { - text: "tutti.label.fishingOperation.location"; + text: "tutti.editFishingOperation.field.location"; labelFor: {locationComboBox}; - toolTipText: "tuttihelp.editFishingOperation.field.location.tip"; - _help: {"tuttihelp.editFishingOperation.field.location.help"}; + toolTipText: "tutti.editFishingOperation.field.location.tip"; + _help: {"tutti.editFishingOperation.field.location.help"}; } #locationComboBox { property: location; selectedItem: {model.getLocation()}; - _validatorLabel : {_("tutti.label.fishingOperation.location")}; + _validatorLabel : {_("tutti.editFishingOperation.field.location")}; } #gearLongitudeLabel { text: {handler.getGearLongitudeLabelText(handler.getConfig().getCoordinateEditorType())}; actionIcon: "coordinates"; - toolTipText: "tuttihelp.editFishingOperation.field.gearLongitude.tip"; - _help: {"tuttihelp.editFishingOperation.field.gearLongitude.help"}; + toolTipText: "tutti.editFishingOperation.field.gearLongitude.tip"; + _help: {"tutti.editFishingOperation.field.gearLongitude.help"}; } #gearLatitudeLabel { text: {handler.getGearLatitudeLabelText(handler.getConfig().getCoordinateEditorType())}; actionIcon: "coordinates"; - toolTipText: "tuttihelp.editFishingOperation.field.gearLatitude.tip"; - _help: {"tuttihelp.editFishingOperation.field.gearLatitude.help"}; + toolTipText: "tutti.editFishingOperation.field.gearLatitude.tip"; + _help: {"tutti.editFishingOperation.field.gearLatitude.help"}; } #gearDateLabel { - text: "tutti.label.fishingOperation.gearDate"; + text: "tutti.editFishingOperation.field.gearDate"; actionIcon: "calendar"; - toolTipText: "tuttihelp.editFishingOperation.field.gearDate.tip"; - _help: {"tuttihelp.editFishingOperation.field.gearDate.help"}; + toolTipText: "tutti.editFishingOperation.field.gearDate.tip"; + _help: {"tutti.editFishingOperation.field.gearDate.help"}; } #gearTimeLabel { - text: "tutti.label.fishingOperation.gearTime"; + text: "tutti.editFishingOperation.field.gearTime"; actionIcon: "time"; - toolTipText: "tuttihelp.editFishingOperation.field.gearTime.tip"; - _help: {"tuttihelp.editFishingOperation.field.gearTime.help"}; + toolTipText: "tutti.editFishingOperation.field.gearTime.tip"; + _help: {"tutti.editFishingOperation.field.gearTime.help"}; } #gearShootingStartLabel { - text: "tutti.label.fishingOperation.gearShootingStart"; - toolTipText: "tuttihelp.editFishingOperation.field.gearShootingStart.tip"; - _help: {"tuttihelp.editFishingOperation.field.gearShootingStart.help"}; + text: "tutti.editFishingOperation.field.gearShootingStart"; + toolTipText: "tutti.editFishingOperation.field.gearShootingStart.tip"; + _help: {"tutti.editFishingOperation.field.gearShootingStart.help"}; } #gearShootingEndLabel { - text: "tutti.label.fishingOperation.gearShootingEnd"; - toolTipText: "tuttihelp.editFishingOperation.field.gearShootingEnd.tip"; - _help: {"tuttihelp.editFishingOperation.field.gearShootingEnd.help"}; + text: "tutti.editFishingOperation.field.gearShootingEnd"; + toolTipText: "tutti.editFishingOperation.field.gearShootingEnd.tip"; + _help: {"tutti.editFishingOperation.field.gearShootingEnd.help"}; } CardLayout2Ext { @@ -188,47 +184,47 @@ } #traitVesselPanel { - border: {BorderFactory.createTitledBorder(_("tutti.label.fishingOperation.other"))}; + border: {BorderFactory.createTitledBorder(_("tutti.editFishingOperation.pane.other"))}; } #vesselLabel { - text: "tutti.label.fishingOperation.vessel"; + text: "tutti.editFishingOperation.field.vessel"; labelFor: {vesselComboBox}; actionIcon: "vessel"; - toolTipText: "tuttihelp.editFishingOperation.field.vessel.tip"; - _help: {"tuttihelp.editFishingOperation.field.vessel.help"}; + toolTipText: "tutti.editFishingOperation.field.vessel.tip"; + _help: {"tutti.editFishingOperation.field.vessel.help"}; } #vesselComboBox { property: vessel; selectedItem: {model.getVessel()}; - _validatorLabel : {_("tutti.label.fishingOperation.vessel")}; + _validatorLabel : {_("tutti.editFishingOperation.field.vessel")}; } #gearLabel { - text: "tutti.label.fishingOperation.gear"; + text: "tutti.editFishingOperation.field.gear"; labelFor: {gearComboBox}; actionIcon: "gear"; - toolTipText: "tuttihelp.editFishingOperation.field.gear.tip"; - _help: {"tuttihelp.editFishingOperation.field.gear.help"}; + toolTipText: "tutti.editFishingOperation.field.gear.tip"; + _help: {"tutti.editFishingOperation.field.gear.help"}; } #gearComboBox { property: gear; selectedItem: {model.getGear()}; - _validatorLabel : {_("tutti.label.fishingOperation.gear")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gear")}; } #multirigAggregationLabel { - text: "tutti.label.fishingOperation.multirigAggregation"; + text: "tutti.editFishingOperation.field.multirigAggregation"; labelFor: {multirigAggregationField}; - toolTipText: "tuttihelp.editFishingOperation.field.multirigAggregation.tip"; - _help: {"tuttihelp.editFishingOperation.field.multirigAggregation.help"}; + toolTipText: "tutti.editFishingOperation.field.multirigAggregation.tip"; + _help: {"tutti.editFishingOperation.field.multirigAggregation.help"}; } #multirigAggregationField { text: {model.getMultirigAggregation()}; - _validatorLabel : {_("tutti.label.fishingOperation.multirigAggregation")}; + _validatorLabel : {_("tutti.editFishingOperation.field.multirigAggregation")}; } .degree { @@ -260,40 +256,40 @@ #gearShootingStartLongitudePanel { layout:{gearShootingStartLongitudeLayout}; - toolTipText: "tuttihelp.editFishingOperation.gearShootingStartLongitude.tip"; - _help: {"tuttihelp.editFishingOperation.gearShootingStartLongitude.help"}; + toolTipText: "tutti.editFishingOperation.field.gearShootingStartLongitude.tip"; + _help: {"tutti.editFishingOperation.field.gearShootingStartLongitude.help"}; } #gearShootingStartLongitudeDMSDegreeField { property: gearShootingStartLongitudeDegree; model: {model.getGearShootingStartLongitudeDegree()}; numberPattern: {SIGNED_INT_3_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeDegree")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLongitudeDegree")}; } #gearShootingStartLongitudeDMSMinuteField { property: gearShootingStartLongitudeMinute; model: {model.getGearShootingStartLongitudeMinute()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeMinute")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLongitudeMinute")}; } #gearShootingStartLongitudeDMSSecondField { property: gearShootingStartLongitudeSecond; model: {model.getGearShootingStartLongitudeSecond()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeSecond")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLongitudeSecond")}; } #gearShootingStartLongitudeDMDDegreeField { property: gearShootingStartLongitudeDegree; model: {model.getGearShootingStartLongitudeDegree()}; numberPattern: {SIGNED_INT_3_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeDegree")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLongitudeDegree")}; } #gearShootingStartLongitudeDMDMinuteField { property: gearShootingStartLongitudeDecimalMinute; model: {model.getGearShootingStartLongitudeDecimalMinute()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeMinute")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLongitudeMinute")}; } #gearShootingStartLongitudeDDField { @@ -302,45 +298,45 @@ showReset: false; useFloat: true; useSign: true; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitude")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLongitude")}; } #gearShootingStartLatitudePanel { layout:{gearShootingStartLatitudeLayout}; - toolTipText: "tuttihelp.editFishingOperation.field.gearShootingStartLatitude.tip"; - _help: {"tuttihelp.editFishingOperation.field.gearShootingStartLatitude.help"}; + toolTipText: "tutti.editFishingOperation.field.gearShootingStartLatitude.tip"; + _help: {"tutti.editFishingOperation.field.gearShootingStartLatitude.help"}; } #gearShootingStartLatitudeDMSDegreeField { property: gearShootingStartLatitudeDegree; model: {model.getGearShootingStartLatitudeDegree()}; numberPattern: {SIGNED_INT_2_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeDegree")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLatitudeDegree")}; } #gearShootingStartLatitudeDMSMinuteField { property: gearShootingStartLatitudeMinute; model: {model.getGearShootingStartLatitudeMinute()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeMinute")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLatitudeMinute")}; } #gearShootingStartLatitudeDMSSecondField { property: gearShootingStartLatitudeSecond; model: {model.getGearShootingStartLatitudeSecond()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeSecond")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLatitudeSecond")}; } #gearShootingStartLatitudeDMDDegreeField { property: gearShootingStartLatitudeDegree; model: {model.getGearShootingStartLatitudeDegree()}; numberPattern: {SIGNED_INT_2_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeDegree")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLatitudeDegree")}; } #gearShootingStartLatitudeDMDMinuteField { property: gearShootingStartLatitudeDecimalMinute; model: {model.getGearShootingStartLatitudeDecimalMinute()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeMinute")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLatitudeMinute")}; } #gearShootingStartLatitudeDDField { @@ -349,12 +345,12 @@ showReset: false; useFloat: true; useSign: true; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitude")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartLatitude")}; } #gearShootingStartDateField { date: {model.getGearShootingStartDate()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartDate")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingStartDate")}; } #gearShootingStartTimeField { @@ -364,40 +360,40 @@ #gearShootingEndLongitudePanel { layout:{gearShootingEndLongitudeLayout}; - toolTipText: "tuttihelp.editFishingOperation.field.gearShootingEndLongitude.tip"; - _help: {"tuttihelp.editFishingOperation.field.gearShootingEndLongitude.help"}; + toolTipText: "tutti.editFishingOperation.field.gearShootingEndLongitude.tip"; + _help: {"tutti.editFishingOperation.field.gearShootingEndLongitude.help"}; } #gearShootingEndLongitudeDMSDegreeField { property: gearShootingEndLongitudeDegree; model: {model.getGearShootingEndLongitudeDegree()}; numberPattern: {SIGNED_INT_3_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeDegree")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLongitudeDegree")}; } #gearShootingEndLongitudeDMSMinuteField { property: gearShootingEndLongitudeMinute; model: {model.getGearShootingEndLongitudeMinute()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeMinute")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLongitudeMinute")}; } #gearShootingEndLongitudeDMSSecondField { property: gearShootingEndLongitudeSecond; model: {model.getGearShootingEndLongitudeSecond()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeSecond")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLongitudeSecond")}; } #gearShootingEndLongitudeDMDDegreeField { property: gearShootingEndLongitudeDegree; model: {model.getGearShootingEndLongitudeDegree()}; numberPattern: {SIGNED_INT_3_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeDegree")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLongitudeDegree")}; } #gearShootingEndLongitudeDMDMinuteField { property: gearShootingEndLongitudeDecimalMinute; model: {model.getGearShootingEndLongitudeDecimalMinute()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeMinute")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLongitudeMinute")}; } #gearShootingEndLongitudeDDField { @@ -406,45 +402,45 @@ showReset: false; useFloat: true; useSign: true; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitude")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLongitude")}; } #gearShootingEndLatitudePanel { layout:{gearShootingEndLatitudeLayout}; - toolTipText: "tuttihelp.editFishingOperation.field.gearShootingEndLatitude.tip"; - _help: {"tuttihelp.editFishingOperation.field.gearShootingEndLatitude.help"}; + toolTipText: "tutti.editFishingOperation.field.gearShootingEndLatitude.tip"; + _help: {"tutti.editFishingOperation.field.gearShootingEndLatitude.help"}; } #gearShootingEndLatitudeDMSDegreeField { property: gearShootingEndLatitudeDegree; model: {model.getGearShootingEndLatitudeDegree()}; numberPattern: {SIGNED_INT_2_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeDegree")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLatitudeDegree")}; } #gearShootingEndLatitudeDMSMinuteField { property: gearShootingEndLatitudeMinute; model: {model.getGearShootingEndLatitudeMinute()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeMinute")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLatitudeMinute")}; } #gearShootingEndLatitudeDMSSecondField { property: gearShootingEndLatitudeSecond; model: {model.getGearShootingEndLatitudeSecond()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeSecond")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLatitudeSecond")}; } #gearShootingEndLatitudeDMDDegreeField { property: gearShootingEndLatitudeDegree; model: {model.getGearShootingEndLatitudeDegree()}; numberPattern: {SIGNED_INT_2_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeDegree")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLatitudeDegree")}; } #gearShootingEndLatitudeDMDMinuteField { property: gearShootingEndLatitudeDecimalMinute; model: {model.getGearShootingEndLatitudeDecimalMinute()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeMinute")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLatitudeMinute")}; } #gearShootingEndLatitudeDDField { @@ -453,12 +449,12 @@ showReset: false; useFloat: true; useSign: true; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitude")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndLatitude")}; } #gearShootingEndDateField { date: {model.getGearShootingEndDate()}; - _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndDate")}; + _validatorLabel : {_("tutti.editFishingOperation.field.gearShootingEndDate")}; } #gearShootingEndTimeField { @@ -470,24 +466,26 @@ floatable: false; borderPainted: false; opaque: false; - _validatorLabel : {_("tutti.label.fishingOperation.fishingOperationValidity")}; - toolTipText: "tuttihelp.editFishingOperation.field.fishingOperationValid.tip"; - _help: {"tuttihelp.editFishingOperation.field.fishingOperationValid.help"}; + _validatorLabel : {_("tutti.editFishingOperation.field.fishingOperationValidity")}; + toolTipText: "tutti.editFishingOperation.field.fishingOperationValid.tip"; + _help: {"tutti.editFishingOperation.field.fishingOperationValid.help"}; } #resetValidStateButton { actionIcon: reset; - text: "tutti.action.reset.fishingOperationValidState"; + text: "tutti.editFishingOperation.action.resetFishingOperationValidState"; + toolTipText: "tutti.editFishingOperation.action.resetFishingOperationValidState.tip"; + _help: {"tutti.editFishingOperation.action.resetFishingOperationValidState.help"}; } #fishingOperationValidRadio { - text: "tutti.label.fishingOperation.fishingOperationValid"; + text: "tutti.editFishingOperation.field.fishingOperationValid"; selected: {model.getFishingOperationValid() == Boolean.TRUE}; buttonGroup: "fishingOperationValid"; } #fishingOperationInvalidRadio { - text: "tutti.label.fishingOperation.fishingOperationInvalid"; + text: "tutti.editFishingOperation.field.fishingOperationInvalid"; selected: {model.getFishingOperationValid() == Boolean.FALSE}; buttonGroup: "fishingOperationValid"; } @@ -498,17 +496,17 @@ } #fishingOperationRectiligneCheckBox { - text: "tutti.label.fishingOperation.fishingOperationRectiligne"; + text: "tutti.editFishingOperation.field.fishingOperationRectiligne"; selected: {model.isFishingOperationRectiligne()}; - toolTipText: "tuttihelp.editFishingOperation.field.fishingOperationRectiligne.tip"; - _help: {"tuttihelp.editFishingOperation.field.fishingOperationRectiligne.help"}; + toolTipText: "tutti.editFishingOperation.field.fishingOperationRectiligne.tip"; + _help: {"tutti.editFishingOperation.field.fishingOperationRectiligne.help"}; } #trawlDistanceLabel { - text: "tutti.label.fishingOperation.trawlDistance"; + text: "tutti.editFishingOperation.field.trawlDistance"; labelFor: {trawlDistanceField}; - toolTipText: "tuttihelp.editFishingOperation.field.trawlDistance.tip"; - _help: {"tuttihelp.editFishingOperation.field.trawlDistance.help"}; + toolTipText: "tutti.editFishingOperation.field.trawlDistance.tip"; + _help: {"tutti.editFishingOperation.field.trawlDistance.help"}; } #trawlDistanceField { @@ -518,65 +516,65 @@ numberPattern: {INT_6_DIGITS_PATTERN}; enabled: {!model.isFishingOperationRectiligne()}; toolTipText: {handler.getTrawlDistanceTooltipText(model.getTrawlDistance())}; - _validatorLabel : {_("tutti.label.fishingOperation.trawlDistance")}; + _validatorLabel : {_("tutti.editFishingOperation.field.trawlDistance")}; } #durationLabel { - text: "tutti.label.fishingOperation.duration"; + text: "tutti.editFishingOperation.field.duration"; labelFor: {durationField}; - toolTipText: "tuttihelp.editFishingOperation.field.duration.tip"; - _help: {"tuttihelp.editFishingOperation.field.duration.help"}; + toolTipText: "tutti.editFishingOperation.field.duration.tip"; + _help: {"tutti.editFishingOperation.field.duration.help"}; } #durationField { text: {TuttiUIUtil.getDuration(model.getGearShootingStartDate(), model.getGearShootingEndDate())}; enabled: false; - _validatorLabel : {_("tutti.label.fishingOperation.duration")}; + _validatorLabel : {_("tutti.editFishingOperation.field.duration")}; } #recorderPersonList { property: recorderPerson; border: {BorderFactory.createTitledBorder(_("tutti.label.list.recorderPerson"))}; _validatorLabel : {_("tutti.label.list.recorderPerson")}; - toolTipText: "tuttihelp.editFishingOperation.list.recorderPerson.tip"; - _help: {"tuttihelp.editFishingOperation.list.recorderPerson.help"}; + toolTipText: "tutti.editFishingOperation.list.recorderPerson.tip"; + _help: {"tutti.editFishingOperation.list.recorderPerson.help"}; } #commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; - toolTipText: "tuttihelp.editFishingOperation.field.comment.tip"; - _help: {"tuttihelp.editFishingOperation.field.comment.help"}; + border: {BorderFactory.createTitledBorder(_("tutti.editFishingOperation.field.comment"))}; + toolTipText: "tutti.editFishingOperation.field.comment.tip"; + _help: {"tutti.editFishingOperation.field.comment.help"}; } #commentField { text: {model.getComment()}; - _validatorLabel : {_("tutti.label.comment")}; + _validatorLabel : {_("tutti.editFishingOperation.field.comment")}; } #saveButton { actionIcon: save; - text: "tutti.action.saveFishingOperation"; - toolTipText: "tuttihelp.editFishingOperation.action.saveEditFishingOperation.tip"; + text: "tutti.editFishingOperation.action.saveFishingOperation"; + toolTipText: "tutti.editFishingOperation.action.saveEditFishingOperation.tip"; mnemonic: E; _tuttiAction: {SaveFishingOperationAction.class}; - _help: {"tuttihelp.editFishingOperation.action.saveEditFishingOperation.help"}; + _help: {"tutti.editFishingOperation.action.saveEditFishingOperation.help"}; } #cancelButton { actionIcon: cancel; - text: "tutti.action.cancelEditFishingOperation"; - toolTipText: "tuttihelp.editFishingOperation.action.cancelEditFishingOperation.tip"; + text: "tutti.editFishingOperation.action.cancelEditFishingOperation"; + toolTipText: "tutti.editFishingOperation.action.cancelEditFishingOperation.tip"; mnemonic: A; _tuttiAction: {CancelEditFishingOperationAction.class}; - _help: {"tuttihelp.editFishingOperation.action.cancelEditFishingOperation.help"}; + _help: {"tutti.editFishingOperation.action.cancelEditFishingOperation.help"}; } #importCasinoButton { actionIcon: casino-import; - text: "tutti.action.importCasino"; - toolTipText: "tuttihelp.editFishingOperation.action.importCasino.tip"; + text: "tutti.editFishingOperation.action.importCasino"; + toolTipText: "tutti.editFishingOperation.action.importCasino.tip"; mnemonic: I; _tuttiAction: {ImportCasinoAction.class}; enabled: {model.getId() != null}; - _help: {"tuttihelp.editFishingOperation.action.importCasino.help"}; + _help: {"tutti.editFishingOperation.action.importCasino.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -338,18 +338,6 @@ }); } -// // FIXME kmorin 20130222 remove this when we use jaxx 2.5.11 -// model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_TRAWL_DISTANCE, new PropertyChangeListener() { -// -// public void propertyChange(PropertyChangeEvent evt) { -// String tooltip = model.getTrawlDistance() != null ? -// _("tutti.tooltip.distanceInMilles", TuttiUIUtil.getDistanceInMilles(model.getTrawlDistance())) : -// null; -// ui.getTrawlDistanceField().getTextField().setToolTipText(tooltip); -// } -// }); - - // listen when id becones empty or not toupdate cancel action and button getModel().addPropertyChangeListener( EditFishingOperationUIModel.PROPERTY_ID, @@ -360,14 +348,14 @@ CancelEditFishingOperationAction action = getLogicAction(button); if (evt.getNewValue() == null) { - button.setText(_("tutti.action.cancelEditFishingOperation")); - button.setToolTipText(_("tuttihelp.editFishingOperation.action.cancelEditFishingOperation.tip")); - action.setActionDescription(_("tuttihelp.editFishingOperation.action.cancelEditFishingOperation.tip")); + button.setText(_("tutti.editFishingOperation.action.cancelEditFishingOperation")); + button.setToolTipText(_("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); + action.setActionDescription(_("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); } else { - button.setText(_("tutti.action.reset.editFishingOperation")); - button.setToolTipText(_("tutti.action.reset.editFishingOperation.tip")); - action.setActionDescription(_("tutti.action.reset.editFishingOperation.tip")); + button.setText(_("tutti.editFishingOperation.action.resetEditFishingOperation")); + button.setToolTipText(_("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); + action.setActionDescription(_("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); } } }); @@ -410,9 +398,9 @@ String message; if (TuttiEntities.isNew(model.getFishingOperation())) { - message = _("tutti.dialog.askSaveBeforeLeaving.createFishingOperation"); + message = _("tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation"); } else { - message = _("tutti.dialog.askSaveBeforeLeaving.saveFishingOperation"); + message = _("tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation"); } int answer = askSaveBeforeLeaving(message); @@ -437,7 +425,7 @@ // model is not valid, ask user to continue or not result = askCancelEditBeforeLeaving( - _("tutti.dialog.askCancelEditBeforeLeaving.cancelEditFishingOperation")); + _("tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation")); if (result) { // ok will revert any modification @@ -509,19 +497,19 @@ } public String getGearLatitudeLabelText(CoordinateEditorType coordinateEditorType) { - String result = _("tutti.label.fishingOperation.gearLatitude", coordinateEditorType.toString()); + String result = _("tutti.editFishingOperation.field.gearLatitude", coordinateEditorType.toString()); return result; } public String getGearLongitudeLabelText(CoordinateEditorType coordinateEditorType) { - String result = _("tutti.label.fishingOperation.gearLongitude", coordinateEditorType.toString()); + String result = _("tutti.editFishingOperation.field.gearLongitude", coordinateEditorType.toString()); return result; } public String getTrawlDistanceTooltipText(Float trawlDistance) { String result = trawlDistance == null ? null : - _("tutti.tooltip.distanceInMilles", TuttiUIUtil.getDistanceInMilles(trawlDistance)); + _("tutti.editFishingOperation.field.trawlDistance.inMilles.tip", TuttiUIUtil.getDistanceInMilles(trawlDistance)); return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -60,7 +60,7 @@ private static final long serialVersionUID = 1L; - public static final String TITLE = n_("tutti.label.tab.fishingOperation.general"); + public static final String TITLE = n_("tutti.editFishingOperation.tab.general"); public static final String PROPERTY_PERSISTED = "persisted"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -35,21 +35,21 @@ } #fishingOperationsTopPanel { - _help: {"tuttihelp.fishingOperations.help"}; + _help: {"tutti.fishingOperations.help"}; } #newFishingOperationButton { actionIcon: add; - toolTipText: "tuttihelp.fishingOperations.action.newFishingOperation.tip"; + toolTipText: "tutti.fishingOperations.action.newFishingOperation.tip"; mnemonic: N; _tuttiAction: {NewFishingOperationAction.class}; - _help: {"tuttihelp.fishingOperations.action.newFishingOperation.help"}; + _help: {"tutti.fishingOperations.action.newFishingOperation.help"}; } #fishingOperationComboBox { property: selectedFishingOperation; selectedItem: {model.getSelectedFishingOperation()}; - _help: {"tuttihelp.fishingOperations.field.fishingOperation.help"}; + _help: {"tutti.fishingOperations.field.fishingOperation.help"}; } #warningContainer { @@ -60,7 +60,7 @@ #warningLabel { actionIcon: warning; border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; - text: "tutti.warn.invalid.batch.model"; + text: "tutti.fishingOperations.warn.invalid.batch.model"; } #catchesTab { @@ -68,6 +68,6 @@ } #noTraitPane { - text: "tutti.label.no.fishingOperation.selected"; + text: "tutti.fishingOperations.info.no.fishingOperation.selected"; horizontalAlignment: {JLabel.CENTER}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -59,7 +59,7 @@ initializer='getContextValue(FishingOperationsUIModel.class)'/> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.fishingOperations.help"'/> + constructorParams='"tutti.fishingOperations.help"'/> <Table fill='both' id='topPanel' constraints='BorderLayout.NORTH'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -77,7 +77,7 @@ if (rejectedWeight == null && totalWeight != null) { if (!totalWeight.equals(speciesTotalUnsortedWeight + speciesTotalSortedWeight)) { - throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentTotal")); + throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.incoherentTotal")); } else { @@ -99,7 +99,7 @@ && !totalWeight.equals(speciesTotalUnsortedWeight + speciesTotalSortedWeight + rejectedWeight)) { - throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentTotal")); + throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.incoherentTotal")); } } @@ -125,7 +125,7 @@ Float weight = computeSpeciesBatch(row); if (weight == null) { AbstractSelectTableAction.doSelectCell(speciesUI.getTable(), i, 1); - throw new TuttiBusinessException(_("tutti.action.computeWeights.error.noWeight")); + throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.noWeight")); } if (persistenceService.isSortedQualitativeValue(row.getSortedUnsortedCategory().getCategoryValue())) { totalSortedWeight += weight; @@ -158,7 +158,7 @@ model.setSpeciesTotalSortedComputedWeight(totalSortedWeight); } else if (speciesTotalSortedWeight < totalSortedWeight) { - throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentSpeciesTotalSorted")); + throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.incoherentSpeciesTotalSorted")); } else if (speciesTotalSortedWeight < (1 + rate / 100) * totalSortedWeight) { // Si le "Poids total VRAC" est saisi est que sa valeur @@ -168,12 +168,12 @@ // sinon la remplacer par le "Poids total Vrac trié" String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.action.computeWeights.replaceTotalSortedWeight.message", rate), - _("tutti.action.computeWeights.replaceTotalSortedWeight.help")); + _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message", rate), + _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), htmlMessage, - _("tutti.action.computeWeights.replaceTotalSortedWeight.title"), + _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -221,7 +221,7 @@ } } else if (categoryWeight < sum) { - throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentParentCategoryWeight")); + throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.incoherentParentCategoryWeight")); } else { boolean subSample = categoryWeight > sum; @@ -256,7 +256,7 @@ } if (categoryWeight == null && rowWeight != null) { - throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentRowWeightCategory")); + throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightCategory")); } else if (categoryWeight == null && frequencyWeight != null) { // if the category weight is null and the frequencies have a weight, @@ -270,13 +270,13 @@ // if the weight of the frequencies is different from the category // weight, then set the weight of the sample if (frequencyWeight > categoryWeight) { - throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentCategoryWeight")); + throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.incoherentCategoryWeight")); } else if (rowWeight == null) { row.setComputedWeight(frequencyWeight); } else if (!rowWeight.equals(frequencyWeight)) { - throw new TuttiBusinessException(_("tutti.action.computeWeights.error.incoherentRowWeightFrequency")); + throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightFrequency")); } result = categoryWeight; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -42,7 +42,7 @@ } #editCatchesTopPanel { - _help: {"tuttihelp.editCatchBatch.help"}; + _help: {"tutti.editCatchBatch.help"}; } #catchesCaracteristicsTabToolBar { @@ -64,15 +64,15 @@ } #catchTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.total"))}; + border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.total"))}; } #catchTotalWeightLabel { - text: "tutti.label.catches.catchTotalWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.catchTotalWeight.tip"}; + text: "tutti.editCatchBatch.field.catchTotalWeight"; + toolTipText: {"tutti.editCatchBatch.field.catchTotalWeight.tip"}; labelFor: {catchTotalWeightField}; _strongStyle: true; - _help: {"tuttihelp.editCatchBatch.field.catchTotalWeight.help"}; + _help: {"tutti.editCatchBatch.field.catchTotalWeight.help"}; } #catchTotalSortedWeightPanel { @@ -85,10 +85,10 @@ } #catchTotalSortedWeightLabel { - text: "tutti.label.catches.catchTotalSortedWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.catchTotalSortedWeight.tip"}; + text: "tutti.editCatchBatch.field.catchTotalSortedWeight"; + toolTipText: {"tutti.editCatchBatch.field.catchTotalSortedWeight.tip"}; labelFor: {catchTotalSortedWeightField}; - _help: {"tuttihelp.editCatchBatch.field.catchTotalSortedWeight.help"}; + _help: {"tutti.editCatchBatch.field.catchTotalSortedWeight.help"}; } #catchTotalSortedWeightField { @@ -97,10 +97,10 @@ } #catchTotalSortedTremisWeightLabel { - text: "tutti.label.catches.catchTotalSortedTremisWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.catchTotalSortedTremisWeight.tip"}; + text: "tutti.editCatchBatch.field.catchTotalSortedTremisWeight"; + toolTipText: {"tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip"}; labelFor: {catchTotalSortedTremisWeightField}; - _help: {"tuttihelp.editCatchBatch.field.catchTotalSortedTremisWeight.help"}; + _help: {"tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help"}; } #catchTotalSortedTremisWeightField { @@ -108,10 +108,10 @@ } #catchTotalSortedCarousselWeightLabel { - text: "tutti.label.catches.catchTotalSortedCarousselWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.catchTotalSortedCarousselWeight.tip"}; + text: "tutti.editCatchBatch.field.catchTotalSortedCarousselWeight"; + toolTipText: {"tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip"}; labelFor: {catchTotalSortedCarousselWeightField}; - _help: {"tuttihelp.editCatchBatch.field.catchTotalSortedCarousselWeight.help"}; + _help: {"tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help"}; } #catchTotalSortedCarousselWeightField { @@ -119,10 +119,10 @@ } #catchTotalRejectedWeightLabel { - text: "tutti.label.catches.catchTotalRejectedWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.catchTotalRejectedWeight.tip"}; + text: "tutti.editCatchBatch.field.catchTotalRejectedWeight"; + toolTipText: {"tutti.editCatchBatch.field.catchTotalRejectedWeight.tip"}; labelFor: {catchTotalRejectedWeightField}; - _help: {"tuttihelp.editCatchBatch.field.catchTotalRejectedWeight.help"}; + _help: {"tutti.editCatchBatch.field.catchTotalRejectedWeight.help"}; } #catchTotalRejectedWeightField { @@ -131,10 +131,10 @@ } #catchTotalUnsortedWeightLabel { - text: "tutti.label.catches.catchTotalUnsortedWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.catchTotalUnsortedWeight.tip"}; + text: "tutti.editCatchBatch.field.catchTotalUnsortedWeight"; + toolTipText: {"tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip"}; labelFor: {catchTotalUnsortedWeightField}; - _help: {"tuttihelp.editCatchBatch.field.catchTotalUnsortedWeight.help"}; + _help: {"tutti.editCatchBatch.field.catchTotalUnsortedWeight.help"}; } #catchTotalUnsortedWeightField { @@ -147,15 +147,15 @@ } #speciesTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.species"))}; + border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.species"))}; } #speciesTotalWeightLabel { - text: "tutti.label.catches.speciesTotalWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.speciesTotalWeight.tip"}; + text: "tutti.editCatchBatch.field.speciesTotalWeight"; + toolTipText: {"tutti.editCatchBatch.field.speciesTotalWeight.tip"}; labelFor: {speciesTotalWeightField}; _strongStyle: true; - _help: {"tuttihelp.editCatchBatch.field.speciesTotalWeight.help"}; + _help: {"tutti.editCatchBatch.field.speciesTotalWeight.help"}; } #speciesTotalWeightField { @@ -164,10 +164,10 @@ } #speciesTotalSortedWeightLabel { - text: "tutti.label.catches.speciesTotalSortedWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.speciesTotalSortedWeight.tip"}; + text: "tutti.editCatchBatch.field.speciesTotalSortedWeight"; + toolTipText: {"tutti.editCatchBatch.field.speciesTotalSortedWeight.tip"}; labelFor: {speciesTotalSortedWeightField}; - _help: {"tuttihelp.editCatchBatch.field.speciesTotalSortedWeight.help"}; + _help: {"tutti.editCatchBatch.field.speciesTotalSortedWeight.help"}; } #speciesTotalSortedWeightField { @@ -178,11 +178,11 @@ } #speciesTotalSampleSortedWeightLabel { - text: "tutti.label.catches.speciesTotalSampleSortedWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.speciesTotalSampleSortedWeight.tip"}; + text: "tutti.editCatchBatch.field.speciesTotalSampleSortedWeight"; + toolTipText: {"tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip"}; labelFor: {speciesTotalSampleSortedWeightField}; _italicStyle: true; - _help: {"tuttihelp.editCatchBatch.field.speciesTotalSampleSortedWeight.help"}; + _help: {"tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help"}; } #speciesTotalSampleSortedWeightField { @@ -191,10 +191,10 @@ } #speciesTotalUnsortedWeightLabel { - text: "tutti.label.catches.speciesTotalUnsortedWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.tip"}; + text: "tutti.editCatchBatch.field.speciesTotalUnsortedWeight"; + toolTipText: {"tutti.editCatchBatch.field.speciesTotalUnsortedWeight.tip"}; labelFor: {speciesTotalUnsortedWeightField}; - _help: {"tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.help"}; + _help: {"tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help"}; } #speciesTotalUnsortedWeightField { @@ -203,15 +203,15 @@ } #benthosTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.benthos"))}; + border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.benthos"))}; } #benthosTotalWeightLabel { - text: "tutti.label.catches.benthosTotalWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.benthosTotalWeight.tip"}; + text: "tutti.editCatchBatch.field.benthosTotalWeight"; + toolTipText: {"tutti.editCatchBatch.field.benthosTotalWeight.tip"}; labelFor: {benthosTotalWeightField}; _strongStyle: true; - _help: {"tuttihelp.editCatchBatch.field.benthosTotalWeight.help"}; + _help: {"tutti.editCatchBatch.field.benthosTotalWeight.help"}; } #benthosTotalWeightField { @@ -219,10 +219,10 @@ } #benthosTotalSortedWeightLabel { - text: "tutti.label.catches.benthosTotalSortedWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.benthosTotalSortedWeight.tip"}; + text: "tutti.editCatchBatch.field.benthosTotalSortedWeight"; + toolTipText: {"tutti.editCatchBatch.field.benthosTotalSortedWeight.tip"}; labelFor: {benthosTotalSortedWeightField}; - _help: {"tuttihelp.editCatchBatch.field.benthosTotalSortedWeight.help"}; + _help: {"tutti.editCatchBatch.field.benthosTotalSortedWeight.help"}; } #benthosTotalSortedWeightField { @@ -230,11 +230,11 @@ } #benthosTotalSampleSortedWeightLabel { - text: "tutti.label.catches.benthosTotalSampleSortedWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.benthosTotalSampleSortedWeight.tip"}; + text: "tutti.editCatchBatch.field.benthosTotalSampleSortedWeight"; + toolTipText: {"tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip"}; labelFor: {benthosTotalSampleSortedWeightField}; _italicStyle: true; - _help: {"tuttihelp.editCatchBatch.field.benthosTotalSampleSortedWeight.help"}; + _help: {"tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help"}; } #benthosTotalSampleSortedWeightField { @@ -242,10 +242,10 @@ } #benthosTotalUnsortedWeightLabel { - text: "tutti.label.catches.benthosTotalUnsortedWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.benthosTotalUnsortedWeight.tip"}; + text: "tutti.editCatchBatch.field.benthosTotalUnsortedWeight"; + toolTipText: {"tutti.editCatchBatch.field.benthosTotalUnsortedWeight.tip"}; labelFor: {benthosTotalUnsortedWeightField}; - _help: {"tuttihelp.editCatchBatch.field.benthosTotalUnsortedWeight.help"}; + _help: {"tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help"}; } #benthosTotalUnsortedWeightField { @@ -253,30 +253,21 @@ } #macroWasteTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.macroWaste"))}; + border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.macroWaste"))}; } #macroWasteTotalWeightLabel { - text: "tutti.label.catches.macroWasteTotalWeight"; - toolTipText: {"tuttihelp.editCatchBatch.field.macroWasteTotalWeight.tip"}; + text: "tutti.editCatchBatch.field.macroWasteTotalWeight"; + toolTipText: {"tutti.editCatchBatch.field.macroWasteTotalWeight.tip"}; labelFor: {macroWasteTotalWeightField}; _strongStyle: true; - _help: {"tuttihelp.editCatchBatch.field.macroWasteTotalWeight.help"}; + _help: {"tutti.editCatchBatch.field.macroWasteTotalWeight.help"}; } #macroWasteTotalWeightField { _computed: true; } -#importPupitriButton { - actionIcon: pupitri-import; - text: "tutti.action.importPupitri"; - toolTipText: "tuttihelp.editCatchBatch.action.importPupitri.tip"; - mnemonic: I; - _tuttiAction: {ImportPupitriAction.class}; - _help: {"tuttihelp.editCatchBatch.action.importPupitri.help"}; -} - #benthosTab { enabled: {false}; } @@ -297,29 +288,38 @@ enabled: {false}; } +#importPupitriButton { + actionIcon: pupitri-import; + text: "tutti.editCatchBatch.action.importPupitri"; + toolTipText: "tutti.editCatchBatch.action.importPupitri.tip"; + mnemonic: I; + _tuttiAction: {ImportPupitriAction.class}; + _help: {"tutti.editCatchBatch.action.importPupitri.help"}; +} + #saveButton { actionIcon: save; - text: "tutti.action.saveCatchBatch"; - toolTipText: "tuttihelp.editCatchBatch.action.saveCatchBatch.tip"; + text: "tutti.editCatchBatch.action.saveCatchBatch"; + toolTipText: "tutti.editCatchBatch.action.saveCatchBatch.tip"; mnemonic: E; _tuttiAction: {SaveCatchBatchAction.class}; - _help: {"tuttihelp.editCatchBatch.action.saveCatchBatch.help"}; + _help: {"tutti.editCatchBatch.action.saveCatchBatch.help"}; } #cancelButton { actionIcon: cancel; - text: "tutti.action.cancelEditCatchBatch"; - toolTipText: "tuttihelp.editCatchBatch.action.cancelEditCatchBatch.tip"; + text: "tutti.editCatchBatch.action.cancelEditCatchBatch"; + toolTipText: "tutti.editCatchBatch.action.cancelEditCatchBatch.tip"; mnemonic: A; _tuttiAction: {CancelEditCatchBatchAction.class}; - _help: {"tuttihelp.editCatchBatch.action.cancelEditCatchBatch.help"}; + _help: {"tutti.editCatchBatch.action.cancelEditCatchBatch.help"}; } #computeSpeciesBatchButton { actionIcon: generate; - text: "tutti.action.computeWeights"; - toolTipText: "tuttihelp.editCatchBatch.action.computeWeights.tip"; + text: "tutti.editCatchBatch.action.computeWeights"; + toolTipText: "tutti.editCatchBatch.action.computeWeights.tip"; mnemonic: E; _tuttiAction: {ComputeWeightsAction.class}; - _help: {"tuttihelp.editCatchBatch.action.computeWeights.help"}; + _help: {"tutti.editCatchBatch.action.computeWeights.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -99,8 +99,7 @@ <CardLayout2Ext id='catchTotalSortedWeightPanelLayout' constructorParams='this, "catchTotalSortedWeightPanel"'/> - <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editCatchBatch.help"'/> + <TuttiHelpBroker id='broker' constructorParams='"tutti.editCatchBatch.help"'/> <JToolBar id='catchesCaracteristicsTabToolBar'> <JButton id='importPupitriButton'/> 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -190,7 +190,7 @@ // ask user to save, do not save or cancel action int answer = askSaveBeforeLeaving( - _("tutti.dialog.askSaveBeforeLeaving.saveCatchBatch")); + _("tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch")); switch (answer) { case JOptionPane.OK_OPTION: @@ -219,7 +219,7 @@ // model is not valid, ask user to loose modification or cancel result = askCancelEditBeforeLeaving( - _("tutti.dialog.askCancelEditBeforeLeaving.cancelEditCatchBatch")); + _("tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch")); if (result) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -41,28 +41,28 @@ public static final ColumnIdentifier<AccidentalBatchRowModel> SPECIES_BY_CODE = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.accidental.batch.header.speciesByCode"), - n_("tutti.table.accidental.batch.header.speciesByCode")); + n_("tutti.editAccidentalBatch.table.header.speciesByCode"), + n_("tutti.editAccidentalBatch.table.header.speciesByCode")); public static final ColumnIdentifier<AccidentalBatchRowModel> SPECIES_BY_GENUS_CODE = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.accidental.batch.header.speciesByGenusCode"), - n_("tutti.table.accidental.batch.header.speciesByGenusCode")); + n_("tutti.editAccidentalBatch.table.header.speciesByGenusCode"), + n_("tutti.editAccidentalBatch.table.header.speciesByGenusCode")); public static final ColumnIdentifier<AccidentalBatchRowModel> WEIGHT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.table.accidental.batch.header.weight"), - n_("tutti.table.accidental.batch.header.weight")); + n_("tutti.editAccidentalBatch.table.header.weight"), + n_("tutti.editAccidentalBatch.table.header.weight")); public static final ColumnIdentifier<AccidentalBatchRowModel> COMMENT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_COMMENT, - n_("tutti.table.accidental.batch.header.comment"), - n_("tutti.table.accidental.batch.header.comment")); + n_("tutti.editAccidentalBatch.table.header.comment"), + n_("tutti.editAccidentalBatch.table.header.comment")); public static final ColumnIdentifier<AccidentalBatchRowModel> ATTACHMENT = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.table.accidental.batch.header.file"), - n_("tutti.table.accidental.batch.header.file")); + n_("tutti.editAccidentalBatch.table.header.file"), + n_("tutti.editAccidentalBatch.table.header.file")); public AccidentalBatchTableModel(TableColumnModelExt columnModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -40,44 +40,44 @@ public static final ColumnIdentifier<BenthosBatchRowModel> SPECIES_BY_CODE = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.benthos.batch.header.speciesByCode"), - n_("tutti.table.benthos.batch.header.speciesByCode")); + n_("tutti.editBenthosBatch.table.header.speciesByCode"), + n_("tutti.editBenthosBatch.table.header.speciesByCode")); public static final ColumnIdentifier<BenthosBatchRowModel> SPECIES_BY_GENUS_CODE = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.benthos.batch.header.speciesByGenusCode"), - n_("tutti.table.benthos.batch.header.speciesByGenusCode")); + n_("tutti.editBenthosBatch.table.header.speciesByGenusCode"), + n_("tutti.editBenthosBatch.table.header.speciesByGenusCode")); public static final ColumnIdentifier<BenthosBatchRowModel> WEIGHT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.table.benthos.batch.header.weight"), - n_("tutti.table.benthos.batch.header.weight")); + n_("tutti.editBenthosBatch.table.header.weight"), + n_("tutti.editBenthosBatch.table.header.weight")); public static final ColumnIdentifier<BenthosBatchRowModel> NUMBER = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_NUMBER, - n_("tutti.table.benthos.batch.header.number"), - n_("tutti.table.benthos.batch.header.number")); + n_("tutti.editBenthosBatch.table.header.number"), + n_("tutti.editBenthosBatch.table.header.number")); public static final ColumnIdentifier<BenthosBatchRowModel> SAMPLE_WEIGHT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SAMPLE_WEIGHT, - n_("tutti.table.benthos.batch.header.sampleWeight"), - n_("tutti.table.benthos.batch.header.sampleWeight")); + n_("tutti.editBenthosBatch.table.header.sampleWeight"), + n_("tutti.editBenthosBatch.table.header.sampleWeight")); public static final ColumnIdentifier<BenthosBatchRowModel> COMMENT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_COMMENT, - n_("tutti.table.benthos.batch.header.comment"), - n_("tutti.table.benthos.batch.header.comment")); + n_("tutti.editBenthosBatch.table.header.comment"), + n_("tutti.editBenthosBatch.table.header.comment")); public static final ColumnIdentifier<BenthosBatchRowModel> ATTACHMENT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.table.benthos.batch.header.file"), - n_("tutti.table.benthos.batch.header.file")); + n_("tutti.editBenthosBatch.table.header.file"), + n_("tutti.editBenthosBatch.table.header.file")); public static final ColumnIdentifier<BenthosBatchRowModel> SPECIES_TO_CONFIRM = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, - n_("tutti.table.benthos.batch.header.toConfirm"), - n_("tutti.table.benthos.batch.header.toConfirm")); + n_("tutti.editBenthosBatch.table.header.toConfirm"), + n_("tutti.editBenthosBatch.table.header.toConfirm")); public BenthosBatchTableModel(TableColumnModelExt columnModel) { super(columnModel, true, true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -30,11 +30,11 @@ } #benthosBatchTopPanel { - _help: {"tuttihelp.editBenthosBatch.help"}; + _help: {"tutti.editBenthosBatch.help"}; } #benthosTotalWeightLabel { - text: "tutti.label.catches.benthosTotalWeight"; + text: "tutti.editBenthosBatch.field.benthosTotalWeight"; labelFor: {benthosTotalWeightField}; } @@ -46,7 +46,7 @@ } #benthosTotalSortedWeightLabel { - text: "tutti.label.catches.benthosTotalSortedWeight"; + text: "tutti.editBenthosBatch.field.benthosTotalSortedWeight"; labelFor: {benthosTotalSortedWeightField}; } @@ -58,7 +58,7 @@ } #benthosTotalSampleSortedWeightLabel { - text: "tutti.label.catches.benthosTotalSampleSortedWeight"; + text: "tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight"; labelFor: {benthosTotalSampleSortedWeightField}; } @@ -70,7 +70,7 @@ } #benthosTotalUnsortedWeightLabel { - text: "tutti.label.catches.benthosTotalUnsortedWeight"; + text: "tutti.editBenthosBatch.field.benthosTotalUnsortedWeight"; labelFor: {benthosTotalUnsortedWeightField}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -71,7 +71,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editBenthosBatch.help"'/> + constructorParams='"tutti.editBenthosBatch.help"'/> <Table id='form' fill='both' constraints='BorderLayout.NORTH'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -40,33 +40,33 @@ public static final ColumnIdentifier<MacroWasteBatchRowModel> MACRO_WASTE_CATEGORY = ColumnIdentifier.newId( MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_CATEGORY, - n_("tutti.table.macrowaste.batch.header.macroWasteCategory"), - n_("tutti.table.macrowaste.batch.header.macroWasteCategory")); + n_("tutti.editMacroWasteBatch.table.header.macroWasteCategory"), + n_("tutti.editMacroWasteBatch.table.header.macroWasteCategory")); public static final ColumnIdentifier<MacroWasteBatchRowModel> MACRO_WASTE_SIZE_CATEGORY = ColumnIdentifier.newId( MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_SIZE_CATEGORY, - n_("tutti.table.macrowaste.batch.header.macroWasteSizeCategory"), - n_("tutti.table.macrowaste.batch.header.macroWasteSizeCategory")); + n_("tutti.editMacroWasteBatch.table.header.macroWasteSizeCategory"), + n_("tutti.editMacroWasteBatch.table.header.macroWasteSizeCategory")); public static final ColumnIdentifier<MacroWasteBatchRowModel> WEIGHT = ColumnIdentifier.newId( MacroWasteBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.table.macrowaste.batch.header.weight"), - n_("tutti.table.macrowaste.batch.header.weight")); + n_("tutti.editMacroWasteBatch.table.header.weight"), + n_("tutti.editMacroWasteBatch.table.header.weight")); public static final ColumnIdentifier<MacroWasteBatchRowModel> NUMBER = ColumnIdentifier.newId( MacroWasteBatchRowModel.PROPERTY_NUMBER, - n_("tutti.table.macrowaste.batch.header.number"), - n_("tutti.table.macrowaste.batch.header.number")); + n_("tutti.editMacroWasteBatch.table.header.number"), + n_("tutti.editMacroWasteBatch.table.header.number")); public static final ColumnIdentifier<MacroWasteBatchRowModel> COMMENT = ColumnIdentifier.newId( MacroWasteBatchRowModel.PROPERTY_COMMENT, - n_("tutti.table.macrowaste.batch.header.comment"), - n_("tutti.table.macrowaste.batch.header.comment")); + n_("tutti.editMacroWasteBatch.table.header.comment"), + n_("tutti.editMacroWasteBatch.table.header.comment")); public static final ColumnIdentifier<MacroWasteBatchRowModel> ATTACHMENT = ColumnIdentifier.newId( MacroWasteBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.table.macrowaste.batch.header.file"), - n_("tutti.table.macrowaste.batch.header.file")); + n_("tutti.editMacroWasteBatch.table.header.file"), + n_("tutti.editMacroWasteBatch.table.header.file")); public MacroWasteBatchTableModel(TableColumnModelExt columnModel) { super(columnModel, true, true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -34,7 +34,7 @@ } #macroWasteTotalWeightLabel { - text: "tutti.label.catches.macroWasteTotalWeight"; + text: "tutti.editCatchBatch.field.macroWasteTotalWeight"; labelFor: {macroWasteTotalWeightField}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchTableModel.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchTableModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -40,38 +40,38 @@ public static final ColumnIdentifier<PlanktonBatchRowModel> SPECIES_TO_CONFIRM = ColumnIdentifier.newId( PlanktonBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, - n_("tutti.table.plankton.batch.header.toConfirm"), - n_("tutti.table.plankton.batch.header.toConfirm")); + n_("tutti.editPlanktonBatch.table.header.toConfirm"), + n_("tutti.editPlanktonBatch.table.header.toConfirm")); public static final ColumnIdentifier<PlanktonBatchRowModel> SPECIES_BY_CODE = ColumnIdentifier.newId( PlanktonBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.plankton.batch.header.speciesByCode"), - n_("tutti.table.plankton.batch.header.speciesByCode")); + n_("tutti.editPlanktonBatch.table.header.speciesByCode"), + n_("tutti.editPlanktonBatch.table.header.speciesByCode")); public static final ColumnIdentifier<PlanktonBatchRowModel> SPECIES_BY_GENUS_CODE = ColumnIdentifier.newId( PlanktonBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.plankton.batch.header.speciesByGenusCode"), - n_("tutti.table.plankton.batch.header.speciesByGenusCode")); + n_("tutti.editPlanktonBatch.table.header.speciesByGenusCode"), + n_("tutti.editPlanktonBatch.table.header.speciesByGenusCode")); public static final ColumnIdentifier<PlanktonBatchRowModel> WEIGHT = ColumnIdentifier.newId( PlanktonBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.table.plankton.batch.header.weight"), - n_("tutti.table.plankton.batch.header.weight")); + n_("tutti.editPlanktonBatch.table.header.weight"), + n_("tutti.editPlanktonBatch.table.header.weight")); public static final ColumnIdentifier<PlanktonBatchRowModel> SAMPLE_WEIGHT = ColumnIdentifier.newId( PlanktonBatchRowModel.PROPERTY_SAMPLE_WEIGHT, - n_("tutti.table.plankton.batch.header.sampleWeight"), - n_("tutti.table.plankton.batch.header.sampleWeight")); + n_("tutti.editPlanktonBatch.table.header.sampleWeight"), + n_("tutti.editPlanktonBatch.table.header.sampleWeight")); public static final ColumnIdentifier<PlanktonBatchRowModel> COMMENT = ColumnIdentifier.newId( PlanktonBatchRowModel.PROPERTY_COMMENT, - n_("tutti.table.plankton.batch.header.comment"), - n_("tutti.table.plankton.batch.header.comment")); + n_("tutti.editPlanktonBatch.table.header.comment"), + n_("tutti.editPlanktonBatch.table.header.comment")); public static final ColumnIdentifier<PlanktonBatchRowModel> ATTACHMENT = ColumnIdentifier.newId( PlanktonBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.table.plankton.batch.header.file"), - n_("tutti.table.plankton.batch.header.file")); + n_("tutti.editPlanktonBatch.table.header.file"), + n_("tutti.editPlanktonBatch.table.header.file")); public PlanktonBatchTableModel(TableColumnModelExt columnModel) { super(columnModel, true, true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateMelagAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateMelagAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -98,8 +98,8 @@ if (sampleWeight == 0f) { JOptionPane.showMessageDialog( getUI(), - _("tutti.dialog.createMelag.error.message", selectedRowIndex + 1), - _("tutti.dialog.createMelag.error.title"), + _("tutti.createMelag.error.message", selectedRowIndex + 1), + _("tutti.createMelag.error.title"), JOptionPane.ERROR_MESSAGE); handler.getTable().getSelectionModel().setSelectionInterval(selectedRowIndex, selectedRowIndex); 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EnterMelagWeightDialog.css 2013-03-15 09:48:31 UTC (rev 629) @@ -22,11 +22,11 @@ * #L% */ #dialog { - title: "tutti.dialog.createMelag.title"; + title: "tutti.createMelag.title"; } #message { - text: "tutti.dialog.createMelag.message"; + text: "tutti.createMelag.message"; horizontalAlignment: {JLabel.CENTER}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -85,68 +85,68 @@ public static final ColumnIdentifier<SpeciesBatchRowModel> SPECIES = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.species.batch.header.species"), - n_("tutti.table.species.batch.header.species")); + n_("tutti.editSpeciesBatch.table.header.species"), + n_("tutti.editSpeciesBatch.table.header.species")); public static final ColumnIdentifier<SpeciesBatchRowModel> SORTED_UNSORTED_CATEGORY = SampleColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY_WEIGHT, SampleCategoryType.sortedUnsorted, - n_("tutti.table.species.batch.header.sortedUnsortedCategory"), - n_("tutti.table.species.batch.header.sortedUnsortedCategory")); + n_("tutti.editSpeciesBatch.table.header.sortedUnsortedCategory"), + n_("tutti.editSpeciesBatch.table.header.sortedUnsortedCategory")); public static final ColumnIdentifier<SpeciesBatchRowModel> SIZE_CATEGORY = SampleColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SIZE_CATEGORY, SpeciesBatchRowModel.PROPERTY_SIZE_CATEGORY_WEIGHT, SampleCategoryType.size, - n_("tutti.table.species.batch.header.sizeCategory"), - n_("tutti.table.species.batch.header.sizeCategory")); + n_("tutti.editSpeciesBatch.table.header.sizeCategory"), + n_("tutti.editSpeciesBatch.table.header.sizeCategory")); public static final ColumnIdentifier<SpeciesBatchRowModel> SEX_CATEGORY = SampleColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SEX_CATEGORY, SpeciesBatchRowModel.PROPERTY_SEX_CATEGORY_WEIGHT, SampleCategoryType.sex, - n_("tutti.table.species.batch.header.sexCategory"), - n_("tutti.table.species.batch.header.sexCategory")); + n_("tutti.editSpeciesBatch.table.header.sexCategory"), + n_("tutti.editSpeciesBatch.table.header.sexCategory")); public static final ColumnIdentifier<SpeciesBatchRowModel> MATURITY_CATEGORY = SampleColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_MATURITY_CATEGORY, SpeciesBatchRowModel.PROPERTY_MATURITY_CATEGORY_WEIGHT, SampleCategoryType.maturity, - n_("tutti.table.species.batch.header.maturityCategory"), - n_("tutti.table.species.batch.header.maturityCategory")); + n_("tutti.editSpeciesBatch.table.header.maturityCategory"), + n_("tutti.editSpeciesBatch.table.header.maturityCategory")); public static final ColumnIdentifier<SpeciesBatchRowModel> AGE_CATEGORY = SampleColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_AGE_CATEGORY, SpeciesBatchRowModel.PROPERTY_AGE_CATEGORY_WEIGHT, SampleCategoryType.age, - n_("tutti.table.species.batch.header.ageCategory"), - n_("tutti.table.species.batch.header.ageCategory")); + n_("tutti.editSpeciesBatch.table.header.ageCategory"), + n_("tutti.editSpeciesBatch.table.header.ageCategory")); public static final ColumnIdentifier<SpeciesBatchRowModel> WEIGHT = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMPUTED_WEIGHT, - n_("tutti.table.species.batch.header.weight"), - n_("tutti.table.species.batch.header.weight")); + n_("tutti.editSpeciesBatch.table.header.weight"), + n_("tutti.editSpeciesBatch.table.header.weight")); public static final ColumnIdentifier<SpeciesBatchRowModel> COMPUTED_NUMBER = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMPUTED_NUMBER, - n_("tutti.table.species.batch.header.computedNumber"), - n_("tutti.table.species.batch.header.computedNumber")); + n_("tutti.editSpeciesBatch.table.header.computedNumber"), + n_("tutti.editSpeciesBatch.table.header.computedNumber")); public static final ColumnIdentifier<SpeciesBatchRowModel> COMMENT = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMMENT, - n_("tutti.table.species.batch.header.comment"), - n_("tutti.table.species.batch.header.comment")); + n_("tutti.editSpeciesBatch.table.header.comment"), + n_("tutti.editSpeciesBatch.table.header.comment")); public static final ColumnIdentifier<SpeciesBatchRowModel> ATTACHMENT = ColumnIdentifier.newReadOnlyId( SpeciesBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.table.species.batch.header.file"), - n_("tutti.table.species.batch.header.file")); + n_("tutti.editSpeciesBatch.table.header.file"), + n_("tutti.editSpeciesBatch.table.header.file")); public static final ColumnIdentifier<SpeciesBatchRowModel> SPECIES_TO_CONFIRM = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, - n_("tutti.table.species.batch.header.toConfirm"), - n_("tutti.table.species.batch.header.toConfirm")); + n_("tutti.editSpeciesBatch.table.header.toConfirm"), + n_("tutti.editSpeciesBatch.table.header.toConfirm")); /** * Columns for the frequency edition. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -42,7 +42,7 @@ } #editSpeciesBatchTopPanel { - _help: {"tuttihelp.editSpeciesBatch.help"}; + _help: {"tutti.editSpeciesBatch.help"}; } #speciesBatchTabToolBar { @@ -56,10 +56,10 @@ } #speciesTotalWeightLabel { - text: "tutti.label.catches.speciesTotalWeight"; - toolTipText: "tuttihelp.editSpeciesBatch.field.speciesTotalWeight.tip"; + text: "tutti.editSpeciesBatch.field.speciesTotalWeight"; + toolTipText: "tutti.editSpeciesBatch.field.speciesTotalWeight.tip"; labelFor: {speciesTotalWeightField}; - _help: {"tuttihelp.editSpeciesBatch.field.speciesTotalWeight.help"}; + _help: {"tutti.editSpeciesBatch.field.speciesTotalWeight.help"}; } #speciesTotalWeightField { @@ -68,10 +68,10 @@ } #speciesTotalSortedWeightLabel { - text: "tutti.label.catches.speciesTotalSortedWeight"; - toolTipText: "tuttihelp.editSpeciesBatch.field.speciesTotalSortedWeight.tip"; + text: "tutti.editSpeciesBatch.field.speciesTotalSortedWeight"; + toolTipText: "tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip"; labelFor: {speciesTotalSortedWeightField}; - _help: {"tuttihelp.editSpeciesBatch.field.speciesTotalSortedWeight.help"}; + _help: {"tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help"}; } #speciesTotalSortedWeightField { @@ -80,10 +80,10 @@ } #speciesTotalSampleSortedWeightLabel { - text: "tutti.label.catches.speciesTotalSampleSortedWeight"; - toolTipText: "tuttihelp.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip"; + text: "tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight"; + toolTipText: "tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip"; labelFor: {speciesTotalSampleSortedWeightField}; - _help: {"tuttihelp.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help"}; + _help: {"tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help"}; } #speciesTotalSampleSortedWeightField { @@ -92,10 +92,10 @@ } #speciesTotalUnsortedWeightLabel { - text: "tutti.label.catches.speciesTotalUnsortedWeight"; - toolTipText: "tuttihelp.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip"; + text: "tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight"; + toolTipText: "tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip"; labelFor: {speciesTotalUnsortedWeightField}; - _help: {"tuttihelp.editSpeciesBatch.field.speciesTotalUnsortedWeight.help"}; + _help: {"tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help"}; } #speciesTotalUnsortedWeightField { @@ -104,10 +104,10 @@ } #speciesTotalInertWeightLabel { - text: "tutti.label.catches.speciesTotalInertWeight"; - toolTipText: "tuttihelp.editSpeciesBatch.field.speciesTotalInertWeight.tip"; + text: "tutti.editSpeciesBatch.field.speciesTotalInertWeight"; + toolTipText: "tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip"; labelFor: {speciesTotalInertWeightField}; - _help: {"tuttihelp.editSpeciesBatch.field.speciesTotalInertWeight.help"}; + _help: {"tutti.editSpeciesBatch.field.speciesTotalInertWeight.help"}; } #speciesTotalInertWeightField { @@ -116,10 +116,10 @@ } #speciesTotalLivingNotItemizedWeightLabel { - text: "tutti.label.catches.speciesTotalLivingNotItemizedWeight"; - toolTipText: "tuttihelp.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip"; + text: "tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight"; + toolTipText: "tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip"; labelFor: {speciesTotalLivingNotItemizedWeightField}; - _help: {"tuttihelp.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help"}; + _help: {"tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help"}; } #speciesTotalLivingNotItemizedWeightField { @@ -128,58 +128,67 @@ } #tablePopup { - label: "tutti.title.batchActions"; + label: "tutti.editSpeciesBatch.title.batchActions"; } #splitSpeciesBatchMenu { actionIcon: batch-split; - text: "tutti.action.splitSpeciesBatch"; - toolTipText: "tuttihelp.editSpeciesBatch.action.splitSpeciesBatch.tip"; + text: "tutti.editSpeciesBatch.tutti.action.splitSpeciesBatch"; + toolTipText: "tutti.editSpeciesBatch.action.splitSpeciesBatch.tip"; mnemonic: S; enabled: {model.isTableViewModeAll() && model.isSplitSpeciesBatchEnabled()}; - _help: {"tuttihelp.editSpeciesBatch.action.splitSpeciesBatch.help"}; + _help: {"tutti.editSpeciesBatch.action.splitSpeciesBatch.help"}; } #removeSpeciesBatchMenu { actionIcon: batch-delete; - text: "tutti.action.removeSpeciesBatch"; - toolTipText: "tuttihelp.editSpeciesBatch.action.removeSpeciesBatch.tip"; + text: "tutti.editSpeciesBatch.tutti.action.removeSpeciesBatch"; + toolTipText: "tutti.editSpeciesBatch.action.removeSpeciesBatch.tip"; mnemonic: R; _tuttiAction: {RemoveSpeciesBatchAction.class}; enabled: {model.isTableViewModeAll() && model.isRemoveSpeciesBatchEnabled()}; - _help: {"tuttihelp.editSpeciesBatch.action.removeSpeciesBatch.help"}; + _help: {"tutti.editSpeciesBatch.action.removeSpeciesBatch.help"}; } #removeSpeciesSubBatchMenu { actionIcon: batch-delete; - text: "tutti.action.removeSpeciesSubBatch"; - toolTipText: "tuttihelp.editSpeciesBatch.action.removeSpeciesSubBatch.tip"; + text: "tutti.editSpeciesBatch.tutti.action.removeSpeciesSubBatch"; + toolTipText: "tutti.editSpeciesBatch.action.removeSpeciesSubBatch.tip"; mnemonic: R; _tuttiAction: {RemoveSpeciesSubBatchAction.class}; enabled: {model.isTableViewModeAll() && model.isRemoveSpeciesSubBatchEnabled()}; - _help: {"tuttihelp.editSpeciesBatch.action.removeSpeciesSubBatch.help"}; + _help: {"tutti.editSpeciesBatch.action.removeSpeciesSubBatch.help"}; } #renameSpeciesBatchMenu { actionIcon: batch-rename; - text: "tutti.action.renameSpeciesBatch"; - toolTipText: "tuttihelp.editSpeciesBatch.renameSpeciesBatch.tip"; + text: "tutti.editSpeciesBatch.tutti.action.renameSpeciesBatch"; + toolTipText: "tutti.editSpeciesBatch.renameSpeciesBatch.tip"; mnemonic: C; _tuttiAction: {RenameSpeciesBatchAction.class}; enabled: {model.isTableViewModeAll() && model.isRenameSpeciesBatchEnabled()}; - _help: {"tuttihelp.editSpeciesBatch.action.renameSpeciesBatch.help"}; + _help: {"tutti.editSpeciesBatch.action.renameSpeciesBatch.help"}; } #createMelag { actionIcon: batch-rename; - text: "tutti.action.createMelag"; - toolTipText: "tuttihelp.editSpeciesBatch.action.createMelag.tip"; + text: "tutti.editSpeciesBatch.tutti.action.createMelag"; + toolTipText: "tutti.editSpeciesBatch.action.createMelag.tip"; mnemonic: M; _tuttiAction: {CreateMelagAction.class}; enabled: {!model.isTableViewModeLeaf() && model.isCreateMelagEnabled()}; - _help: {"tuttihelp.editSpeciesBatch.action.createMelag.help"}; + _help: {"tutti.editSpeciesBatch.action.createMelag.help"}; } +#createSpeciesBatchButton { + actionIcon: batch-create; + text: "tutti.editSpeciesBatch.tutti.action.createSpeciesBatch"; + toolTipText: "tutti.editSpeciesBatch.createSpeciesBatch.tip"; + mnemonic: C; + enabled: {model.isCreateSpeciesBatchEnabled()}; + _help: {"tutti.editSpeciesBatch.action.createSpeciesBatch.help"}; +} + #table { selectionMode: {ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}; selectionBackground: {null}; @@ -187,38 +196,29 @@ sortable: false; } -#createSpeciesBatchButton { - actionIcon: batch-create; - text: "tutti.action.createSpeciesBatch"; - toolTipText: "tuttihelp.editSpeciesBatch.createSpeciesBatch.tip"; - mnemonic: C; - enabled: {model.isCreateSpeciesBatchEnabled()}; - _help: {"tuttihelp.editSpeciesBatch.action.createSpeciesBatch.help"}; -} - #filterTablePane { border: {new TitledBorder(null, "")}; } #filterSpeciesBatchLabel { actionIcon: filter; - text: "tutti.label.filterSpeciesBatchMode.label"; - toolTipText: "tuttihelp.editSpeciesBatch.filterSpeciesBatch.tip"; + text: "tutti.editSpeciesBatch.label.filterSpeciesBatchMode"; + toolTipText: "tutti.editSpeciesBatch.filterSpeciesBatch.tip"; _strongStyle: true; - _help: {"tuttihelp.editSpeciesBatch.filterSpeciesBatch.help"}; + _help: {"tutti.editSpeciesBatch.filterSpeciesBatch.help"}; } #filterSpeciesBatchAllButton { - text: "tutti.label.filterSpeciesBatchMode.mode.all"; - toolTipText: "tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.all.tip"; + text: "tutti.editSpeciesBatch.label.filterSpeciesBatchMode.mode.all"; + toolTipText: "tutti.editSpeciesBatch.filterSpeciesBatch.mode.all.tip"; value: "all"; selected: {model.isTableViewModeAll()}; buttonGroup: "filterSpeciesBatchMode"; } #filterSpeciesBatchLeafButton { - text: "tutti.label.filterSpeciesBatchMode.mode.leaf"; - toolTipText: "tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.leaf.tip"; + text: "tutti.editSpeciesBatch.label.filterSpeciesBatchMode.mode.leaf"; + toolTipText: "tutti.editSpeciesBatch.filterSpeciesBatch.mode.leaf.tip"; value: "leaf"; selected: {model.isTableViewModeLeaf()}; buttonGroup: "filterSpeciesBatchMode"; @@ -226,7 +226,7 @@ #filterSpeciesBatchRootButton { text: {handler.getFilterSpeciesBatchRootButtonText(model.getRootNumber())}; - toolTipText: "tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.root.tip"; + toolTipText: "tutti.editSpeciesBatch.filterSpeciesBatch.mode.root.tip"; value: "root"; selected: {model.isTableViewModeRoot()}; buttonGroup: "filterSpeciesBatchMode"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -69,7 +69,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editSpeciesBatch.help"'/> + constructorParams='"tutti.editSpeciesBatch.help"'/> <JToolBar id='speciesBatchTabToolBar'> <ButtonAttachment id='speciesBatchAttachmentsButton' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -936,7 +936,7 @@ } public String getFilterSpeciesBatchRootButtonText(int rootNumber) { - return _("tutti.label.filterSpeciesBatchMode.mode.root", rootNumber); + return _("tutti.editSpeciesBatch.label.filterSpeciesBatchMode.mode.root", rootNumber); } protected void recomputeBatchActionEnable() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -47,18 +47,18 @@ public static final ColumnIdentifier<SpeciesFrequencyRowModel> LENGTH_STEP = ColumnIdentifier.newId( SpeciesFrequencyRowModel.PROPERTY_LENGTH_STEP, - n_("tutti.table.species.frequency.header.lengthStep"), - n_("tutti.table.species.frequency.header.lengthStep")); + n_("tutti.editSpeciesFrequencies.table.header.lengthStep"), + n_("tutti.editSpeciesFrequencies.table.header.lengthStep")); public static final ColumnIdentifier<SpeciesFrequencyRowModel> NUMBER = ColumnIdentifier.newId( SpeciesFrequencyRowModel.PROPERTY_NUMBER, - n_("tutti.table.species.frequency.header.number"), - n_("tutti.table.species.frequency.header.number")); + n_("tutti.editSpeciesFrequencies.table.header.number"), + n_("tutti.editSpeciesFrequencies.table.header.number")); public static final ColumnIdentifier<SpeciesFrequencyRowModel> WEIGHT = ColumnIdentifier.newId( SpeciesFrequencyRowModel.PROPERTY_WEIGHT, - n_("tutti.table.species.frequency.header.weight"), - n_("tutti.table.species.frequency.header.weight")); + n_("tutti.editSpeciesFrequencies.table.header.weight"), + n_("tutti.editSpeciesFrequencies.table.header.weight")); private final SpeciesFrequencyUIModel uiModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -34,13 +34,15 @@ } #editSpeciesFrequenciesTopPanel { - _help: {"tuttihelp.editSpeciesFrequencies.help"}; + _help: {"tutti.editSpeciesFrequencies.help"}; } #stepLabel { - text: "tutti.label.frequencyConfiguration.step"; + text: "tutti.editSpeciesFrequencies.field.step"; + toolTipText: "tutti.editSpeciesFrequencies.field.step.tip"; labelFor: {stepField}; enabled: {!model.isSimpleCountingMode()}; + _help: {"tutti.editSpeciesFrequencies.field.step.help"}; } #stepField { @@ -53,9 +55,11 @@ } #lengthStepCaracteristicLabel { - text: "tutti.label.frequencyConfiguration.lengthStepCaracteristic"; + text: "tutti.editSpeciesFrequencies.field.lengthStepCaracteristic"; + toolTipText: "tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip"; labelFor: {lengthStepCaracteristicComboBox}; enabled: {!model.isSimpleCountingMode()}; + _help: {"tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help"}; } #lengthStepCaracteristicComboBox { @@ -65,8 +69,10 @@ } #minStepLabel { - text: "tutti.label.frequencyConfiguration.minStep"; + text: "tutti.editSpeciesFrequencies.field.minStep"; + toolTipText: "tutti.editSpeciesFrequencies.field.minStep.tip"; labelFor: {minStepField}; + _help: {"tutti.editSpeciesFrequencies.field.minStep.help"}; } #minStepField { @@ -79,8 +85,10 @@ } #maxStepLabel { - text: "tutti.label.frequencyConfiguration.maxStep"; + text: "tutti.editSpeciesFrequencies.field.maxStep"; + toolTipText: "tutti.editSpeciesFrequencies.field.maxStep.tip"; labelFor: {maxStepField}; + _help: {"tutti.editSpeciesFrequencies.field.maxStep.help"}; } #maxStepField { @@ -93,8 +101,10 @@ } #rafaleStepLabel { - text: "tutti.label.frequencyConfiguration.rafaleStep"; + text: "tutti.editSpeciesFrequencies.field.rafaleStep"; + toolTipText: "tutti.editSpeciesFrequencies.field.rafaleStep.tip"; labelFor: {rafaleStepField}; + _help: {"tutti.editSpeciesFrequencies.field.rafaleStep.help"}; } #rafaleStepField { @@ -105,12 +115,6 @@ enabled: {model.getLengthStepCaracteristic() != null}; } -#generateButton { - actionIcon: generate; - text: "tutti.action.generate"; - enabled: {model.isCanGenerate()}; -} - #configurationPanel { border: {new TitledBorder(null, _("tutti.legend.frequencyConfiguration"))}; } @@ -124,56 +128,53 @@ } #simpleModeButton { - text: "tutti.label.frequencyConfiguration.mode.simple"; - toolTipText: "tutti.label.frequencyConfiguration.mode.simple.tip"; + text: "tutti.editSpeciesFrequencies.field.mode.simple"; + toolTipText: "tutti.editSpeciesFrequencies.field.mode.simple.tip"; value: "simpleMode"; selected: {model.isSimpleMode()}; buttonGroup: "mode"; + _help: {"tutti.editSpeciesFrequencies.field.mode.simple.help"}; } #simpleModeLabel { - text: "tutti.label.frequencyConfiguration.no.configuration"; + text: "tutti.editSpeciesFrequencies.label.no.configuration"; horizontalAlignment: {JLabel.CENTER}; enabled: false; } #autoGenModeButton { - text: "tutti.label.frequencyConfiguration.mode.autoGen"; - toolTipText: "tutti.label.frequencyConfiguration.mode.autoGen.tip"; + text: "tutti.editSpeciesFrequencies.field.mode.autoGen"; + toolTipText: "tutti.editSpeciesFrequencies.field.mode.autoGen.tip"; value: "autoGenMode"; selected: {model.isAutoGenMode()}; buttonGroup: "mode"; + _help: {"tutti.editSpeciesFrequencies.field.mode.autoGen.help"}; } #rafaleModeButton { - text: "tutti.label.frequencyConfiguration.mode.rafale"; - toolTipText: "tutti.label.frequencyConfiguration.mode.rafale.tip"; + text: "tutti.editSpeciesFrequencies.field.mode.rafale"; + toolTipText: "tutti.editSpeciesFrequencies.field.mode.rafale.tip"; value: "rafaleMode"; selected: {model.isRafaleMode()}; buttonGroup: "mode"; + _help: {"tutti.editSpeciesFrequencies.field.mode.rafale.help"}; } #simpleCountingModeButton { - text: "tutti.label.frequencyConfiguration.mode.simpleCounting"; - toolTipText: "tutti.label.frequencyConfiguration.mode.simpleCounting.tip"; + text: "tutti.editSpeciesFrequencies.field.mode.simpleCounting"; + toolTipText: "tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip"; value: "simpleCountingMode"; selected: {model.isSimpleCountingMode()}; buttonGroup: "mode"; + _help: {"tutti.editSpeciesFrequencies.field.mode.simpleCounting.help"}; } #simpleCountingModeLabel { - text: "tutti.label.frequencyConfiguration.no.configuration"; + text: "tutti.editSpeciesFrequencies.label.no.configuration"; horizontalAlignment: {JLabel.CENTER}; enabled: false; } -#closeButton { - actionIcon: "close"; - text: "tutti.action.close"; - mnemonic: F; - enabled: {model.getRows().size() == 0 || model.getLengthStepCaracteristic() != null}; -} - #dataFieldLayout { selected: {model.isSimpleCountingMode() ? "noLengthCaracteristicPmfm" : "lengthCaracteristicPmfm"}; } @@ -191,8 +192,10 @@ } #simpleCountingLabel { - text: "tutti.table.species.frequency.header.number"; + text: "tutti.editSpeciesFrequencies.field.simpleCounting"; + toolTipText: "tutti.editSpeciesFrequencies.field.simpleCounting.tip"; labelFor: {simpleCountingField}; + _help: {"tutti.editSpeciesFrequencies.field.simpleCounting.help"}; } #simpleCountingField { @@ -204,15 +207,37 @@ bean: {model}; } +#generateButton { + actionIcon: generate; + text: "tutti.editSpeciesFrequencies.action.generate"; + toolTipText: "tutti.editSpeciesFrequencies.action.generate.tip"; + mnemonic: G; + enabled: {model.isCanGenerate()}; + _help: {"tutti.editSpeciesFrequencies.action.generate.help"}; +} + +/*#closeButton { + actionIcon: "close"; + text: "tutti.action.close"; + toolTipText: "tutti.editSpeciesFrequencies.action.close.tip"; + mnemonic: F; + enabled: {model.getRows().size() == 0 || model.getLengthStepCaracteristic() != null}; + _help: {"tutti.editSpeciesFrequencies.action.close.help"}; +}*/ + #cancelButton { actionIcon: cancel; + text: "tutti.editSpeciesFrequencies.action.cancel"; + toolTipText: "tutti.editSpeciesFrequencies.action.cancel.tip"; mnemonic: C; - text: "tutti.action.cancel"; + _help: {"tutti.editSpeciesFrequencies.action.cancel.help"}; } #saveButton { actionIcon: save; + text: "tutti.editSpeciesFrequencies.action.save"; + toolTipText: "tutti.editSpeciesFrequencies.action.save.tip"; mnemonic: S; - text: "tutti.action.save"; enabled: {model.isValid()}; + _help: {"tutti.editSpeciesFrequencies.action.save.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -78,7 +78,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editSpeciesFrequencies.help"'/> + constructorParams='"tutti.editSpeciesFrequencies.help"'/> <CardLayout2Ext id='modeConfigurationLayout' constructorParams='this, "modeConfigurationPanel"'/> 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -88,7 +88,7 @@ String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); - sendMessage(_("tutti.flash.information.species.replaced", decoratedSynonym, decoratedReferent)); + sendMessage(_("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); } if (!availableSpecies.contains(selectedSpecies)) { 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -41,14 +41,14 @@ } #createSpeciesBatchTopPanel { - _help: {"tuttihelp.createSpeciesBatch.help"}; + _help: {"tutti.createSpeciesBatch.help"}; } #speciesLabel { - text: "tutti.label.createSpeciesBatch.species"; - toolTipText: "tuttihelp.createSpeciesBatch.field.speciesComboBox.tip"; + text: "tutti.createSpeciesBatch.field.species"; + toolTipText: "tutti.createSpeciesBatch.field.species.tip"; labelFor: {speciesComboBox}; - _help: {"tuttihelp.createSpeciesBatch.field.speciesComboBox.help"}; + _help: {"tutti.createSpeciesBatch.field.species.help"}; } #speciesComboBox { @@ -58,18 +58,18 @@ } #addSpeciesButton { - text: "tutti.action.addSpecies"; - toolTipText: "tuttihelp.createSpeciesBatch.action.addSpecies.tip"; + text: "tutti.createSpeciesBatch.action.addSpecies"; + toolTipText: "tutti.createSpeciesBatch.action.addSpecies.tip"; mnemonic: A; _tuttiAction: {AddSpeciesAction.class}; - _help: {"tuttihelp.createSpeciesBatch.action.addSpecies.help"}; + _help: {"tutti.createSpeciesBatch.action.addSpecies.help"}; } #sortedUnsortedCategoryLabel { - text: "tutti.label.createSpeciesBatch.sortedUnsortedCategory"; - toolTipText: "tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.tip"; + text: "tutti.createSpeciesBatch.field.sortedUnsortedCategory"; + toolTipText: "tutti.createSpeciesBatch.field.sortedUnsortedCategory.tip"; labelFor: {sortedUnsortedCategoryComboBox}; - _help: {"tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.help"}; + _help: {"tutti.createSpeciesBatch.field.sortedUnsortedCategory.help"}; } #sortedUnsortedCategoryComboBox { @@ -78,10 +78,10 @@ } #batchWeightLabel { - text: "tutti.label.createSpeciesBatch.batchWeight"; - toolTipText: "tuttihelp.createSpeciesBatch.field.batchWeightField.tip"; + text: "tutti.createSpeciesBatch.field.batchWeight"; + toolTipText: "tutti.createSpeciesBatch.field.batchWeight.tip"; labelFor: {batchWeightField}; - _help: {"tuttihelp.createSpeciesBatch.field.batchWeightField.help"}; + _help: {"tutti.createSpeciesBatch.field.batchWeight.help"}; } #batchWeightField { @@ -94,15 +94,15 @@ #saveButton { actionIcon: save; - text: "tutti.action.save"; - toolTipText: "tuttihelp.createSpeciesBatch.action.save.tip"; + text: "tutti.createSpeciesBatch.action.save"; + toolTipText: "tutti.createSpeciesBatch.action.save.tip"; mnemonic: E; enabled: {model.isValid()}; } #cancelButton { actionIcon: cancel; - text: "tutti.action.cancel"; - toolTipText: "tuttihelp.createSpeciesBatch.action.cancel.tip"; + text: "tutti.createSpeciesBatch.action.cancel"; + toolTipText: "tutti.createSpeciesBatch.action.cancel.tip"; mnemonic: A; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -78,7 +78,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.createSpeciesBatch.help"'/> + constructorParams='"tutti.createSpeciesBatch.help"'/> <Table id='configurationPanel' constraints='BorderLayout.CENTER' fill='both'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -43,23 +43,23 @@ public static final ColumnIdentifier<SplitSpeciesBatchRowModel> SELECTED = ColumnIdentifier.newId( SplitSpeciesBatchRowModel.PROPERTY_VALID, - n_("tutti.table.species.sampleCategory.header.selected"), - n_("tutti.table.species.sampleCategory.header.selected")); + n_("tutti.splitSpeciesBatch.table.header.selected"), + n_("tutti.splitSpeciesBatch.table.header.selected")); public static final ColumnIdentifier<SplitSpeciesBatchRowModel> EDITABLE_CATEGORY_VALUE = ColumnIdentifier.newId( SplitSpeciesBatchRowModel.PROPERTY_CATEGORY_VALUE, - n_("tutti.table.species.sampleCategory.header.category"), - n_("tutti.table.species.sampleCategory.header.category")); + n_("tutti.splitSpeciesBatch.table.header.category"), + n_("tutti.splitSpeciesBatch.table.header.category")); public static final ColumnIdentifier<SplitSpeciesBatchRowModel> READ_ONLY_CATEGORY_VALUE = ColumnIdentifier.newId( SplitSpeciesBatchRowModel.PROPERTY_CATEGORY_VALUE, - n_("tutti.table.species.sampleCategory.header.category"), - n_("tutti.table.species.sampleCategory.header.category")); + n_("tutti.splitSpeciesBatch.table.header.category"), + n_("tutti.splitSpeciesBatch.table.header.category")); public static final ColumnIdentifier<SplitSpeciesBatchRowModel> WEIGHT = ColumnIdentifier.newId( SplitSpeciesBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.table.species.sampleCategory.header.weight"), - n_("tutti.table.species.sampleCategory.header.weight")); + n_("tutti.splitSpeciesBatch.table.header.weight"), + n_("tutti.splitSpeciesBatch.table.header.weight")); private final SplitSpeciesBatchUIModel uiModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -29,7 +29,7 @@ } #splitSpeciesBatchTopPanel { - _help: {"tuttihelp.splitSpeciesBatch.help"}; + _help: {"tutti.splitSpeciesBatch.help"}; } #configurationPanel { @@ -37,10 +37,10 @@ } #categoryLabel { - text: "tutti.label.sampleCategoryConfiguration.category"; - toolTipText: "tuttihelp.splitSpeciesBatch.field.categoryField.tip"; + text: "tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.category"; + toolTipText: "tutti.splitSpeciesBatch.field.categoryField.tip"; labelFor: {categoryComboBox}; - _help: {"tuttihelp.splitSpeciesBatch.field.categoryField.help"}; + _help: {"tutti.splitSpeciesBatch.field.categoryField.help"}; } #categoryComboBox { @@ -48,10 +48,10 @@ } #speciesLabel { - text: "tutti.label.sampleCategoryConfiguration.species"; - toolTipText: "tuttihelp.splitSpeciesBatch.field.speciesField.tip"; + text: "tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.species"; + toolTipText: "tutti.splitSpeciesBatch.field.speciesField.tip"; labelFor: {speciesField}; - _help: {"tuttihelp.splitSpeciesBatch.field.speciesField.help"}; + _help: {"tutti.splitSpeciesBatch.field.speciesField.help"}; } #speciesField { @@ -61,10 +61,10 @@ } #batchWeightLabel { - text: "tutti.label.sampleCategoryConfiguration.batchWeight"; - toolTipText: "tuttihelp.splitSpeciesBatch.field.batchWeightField.tip"; + text: "tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.batchWeight"; + toolTipText: "tutti.splitSpeciesBatch.field.batchWeightField.tip"; labelFor: {batchWeightField}; - _help: {"tuttihelp.splitSpeciesBatch.field.batchWeightField.help"}; + _help: {"tutti.splitSpeciesBatch.field.batchWeightField.help"}; } #batchWeightField { @@ -74,10 +74,10 @@ } #sampleWeightLabel { - text: "tutti.label.sampleCategoryConfiguration.sampleWeight"; - toolTipText: "tuttihelp.splitSpeciesBatch.field.sampleWeightField.tip"; + text: "tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.sampleWeight"; + toolTipText: "tutti.splitSpeciesBatch.field.sampleWeightField.tip"; labelFor: {sampleWeightField}; - _help: {"tuttihelp.splitSpeciesBatch.field.sampleWeightField.help"}; + _help: {"tutti.splitSpeciesBatch.field.sampleWeightField.help"}; } #sampleWeightField { @@ -96,17 +96,17 @@ #cancelButton { actionIcon: cancel; - text: "tutti.action.cancel"; - toolTipText: "tuttihelp.splitSpeciesBatch.action.cancel.tip"; + text: "tutti.splitSpeciesBatch.action.cancel"; + toolTipText: "tutti.splitSpeciesBatch.action.cancel.tip"; mnemonic: A; - _help: {"tuttihelp.splitSpeciesBatch.action.cancel.help"}; + _help: {"tutti.splitSpeciesBatch.action.cancel.help"}; } #saveButton { actionIcon: save; - text: "tutti.action.save"; - toolTipText: "tuttihelp.splitSpeciesBatch.action.save.tip"; + text: "tutti.splitSpeciesBatch.action.save"; + toolTipText: "tutti.splitSpeciesBatch.action.save.tip"; mnemonic: E; enabled: {model.isValid()}; - _help: {"tuttihelp.splitSpeciesBatch.action.save.help"}; + _help: {"tutti.splitSpeciesBatch.action.save.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -73,7 +73,7 @@ </BeanValidator> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.splitSpeciesBatch.help"'/> + constructorParams='"tutti.splitSpeciesBatch.help"'/> <Table id='configurationPanel' fill='both' constraints='BorderLayout.NORTH'> 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -36,7 +36,7 @@ private static final long serialVersionUID = 1L; public static final String TITLE = - n_("tutti.label.tab.fishingOperation.gearUseFeature"); + n_("tutti.editFishingOperation.tab.gearUseFeature"); @Override public String getTitle() { 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -35,7 +35,7 @@ private static final long serialVersionUID = 1L; public static final String TITLE = - n_("tutti.label.tab.fishingOperation.vesselUseFeature"); + n_("tutti.editFishingOperation.tab.vesselUseFeature"); @Override public String getTitle() { 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -29,7 +29,7 @@ } #editProgramTopPanel { - _help: {"tuttihelp.editProgram.help"}; + _help: {"tutti.editProgram.help"}; } #form { @@ -37,56 +37,56 @@ } #nameLabel { - text: "tutti.label.program.name"; + text: "tutti.editProgram.label.program.name"; labelFor: {nameField}; - toolTipText: "tuttihelp.editProgram.field.name.tip"; - _help: {"tuttihelp.editProgram.field.name.help"}; + toolTipText: "tutti.editProgram.field.name.tip"; + _help: {"tutti.editProgram.field.name.help"}; } #nameField { text: {model.getName()}; - _validatorLabel : {_("tutti.label.program.name")}; + _validatorLabel : {_("tutti.editProgram.label.program.name")}; } #commentPane { border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; - toolTipText: "tuttihelp.editProgram.field.comment.tip"; - _help: {"tuttihelp.editProgram.field.comment.help"}; + toolTipText: "tutti.editProgram.field.comment.tip"; + _help: {"tutti.editProgram.field.comment.help"}; } #commentField { text: {getStringValue(model.getComment())}; - _validatorLabel : {_("tutti.label.comment")}; + _validatorLabel : {_("tutti.editProgram.label.comment")}; } #zoneLabel { - text: "tutti.label.program.zone"; + text: "tutti.editProgram.label.program.zone"; labelFor: {zoneComboBox}; - toolTipText: "tuttihelp.editProgram.field.zone.tip"; - _help: {"tuttihelp.editProgram.field.zone.help"}; + toolTipText: "tutti.editProgram.field.zone.tip"; + _help: {"tutti.editProgram.field.zone.help"}; } #zoneComboBox { property: zone; selectedItem: {model.getZone()}; - _validatorLabel : {_("tutti.label.program.zone")}; + _validatorLabel : {_("tutti.editProgram.label.program.zone")}; } #saveButton { actionIcon: save; - text: "tutti.action.saveProgram"; - toolTipText: "tuttihelp.editProgram.action.saveProgram.tip"; + text: "tutti.editProgram.action.saveProgram"; + toolTipText: "tutti.editProgram.action.saveProgram.tip"; mnemonic: E; _tuttiAction: {SaveProgramAction.class}; enabled: {model.isModify() && model.isValid()}; - _help: {"tuttihelp.editProgram.action.saveProgram.help"}; + _help: {"tutti.editProgram.action.saveProgram.help"}; } #closeButton { actionIcon: cancel; - text: "tutti.action.closeEditProgram"; - toolTipText: "tuttihelp.editProgram.action.closeEditProgram.tip"; + text: "tutti.editProgram.action.closeEditProgram"; + toolTipText: "tutti.editProgram.action.closeEditProgram.tip"; mnemonic: A; _tuttiAction: {fr.ifremer.tutti.ui.swing.content.SelectCruiseAction.class}; - _help: {"tuttihelp.editProgram.action.cancelProgram.help"}; + _help: {"tutti.editProgram.action.cancelProgram.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -61,7 +61,7 @@ initializer='getContextValue(EditProgramUIModel.class)'/> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editProgram.help"'/> + constructorParams='"tutti.editProgram.help"'/> <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -139,8 +139,8 @@ boolean result = quitScreen( getModel().isValid(), getModel().isModify(), - _("tutti.dialog.askCancelEditBeforeLeaving.cancelSaveProgram"), - _("tutti.dialog.askSaveBeforeLeaving.saveProgram"), + _("tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram"), + _("tutti.editProgram.askSaveBeforeLeaving.saveProgram"), ui.getSaveButton().getAction() ); return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -59,10 +59,10 @@ saved = persistenceService.createProgram(bean); model.setId(saved.getId()); - sendMessage(_("tutti.flash.information.programCreated", bean.getName())); + sendMessage(_("tutti.flash.info.programCreated", bean.getName())); } else { saved = persistenceService.saveProgram(bean); - sendMessage(_("tutti.flash.information.programSaved", bean.getName())); + sendMessage(_("tutti.flash.info.programSaved", bean.getName())); } context.setProgramId(saved.getId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -72,7 +72,7 @@ getModel().setModify(true); String speciesStr = decorate(species); - sendMessage(_("tutti.flash.information.species.add.to.protocol", + sendMessage(_("tutti.flash.info.species.add.to.protocol", speciesStr)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-03-15 09:48:31 UTC (rev 629) @@ -38,53 +38,53 @@ public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SPECIES_ID = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_SPECIES, - n_("tutti.table.protocol.species.header.speciesReferenceTaxonId"), - n_("tutti.table.protocol.species.header.speciesReferenceTaxonId.tip")); + n_("tutti.editProtocol.table.header.speciesReferenceTaxonId"), + n_("tutti.editProtocol.table.header.speciesReferenceTaxonId.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SURVEY_CODE_ID = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_SPECIES_SURVEY_CODE, - n_("tutti.table.protocol.species.header.speciesSurveyCode"), - n_("tutti.table.protocol.species.header.speciesSurveyCode.tip")); + n_("tutti.editProtocol.table.header.speciesSurveyCode"), + n_("tutti.editProtocol.table.header.speciesSurveyCode.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SIZE_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_SIZE_ENABLED, - n_("tutti.table.protocol.species.header.size"), - n_("tutti.table.protocol.species.header.size.tip")); + n_("tutti.editProtocol.table.header.size"), + n_("tutti.editProtocol.table.header.size.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SEX_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_SEX_ENABLED, - n_("tutti.table.protocol.species.header.sex"), - n_("tutti.table.protocol.species.header.sex.tip")); + n_("tutti.editProtocol.table.header.sex"), + n_("tutti.editProtocol.table.header.sex.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> MATURITY_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_MATURITY_ENABLED, - n_("tutti.table.protocol.species.header.maturity"), - n_("tutti.table.protocol.species.header.maturity.tip")); + n_("tutti.editProtocol.table.header.maturity"), + n_("tutti.editProtocol.table.header.maturity.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> AGE_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_AGE_ENABLED, - n_("tutti.table.protocol.species.header.age"), - n_("tutti.table.protocol.species.header.age.tip")); + n_("tutti.editProtocol.table.header.age"), + n_("tutti.editProtocol.table.header.age.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> LENGTH_STEP_PMFM_ID = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_LENGTH_STEP_PMFM, - n_("tutti.table.protocol.species.header.lengthStep"), - n_("tutti.table.protocol.species.header.lengthStep.tip")); + n_("tutti.editProtocol.table.header.lengthStep"), + n_("tutti.editProtocol.table.header.lengthStep.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> WEIGHT_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_WEIGHT_ENABLED, - n_("tutti.table.protocol.species.header.weight"), - n_("tutti.table.protocol.species.header.weight.tip")); + n_("tutti.editProtocol.table.header.weight"), + n_("tutti.editProtocol.table.header.weight.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> COUNT_IF_NO_FREQUENCY_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, - n_("tutti.table.protocol.species.header.countIfNoFrequency"), - n_("tutti.table.protocol.species.header.countIfNoFrequency.tip")); + n_("tutti.editProtocol.table.header.countIfNoFrequency"), + n_("tutti.editProtocol.table.header.countIfNoFrequency.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CALCIFY_SAMPLE_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_CALCIFY_SAMPLE_ENABLED, - n_("tutti.table.protocol.species.header.calcifySample"), - n_("tutti.table.protocol.species.header.calcifySample.tip")); + n_("tutti.editProtocol.table.header.calcifySample"), + n_("tutti.editProtocol.table.header.calcifySample.tip")); private static final long serialVersionUID = 1L; 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -34,7 +34,7 @@ } #editProtocolTopPanel { - _help: {"tuttihelp.editProtocol.help"}; + _help: {"tutti.editProtocol.help"}; } #form { @@ -42,26 +42,26 @@ } #nameLabel { - text: "tutti.label.protocol.name"; + text: "tutti.editProtocol.label.protocol.name"; labelFor: {nameField}; - toolTipText: "tuttihelp.editProtocol.field..tip"; - _help: {"tuttihelp.editProtocol.field.name.help"}; + toolTipText: "tutti.editProtocol.field.protocol.name.tip"; + _help: {"tutti.editProtocol.field.name.help"}; } #nameField { text: {model.getName()}; - _validatorLabel : {_("tutti.label.protocol.name")}; + _validatorLabel : {_("tutti.editProtocol.label.protocol.name")}; } #commentPane { border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; - toolTipText: "tuttihelp.editProtocol.field.comment.tip"; - _help: {"tuttihelp.editProtocol.field.comment.help"}; + toolTipText: "tutti.editProtocol.field.comment.tip"; + _help: {"tutti.editProtocol.field.comment.help"}; } #commentField { text: {getStringValue(model.getComment())}; - _validatorLabel : {_("tutti.label.comment")}; + _validatorLabel : {_("tutti.editProtocol.label.comment")}; } #saveWarningContainer { @@ -76,58 +76,58 @@ #saveButton { actionIcon: save; - text: "tutti.action.saveProtocol"; - toolTipText: "tuttihelp.editProtocol.action.saveProtocol.tip"; + text: "tutti.editProtocol.action.saveProtocol"; + toolTipText: "tutti.editProtocol.action.saveProtocol.tip"; mnemonic: E; enabled: {model.isModify() && model.isValid()}; _tuttiAction: {SaveProtocolAction.class}; - _help: {"tuttihelp.editProtocol.action.saveProtocol.help"}; + _help: {"tutti.editProtocol.action.saveProtocol.help"}; } #closeButton { actionIcon: cancel; - text: "tutti.action.closeEditProtocol"; - toolTipText: "tuttihelp.editProtocol.action.closeEditProtocol.tip"; + text: "tutti.editProtocol.action.closeEditProtocol"; + toolTipText: "tutti.editProtocol.action.closeEditProtocol.tip"; mnemonic: A; _tuttiAction: {fr.ifremer.tutti.ui.swing.content.SelectCruiseAction.class}; - _help: {"tuttihelp.editProtocol.action.closeEditProtocol.help"}; + _help: {"tutti.editProtocol.action.closeEditProtocol.help"}; } #speciesComboBox { enabled: {!speciesComboBox.isEmpty()}; - toolTipText: "tuttihelp.editProtocol.field..tip"; - _help: {"tuttihelp.editProtocol.field.species.help"}; + toolTipText: "tutti.editProtocol.field..tip"; + _help: {"tutti.editProtocol.field.species.help"}; } #selectOtherSpeciesButton { - text: "tutti.action.selectOtherSpecies"; - toolTipText: "tuttihelp.editProtocol.action.selectOtherSpecies.tip"; + text: "tutti.editProtocol.action.selectOtherSpecies"; + toolTipText: "tutti.editProtocol.action.selectOtherSpecies.tip"; mnemonic: S; _tuttiAction: {SelectOtherSpeciesAction.class}; - _help: {"tuttihelp.editProtocol.action.selectOtherSpecies.help"}; + _help: {"tutti.editProtocol.action.selectOtherSpecies.help"}; } #addSpeciesProtocolButton { actionIcon: add; - toolTipText: "tuttihelp.editProtocol.action.addSpeciesProtocol.tip"; + toolTipText: "tutti.editProtocol.action.addSpeciesProtocol.tip"; mnemonic: A; _tuttiAction: {AddSpeciesProtocolAction.class}; enabled: {speciesComboBox.getSelectedItem() != null}; - _help: {"tuttihelp.editProtocol.action.addSpeciesProtocol.help"}; + _help: {"tutti.editProtocol.action.addSpeciesProtocol.help"}; } #tablePopup { - label: "tutti.title.batchActions"; + label: "tutti.editProtocol.title.batchActions"; } #removeSpeciesProtocolButton { actionIcon: batch-delete; - text: "tutti.action.removeSpeciesProtocol"; - toolTipText: "tuttihelp.editProtocol.action.removeSpeciesProtocol.tip"; + text: "tutti.editProtocol.action.removeSpeciesProtocol"; + toolTipText: "tutti.editProtocol.action.removeSpeciesProtocol.tip"; mnemonic: R; _tuttiAction: {RemoveSpeciesProtocolAction.class}; enabled: {model.isRemoveSpeciesEnabled()}; - _help: {"tuttihelp.editProtocol.action.removeSpeciesProtocol.help"}; + _help: {"tutti.editProtocol.action.removeSpeciesProtocol.help"}; } #speciesTable { @@ -135,74 +135,74 @@ selectionBackground: {null}; selectionForeground: {Color.BLACK}; sortable: false; - _help: {"tuttihelp.editProtocol.table.species.help"}; + _help: {"tutti.editProtocol.field.species.help"}; } #caracteristicPane { tabPlacement: {JTabbedPane.LEFT}; - _help: {"tuttihelp.editProtocol.pane.caracteristic.help"}; + _help: {"tutti.editProtocol.pane.caracteristic.help"}; } #importSpeciesButton { actionIcon: import; - text: "tutti.action.importProtocolSpecies"; - toolTipText: "tuttihelp.editProtocol.action.importProtocolSpecies.tip"; + text: "tutti.editProtocol.action.importProtocolSpecies"; + toolTipText: "tutti.editProtocol.action.importProtocolSpecies.tip"; mnemonic: I; _tuttiAction: {ImportProtocolSpeciesAction.class}; - _help: {"tuttihelp.editProtocol.action.importProtocolSpecies.help"}; + _help: {"tutti.editProtocol.action.importProtocolSpecies.help"}; } #exportSpeciesButton { actionIcon: export; - text: "tutti.action.exportProtocolSpecies"; - toolTipText: "tuttihelp.editProtocol.action.exportProtocolSpecies.tip"; + text: "tutti.editProtocol.action.exportProtocolSpecies"; + toolTipText: "tutti.editProtocol.action.exportProtocolSpecies.tip"; mnemonic: E; _tuttiAction: {ExportProtocolSpeciesAction.class}; - _help: {"tuttihelp.editProtocol.action.exportProtocolSpecies.help"}; + _help: {"tutti.editProtocol.action.exportProtocolSpecies.help"}; } #importCaracteristicButton { actionIcon: import; - text: "tutti.action.importProtocolCaracteristic"; - toolTipText: "tuttihelp.editProtocol.action.importProtocolCaracteristic.tip"; + text: "tutti.editProtocol.action.importProtocolCaracteristic"; + toolTipText: "tutti.editProtocol.action.importProtocolCaracteristic.tip"; mnemonic: I; _tuttiAction: {ImportProtocolCaracteristicAction.class}; - _help: {"tuttihelp.editProtocol.action.importProtocolCaracteristic.help"}; + _help: {"tutti.editProtocol.action.importProtocolCaracteristic.help"}; } #exportCaracteristicButton { actionIcon: export; - text: "tutti.action.exportProtocolCaracteristic"; - toolTipText: "tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip"; + text: "tutti.editProtocol.action.exportProtocolCaracteristic"; + toolTipText: "tutti.editProtocol.action.exportProtocolCaracteristic.tip"; mnemonic: E; _tuttiAction: {ExportProtocolCaracteristicAction.class}; - _help: {"tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip"}; + _help: {"tutti.editProtocol.action.exportProtocolCaracteristic.tip"}; } #exportAllCaracteristicButton { actionIcon: export; - text: "tutti.action.exportProtocolAllCaracteristic"; - toolTipText: "tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.tip"; + text: "tutti.editProtocol.action.exportProtocolAllCaracteristic"; + toolTipText: "tutti.editProtocol.action.exportProtocolAllCaracteristic.tip"; mnemonic: E; _tuttiAction: {ExportAllCaracteristicAction.class}; - _help: {"tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.help"}; + _help: {"tutti.editProtocol.action.exportProtocolAllCaracteristic.help"}; } #gearUseFeatureList { property: gearUseFeaturePmfm; beanType: {Caracteristic.class}; - _help: {"tuttihelp.editProtocol.list.gearUseFeature.help"}; + _help: {"tutti.editProtocol.field.gearUseFeature.help"}; } #vesselUseFeatureList { property: vesselUseFeaturePmfm; beanType: {Caracteristic.class}; - _help: {"tuttihelp.editProtocol.list.vesselUseFeature.help"}; + _help: {"tutti.editProtocol.field.vesselUseFeature.help"}; } #lengthClassesList { property: lengthClassesPmfm; beanType: {Caracteristic.class}; - _help: {"tuttihelp.editProtocol.list.lengthClasses.help"}; + _help: {"tutti.editProtocol.field.lengthClasses.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -68,8 +68,7 @@ <EditProtocolUIModel id='model' initializer='getContextValue(EditProtocolUIModel.class)'/> - <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.editProtocol.help"'/> + <TuttiHelpBroker id='broker' constructorParams='"tutti.editProtocol.help"'/> <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> @@ -82,7 +81,7 @@ </JPopupMenu> <JTabbedPane constraints='BorderLayout.CENTER'> - <tab title='tutti.label.tab.protocol.info'> + <tab title='tutti.editProtocol.tab.info'> <Table id='protocolInfoForm' fill='both'> <!-- protocol name --> @@ -109,7 +108,7 @@ </Table> </tab> - <tab title='tutti.label.tab.protocol.caracteristic'> + <tab title='tutti.editProtocol.tab.caracteristic'> <JPanel id='caracteristicPanel' layout="{new BorderLayout()}"> <JPanel id='caracteristicActions' layout="{new GridLayout()}" constraints='BorderLayout.NORTH'> @@ -119,14 +118,14 @@ <JButton id='exportAllCaracteristicButton'/> </JPanel> <JTabbedPane id='caracteristicPane' constraints='BorderLayout.CENTER'> - <tab title='tutti.label.tab.protocol.caracteristic.lengthClasses'> + <tab title='tutti.editProtocol.tab.caracteristic.lengthClasses'> <BeanDoubleList id='lengthClassesList' genericType='Caracteristic'/> </tab> - <tab title='tutti.label.tab.protocol.caracteristic.gearUseFeature'> + <tab title='tutti.editProtocol.tab.caracteristic.gearUseFeature'> <BeanDoubleList id='gearUseFeatureList' genericType='Caracteristic'/> </tab> - <tab title='tutti.label.tab.protocol.caracteristic.vesselUseFeature'> + <tab title='tutti.editProtocol.tab.caracteristic.vesselUseFeature'> <BeanDoubleList id='vesselUseFeatureList' genericType='Caracteristic'/> </tab> @@ -134,7 +133,7 @@ </JPanel> </tab> - <tab title='tutti.label.tab.protocol.species'> + <tab title='tutti.editProtocol.tab.species'> <JPanel id='speciesPanel' layout="{new BorderLayout()}"> <JPanel id='speciesActions' layout="{new GridLayout()}" constraints='BorderLayout.NORTH'> @@ -168,13 +167,13 @@ </Table> </JPanel> </tab> - <tab title='tutti.label.tab.protocol.benthos' enabled='false'> + <tab title='tutti.editProtocol.tab.benthos' enabled='false'> <JLabel text='tutti.to.be.done' horizontalAlignment="{JLabel.CENTER}"/> </tab> - <tab title='tutti.label.tab.protocol.plankton' enabled='false'> + <tab title='tutti.editProtocol.tab.plankton' enabled='false'> <JLabel text='tutti.to.be.done' horizontalAlignment="{JLabel.CENTER}"/> </tab> - <tab title='tutti.label.tab.protocol.accidental' enabled='false'> + <tab title='tutti.editProtocol.tab.accidental' enabled='false'> <JLabel text='tutti.to.be.done' horizontalAlignment="{JLabel.CENTER}"/> </tab> 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -223,7 +223,7 @@ model.fromBean(protocol); model.setImported(true); - ui.getSaveWarning().setText(_("tutti.label.protocol.import.warning")); + ui.getSaveWarning().setText(_("tutti.editProtocol.warn.import")); } else if ((protocol = CloneProtocolAction.CLONE_PROTOCOL_ENTRY.getContextValue(ui)) != null) { @@ -233,7 +233,7 @@ model.fromBean(protocol); model.setCloned(true); - ui.getSaveWarning().setText(_("tutti.label.protocol.clone.warning")); + ui.getSaveWarning().setText(_("tutti.editProtocol.warn.clone")); } else { @@ -433,8 +433,8 @@ boolean result = quitScreen( getModel().isValid(), getModel().isModify(), - _("tutti.dialog.askCancelEditBeforeLeaving.cancelSaveProtocol"), - _("tutti.dialog.askSaveBeforeLeaving.saveProtocol"), + _("tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol"), + _("tutti.editProtocol.askSaveBeforeLeaving.saveProtocol"), ui.getSaveButton().getAction() ); return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -64,8 +64,8 @@ // choose file to export file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.protocolCaracteristicExportFile"), - _("tutti.action.chooseProtocolCaracteristicFile"), + _("tutti.editProtocol.title.choose.caracteristicExportFile"), + _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), "^.*\\.csv", _("tutti.file.csv") ); if (file == null) { @@ -103,6 +103,6 @@ service.exportAllCaracteristic(file, getModel().getAllCaracteristic()); - sendMessage(_("tutti.flash.information.all.caractristic.exported", file)); + sendMessage(_("tutti.flash.info.all.caractristic.exported", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -65,8 +65,8 @@ // choose file to export file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.protocolCaracteristicExportFile"), - _("tutti.action.chooseProtocolCaracteristicFile"), + _("tutti.editProtocol.title.choose.caracteristicExportFile"), + _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), "^.*\\.csv", _("tutti.file.csv") ); if (file == null) { @@ -109,7 +109,7 @@ protocol, getModel().getAllCaracteristic()); - sendMessage(_("tutti.flash.information.caractristic.exported.from.protocol", + sendMessage(_("tutti.flash.info.caractristic.exported.from.protocol", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -67,8 +67,8 @@ // choose file to export file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.protocolSpeciesExportFile"), - _("tutti.action.chooseProtocolSpeciesFile"), + _("tutti.editProtocol.title.choose.speciesExportFile"), + _("tutti.editProtocol.action.chooseProtocolSpeciesFile"), "^.*\\.csv", _("tutti.file.csv") ); if (file == null) { @@ -120,7 +120,7 @@ model.getAllCaracteristic(), model.getAllReferentSpeciesByTaxonId()); - sendMessage(_("tutti.flash.information.species.exported.from.protocol", + sendMessage(_("tutti.flash.info.species.exported.from.protocol", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -64,8 +64,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.protocolCaracteristicImportFile"), - _("tutti.action.chooseProtocolCaracteristicFile"), + _("tutti.editProtocol.title.choose.caracteristicImportFile"), + _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), "^.*\\.csv", _("tutti.file.csv") ); @@ -109,7 +109,7 @@ } sendMessage( - _("tutti.flash.information.caracteristic.imported.in.protocol", + _("tutti.flash.info.caracteristic.imported.in.protocol", file)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -68,8 +68,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.protocolSpeciesImportFile"), - _("tutti.action.chooseProtocolSpeciesFile"), + _("tutti.editProtocol.title.choose.speciesImportFile"), + _("tutti.editProtocol.action.chooseProtocolSpeciesFile"), "^.*\\.csv", _("tutti.file.csv") ); @@ -129,17 +129,17 @@ String message; switch (nbSynonym) { case 0: - message = _("tutti.flash.information.species.imported.in.protocol", + message = _("tutti.flash.info.species.imported.in.protocol", file); break; case 1: - message = _("tutti.flash.information.species.imported.in.protocol.oneReplaced", + message = _("tutti.flash.info.species.imported.in.protocol.oneReplaced", file); break; default: - message = _("tutti.flash.information.species.imported.in.protocol.severalReplaced", + message = _("tutti.flash.info.species.imported.in.protocol.severalReplaced", file, nbSynonym); } sendMessage(message); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -81,7 +81,7 @@ tableModel.removeRow(rowIndex); String speciesStr = decorate(selectedRow.getSpecies()); - sendMessage(_("tutti.flash.information.species.remove.from.protocol", + sendMessage(_("tutti.flash.info.species.remove.from.protocol", speciesStr)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -88,10 +88,10 @@ saved = persistenceService.createProtocol(bean); model.setId(saved.getId()); - sendMessage(_("tutti.flash.information.protocolCreated", bean.getName())); + sendMessage(_("tutti.flash.info.protocolCreated", bean.getName())); } else { saved = persistenceService.saveProtocol(bean); - sendMessage(_("tutti.flash.information.protocolSaved", bean.getName())); + sendMessage(_("tutti.flash.info.protocolSaved", bean.getName())); } context.setProtocolId(saved.getId()); 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherSpeciesAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -84,7 +84,7 @@ String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = getModel().getAllReferentSpeciesByTaxonId().get(taxonId); String decoratedReferent = decorate(selectedSpecies); - sendMessage(_("tutti.flash.information.species.replaced", decoratedSynonym, decoratedReferent)); + sendMessage(_("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); getUI().getSpeciesComboBox().setSelectedItem(selectedSpecies); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -65,8 +65,8 @@ // choose file to export file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.exportTemporaryGearExampleFile"), - _("tutti.action.chooseReferentialGearFile"), + _("tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), "^.*\\.csv", _("tutti.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -66,8 +66,8 @@ // choose file to export file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.exportTemporaryPersonExampleFile"), - _("tutti.action.chooseReferentialPersonFile"), + _("tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), "^.*\\.csv", _("tutti.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -65,8 +65,8 @@ // choose file to export file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.exportTemporarySpeciesExampleFile"), - _("tutti.action.chooseReferentialSpeciesFile"), + _("tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), "^.*\\.csv", _("tutti.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -65,8 +65,8 @@ // choose file to export file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.exportTemporaryVesselExampleFile"), - _("tutti.action.chooseReferentialVesselFile"), + _("tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), "^.*\\.csv", _("tutti.file.csv") ); if (file == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -64,8 +64,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.importTemporaryGearFile"), - _("tutti.action.chooseReferentialGearFile"), + _("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), "^.*\\.csv", _("tutti.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -64,8 +64,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.importTemporaryPersonFile"), - _("tutti.action.chooseReferentialPersonFile"), + _("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), "^.*\\.csv", _("tutti.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -63,8 +63,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.importTemporarySpeciesFile"), - _("tutti.action.chooseReferentialSpeciesFile"), + _("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), "^.*\\.csv", _("tutti.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-03-15 09:48:31 UTC (rev 629) @@ -63,8 +63,8 @@ // choose file to import file = TuttiUIUtil.chooseFile( getContext().getMainUI(), - _("tutti.title.choose.importTemporaryVesselFile"), - _("tutti.action.chooseReferentialVesselFile"), + _("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), + _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), "^.*\\.csv", _("tutti.file.csv")); doAction = file != null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -23,106 +23,106 @@ */ #manageTemporaryReferentialTopPanel { - _help: {"tuttihelp.manageTemporaryReferential.help"}; + _help: {"tutti.manageTemporaryReferential.help"}; } #information { actionIcon: information; - text: "tutti.information.import.temporary.referential"; + text: "tutti.manageTemporaryReferential.info.import.temporary.referential"; } #speciesLabel { - text: "tutti.label.referential.species"; - toolTipText: "tuttihelp.manageTemporaryReferential.label.referential.species.tip"; + text: "tutti.manageTemporaryReferential.label.referential.species"; + toolTipText: "tutti.manageTemporaryReferential.label.referential.species.tip"; icon: {SwingUtil.createImageIcon("action-species.gif")}; } #exportSpeciesExampleButton { actionIcon: export; - text: "tutti.action.exportTemporarySpeciesExample"; + text: "tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample"; mnemonic: E; _tuttiAction: {ExportTemporarySpeciesExampleAction.class}; - toolTipText: "tuttihelp.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip"; - _help: {"tuttihelp.manageTemporaryReferential.action.exportTemporarySpeciesExample.help"}; + toolTipText: "tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip"; + _help: {"tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help"}; } #importSpeciesButton { actionIcon: import; - text: "tutti.action.importTemporarySpecies"; + text: "tutti.manageTemporaryReferential.action.importTemporarySpecies"; mnemonic: I; _tuttiAction: {ImportTemporarySpeciesAction.class}; - toolTipText: "tuttihelp.manageTemporaryReferential.action.importTemporarySpecies.tip"; - _help: {"tuttihelp.manageTemporaryReferential.action.importTemporarySpecies.help"}; + toolTipText: "tutti.manageTemporaryReferential.action.importTemporarySpecies.tip"; + _help: {"tutti.manageTemporaryReferential.action.importTemporarySpecies.help"}; } #vesselLabel { - text: "tutti.label.referential.vessel"; - toolTipText: "tuttihelp.manageTemporaryReferential.label.referential.vessel.tip"; + text: "tutti.manageTemporaryReferential.label.referential.vessel"; + toolTipText: "tutti.manageTemporaryReferential.label.referential.vessel.tip"; actionIcon: vessel; } #exportVesselExampleButton { actionIcon: export; - text: "tutti.action.exportTemporaryVesselExample"; + text: "tutti.manageTemporaryReferential.action.exportTemporaryVesselExample"; mnemonic: E; _tuttiAction: {ExportTemporaryVesselExampleAction.class}; - toolTipText: "tuttihelp.manageTemporaryReferential.action.exportTemporaryVesselExample.tip"; - _help: {"tuttihelp.manageTemporaryReferential.action.exportTemporaryVesselExample.help"}; + toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.tip"; + _help: {"tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help"}; } #importVesselButton { actionIcon: import; - text: "tutti.action.importTemporaryVessel"; + text: "tutti.manageTemporaryReferential.action.importTemporaryVessel"; mnemonic: I; _tuttiAction: {ImportTemporaryVesselAction.class}; - toolTipText: "tuttihelp.manageTemporaryReferential.action.importTemporaryVessel.tip"; - _help: {"tuttihelp.manageTemporaryReferential.action.importTemporaryVessel.help"}; + toolTipText: "tutti.manageTemporaryReferential.action.importTemporaryVessel.tip"; + _help: {"tutti.manageTemporaryReferential.action.importTemporaryVessel.help"}; } #gearLabel { - text: "tutti.label.referential.gear"; - toolTipText: "tuttihelp.manageTemporaryReferential.label.referential.gear.tip"; + text: "tutti.manageTemporaryReferential.label.referential.gear"; + toolTipText: "tutti.manageTemporaryReferential.label.referential.gear.tip"; actionIcon: gear; } #exportGearExampleButton { actionIcon: export; - text: "tutti.action.exportTemporaryGearExample"; + text: "tutti.manageTemporaryReferential.action.exportTemporaryGearExample"; mnemonic: E; _tuttiAction: {ExportTemporaryGearExampleAction.class}; - toolTipText: "tuttihelp.manageTemporaryReferential.action.exportTemporaryGearExample.tip"; - _help: {"tuttihelp.manageTemporaryReferential.action.exportTemporaryGearExample.help"}; + toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip"; + _help: {"tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help"}; } #importGearButton { actionIcon: import; - text: "tutti.action.importTemporaryGear"; + text: "tutti.manageTemporaryReferential.action.importTemporaryGear"; mnemonic: I; _tuttiAction: {ImportTemporaryGearAction.class}; - toolTipText: "tuttihelp.manageTemporaryReferential.action.importTemporaryGear.tip"; - _help: {"tuttihelp.manageTemporaryReferential.action.importTemporaryGear.help"}; + toolTipText: "tutti.manageTemporaryReferential.action.importTemporaryGear.tip"; + _help: {"tutti.manageTemporaryReferential.action.importTemporaryGear.help"}; } #personLabel { - text: "tutti.label.referential.person"; - toolTipText: "tuttihelp.manageTemporaryReferential.label.referential.person.tip"; + text: "tutti.manageTemporaryReferential.label.referential.person"; + toolTipText: "tutti.manageTemporaryReferential.label.referential.person.tip"; actionIcon: person; } #exportPersonExampleButton { actionIcon: export; - text: "tutti.action.exportTemporaryPersonExample"; + text: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample"; mnemonic: E; _tuttiAction: {ExportTemporaryPersonExampleAction.class}; - toolTipText: "tuttihelp.manageTemporaryReferential.action.exportTemporaryPersonExample.tip"; - _help: {"tuttihelp.manageTemporaryReferential.action.exportTemporaryPersonExample.help"}; + toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip"; + _help: {"tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help"}; } #importPersonButton { actionIcon: import; - text: "tutti.action.importTemporaryPerson"; + text: "tutti.manageTemporaryReferential.action.importTemporaryPerson"; mnemonic: I; _tuttiAction: {ImportTemporaryPersonAction.class}; - toolTipText: "tuttihelp.manageTemporaryReferential.action.importTemporaryPerson.tip"; - _help: {"tuttihelp.manageTemporaryReferential.action.importTemporaryPerson.help"}; + toolTipText: "tutti.manageTemporaryReferential.action.importTemporaryPerson.tip"; + _help: {"tutti.manageTemporaryReferential.action.importTemporaryPerson.help"}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx 2013-03-15 09:48:31 UTC (rev 629) @@ -56,7 +56,7 @@ initializer='getContextValue(TuttiUIContext.class)'/> <TuttiHelpBroker id='broker' - constructorParams='"tuttihelp.manageTemporaryReferential.help"'/> + constructorParams='"tutti.manageTemporaryReferential.help"'/> <Table constraints='BorderLayout.CENTER'> <row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css 2013-03-15 09:48:31 UTC (rev 629) @@ -28,21 +28,21 @@ } #attachmentBody { - title: "tutti.title.attachment"; + title: "tutti.attachmentEditor.title"; } #fileLabel { - text: "tutti.label.attachmentEditor.file"; + text: "tutti.attachmentEditor.field.file"; labelFor: {file}; } #fileNameLabel { - text: "tutti.label.attachmentEditor.fileName"; + text: "tutti.attachmentEditor.field.fileName"; labelFor: {fileName}; } #fileCommentLabel { - text: "tutti.label.attachmentEditor.fileComment"; + text: "tutti.attachmentEditor.field.fileComment"; labelFor: {fileComment}; } @@ -52,6 +52,7 @@ #closeButton { actionIcon: close; - text: "tutti.action.close"; + text: "tutti.attachmentEditor.action.close"; + toolTipText: "tutti.attachmentEditor.action.close.tip"; mnemonic: F; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -131,7 +131,7 @@ closeAction.putValue(Action.LARGE_ICON_KEY, actionIcon); closeAction.putValue(Action.ACTION_COMMAND_KEY, "close"); closeAction.putValue(Action.NAME, "close"); - closeAction.putValue(Action.SHORT_DESCRIPTION, _("tutti.action.closeAttachment.tip")); + closeAction.putValue(Action.SHORT_DESCRIPTION, _("tutti.attachmentEditor.action.closeAttachment.tip")); rootPane.getActionMap().put(CLOSE_DIALOG_ACTION, closeAction); rootPane.getActionMap().put(SHOW_DIALOG_ACTION, openAction); @@ -253,19 +253,19 @@ try { File attachmentFile = persistenceService.getAttachmentFile(attachment.getId()); File file = TuttiUIUtil.chooseFile(ui, - _("tutti.dialog.saveAttachment.title"), - _("tutti.dialog.saveAttachment.button")); + _("tutti.attachmentEditor.saveAttachment.title"), + _("tutti.attachmentEditor.saveAttachment.button")); if (file != null) { if (file.exists()) { String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.dialog.saveAttachment.warning.message"), - _("tutti.dialog.saveAttachment.warning.help")); + _("tutti.attachmentEditor.saveAttachment.warning.message"), + _("tutti.attachmentEditor.saveAttachment.warning.help")); int answer = JOptionPane.showConfirmDialog(ui, htmlMessage, - _("tutti.dialog.saveAttachment.warning.title"), + _("tutti.attachmentEditor.saveAttachment.warning.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); @@ -275,8 +275,8 @@ } FileUtils.copyFile(attachmentFile, file); TuttiUIUtil.showSuccessMessage(ui, - _("tutti.dialog.saveAttachment.success.title"), - _("tutti.dialog.saveAttachment.success.message", file.getName())); + _("tutti.attachmentEditor.saveAttachment.success.title"), + _("tutti.attachmentEditor.saveAttachment.success.message", file.getName())); } if (hackDialog) { ui.setAlwaysOnTop(true); @@ -288,8 +288,8 @@ } JOptionPane.showMessageDialog( ui, - _("tutti.dialog.saveAttachment.fail.message"), - _("tutti.dialog.saveAttachment.fail.title"), + _("tutti.attachmentEditor.saveAttachment.fail.message"), + _("tutti.attachmentEditor.saveAttachment.fail.title"), JOptionPane.ERROR_MESSAGE ); @@ -307,8 +307,8 @@ ui.setAlwaysOnTop(false); } int answer = JOptionPane.showConfirmDialog(ui, - _("tutti.dialog.deleteAttachment.message", attachment.getName()), - _("tutti.dialog.deleteAttachment.title"), + _("tutti.attachmentEditor.deleteAttachment.message", attachment.getName()), + _("tutti.attachmentEditor.deleteAttachment.title"), JOptionPane.YES_NO_OPTION); if (hackDialog) { ui.setAlwaysOnTop(true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java 2013-03-15 09:48:31 UTC (rev 629) @@ -65,7 +65,7 @@ AttachmentModelAware model) { setIcon(SwingUtil.createActionIcon("edit-attachment")); - setToolTipText(_("tutti.action.attachments.tip")); + setToolTipText(_("tutti.attachmentEditor.action.tip")); popup = new AttachmentEditorUI(context); @@ -120,7 +120,7 @@ } public static String getButtonText(List<Attachment> attachment) { - return _("tutti.action.attachments", attachment.size()); + return _("tutti.attachmentEditor.text", attachment.size()); } public void init() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java 2013-03-15 09:48:31 UTC (rev 629) @@ -58,7 +58,7 @@ CommentModelAware model) { setIcon(SwingUtil.createActionIcon("edit-comment")); - setToolTipText(_("tutti.action.comment.tip")); + setToolTipText(_("tutti.commentEditor.action.tip")); popup = new CommentEditorUI(context); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java 2013-03-15 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) @@ -116,7 +116,7 @@ closeAction.putValue(Action.LARGE_ICON_KEY, actionIcon); closeAction.putValue(Action.ACTION_COMMAND_KEY, "close"); closeAction.putValue(Action.NAME, "close"); - closeAction.putValue(Action.SHORT_DESCRIPTION, _("tutti.action.closeCommentEditor.tip")); + closeAction.putValue(Action.SHORT_DESCRIPTION, _("tutti.commentEditor.action.close.tip")); rootPane.getActionMap().put(CLOSE_DIALOG_ACTION, closeAction); rootPane.getActionMap().put(SHOW_DIALOG_ACTION, openAction); 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-15 09:48:31 UTC (rev 629) @@ -1,725 +0,0 @@ -swing.error.desktop.browse.not.supported= -swing.error.desktop.not.supported= -tutti.about.bottomText= -tutti.about.message= -tutti.about.translate.content=<h3>How to translate Tutti</h3>You can help us to translate or improve label in Tutti.<br/><ul><li>Get the <strong>tutti-i18n.csv</strong> file in the <strong>i18n</strong> directory</li><li>open it in Libre office (separator caracter is <strong>Tab</strong>)</li><li>Do you work \:)</li><li>At last, send us back the modified file</li></ul><br/>We will apply the patch before next release. -tutti.action.about= -tutti.action.addSpecies= -tutti.action.attachments= -tutti.action.attachments.tip= -tutti.action.cancel= -tutti.action.cancelEditCatchBatch= -tutti.action.cancelEditCruise= -tutti.action.cancelEditFishingOperation= -tutti.action.cancelEditProgram= -tutti.action.cancelEditProtocol= -tutti.action.changeLocaleFR= -tutti.action.changeLocaleUK= -tutti.action.chooseDbExportFile= -tutti.action.chooseDbFile= -tutti.action.chooseProtocolCaracteristicFile= -tutti.action.chooseProtocolFile= -tutti.action.chooseProtocolSpeciesFile= -tutti.action.chooseReferentialGearFile= -tutti.action.chooseReferentialPersonFile= -tutti.action.chooseReferentialSpeciesFile= -tutti.action.chooseReferentialVesselFile= -tutti.action.cloneProtocol= -tutti.action.closeAttachment.tip= -tutti.action.closeCommentEditor.tip= -tutti.action.closeDb= -tutti.action.closeEditCruise= -tutti.action.closeEditProgram= -tutti.action.closeEditProtocol= -tutti.action.comment.tip= -tutti.action.computeWeights= -tutti.action.computeWeights.error.incoherentCategoryWeight= -tutti.action.computeWeights.error.incoherentParentCategoryWeight= -tutti.action.computeWeights.error.incoherentRowWeightCategory= -tutti.action.computeWeights.error.incoherentRowWeightFrequency= -tutti.action.computeWeights.error.incoherentSpeciesTotalSorted= -tutti.action.computeWeights.error.incoherentTotal= -tutti.action.computeWeights.error.noWeight= -tutti.action.computeWeights.replaceTotalSortedWeight.help= -tutti.action.computeWeights.replaceTotalSortedWeight.message= -tutti.action.computeWeights.replaceTotalSortedWeight.title= -tutti.action.configuration= -tutti.action.createMelag= -tutti.action.createSpeciesBatch= -tutti.action.deleteProtocol= -tutti.action.deleteProtocol.message= -tutti.action.deleteProtocol.title= -tutti.action.editCatches= -tutti.action.editCruise= -tutti.action.editFishingOperation.tip= -tutti.action.editProgram= -tutti.action.editProtocol= -tutti.action.editSelectedCruise= -tutti.action.editSelectedProgram= -tutti.action.editSelectedProtocol= -tutti.action.exit= -tutti.action.exportAndCleanDb= -tutti.action.exportDb= -tutti.action.exportProtocol= -tutti.action.exportProtocolAllCaracteristic= -tutti.action.exportProtocolCaracteristic= -tutti.action.exportProtocolSpecies= -tutti.action.exportTemporaryGearExample= -tutti.action.exportTemporaryPersonExample= -tutti.action.exportTemporarySpeciesExample= -tutti.action.exportTemporaryVesselExample= -tutti.action.generate= -tutti.action.generateCampaignName= -tutti.action.importCasino= -tutti.action.importDb= -tutti.action.importProtocol= -tutti.action.importProtocolCaracteristic= -tutti.action.importProtocolSpecies= -tutti.action.importPupitri= -tutti.action.importTemporaryGear= -tutti.action.importTemporaryPerson= -tutti.action.importTemporaryReferential= -tutti.action.importTemporarySpecies= -tutti.action.importTemporaryVessel= -tutti.action.installDb= -tutti.action.manageDb= -tutti.action.newCruise= -tutti.action.newProgram= -tutti.action.newProtocol= -tutti.action.openDb= -tutti.action.reload.actions= -tutti.action.reload.application= -tutti.action.reload.ui= -tutti.action.reloadTutti= -tutti.action.removeCaracteristic= -tutti.action.removeSpeciesBatch= -tutti.action.removeSpeciesProtocol= -tutti.action.removeSpeciesSubBatch= -tutti.action.renameSpeciesBatch= -tutti.action.reset.editFishingOperation= -tutti.action.reset.editFishingOperation.tip= -tutti.action.reset.fishingOperationValidState= -tutti.action.save= -tutti.action.saveCatchBatch= -tutti.action.saveCruise= -tutti.action.saveFishingOperation= -tutti.action.saveProgram= -tutti.action.saveProtocol= -tutti.action.selectCruise= -tutti.action.selectOtherSpecies= -tutti.action.showHelp= -tutti.action.site= -tutti.action.splitSpeciesBatch= -tutti.action.updateApplication= -tutti.action.upgradeDb= -tutti.action.validate= -tutti.action.validateCatches= -tutti.application.config= -tutti.application.name= -tutti.common.error= -tutti.config.category.applications= -tutti.config.category.applications.description= -tutti.config.category.shortcuts= -tutti.config.category.shortcuts.description= -tutti.config.category.ui= -tutti.config.category.ui.description= -tutti.dialog.askCancelEditBeforeLeaving.cancelEditCatchBatch= -tutti.dialog.askCancelEditBeforeLeaving.cancelEditFishingOperation= -tutti.dialog.askCancelEditBeforeLeaving.cancelSaveCruise= -tutti.dialog.askCancelEditBeforeLeaving.cancelSaveProgram= -tutti.dialog.askCancelEditBeforeLeaving.cancelSaveProtocol= -tutti.dialog.askCancelEditBeforeLeaving.help= -tutti.dialog.askCancelEditBeforeLeaving.title= -tutti.dialog.askOverwriteFile.help= -tutti.dialog.askOverwriteFile.message= -tutti.dialog.askOverwriteFile.title= -tutti.dialog.askSaveBeforeLeaving.createFishingOperation= -tutti.dialog.askSaveBeforeLeaving.help= -tutti.dialog.askSaveBeforeLeaving.saveCatchBatch= -tutti.dialog.askSaveBeforeLeaving.saveCruise= -tutti.dialog.askSaveBeforeLeaving.saveFishingOperation= -tutti.dialog.askSaveBeforeLeaving.saveProgram= -tutti.dialog.askSaveBeforeLeaving.saveProtocol= -tutti.dialog.askSaveBeforeLeaving.title= -tutti.dialog.catches.species.split.weightNotNull.help= -tutti.dialog.catches.species.split.weightNotNull.message= -tutti.dialog.catches.species.split.weightNotNull.title= -tutti.dialog.createMelag.error.message= -tutti.dialog.createMelag.error.title= -tutti.dialog.createMelag.message= -tutti.dialog.createMelag.title= -tutti.dialog.deleteAttachment.message= -tutti.dialog.deleteAttachment.title= -tutti.dialog.saveAttachment.button= -tutti.dialog.saveAttachment.fail.message= -tutti.dialog.saveAttachment.fail.title= -tutti.dialog.saveAttachment.success.message= -tutti.dialog.saveAttachment.success.title= -tutti.dialog.saveAttachment.title= -tutti.dialog.saveAttachment.warning.help= -tutti.dialog.saveAttachment.warning.message= -tutti.dialog.saveAttachment.warning.title= -tutti.duration.format= -tutti.error.errorpane.htmlmessage= -tutti.file.csv= -tutti.file.protocol= -tutti.file.zip= -tutti.flash.information.all.caractristic.exported= -tutti.flash.information.caracteristic.imported.in.protocol= -tutti.flash.information.caractristic.exported.from.protocol= -tutti.flash.information.cruiseCreated= -tutti.flash.information.cruiseSaved= -tutti.flash.information.db.closed= -tutti.flash.information.db.exported= -tutti.flash.information.db.exported.and.clean= -tutti.flash.information.db.imported= -tutti.flash.information.db.installed= -tutti.flash.information.db.opened= -tutti.flash.information.programCreated= -tutti.flash.information.programSaved= -tutti.flash.information.protocolCreated= -tutti.flash.information.protocolSaved= -tutti.flash.information.species.add.to.protocol= -tutti.flash.information.species.exported.from.protocol= -tutti.flash.information.species.imported.in.protocol= -tutti.flash.information.species.imported.in.protocol.oneReplaced= -tutti.flash.information.species.imported.in.protocol.severalReplaced= -tutti.flash.information.species.remove.from.protocol= -tutti.flash.information.species.replaced= -tutti.information.db.loaded= -tutti.information.no.db.exist= -tutti.information.no.db.loaded= -tutti.label.attachmentEditor.file= -tutti.label.attachmentEditor.fileComment= -tutti.label.attachmentEditor.fileName= -tutti.label.catches.benthosTotalSampleSortedWeight= -tutti.label.catches.benthosTotalSortedWeight= -tutti.label.catches.benthosTotalUnsortedWeight= -tutti.label.catches.benthosTotalWeight= -tutti.label.catches.catchTotalRejectedWeight= -tutti.label.catches.catchTotalSortedCarousselWeight= -tutti.label.catches.catchTotalSortedTremisWeight= -tutti.label.catches.catchTotalSortedWeight= -tutti.label.catches.catchTotalUnsortedWeight= -tutti.label.catches.catchTotalWeight= -tutti.label.catches.macroWasteTotalWeight= -tutti.label.catches.planktonTotalSampleWeight= -tutti.label.catches.planktonTotalWeight= -tutti.label.catches.speciesTotalInertWeight= -tutti.label.catches.speciesTotalLivingNotItemizedWeight= -tutti.label.catches.speciesTotalSampleSortedWeight= -tutti.label.catches.speciesTotalSortedWeight= -tutti.label.catches.speciesTotalUnsortedWeight= -tutti.label.catches.speciesTotalWeight= -tutti.label.comment= -tutti.label.createSpeciesBatch.batchWeight= -tutti.label.createSpeciesBatch.sortedUnsortedCategory= -tutti.label.createSpeciesBatch.species= -tutti.label.cruise= -tutti.label.cruise.beginDate= -tutti.label.cruise.country= -tutti.label.cruise.endDate= -tutti.label.cruise.multirigNumber= -tutti.label.cruise.name= -tutti.label.cruise.program= -tutti.label.cruise.surveyPart= -tutti.label.cruise.year= -tutti.label.filterSpeciesBatchMode.label= -tutti.label.filterSpeciesBatchMode.mode.all= -tutti.label.filterSpeciesBatchMode.mode.leaf= -tutti.label.filterSpeciesBatchMode.mode.root= -tutti.label.filterVesselType= -tutti.label.filterVesselType.all= -tutti.label.filterVesselType.all.tip= -tutti.label.filterVesselType.fishing= -tutti.label.filterVesselType.fishing.tip= -tutti.label.filterVesselType.scientific= -tutti.label.filterVesselType.scientific.tip= -tutti.label.fishingOperation.duration= -tutti.label.fishingOperation.fishingOperationInvalid= -tutti.label.fishingOperation.fishingOperationNumber= -tutti.label.fishingOperation.fishingOperationRectiligne= -tutti.label.fishingOperation.fishingOperationValid= -tutti.label.fishingOperation.fishingOperationValidity= -tutti.label.fishingOperation.gear= -tutti.label.fishingOperation.gearDate= -tutti.label.fishingOperation.gearLatitude= -tutti.label.fishingOperation.gearLongitude= -tutti.label.fishingOperation.gearShootingEnd= -tutti.label.fishingOperation.gearShootingEndDate= -tutti.label.fishingOperation.gearShootingEndLatitude= -tutti.label.fishingOperation.gearShootingEndLatitudeDegree= -tutti.label.fishingOperation.gearShootingEndLatitudeMinute= -tutti.label.fishingOperation.gearShootingEndLatitudeSecond= -tutti.label.fishingOperation.gearShootingEndLongitude= -tutti.label.fishingOperation.gearShootingEndLongitudeDegree= -tutti.label.fishingOperation.gearShootingEndLongitudeMinute= -tutti.label.fishingOperation.gearShootingEndLongitudeSecond= -tutti.label.fishingOperation.gearShootingStart= -tutti.label.fishingOperation.gearShootingStartDate= -tutti.label.fishingOperation.gearShootingStartLatitude= -tutti.label.fishingOperation.gearShootingStartLatitudeDegree= -tutti.label.fishingOperation.gearShootingStartLatitudeMinute= -tutti.label.fishingOperation.gearShootingStartLatitudeSecond= -tutti.label.fishingOperation.gearShootingStartLongitude= -tutti.label.fishingOperation.gearShootingStartLongitudeDegree= -tutti.label.fishingOperation.gearShootingStartLongitudeMinute= -tutti.label.fishingOperation.gearShootingStartLongitudeSecond= -tutti.label.fishingOperation.gearTime= -tutti.label.fishingOperation.location= -tutti.label.fishingOperation.multirigAggregation= -tutti.label.fishingOperation.other= -tutti.label.fishingOperation.stationNumber= -tutti.label.fishingOperation.strata= -tutti.label.fishingOperation.subStrata= -tutti.label.fishingOperation.trawlDistance= -tutti.label.fishingOperation.vessel= -tutti.label.frequencyConfiguration.lengthStepCaracteristic= -tutti.label.frequencyConfiguration.maxStep= -tutti.label.frequencyConfiguration.minStep= -tutti.label.frequencyConfiguration.mode.autoGen= -tutti.label.frequencyConfiguration.mode.autoGen.tip= -tutti.label.frequencyConfiguration.mode.rafale= -tutti.label.frequencyConfiguration.mode.rafale.tip= -tutti.label.frequencyConfiguration.mode.simple= -tutti.label.frequencyConfiguration.mode.simple.tip= -tutti.label.frequencyConfiguration.mode.simpleCounting= -tutti.label.frequencyConfiguration.mode.simpleCounting.tip= -tutti.label.frequencyConfiguration.no.configuration= -tutti.label.frequencyConfiguration.rafaleStep= -tutti.label.frequencyConfiguration.step= -tutti.label.list.gear= -tutti.label.list.headOfMission= -tutti.label.list.headOfSortRoom= -tutti.label.list.recorderPerson= -tutti.label.list.vessel= -tutti.label.no.fishingOperation.selected= -tutti.label.program= -tutti.label.program.name= -tutti.label.program.zone= -tutti.label.protocol= -tutti.label.protocol.clone.warning= -tutti.label.protocol.import.warning= -tutti.label.protocol.name= -tutti.label.referential.gear= -tutti.label.referential.person= -tutti.label.referential.species= -tutti.label.referential.vessel= -tutti.label.sampleCategoryConfiguration.batchWeight= -tutti.label.sampleCategoryConfiguration.category= -tutti.label.sampleCategoryConfiguration.sampleWeight= -tutti.label.sampleCategoryConfiguration.species= -tutti.label.tab.accidentel= -tutti.label.tab.benthos= -tutti.label.tab.catches= -tutti.label.tab.catchesCaracteristics= -tutti.label.tab.fishingOperation= -tutti.label.tab.fishingOperation.gearUseFeature= -tutti.label.tab.fishingOperation.general= -tutti.label.tab.fishingOperation.vesselUseFeature= -tutti.label.tab.macroDechet= -tutti.label.tab.observationIndividuel= -tutti.label.tab.plancton= -tutti.label.tab.protocol.accidental= -tutti.label.tab.protocol.benthos= -tutti.label.tab.protocol.caracteristic= -tutti.label.tab.protocol.caracteristic.gearUseFeature= -tutti.label.tab.protocol.caracteristic.lengthClasses= -tutti.label.tab.protocol.caracteristic.vesselUseFeature= -tutti.label.tab.protocol.info= -tutti.label.tab.protocol.plankton= -tutti.label.tab.protocol.species= -tutti.label.tab.species= -tutti.label.traitReminder= -tutti.label.traitReminder.inCreation= -tutti.legend.catch.benthos= -tutti.legend.catch.macroWaste= -tutti.legend.catch.species= -tutti.legend.catch.total= -tutti.legend.frequencyConfiguration= -tutti.legend.splitSpeciesBatchConfiguration= -tutti.menu.actions= -tutti.menu.administration= -tutti.menu.changeLocale= -tutti.menu.file= -tutti.menu.help= -tutti.message.action.running= -tutti.option.cruiseId.description= -tutti.option.help.directory.description= -tutti.option.i18n.directory.description= -tutti.option.i18n.locale.description= -tutti.option.launch.mode.description= -tutti.option.programId.description= -tutti.option.protocolId.description= -tutti.option.samplingCategoryOrderIds.description= -tutti.option.tremieCarousselVessel.description= -tutti.option.ui.autoPopupNumberEditor.description= -tutti.option.ui.color.blockingLayer.description= -tutti.option.ui.color.cellWithValue.description= -tutti.option.ui.color.computedWeights.description= -tutti.option.ui.color.rowInvalid.description= -tutti.option.ui.color.rowReadOnly.description= -tutti.option.ui.color.rowToConfirm.description= -tutti.option.ui.config.file.description= -tutti.option.ui.coordinateEditorType.description= -tutti.option.ui.dateFormat.description= -tutti.option.ui.shortcut.closePopup.description= -tutti.option.ui.showNumberEditorButton.description= -tutti.option.update.url.description= -tutti.option.weights.rate.difference.totalAndSorted.description= -tutti.sampleCategoryType.age= -tutti.sampleCategoryType.maturity= -tutti.sampleCategoryType.sex= -tutti.sampleCategoryType.size= -tutti.sampleCategoryType.sortedUnsorted= -tutti.table.accidental.batch.header.comment= -tutti.table.accidental.batch.header.file= -tutti.table.accidental.batch.header.speciesByCode= -tutti.table.accidental.batch.header.speciesByGenusCode= -tutti.table.accidental.batch.header.weight= -tutti.table.benthos.batch.header.comment= -tutti.table.benthos.batch.header.file= -tutti.table.benthos.batch.header.number= -tutti.table.benthos.batch.header.sampleWeight= -tutti.table.benthos.batch.header.speciesByCode= -tutti.table.benthos.batch.header.speciesByGenusCode= -tutti.table.benthos.batch.header.toConfirm= -tutti.table.benthos.batch.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.table.macrowaste.batch.header.comment= -tutti.table.macrowaste.batch.header.file= -tutti.table.macrowaste.batch.header.macroWasteCategory= -tutti.table.macrowaste.batch.header.macroWasteSizeCategory= -tutti.table.macrowaste.batch.header.number= -tutti.table.macrowaste.batch.header.weight= -tutti.table.plankton.batch.header.comment= -tutti.table.plankton.batch.header.file= -tutti.table.plankton.batch.header.sampleWeight= -tutti.table.plankton.batch.header.speciesByCode= -tutti.table.plankton.batch.header.speciesByGenusCode= -tutti.table.plankton.batch.header.toConfirm= -tutti.table.plankton.batch.header.weight= -tutti.table.protocol.species.header.age= -tutti.table.protocol.species.header.age.tip= -tutti.table.protocol.species.header.calcifySample= -tutti.table.protocol.species.header.calcifySample.tip= -tutti.table.protocol.species.header.countIfNoFrequency= -tutti.table.protocol.species.header.countIfNoFrequency.tip= -tutti.table.protocol.species.header.lengthStep= -tutti.table.protocol.species.header.lengthStep.tip= -tutti.table.protocol.species.header.maturity= -tutti.table.protocol.species.header.maturity.tip= -tutti.table.protocol.species.header.sex= -tutti.table.protocol.species.header.sex.tip= -tutti.table.protocol.species.header.size= -tutti.table.protocol.species.header.size.tip= -tutti.table.protocol.species.header.speciesReferenceTaxonId= -tutti.table.protocol.species.header.speciesReferenceTaxonId.tip= -tutti.table.protocol.species.header.speciesSurveyCode= -tutti.table.protocol.species.header.speciesSurveyCode.tip= -tutti.table.protocol.species.header.weight= -tutti.table.protocol.species.header.weight.tip= -tutti.table.species.batch.header.ageCategory= -tutti.table.species.batch.header.comment= -tutti.table.species.batch.header.computedNumber= -tutti.table.species.batch.header.file= -tutti.table.species.batch.header.maturityCategory= -tutti.table.species.batch.header.sexCategory= -tutti.table.species.batch.header.sizeCategory= -tutti.table.species.batch.header.sortedUnsortedCategory= -tutti.table.species.batch.header.species= -tutti.table.species.batch.header.toConfirm= -tutti.table.species.batch.header.weight= -tutti.table.species.frequency.header.lengthStep= -tutti.table.species.frequency.header.number= -tutti.table.species.frequency.header.weight= -tutti.table.species.sampleCategory.header.category= -tutti.table.species.sampleCategory.header.selected= -tutti.table.species.sampleCategory.header.weight= -tutti.timeeditor.H= -tutti.title.about= -tutti.title.about.translate=Translate Tutti -tutti.title.attachment= -tutti.title.choose.dbExportFile= -tutti.title.choose.dbImportFile= -tutti.title.choose.exportTemporaryGearExampleFile= -tutti.title.choose.exportTemporaryPersonExampleFile= -tutti.title.choose.exportTemporarySpeciesExampleFile= -tutti.title.choose.exportTemporaryVesselExampleFile= -tutti.title.choose.importTemporaryGearFile= -tutti.title.choose.importTemporaryPersonFile= -tutti.title.choose.importTemporarySpeciesFile= -tutti.title.choose.importTemporaryVesselFile= -tutti.title.choose.protocolCaracteristicExportFile= -tutti.title.choose.protocolCaracteristicImportFile= -tutti.title.choose.protocolExportFile= -tutti.title.choose.protocolImportFile= -tutti.title.choose.protocolSpeciesExportFile= -tutti.title.choose.protocolSpeciesImportFile= -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.samplingOrder= -tutti.title.selectSpecies= -tutti.title.selectedCruise= -tutti.title.selectedProgram= -tutti.title.selectedProtocol= -tutti.title.splitBatch= -tutti.title.validate.operations= -tutti.to.be.done= -tutti.tooltip.attachment.button.open= -tutti.tooltip.attachment.button.remove= -tutti.tooltip.attachment.button.save= -tutti.tooltip.attachment.none= -tutti.tooltip.comment.none= -tutti.tooltip.distanceInMilles= -tutti.ui.common.error= -tutti.validator.error.comment.too.long= -tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue= -tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required= -tutti.validator.error.createSpeciesBatch.species.required= -tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable= -tutti.validator.error.cruise.beginDate.required= -tutti.validator.error.cruise.country.required= -tutti.validator.error.cruise.dates.endBeforeStart= -tutti.validator.error.cruise.endDate.required= -tutti.validator.error.cruise.gear.required= -tutti.validator.error.cruise.headOfMission.required= -tutti.validator.error.cruise.headOfSortRoom.required= -tutti.validator.error.cruise.multirigNumber.required= -tutti.validator.error.cruise.name.required= -tutti.validator.error.cruise.program.required= -tutti.validator.error.cruise.vessel.required= -tutti.validator.error.cruise.year.required= -tutti.validator.error.fishingOperation.catcher.required= -tutti.validator.error.fishingOperation.comment.required= -tutti.validator.error.fishingOperation.date.end.required= -tutti.validator.error.fishingOperation.date.start.required= -tutti.validator.error.fishingOperation.dates.endBeforeStart= -tutti.validator.error.fishingOperation.dates.endOutOfCruiseDates= -tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates= -tutti.validator.error.fishingOperation.dates.wrongTime= -tutti.validator.error.fishingOperation.existingKey= -tutti.validator.error.fishingOperation.fishingOperationNumber.required= -tutti.validator.error.fishingOperation.fishingOperationValid.required= -tutti.validator.error.fishingOperation.gear.required= -tutti.validator.error.fishingOperation.stationNumber.required= -tutti.validator.error.fishingOperation.stationNumber.too.long= -tutti.validator.error.fishingOperation.strataLocation.required= -tutti.validator.error.fishingOperation.trawlDistance.required= -tutti.validator.error.fishingOperation.trawlDistance.tooLong= -tutti.validator.error.fishingOperation.trawlNetNumber.required= -tutti.validator.error.fishingOperation.vessel.required= -tutti.validator.error.latitude.end.required= -tutti.validator.error.latitude.start.required= -tutti.validator.error.longitude.end.required= -tutti.validator.error.longitude.start.required= -tutti.validator.error.program.comment.required= -tutti.validator.error.program.existingKey= -tutti.validator.error.program.name.required= -tutti.validator.error.program.zone.required= -tutti.validator.error.protocol.name.alreadyUsed= -tutti.validator.error.protocol.name.required= -tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required= -tutti.validator.error.speciesFrequency.oneRowRequired= -tutti.validator.error.splitSpeciesBatch.sampleWeight.invalidValue= -tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight= -tutti.validator.error.splitSpeciesBatch.selectedCategory.required= -tutti.validator.warning.cruise.name.format= -tutti.validator.warning.latitude.degree.outOfBounds= -tutti.validator.warning.latitude.minute.outOfBounds= -tutti.validator.warning.latitude.outOfBounds= -tutti.validator.warning.latitude.second.outOfBounds= -tutti.validator.warning.longitude.degree.outOfBounds= -tutti.validator.warning.longitude.minute.outOfBounds= -tutti.validator.warning.longitude.outOfBounds= -tutti.validator.warning.longitude.second.outOfBounds= -tutti.warn.invalid.batch.model= -tutti.warn.invalid.selected.data= -tuttihelp.createSpeciesBatch.action.addSpecies.tip= -tuttihelp.createSpeciesBatch.action.cancel.tip= -tuttihelp.createSpeciesBatch.action.save.tip= -tuttihelp.createSpeciesBatch.field.batchWeightField.tip= -tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.tip= -tuttihelp.createSpeciesBatch.field.speciesComboBox.tip= -tuttihelp.dbManager.action.closeDb.tip= -tuttihelp.dbManager.action.exportAndCleanDb.tip= -tuttihelp.dbManager.action.exportDb.tip= -tuttihelp.dbManager.action.importDb.tip= -tuttihelp.dbManager.action.installDb.tip= -tuttihelp.dbManager.action.openDb.tip= -tuttihelp.dbManager.action.upgradeDb.tip= -tuttihelp.editCatchBatch.action.cancelEditCatchBatch.tip= -tuttihelp.editCatchBatch.action.computeWeights.tip= -tuttihelp.editCatchBatch.action.importPupitri.tip= -tuttihelp.editCatchBatch.action.saveCatchBatch.tip= -tuttihelp.editCatchBatch.field.benthosTotalSampleSortedWeight.tip= -tuttihelp.editCatchBatch.field.benthosTotalSortedWeight.tip= -tuttihelp.editCatchBatch.field.benthosTotalUnsortedWeight.tip= -tuttihelp.editCatchBatch.field.benthosTotalWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalRejectedWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalSortedCarousselWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalSortedTremisWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalSortedWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalUnsortedWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalWeight.tip= -tuttihelp.editCatchBatch.field.macroWasteTotalWeight.tip= -tuttihelp.editCatchBatch.field.speciesTotalSampleSortedWeight.tip= -tuttihelp.editCatchBatch.field.speciesTotalSortedWeight.tip= -tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.tip= -tuttihelp.editCatchBatch.field.speciesTotalWeight.tip= -tuttihelp.editCruise.action.cancelEditCruise.tip= -tuttihelp.editCruise.action.closeEditCruise.tip= -tuttihelp.editCruise.action.generateName.tip= -tuttihelp.editCruise.action.saveCruise.tip= -tuttihelp.editCruise.field.beginDate.tip= -tuttihelp.editCruise.field.comment.tip= -tuttihelp.editCruise.field.country.tip= -tuttihelp.editCruise.field.endDate.tip= -tuttihelp.editCruise.field.multirigNumber.tip= -tuttihelp.editCruise.field.name.tip= -tuttihelp.editCruise.field.program.tip= -tuttihelp.editCruise.field.surveyPart.tip= -tuttihelp.editCruise.field.year.tip= -tuttihelp.editCruise.filterVessel.tip= -tuttihelp.editCruise.list.gear.tip= -tuttihelp.editCruise.list.headOfMission.tip= -tuttihelp.editCruise.list.headOfSortRoom.tip= -tuttihelp.editCruise.list.vessel.tip= -tuttihelp.editFishingOperation.action.attachments.tip= -tuttihelp.editFishingOperation.action.cancelEditFishingOperation.tip= -tuttihelp.editFishingOperation.action.importCasino.tip= -tuttihelp.editFishingOperation.action.saveEditFishingOperation.tip= -tuttihelp.editFishingOperation.field.comment.tip= -tuttihelp.editFishingOperation.field.duration.tip= -tuttihelp.editFishingOperation.field.fishingOperationNumber.tip= -tuttihelp.editFishingOperation.field.fishingOperationRectiligne.tip= -tuttihelp.editFishingOperation.field.fishingOperationValid.tip= -tuttihelp.editFishingOperation.field.gear.tip= -tuttihelp.editFishingOperation.field.gearDate.tip= -tuttihelp.editFishingOperation.field.gearLatitude.tip= -tuttihelp.editFishingOperation.field.gearLongitude.tip= -tuttihelp.editFishingOperation.field.gearShootingEnd.tip= -tuttihelp.editFishingOperation.field.gearShootingEndLatitude.tip= -tuttihelp.editFishingOperation.field.gearShootingEndLongitude.tip= -tuttihelp.editFishingOperation.field.gearShootingStart.tip= -tuttihelp.editFishingOperation.field.gearShootingStartLatitude.tip= -tuttihelp.editFishingOperation.field.gearTime.tip= -tuttihelp.editFishingOperation.field.location.tip= -tuttihelp.editFishingOperation.field.multirigAggregation.tip= -tuttihelp.editFishingOperation.field.stationNumber.tip= -tuttihelp.editFishingOperation.field.strata.tip= -tuttihelp.editFishingOperation.field.subStrata.tip= -tuttihelp.editFishingOperation.field.trawlDistance.tip= -tuttihelp.editFishingOperation.field.vessel.tip= -tuttihelp.editFishingOperation.gearShootingStartLongitude.tip= -tuttihelp.editFishingOperation.list.recorderPerson.tip= -tuttihelp.editProgram.action.cancelEditProgram.tip= -tuttihelp.editProgram.action.closeEditProgram.tip= -tuttihelp.editProgram.action.saveProgram.tip= -tuttihelp.editProgram.field.comment.tip= -tuttihelp.editProgram.field.name.tip= -tuttihelp.editProgram.field.zone.tip= -tuttihelp.editProtocol.action.addSpeciesProtocol.tip= -tuttihelp.editProtocol.action.cancelEditProtocol.tip= -tuttihelp.editProtocol.action.closeEditProtocol.tip= -tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.tip= -tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip= -tuttihelp.editProtocol.action.exportProtocolSpecies.tip= -tuttihelp.editProtocol.action.importProtocolCaracteristic.tip= -tuttihelp.editProtocol.action.importProtocolSpecies.tip= -tuttihelp.editProtocol.action.removeSpeciesProtocol.tip= -tuttihelp.editProtocol.action.saveProtocol.tip= -tuttihelp.editProtocol.action.selectOtherSpecies.tip= -tuttihelp.editProtocol.field..tip= -tuttihelp.editProtocol.field.comment.tip= -tuttihelp.editSpeciesBatch.action.createMelag.tip= -tuttihelp.editSpeciesBatch.action.removeSpeciesBatch.tip= -tuttihelp.editSpeciesBatch.action.removeSpeciesSubBatch.tip= -tuttihelp.editSpeciesBatch.action.splitSpeciesBatch.tip= -tuttihelp.editSpeciesBatch.createSpeciesBatch.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalInertWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalSortedWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalWeight.tip= -tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.all.tip= -tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.leaf.tip= -tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.root.tip= -tuttihelp.editSpeciesBatch.filterSpeciesBatch.tip= -tuttihelp.editSpeciesBatch.renameSpeciesBatch.tip= -tuttihelp.fishingOperations.action.newFishingOperation.tip= -tuttihelp.main.action.about.tip= -tuttihelp.main.action.actions.tip= -tuttihelp.main.action.administration.tip= -tuttihelp.main.action.changeLocale.tip= -tuttihelp.main.action.changeLocaleFR.tip= -tuttihelp.main.action.changeLocaleUK.tip= -tuttihelp.main.action.configuration.tip= -tuttihelp.main.action.editCatches.tip= -tuttihelp.main.action.editProgram.tip= -tuttihelp.main.action.editSelectedCruise.tip= -tuttihelp.main.action.editSelectedProtocol.tip= -tuttihelp.main.action.exit.tip= -tuttihelp.main.action.file.tip= -tuttihelp.main.action.help.tip= -tuttihelp.main.action.importTemporaryReferential.tip= -tuttihelp.main.action.manageDb.tip= -tuttihelp.main.action.selectCruise.tip= -tuttihelp.main.action.showHelp.tip= -tuttihelp.main.action.site.tip= -tuttihelp.main.action.updateApplication.tip= -tuttihelp.main.action.validateCatches.tip= -tuttihelp.manageTemporaryReferential.action.exportTemporaryGearExample.tip= -tuttihelp.manageTemporaryReferential.action.exportTemporaryPersonExample.tip= -tuttihelp.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip= -tuttihelp.manageTemporaryReferential.action.exportTemporaryVesselExample.tip= -tuttihelp.manageTemporaryReferential.action.importTemporaryGear.tip= -tuttihelp.manageTemporaryReferential.action.importTemporaryPerson.tip= -tuttihelp.manageTemporaryReferential.action.importTemporarySpecies.tip= -tuttihelp.manageTemporaryReferential.action.importTemporaryVessel.tip= -tuttihelp.manageTemporaryReferential.label.referential.gear.tip= -tuttihelp.manageTemporaryReferential.label.referential.person.tip= -tuttihelp.manageTemporaryReferential.label.referential.species.tip= -tuttihelp.manageTemporaryReferential.label.referential.vessel.tip= -tuttihelp.selectCruise.action.cloneProtocol.tip= -tuttihelp.selectCruise.action.deleteProtocol.tip= -tuttihelp.selectCruise.action.editCatches.tip= -tuttihelp.selectCruise.action.editCruise.tip= -tuttihelp.selectCruise.action.editProgram.tip= -tuttihelp.selectCruise.action.editProtocol.tip= -tuttihelp.selectCruise.action.exportProtocol.tip= -tuttihelp.selectCruise.action.importProtocol.tip= -tuttihelp.selectCruise.action.newCruise.tip= -tuttihelp.selectCruise.action.newProgram.tip= -tuttihelp.selectCruise.action.newProtocol.tip= -tuttihelp.selectCruise.action.validateCatches.tip= -tuttihelp.selectCruise.field.cruise.tip= -tuttihelp.selectCruise.field.program.tip= -tuttihelp.selectCruise.field.protocol.tip= -tuttihelp.splitSpeciesBatch.action.cancel.tip= -tuttihelp.splitSpeciesBatch.action.save.tip= -tuttihelp.splitSpeciesBatch.field.batchWeightField.tip= -tuttihelp.splitSpeciesBatch.field.categoryField.tip= -tuttihelp.splitSpeciesBatch.field.sampleWeightField.tip= -tuttihelp.splitSpeciesBatch.field.speciesField.tip= 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 00:56:49 UTC (rev 628) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-15 09:48:31 UTC (rev 629) @@ -3,118 +3,125 @@ 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.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.about=À propos -tutti.action.addSpecies=... -tutti.action.attachments=(%s) -tutti.action.attachments.tip=Pièces jointes -tutti.action.cancel=Annuler -tutti.action.sampleOrder.tip=Réordonner les catégories d'échantilonnage -tutti.action.cancelEditCatchBatch=Réinitialiser +tutti.main.action.about=À propos +tutti.createSpeciesBatch.action.addSpecies=... +tutti.attachmentEditor.text=(%s) +tutti.attachmentEditor.action.tip=Pièces jointes +tutti.splitSpeciesBatch.action.cancel=Annuler +tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser tutti.action.cancelEditCruise=Annuler -tutti.action.cancelEditFishingOperation=Annuler +tutti.editFishingOperation.action.cancelEditFishingOperation=Annuler tutti.action.cancelEditProgram=Annuler tutti.action.cancelEditProtocol=Annuler -tutti.action.changeLocaleFR=Français -tutti.action.changeLocaleUK=Anglais -tutti.action.chooseDbExportFile=Exporter la base de données -tutti.action.chooseDbFile=Choisir la base à importer -tutti.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques -tutti.action.chooseProtocolFile=Choisir le fichier de protocole -tutti.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces -tutti.action.chooseReferentialGearFile=Choisir le fichier de référentiel engin -tutti.action.chooseReferentialPersonFile=Choisir le fichier de référentiel personne -tutti.action.chooseReferentialSpeciesFile=Choisir le fichier de référentiel espèce -tutti.action.chooseReferentialVesselFile=Choisir le fichier de référentiel navire -tutti.action.cloneProtocol=Cloner -tutti.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes -tutti.action.closeCommentEditor.tip=Fermer la fenêtre des commentaires -tutti.action.closeDb=Fermer -tutti.action.closeEditCruise=Fermer -tutti.action.closeEditProgram=Fermer -tutti.action.closeEditProtocol=Fermer -tutti.action.comment.tip=Commentaire -tutti.action.computeWeights=Elever les poids -tutti.action.computeWeights.error.incoherentCategoryWeight=Le poids total des mensurations est supérieur au poids de la catégorie -tutti.action.computeWeights.error.incoherentParentCategoryWeight=Le poids de la catégorie est différent de la somme des poids de ses sous-catégories -tutti.action.computeWeights.error.incoherentRowWeightCategory=Le poids de la catégorie ne peut pas être nul si le poids de sous-échantillonage est renseigné -tutti.action.computeWeights.error.incoherentRowWeightFrequency=Le poids total des mensurations est différent du poids du sous-échantillon -tutti.action.computeWeights.error.incoherentSpeciesTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié -tutti.action.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés -tutti.action.computeWeights.error.noWeight=Un lot n'a pas de poids -tutti.action.computeWeights.replaceTotalSortedWeight.help=Est-ce bien une valeur observée ?<ul><li><strong>Non</strong> pour remplacer la valeur saisie par le poids calculé</li><li><strong>Oui</strong> pour garder la valeur saisie</li></ul>. -tutti.action.computeWeights.replaceTotalSortedWeight.message=Le Poids total VRAC saisi est supérieur de moins de %s%% au Poids total Vrac trié. -tutti.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié -tutti.action.configuration=Configuration -tutti.action.createMelag=Èspèces d'un MELAG -tutti.action.createSpeciesBatch=Créer un lot pour une espèce -tutti.action.deleteProtocol=Supprimer -tutti.action.deleteProtocol.message=Vous êtes sur le point de supprimer le protocol %s -tutti.action.deleteProtocol.title=Supprimer le protocole sélectioné -tutti.action.editCatches=Saisir les captures -tutti.action.editCruise=Éditer -tutti.action.editFishingOperation.tip=Éditer l'opération de pêche -tutti.action.editProgram=Éditer -tutti.action.editProtocol=Éditer -tutti.action.editSelectedCruise=Campagne -tutti.action.editSelectedProgram=Série de campagne -tutti.action.editSelectedProtocol=Protocole -tutti.action.exit=Quitter -tutti.action.exportAndCleanDb=Exporter et supprimer -tutti.action.exportDb=Exporter -tutti.action.exportProtocol=Exporter -tutti.action.exportProtocolAllCaracteristic=Exporter toutes les caractéristiques -tutti.action.exportProtocolCaracteristic=Exporter les caractéristiques -tutti.action.exportProtocolSpecies=Exporter les espèces -tutti.action.exportTemporaryGearExample=Exporter -tutti.action.exportTemporaryPersonExample=Exporter -tutti.action.exportTemporarySpeciesExample=Exporter -tutti.action.exportTemporaryVesselExample=Exporter -tutti.action.generate=Générer -tutti.action.generateCampaignName=Générer le nom -tutti.action.importCasino=Import Casino -tutti.action.importDb=Importer une base -tutti.action.importProtocol=Importer -tutti.action.importProtocolCaracteristic=Importer les caractéristiques -tutti.action.importProtocolSpecies=Importer les espèces -tutti.action.importPupitri=Import Pupitri -tutti.action.importTemporaryGear=Importer -tutti.action.importTemporaryPerson=Importer -tutti.action.importTemporaryReferential=Référentiels temporaires -tutti.action.importTemporarySpecies=Importer -tutti.action.importTemporaryVessel=Importer -tutti.action.installDb=Installer -tutti.action.manageDb=Gestionnaire de base -tutti.action.newCruise=Nouveau -tutti.action.newProgram=Nouveau -tutti.action.newProtocol=Nouveau -tutti.action.openDb=Ouvrir -tutti.action.reload.actions=Recharger les actions -tutti.action.reload.application=Recharger l'application -tutti.action.reload.ui=Recharger l'interface graphique +tutti.main.action.changeLocaleFR=Français +tutti.main.action.changeLocaleUK=Anglais +tutti.dbManager.action.chooseDbExportFile=Exporter la base de données +tutti.dbManager.action.chooseDbFile=Choisir la base à importer +tutti.editProtocol.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques +tutti.selectCruise.action.chooseProtocolFile=Choisir le fichier de protocole +tutti.editProtocol.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces +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 +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile=Choisir le fichier de référentiel navire +tutti.selectCruise.action.cloneProtocol=Cloner +tutti.attachmentEditor.action.close=Fermer +tutti.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes +tutti.commentEditor.action.close.tip=Fermer la fenêtre des commentaires +tutti.dbManager.action.closeDb=Fermer +tutti.editCruise.action.closeEditCruise=Fermer +tutti.editProgram.action.closeEditProgram=Fermer +tutti.editProtocol.action.closeEditProtocol=Fermer +tutti.commentEditor.action.tip=Commentaire +tutti.editCatchBatch.action.computeWeights=Elever les poids +tutti.editCatchBatch.action.computeWeights.error.incoherentCategoryWeight=Le poids total des mensurations est supérieur au poids de la catégorie +tutti.editCatchBatch.action.computeWeights.error.incoherentParentCategoryWeight=Le poids de la catégorie est différent de la somme des poids de ses sous-catégories +tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightCategory=Le poids de la catégorie ne peut pas être nul si le poids de sous-échantillonage est renseigné +tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightFrequency=Le poids total des mensurations est différent du poids du sous-échantillon +tutti.editCatchBatch.action.computeWeights.error.incoherentSpeciesTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié +tutti.editCatchBatch.action.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés +tutti.editCatchBatch.action.computeWeights.error.noWeight=Un lot n'a pas de poids +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help=Est-ce bien une valeur observée ?<ul><li><strong>Non</strong> pour remplacer la valeur saisie par le poids calculé</li><li><strong>Oui</strong> pour garder la valeur saisie</li></ul>. +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message=Le Poids total VRAC saisi est supérieur de moins de %s%% au Poids total Vrac trié. +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié +tutti.main.action.configuration=Configuration +tutti.editSpeciesBatch.tutti.action.createMelag=Èspèces d'un MELAG +tutti.editSpeciesBatch.tutti.action.createSpeciesBatch=Créer un lot pour une espèce +tutti.selectCruise.action.deleteProtocol=Supprimer +tutti.selectCruise.action.deleteProtocol.message=Vous êtes sur le point de supprimer le protocol %s +tutti.selectCruise.action.deleteProtocol.title=Supprimer le protocole sélectioné +tutti.main.action.editCatches=Saisir les captures +tutti.selectCruise.action.editCatches=Saisir les captures +tutti.selectCruise.action.editCruise=Éditer +tutti.editFishingOperation.action.editFishingOperation.tip=Éditer l'opération de pêche +tutti.selectCruise.action.editProgram=Éditer +tutti.selectCruise.action.editProtocol=Éditer +tutti.main.action.editSelectedCruise=Campagne +tutti.main.action.editSelectedProgram=Série de campagne +tutti.main.action.editSelectedProtocol=Protocole +tutti.main.action.exit=Quitter +tutti.dbManager.action.exportAndCleanDb=Exporter et supprimer +tutti.dbManager.action.exportDb=Exporter +tutti.selectCruise.action.exportProtocol=Exporter +tutti.editProtocol.action.exportProtocolAllCaracteristic=Exporter toutes les caractéristiques +tutti.editProtocol.action.exportProtocolCaracteristic=Exporter les caractéristiques +tutti.editProtocol.action.exportProtocolSpecies=Exporter les espèces +tutti.manageTemporaryReferential.action.exportTemporaryGearExample=Exporter +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample=Exporter +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample=Exporter +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample=Exporter +tutti.editSpeciesFrequencies.action.generate=Générer +tutti.editCruise.action.generateCampaignName=Générer le nom +tutti.editFishingOperation.action.importCasino=Import Casino +tutti.dbManager.action.importDb=Importer une base +tutti.selectCruise.action.importProtocol=Importer +tutti.editProtocol.action.importProtocolCaracteristic=Importer les caractéristiques +tutti.editProtocol.action.importProtocolSpecies=Importer les espèces +tutti.editCatchBatch.action.importPupitri=Import Pupitri +tutti.manageTemporaryReferential.action.importTemporaryGear=Importer +tutti.manageTemporaryReferential.action.importTemporaryPerson=Importer +tutti.main.action.importTemporaryReferential=Référentiels temporaires +tutti.manageTemporaryReferential.action.importTemporarySpecies=Importer +tutti.manageTemporaryReferential.action.importTemporaryVessel=Importer +tutti.dbManager.action.installDb=Installer +tutti.main.action.manageDb=Gestionnaire de base +tutti.selectCruise.action.newCruise=Nouveau +tutti.selectCruise.action.newProgram=Nouveau +tutti.selectCruise.action.newProtocol=Nouveau +tutti.dbManager.action.openDb=Ouvrir +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.action.reloadTutti=Redémarrer Tutti tutti.action.removeCaracteristic=Supprimer la caractéristique -tutti.action.removeSpeciesBatch=Supprimer le lot -tutti.action.removeSpeciesProtocol=Supprimer l'espèce -tutti.action.removeSpeciesSubBatch=Supprimer les lots fils -tutti.action.renameSpeciesBatch=Corriger l'espèce -tutti.action.reset.editFishingOperation=Réinitialiser -tutti.action.reset.editFishingOperation.tip=Réinitialiser l'édition du trait -tutti.action.reset.fishingOperationValidState=Réinitialiser -tutti.action.save=Enregistrer -tutti.action.saveCatchBatch=Sauver -tutti.action.saveCruise=Enregistrer -tutti.action.saveFishingOperation=Enregistrer -tutti.action.saveProgram=Enregistrer -tutti.action.saveProtocol=Enregistrer -tutti.action.selectCruise=Sélectionner une campagne -tutti.action.selectOtherSpecies=... -tutti.action.showHelp=Aide -tutti.action.site=Site -tutti.action.splitSpeciesBatch=Catégoriser le lot -tutti.action.updateApplication=Vérifier les mises à jour -tutti.action.upgradeDb=Vérifier les mises à jour +tutti.editSpeciesBatch.tutti.action.removeSpeciesBatch=Supprimer le lot +tutti.editProtocol.action.removeSpeciesProtocol=Supprimer l'espèce +tutti.editSpeciesBatch.tutti.action.removeSpeciesSubBatch=Supprimer les lots fils +tutti.editSpeciesBatch.tutti.action.renameSpeciesBatch=Corriger l'espèce +tutti.editFishingOperation.action.resetEditFishingOperation=Réinitialiser +tutti.editFishingOperation.action.resetEditFishingOperation.tip=Réinitialiser l'édition du trait +tutti.editFishingOperation.action.resetFishingOperationValidState=Réinitialiser +tutti.action.sampleOrder.tip=Réordonner les catégories d'échantilonnage +tutti.editSpeciesFrequencies.action.cancel=Annuler +tutti.editSpeciesFrequencies.action.save=Enregistrer +tutti.createSpeciesBatch.action.cancel=Annuler +tutti.createSpeciesBatch.action.save=Enregistrer +tutti.splitSpeciesBatch.action.save=Enregistrer +tutti.editCatchBatch.action.saveCatchBatch=Sauver +tutti.editCruise.action.saveCruise=Enregistrer +tutti.editFishingOperation.action.saveFishingOperation=Enregistrer +tutti.editProgram.action.saveProgram=Enregistrer +tutti.editProtocol.action.saveProtocol=Enregistrer +tutti.main.action.selectCruise=Sélectionner une campagne +tutti.editProtocol.action.selectOtherSpecies=... +tutti.main.action.showHelp=Aide +tutti.main.action.site=Site +tutti.editSpeciesBatch.tutti.action.splitSpeciesBatch=Catégoriser le lot +tutti.main.action.updateApplication=Vérifier les mises à jour +tutti.dbManager.action.upgradeDb=Vérifier les mises à jour tutti.action.validate=Valider -tutti.action.validateCatches=Valider les captures +tutti.main.action.validateCatches=Valider les captures +tutti.selectCruise.action.validateCatches=Valider les captures tutti.application.config=Configuration de l'application Tutti tutti.application.name=Tutti tutti.common.error=Erreur @@ -124,226 +131,241 @@ tutti.config.category.shortcuts.description=Liste des raccourcis clavier tutti.config.category.ui=Interface utilisateur tutti.config.category.ui.description=Options de l'interface utilisateur -tutti.dialog.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture n'est pas valide et ne peut pas être enregistrée. -tutti.dialog.askCancelEditBeforeLeaving.cancelEditFishingOperation=Le trait modifié n'est pas valide et ne peut pas être enregistré. -tutti.dialog.askCancelEditBeforeLeaving.cancelSaveCruise=La campagne n'est pas valide et ne peut pas être enregistrée. -tutti.dialog.askCancelEditBeforeLeaving.cancelSaveProgram=La série de campagne n'est pas valide et ne peut pas être enregistrée. -tutti.dialog.askCancelEditBeforeLeaving.cancelSaveProtocol=Le protocole n'est pas valide et ne peut pas être enregistré. +tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture n'est pas valide et ne peut pas être enregistrée. +tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation=Le trait modifié n'est pas valide et ne peut pas être enregistré. +tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise=La campagne n'est pas valide et ne peut pas être enregistrée. +tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram=La série de campagne n'est pas valide et ne peut pas être enregistrée. +tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol=Le protocole n'est pas valide et ne peut pas être enregistré. tutti.dialog.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.dialog.askCancelEditBeforeLeaving.title=Modifications non enregistrées mais invalides tutti.dialog.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.dialog.askOverwriteFile.message=Le fichier %s existe déjà, confirmer pour l'écraser. tutti.dialog.askOverwriteFile.title=Confirmer l'écrasement d'un fichier... -tutti.dialog.askSaveBeforeLeaving.createFishingOperation=Le trait n'a pas été créé. +tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation=Le trait n'a pas été créé. tutti.dialog.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.dialog.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées. -tutti.dialog.askSaveBeforeLeaving.saveCruise=Des modifications sur la campagne n'ont pas été enregistrées. -tutti.dialog.askSaveBeforeLeaving.saveFishingOperation=Des modifications sur le trait n'ont pas été enregistrées. -tutti.dialog.askSaveBeforeLeaving.saveProgram=Des modifications sur la série de campagne n'ont pas été enregistrées. -tutti.dialog.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées. +tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées. +tutti.editCruise.askSaveBeforeLeaving.saveCruise=Des modifications sur la campagne n'ont pas été enregistrées. +tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation=Des modifications sur le trait n'ont pas été enregistrées. +tutti.editProgram.askSaveBeforeLeaving.saveProgram=Des modifications sur la série de campagne n'ont pas été enregistrées. +tutti.editProtocol.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées. tutti.dialog.askSaveBeforeLeaving.title=Modifications non enregistrées tutti.dialog.catches.species.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.dialog.catches.species.split.weightNotNull.message=Pour catégoriser un lot, il ne doit pas avoir de poids sous-échantillonné. tutti.dialog.catches.species.split.weightNotNull.title=Poids sous-échantillonné non nul -tutti.dialog.createMelag.error.message=Erreur à la ligne %s -tutti.dialog.createMelag.error.title=Erreur -tutti.dialog.createMelag.message=Combien pesait le MELAG (kg) ? -tutti.dialog.createMelag.title=Poids du MELAG (kg) -tutti.dialog.deleteAttachment.message=Êtes-vous sûr de vouloir supprimer la pièce-jointe %s ? -tutti.dialog.deleteAttachment.title=Suppression de pièce-jointe -tutti.dialog.saveAttachment.button=Choisir -tutti.dialog.saveAttachment.fail.message=Une erreur est survenue lors de la sauvegarde du fichier. -tutti.dialog.saveAttachment.fail.title=Erreur de sauvegarde. -tutti.dialog.saveAttachment.success.message=Le fichier %s a été sauvegardé sur votre machine. -tutti.dialog.saveAttachment.success.title=Sauvegarde réussie. -tutti.dialog.saveAttachment.title=Choisir un fichier -tutti.dialog.saveAttachment.warning.help=Que voulez-vous faire ?<ul><li><strong>Non</strong> pour annuler la sauvegarde</li><li><strong>Oui</strong> pour écraser le fichier existant</li></ul> -tutti.dialog.saveAttachment.warning.message=Vous êtes sur le point d'écraser un fichier existant. -tutti.dialog.saveAttachment.warning.title=Fichier existant +tutti.createMelag.error.message=Erreur à la ligne %s +tutti.createMelag.error.title=Erreur +tutti.createMelag.message=Combien pesait le MELAG (kg) ? +tutti.createMelag.title=Poids du MELAG (kg) +tutti.attachmentEditor.deleteAttachment.message=Êtes-vous sûr de vouloir supprimer la pièce-jointe %s ? +tutti.attachmentEditor.deleteAttachment.title=Suppression de pièce-jointe +tutti.attachmentEditor.saveAttachment.button=Choisir +tutti.attachmentEditor.saveAttachment.fail.message=Une erreur est survenue lors de la sauvegarde du fichier. +tutti.attachmentEditor.saveAttachment.fail.title=Erreur de sauvegarde. +tutti.attachmentEditor.saveAttachment.success.message=Le fichier %s a été sauvegardé sur votre machine. +tutti.attachmentEditor.saveAttachment.success.title=Sauvegarde réussie. +tutti.attachmentEditor.saveAttachment.title=Choisir un fichier +tutti.attachmentEditor.saveAttachment.warning.help=Que voulez-vous faire ?<ul><li><strong>Non</strong> pour annuler la sauvegarde</li><li><strong>Oui</strong> pour écraser le fichier existant</li></ul> +tutti.attachmentEditor.saveAttachment.warning.message=Vous êtes sur le point d'écraser un fichier existant. +tutti.attachmentEditor.saveAttachment.warning.title=Fichier existant tutti.duration.format=dj Hh m'm' tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> tutti.file.csv=Extension d'un fichier csv tutti.file.protocol=Extension d'un fichier de protocole Tutti tutti.file.zip=Extension d'une archive zip -tutti.flash.information.all.caractristic.exported=Toutes les caractéristiques exportées dans le fichier <strong>%s</strong>. -tutti.flash.information.caracteristic.imported.in.protocol=Caractéristiques importées dans le protocole depuis le fichier <strong>%s</strong>. -tutti.flash.information.caractristic.exported.from.protocol=Caractéristiques du protocole exportées dans le fichier <strong>%s</strong>. -tutti.flash.information.cruiseCreated=La campagne <strong>%s</strong> a été créée. -tutti.flash.information.cruiseSaved=La campagne <strong>%s</strong> a été enregistrée. -tutti.flash.information.db.closed=La base de données <strong>%s</strong> est fermée. -tutti.flash.information.db.exported=Base exportée dans l'archive <strong>%s</strong>. -tutti.flash.information.db.exported.and.clean=Base exportée dans l'archive <strong>%s</strong>. -tutti.flash.information.db.imported=La base de données <strong>%s</strong> est importée. -tutti.flash.information.db.installed=La base de données <strong>%s</strong> est installée. -tutti.flash.information.db.opened=La base de données <strong>%s</strong> est ouverte. -tutti.flash.information.programCreated=La série de campagne <strong>%s</strong> a été créée. -tutti.flash.information.programSaved=La série de campagne <strong>%s</strong> a été enregistrée. -tutti.flash.information.protocolCreated=Le protocole <strong>%s</strong> a été créé. -tutti.flash.information.protocolSaved=Le protocole <strong>%s</strong> a été enregistré. -tutti.flash.information.species.add.to.protocol=L'espèce <strong>%s</strong> a été ajoutée au protocole. -tutti.flash.information.species.exported.from.protocol=Espèces du protocole exportées dans le fichier <strong>%s</strong>. -tutti.flash.information.species.imported.in.protocol=Espèces importées dans le protocole depuis le fichier <strong>%s</strong>. -tutti.flash.information.species.imported.in.protocol.oneReplaced=Espèces importées dans le protocole depuis le fichier <strong>%s</strong>. 1 remplacée par son référent. -tutti.flash.information.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.information.species.remove.from.protocol=L'espèce <strong>%s</strong> a été retirée du protocole. -tutti.flash.information.species.replaced=L'espèce <strong>%s</strong> a été remplacée par son référent <strong>%s</strong>. -tutti.information.db.loaded=<html>Tutti est connecté à une base de données<hr/>Url de connexion \: <strong>%s</strong></html> -tutti.information.no.db.exist=Aucune base détectée, vous pouvez installer la dernière disponible sur le réseau ou bien en importer une. -tutti.information.no.db.loaded=Tutti possède une base mais elle n'est pas actuellement ouverte. -tutti.label.attachmentEditor.file=Fichier -tutti.label.attachmentEditor.fileComment=Commentaire -tutti.label.attachmentEditor.fileName=Nom -tutti.label.catches.benthosTotalSampleSortedWeight=Poids VRAC trié (kg) -tutti.label.catches.benthosTotalSortedWeight=Poids total VRAC (kg) -tutti.label.catches.benthosTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.label.catches.benthosTotalWeight=Poids TOTAL (kg) -tutti.label.catches.catchTotalRejectedWeight=Poids total NON TRIÉ (kg) -tutti.label.catches.catchTotalSortedCarousselWeight=Caroussel observé (*) -tutti.label.catches.catchTotalSortedTremisWeight=Tremie (*) -tutti.label.catches.catchTotalSortedWeight=Poids total VRAC (kg) -tutti.label.catches.catchTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.label.catches.catchTotalWeight=Poids TOTAL (kg) -tutti.label.catches.macroWasteTotalWeight=Poids TOTAL (kg) +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>. +tutti.flash.info.caractristic.exported.from.protocol=Caractéristiques du protocole exportées dans le fichier <strong>%s</strong>. +tutti.flash.info.cruiseCreated=La campagne <strong>%s</strong> a été créée. +tutti.flash.info.cruiseSaved=La campagne <strong>%s</strong> a été enregistrée. +tutti.flash.info.db.closed=La base de données <strong>%s</strong> est fermée. +tutti.flash.info.db.exported=Base exportée dans l'archive <strong>%s</strong>. +tutti.flash.info.db.exported.and.clean=Base exportée dans l'archive <strong>%s</strong>. +tutti.flash.info.db.imported=La base de données <strong>%s</strong> est importée. +tutti.flash.info.db.installed=La base de données <strong>%s</strong> est installée. +tutti.flash.info.db.opened=La base de données <strong>%s</strong> est ouverte. +tutti.flash.info.programCreated=La série de campagne <strong>%s</strong> a été créée. +tutti.flash.info.programSaved=La série de campagne <strong>%s</strong> a été enregistrée. +tutti.flash.info.protocolCreated=Le protocole <strong>%s</strong> a été créé. +tutti.flash.info.protocolSaved=Le protocole <strong>%s</strong> a été enregistré. +tutti.flash.info.species.add.to.protocol=L'espèce <strong>%s</strong> a été ajoutée au protocole. +tutti.flash.info.species.exported.from.protocol=Espèces du protocole exportées dans le fichier <strong>%s</strong>. +tutti.flash.info.species.imported.in.protocol=Espèces importées dans le protocole depuis le fichier <strong>%s</strong>. +tutti.flash.info.species.imported.in.protocol.oneReplaced=Espèces importées dans le protocole depuis le fichier <strong>%s</strong>. 1 remplacée par son référent. +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.dbManager.info.db.loaded=<html>Tutti est connecté à une base de données<hr/>Url de connexion \: <strong>%s</strong></html> +tutti.dbManager.info.no.db.exist=Aucune base détectée, vous pouvez installer la dernière disponible sur le réseau ou bien en importer une. +tutti.dbManager.info.no.db.loaded=Tutti possède une base mais elle n'est pas actuellement ouverte. +tutti.attachmentEditor.field.file=Fichier +tutti.attachmentEditor.field.fileComment=Commentaire +tutti.attachmentEditor.field.fileName=Nom +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié (kg) +tutti.editCatchBatch.field.benthosTotalSortedWeight=Poids total VRAC (kg) +tutti.editCatchBatch.field.benthosTotalUnsortedWeight=Poids total HORS VRAC (kg) +tutti.editCatchBatch.field.benthosTotalWeight=Poids TOTAL (kg) +tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié (kg) +tutti.editBenthosBatch.field.benthosTotalSortedWeight=Poids total VRAC (kg) +tutti.editBenthosBatch.field.benthosTotalUnsortedWeight=Poids total HORS VRAC (kg) +tutti.editBenthosBatch.field.benthosTotalWeight=Poids TOTAL (kg) +tutti.editCatchBatch.field.catchTotalRejectedWeight=Poids total NON TRIÉ (kg) +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight=Caroussel observé (*) +tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Tremie (*) +tutti.editCatchBatch.field.catchTotalSortedWeight=Poids total VRAC (kg) +tutti.editCatchBatch.field.catchTotalUnsortedWeight=Poids total HORS VRAC (kg) +tutti.editCatchBatch.field.catchTotalWeight=Poids TOTAL (kg) +tutti.editCatchBatch.field.macroWasteTotalWeight=Poids TOTAL (kg) tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total -tutti.label.catches.speciesTotalInertWeight=Poids inerte trié (kg) -tutti.label.catches.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg) -tutti.label.catches.speciesTotalSampleSortedWeight=Poids VRAC trié (kg) -tutti.label.catches.speciesTotalSortedWeight=Poids total VRAC (kg) -tutti.label.catches.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg) -tutti.label.catches.speciesTotalWeight=Poids TOTAL (kg) +tutti.editSpeciesBatch.field.speciesTotalInertWeight=Poids inerte trié (kg) +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg) +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié (kg) +tutti.editSpeciesBatch.field.speciesTotalSortedWeight=Poids total VRAC (kg) +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg) +tutti.editSpeciesBatch.field.speciesTotalWeight=Poids TOTAL (kg) +tutti.editCatchBatch.field.speciesTotalInertWeight=Poids inerte trié (kg) +tutti.editCatchBatch.field.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg) +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié (kg) +tutti.editCatchBatch.field.speciesTotalSortedWeight=Poids total VRAC (kg) +tutti.editCatchBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg) +tutti.editCatchBatch.field.speciesTotalWeight=Poids TOTAL (kg) tutti.label.comment=Commentaire -tutti.label.createSpeciesBatch.batchWeight=Poids du lot (kg) -tutti.label.createSpeciesBatch.sortedUnsortedCategory=V / HV -tutti.label.createSpeciesBatch.species=Espèce du lot -tutti.label.cruise=Campagne -tutti.label.cruise.beginDate=Date de début -tutti.label.cruise.country=Pays -tutti.label.cruise.endDate=Date de fin -tutti.label.cruise.multirigNumber=Nombre de poches -tutti.label.cruise.name=Nom -tutti.label.cruise.program=Série -tutti.label.cruise.surveyPart=Série partielle -tutti.label.cruise.year=Année -tutti.label.filterSpeciesBatchMode.label=Filtre -tutti.label.filterSpeciesBatchMode.mode.all=Aucun -tutti.label.filterSpeciesBatchMode.mode.leaf=Feuilles -tutti.label.filterSpeciesBatchMode.mode.root=Parents (%s) -tutti.label.filterVesselType=Filtre \: -tutti.label.filterVesselType.all=Tout -tutti.label.filterVesselType.all.tip=Tout les navires -tutti.label.filterVesselType.fishing=Pro -tutti.label.filterVesselType.fishing.tip=Uniquement les navires pro -tutti.label.filterVesselType.scientific=Scientifique -tutti.label.filterVesselType.scientific.tip=Uniquement les navires scientifiques -tutti.label.fishingOperation.duration=Durée -tutti.label.fishingOperation.fishingOperationInvalid=Trait invalide -tutti.label.fishingOperation.fishingOperationNumber=Numéro de Trait -tutti.label.fishingOperation.fishingOperationRectiligne=Trait rectiligne -tutti.label.fishingOperation.fishingOperationValid=Trait valide -tutti.label.fishingOperation.fishingOperationValidity=Validité du trait -tutti.label.fishingOperation.gear=Engin -tutti.label.fishingOperation.gearDate=Date -tutti.label.fishingOperation.gearLatitude=Latitude (%s) -tutti.label.fishingOperation.gearLongitude=Longitude (%s) -tutti.label.fishingOperation.gearShootingEnd=Fin de traine -tutti.label.fishingOperation.gearShootingEndDate=Date de fin de traine -tutti.label.fishingOperation.gearShootingEndLatitude=Latitude de fin de traine -tutti.label.fishingOperation.gearShootingEndLatitudeDegree=Degré de latitude de fin de traine -tutti.label.fishingOperation.gearShootingEndLatitudeMinute=Minute de latitude de fin de traine -tutti.label.fishingOperation.gearShootingEndLatitudeSecond=Seconde de latitude de fin de traine -tutti.label.fishingOperation.gearShootingEndLongitude=Longitude de fin de traine -tutti.label.fishingOperation.gearShootingEndLongitudeDegree=Degré de longitude de fin de traine -tutti.label.fishingOperation.gearShootingEndLongitudeMinute=Minute de longitude de fin de traine -tutti.label.fishingOperation.gearShootingEndLongitudeSecond=Seconde de longitude de fin de traine -tutti.label.fishingOperation.gearShootingStart=Début de traine -tutti.label.fishingOperation.gearShootingStartDate=Date de début de traine -tutti.label.fishingOperation.gearShootingStartLatitude=Latitude de début de traine -tutti.label.fishingOperation.gearShootingStartLatitudeDegree=Degré de latitude de début de traine -tutti.label.fishingOperation.gearShootingStartLatitudeMinute=Minute de latitude de début de traine -tutti.label.fishingOperation.gearShootingStartLatitudeSecond=Seconde de latitude de début de traine -tutti.label.fishingOperation.gearShootingStartLongitude=Longitude de début de traine -tutti.label.fishingOperation.gearShootingStartLongitudeDegree=Degré de longitude de début de traine -tutti.label.fishingOperation.gearShootingStartLongitudeMinute=Minute de longitude de début de traine -tutti.label.fishingOperation.gearShootingStartLongitudeSecond=Seconde de longitude de début de traine -tutti.label.fishingOperation.gearTime=Heure -tutti.label.fishingOperation.location=Localité -tutti.label.fishingOperation.multirigAggregation=Numéro de poche -tutti.label.fishingOperation.other=Autres caractéristiques -tutti.label.fishingOperation.stationNumber=Code Station -tutti.label.fishingOperation.strata=Strate -tutti.label.fishingOperation.subStrata=Sous strate -tutti.label.fishingOperation.trawlDistance=Distance chalutée (m) -tutti.label.fishingOperation.vessel=Navire -tutti.label.frequencyConfiguration.lengthStepCaracteristic=Type de mesure -tutti.label.frequencyConfiguration.maxStep=Classe max -tutti.label.frequencyConfiguration.minStep=Classe min -tutti.label.frequencyConfiguration.mode.autoGen=Génération des classes -tutti.label.frequencyConfiguration.mode.autoGen.tip=Mode où toutes les classes de taille sont générées -tutti.label.frequencyConfiguration.mode.rafale=Mode "rafale" -tutti.label.frequencyConfiguration.mode.rafale.tip=Mode où on ne saisit uniquement la classe de taille (les nombres seront alors incrémentés...) -tutti.label.frequencyConfiguration.mode.simple=Mode simple -tutti.label.frequencyConfiguration.mode.simple.tip=Mode par défaut on on doit tout saisir (les classes de tailles et les nombres) -tutti.label.frequencyConfiguration.mode.simpleCounting=Mode simple dénombrement -tutti.label.frequencyConfiguration.mode.simpleCounting.tip=Mode par défaut si la classe de taille n'est pas renseignée dans le protocole. -tutti.label.frequencyConfiguration.no.configuration=< Pas de configuration > -tutti.label.frequencyConfiguration.rafaleStep=Classe de taille à incrémenter -tutti.label.frequencyConfiguration.step=Pas de la classe de taille -tutti.label.list.gear=Engin(s) -tutti.label.list.headOfMission=Chef(s) de mission -tutti.label.list.headOfSortRoom=Reponsable(s) de salle de tri +tutti.editSpeciesBatch.title.batchActions=Actions +tutti.createSpeciesBatch.field.batchWeight=Poids du lot (kg) +tutti.createSpeciesBatch.field.sortedUnsortedCategory=V / HV +tutti.createSpeciesBatch.field.species=Espèce du lot +tutti.selectCruise.label.cruise=Campagne +tutti.editCruise.label.cruise.beginDate=Date de début +tutti.editCruise.label.cruise.country=Pays +tutti.editCruise.label.cruise.endDate=Date de fin +tutti.editCruise.label.cruise.multirigNumber=Nombre de poches +tutti.editCruise.label.cruise.name=Nom +tutti.editCruise.label.cruise.program=Série +tutti.editCruise.label.cruise.surveyPart=Série partielle +tutti.editCruise.label.cruise.year=Année +tutti.editSpeciesBatch.label.filterSpeciesBatchMode=Filtre +tutti.editSpeciesBatch.label.filterSpeciesBatchMode.mode.all=Aucun +tutti.editSpeciesBatch.label.filterSpeciesBatchMode.mode.leaf=Feuilles +tutti.editSpeciesBatch.label.filterSpeciesBatchMode.mode.root=Parents (%s) +tutti.editCruise.label.filterVesselType=Filtre \: +tutti.editCruise.label.filterVesselType.all=Tout +tutti.editCruise.label.filterVesselType.all.tip=Tout les navires +tutti.editCruise.label.filterVesselType.fishing=Pro +tutti.editCruise.label.filterVesselType.fishing.tip=Uniquement les navires pro +tutti.editCruise.label.filterVesselType.scientific=Scientifique +tutti.editCruise.label.filterVesselType.scientific.tip=Uniquement les navires scientifiques +tutti.editFishingOperation.field.duration=Durée +tutti.editFishingOperation.field.fishingOperationInvalid=Trait invalide +tutti.editFishingOperation.field.fishingOperationNumber=Numéro de Trait +tutti.editFishingOperation.field.fishingOperationRectiligne=Trait rectiligne +tutti.editFishingOperation.field.fishingOperationValid=Trait valide +tutti.editFishingOperation.field.fishingOperationValidity=Validité du trait +tutti.editFishingOperation.field.gear=Engin +tutti.editFishingOperation.field.gearDate=Date +tutti.editFishingOperation.field.gearLatitude=Latitude (%s) +tutti.editFishingOperation.field.gearLongitude=Longitude (%s) +tutti.editFishingOperation.field.gearShootingEnd=Fin de traine +tutti.editFishingOperation.field.gearShootingEndDate=Date de fin de traine +tutti.editFishingOperation.field.gearShootingEndLatitude=Latitude de fin de traine +tutti.editFishingOperation.field.gearShootingEndLatitudeDegree=Degré de latitude de fin de traine +tutti.editFishingOperation.field.gearShootingEndLatitudeMinute=Minute de latitude de fin de traine +tutti.editFishingOperation.field.gearShootingEndLatitudeSecond=Seconde de latitude de fin de traine +tutti.editFishingOperation.field.gearShootingEndLongitude=Longitude de fin de traine +tutti.editFishingOperation.field.gearShootingEndLongitudeDegree=Degré de longitude de fin de traine +tutti.editFishingOperation.field.gearShootingEndLongitudeMinute=Minute de longitude de fin de traine +tutti.editFishingOperation.field.gearShootingEndLongitudeSecond=Seconde de longitude de fin de traine +tutti.editFishingOperation.field.gearShootingStart=Début de traine +tutti.editFishingOperation.field.gearShootingStartDate=Date de début de traine +tutti.editFishingOperation.field.gearShootingStartLatitude=Latitude de début de traine +tutti.editFishingOperation.field.gearShootingStartLatitudeDegree=Degré de latitude de début de traine +tutti.editFishingOperation.field.gearShootingStartLatitudeMinute=Minute de latitude de début de traine +tutti.editFishingOperation.field.gearShootingStartLatitudeSecond=Seconde de latitude de début de traine +tutti.editFishingOperation.field.gearShootingStartLongitude=Longitude de début de traine +tutti.editFishingOperation.field.gearShootingStartLongitudeDegree=Degré de longitude de début de traine +tutti.editFishingOperation.field.gearShootingStartLongitudeMinute=Minute de longitude de début de traine +tutti.editFishingOperation.field.gearShootingStartLongitudeSecond=Seconde de longitude de début de traine +tutti.editFishingOperation.field.gearTime=Heure +tutti.editFishingOperation.field.location=Localité +tutti.editFishingOperation.field.multirigAggregation=Numéro de poche +tutti.editFishingOperation.pane.other=Autres caractéristiques +tutti.editFishingOperation.field.stationNumber=Code Station +tutti.editFishingOperation.field.strata=Strate +tutti.editFishingOperation.field.subStrata=Sous strate +tutti.editFishingOperation.field.trawlDistance=Distance chalutée (m) +tutti.editFishingOperation.field.vessel=Navire +tutti.editFishingOperation.field.comment=Commentaire +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure +tutti.editSpeciesFrequencies.field.maxStep=Classe max +tutti.editSpeciesFrequencies.field.minStep=Classe min +tutti.editSpeciesFrequencies.field.mode.autoGen=Génération des classes +tutti.editSpeciesFrequencies.field.mode.autoGen.tip=Mode où toutes les classes de taille sont générées +tutti.editSpeciesFrequencies.field.mode.rafale=Mode "rafale" +tutti.editSpeciesFrequencies.field.mode.rafale.tip=Mode où on ne saisit uniquement la classe de taille (les nombres seront alors incrémentés...) +tutti.editSpeciesFrequencies.field.mode.simple=Mode simple +tutti.editSpeciesFrequencies.field.mode.simple.tip=Mode par défaut on on doit tout saisir (les classes de tailles et les nombres) +tutti.editSpeciesFrequencies.field.mode.simpleCounting=Mode simple dénombrement +tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip=Mode par défaut si la classe de taille n'est pas renseignée dans le protocole. +tutti.editSpeciesFrequencies.label.no.configuration=< Pas de configuration > +tutti.editSpeciesFrequencies.field.rafaleStep=Classe de taille à incrémenter +tutti.editSpeciesFrequencies.field.step=Pas de la classe de taille +tutti.editCruise.label.list.gear=Engin(s) +tutti.editCruise.label.list.headOfMission=Chef(s) de mission +tutti.editCruise.label.list.headOfSortRoom=Reponsable(s) de salle de tri tutti.label.list.recorderPerson=Saisisseur(s) -tutti.label.list.vessel=Navire(s) -tutti.label.no.fishingOperation.selected=< Aucun trait sélectionné > -tutti.label.program=Série de campagne -tutti.label.program.name=Nom -tutti.label.program.zone=Zone -tutti.label.protocol=Protocol de saisie -tutti.label.protocol.clone.warning=Le protocole que vous venez de cloner ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". -tutti.label.protocol.import.warning=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". -tutti.label.protocol.name=Nom -tutti.label.referential.gear=Référentiel Engin -tutti.label.referential.person=Référentiel Personne -tutti.label.referential.species=Référentiel Espèce -tutti.label.referential.vessel=Référentiel Navire -tutti.label.sampleCategoryConfiguration.batchWeight=Poids total à catégoriser -tutti.label.sampleCategoryConfiguration.category=Catégorie -tutti.label.sampleCategoryConfiguration.sampleWeight=Poids total catégorisé -tutti.label.sampleCategoryConfiguration.species=Espèce +tutti.editCruise.label.list.vessel=Navire(s) +tutti.editCruise.label.comment=Commentaire +tutti.editProgram.label.comment=Commentaire +tutti.editProtocol.label.comment=Commentaire +tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > +tutti.selectCruise.label.program=Série de campagne +tutti.editProgram.label.program.name=Nom +tutti.editProgram.label.program.zone=Zone +tutti.selectCruise.label.protocol=Protocol de saisie +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.editProtocol.label.protocol.name=Nom +tutti.manageTemporaryReferential.label.referential.gear=Référentiel Engin +tutti.manageTemporaryReferential.label.referential.person=Référentiel Personne +tutti.manageTemporaryReferential.label.referential.species=Référentiel Espèce +tutti.manageTemporaryReferential.label.referential.vessel=Référentiel Navire +tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.batchWeight=Poids total à catégoriser +tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.category=Catégorie +tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.sampleWeight=Poids total catégorisé +tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.species=Espèce tutti.label.tab.accidentel=Captures accidentelles tutti.label.tab.benthos=Benthos tutti.label.tab.catches=Captures tutti.label.tab.catchesCaracteristics=Résumé tutti.label.tab.fishingOperation=Trait -tutti.label.tab.fishingOperation.gearUseFeature=Mise en oeuvre de l'engin -tutti.label.tab.fishingOperation.general=Trait -tutti.label.tab.fishingOperation.vesselUseFeature=Hydrologie et paramètres environnementaux +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.label.tab.macroDechet=Macro déchets tutti.label.tab.observationIndividuel=Observations individuelles tutti.label.tab.plancton=Plancton -tutti.label.tab.protocol.accidental=Accidental -tutti.label.tab.protocol.benthos=Benthos -tutti.label.tab.protocol.caracteristic=Caractéristiques -tutti.label.tab.protocol.caracteristic.gearUseFeature=Mise en oeuvre de l'engin -tutti.label.tab.protocol.caracteristic.lengthClasses=Classes de taille -tutti.label.tab.protocol.caracteristic.vesselUseFeature=Mise en oeuvre du navire -tutti.label.tab.protocol.info=Informations générales -tutti.label.tab.protocol.plankton=Plancton -tutti.label.tab.protocol.species=Espèces +tutti.editProtocol.tab.accidental=Accidental +tutti.editProtocol.tab.benthos=Benthos +tutti.editProtocol.tab.caracteristic=Caractéristiques +tutti.editProtocol.tab.caracteristic.gearUseFeature=Mise en oeuvre de l'engin +tutti.editProtocol.tab.caracteristic.lengthClasses=Classes de taille +tutti.editProtocol.tab.caracteristic.vesselUseFeature=Mise en oeuvre du navire +tutti.editProtocol.tab.info=Informations générales +tutti.editProtocol.tab.plankton=Plancton +tutti.editProtocol.tab.species=Espèces tutti.label.tab.species=Espèces -tutti.label.traitReminder=Trait \: %s -tutti.label.traitReminder.inCreation=en cours de création -tutti.legend.catch.benthos=Benthos -tutti.legend.catch.macroWaste=Macro déchets -tutti.legend.catch.species=Espèces -tutti.legend.catch.total=Capture +tutti.editFishingOperation.label.traitReminder=Trait \: %s +tutti.editFishingOperation.label.traitReminder.inCreation=en cours de création +tutti.editCatchBatch.legend.benthos=Benthos +tutti.editCatchBatch.legend.macroWaste=Macro déchets +tutti.editCatchBatch.legend.species=Espèces +tutti.editCatchBatch.legend.total=Capture tutti.legend.frequencyConfiguration=Configuration tutti.legend.splitSpeciesBatchConfiguration=Configuration -tutti.menu.actions=Actions -tutti.menu.administration=Administration -tutti.menu.changeLocale=Langue -tutti.menu.file=Fichier -tutti.menu.help=Aide +tutti.main.menu.actions=Actions +tutti.main.menu.administration=Administration +tutti.main.menu.changeLocale=Langue +tutti.main.menu.file=Fichier +tutti.main.menu.help=Aide tutti.message.action.running=<html>Action <strong>%s</strong> en cours d'execution...<hr/></html> tutti.option.cruiseId.description=Identifiant de la dernière campagne utilisée tutti.option.help.directory.description=Répertoire des fichiers d'aide @@ -373,93 +395,94 @@ tutti.sampleCategoryType.sex=Sexe tutti.sampleCategoryType.size=Class Tri. tutti.sampleCategoryType.sortedUnsorted=V/HV -tutti.table.accidental.batch.header.comment=Commentaire -tutti.table.accidental.batch.header.file=Pièces-jointes -tutti.table.accidental.batch.header.speciesByCode=Espèce -tutti.table.accidental.batch.header.speciesByGenusCode=Espèce -tutti.table.accidental.batch.header.weight=Poids observé -tutti.table.benthos.batch.header.comment=Commentaire -tutti.table.benthos.batch.header.file=Pièces jointes -tutti.table.benthos.batch.header.number=Nombre -tutti.table.benthos.batch.header.sampleWeight=Poids échantillonné -tutti.table.benthos.batch.header.speciesByCode=Espèce -tutti.table.benthos.batch.header.speciesByGenusCode=Espèce -tutti.table.benthos.batch.header.toConfirm=A Confirmer -tutti.table.benthos.batch.header.weight=Poids +tutti.editAccidentalBatch.table.header.comment=Commentaire +tutti.editAccidentalBatch.table.header.file=Pièces-jointes +tutti.editAccidentalBatch.table.header.speciesByCode=Espèce +tutti.editAccidentalBatch.table.header.speciesByGenusCode=Espèce +tutti.editAccidentalBatch.table.header.weight=Poids observé +tutti.editBenthosBatch.table.header.comment=Commentaire +tutti.editBenthosBatch.table.header.file=Pièces jointes +tutti.editBenthosBatch.table.header.number=Nombre +tutti.editBenthosBatch.table.header.sampleWeight=Poids échantillonné +tutti.editBenthosBatch.table.header.speciesByCode=Espèce +tutti.editBenthosBatch.table.header.speciesByGenusCode=Espèce +tutti.editBenthosBatch.table.header.toConfirm=A Confirmer +tutti.editBenthosBatch.table.header.weight=Poids 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.table.macrowaste.batch.header.comment=Commentaire -tutti.table.macrowaste.batch.header.file=Pièces jointes -tutti.table.macrowaste.batch.header.macroWasteCategory=Catégorie -tutti.table.macrowaste.batch.header.macroWasteSizeCategory=Catégorie de taille -tutti.table.macrowaste.batch.header.number=Nombre -tutti.table.macrowaste.batch.header.weight=Poids -tutti.table.plankton.batch.header.comment=Commentaire -tutti.table.plankton.batch.header.file=Pièces jointes -tutti.table.plankton.batch.header.sampleWeight=Poids échantillonné -tutti.table.plankton.batch.header.speciesByCode=Espèce -tutti.table.plankton.batch.header.speciesByGenusCode=Espèce -tutti.table.plankton.batch.header.toConfirm=A Confirmer -tutti.table.plankton.batch.header.weight=Poids -tutti.table.protocol.species.header.age=Age -tutti.table.protocol.species.header.age.tip=Catégorisation sur l'age ? -tutti.table.protocol.species.header.calcifySample=Prélèvement de pièces calcifiées -tutti.table.protocol.species.header.calcifySample.tip=Prélèvement de pièces calcifiées -tutti.table.protocol.species.header.countIfNoFrequency=Dénombrement -tutti.table.protocol.species.header.countIfNoFrequency.tip=Dénombrement -tutti.table.protocol.species.header.lengthStep=Classe de Taille -tutti.table.protocol.species.header.lengthStep.tip=Comment mesurer les classes de taille (si vide alors pas de mesure) -tutti.table.protocol.species.header.maturity=Maturité -tutti.table.protocol.species.header.maturity.tip=Catégorisation sur la maturité ? -tutti.table.protocol.species.header.sex=Sexe -tutti.table.protocol.species.header.sex.tip=Catégorisation sur le sexe ? -tutti.table.protocol.species.header.size=Catégorie Tri -tutti.table.protocol.species.header.size.tip=Catégorisation sur la catégorie de tri ? -tutti.table.protocol.species.header.speciesReferenceTaxonId=Espèce -tutti.table.protocol.species.header.speciesReferenceTaxonId.tip=Espèce (code refTax - nom scientifique) -tutti.table.protocol.species.header.speciesSurveyCode=Code -tutti.table.protocol.species.header.speciesSurveyCode.tip=Code campagne (non synchronisable) -tutti.table.protocol.species.header.weight=Pesée -tutti.table.protocol.species.header.weight.tip=Pesée -tutti.table.species.batch.header.ageCategory=Age -tutti.table.species.batch.header.comment=Commentaire -tutti.table.species.batch.header.computedNumber=Nombre -tutti.table.species.batch.header.file=Pièces jointes -tutti.table.species.batch.header.maturityCategory=Maturité -tutti.table.species.batch.header.sexCategory=Sexe -tutti.table.species.batch.header.sizeCategory=Class. Tri -tutti.table.species.batch.header.sortedUnsortedCategory=V/HV (kg) -tutti.table.species.batch.header.species=Espèce -tutti.table.species.batch.header.toConfirm=A Confirmer -tutti.table.species.batch.header.weight=Poids sous-échantillonné (kg) -tutti.table.species.frequency.header.lengthStep=Classe de taille -tutti.table.species.frequency.header.number=Nombre -tutti.table.species.frequency.header.weight=Poids observé (kg) -tutti.table.species.sampleCategory.header.category=Catégorie -tutti.table.species.sampleCategory.header.selected=Sélection -tutti.table.species.sampleCategory.header.weight=Poids (kg) +tutti.editMacroWasteBatch.table.header.comment=Commentaire +tutti.editMacroWasteBatch.table.header.file=Pièces jointes +tutti.editMacroWasteBatch.table.header.macroWasteCategory=Catégorie +tutti.editMacroWasteBatch.table.header.macroWasteSizeCategory=Catégorie de taille +tutti.editMacroWasteBatch.table.header.number=Nombre +tutti.editMacroWasteBatch.table.header.weight=Poids +tutti.editPlanktonBatch.table.header.comment=Commentaire +tutti.editPlanktonBatch.table.header.file=Pièces jointes +tutti.editPlanktonBatch.table.header.sampleWeight=Poids échantillonné +tutti.editPlanktonBatch.table.header.speciesByCode=Espèce +tutti.editPlanktonBatch.table.header.speciesByGenusCode=Espèce +tutti.editPlanktonBatch.table.header.toConfirm=A Confirmer +tutti.editPlanktonBatch.table.header.weight=Poids +tutti.editProtocol.table.header.age=Age +tutti.editProtocol.table.header.age.tip=Catégorisation sur l'age ? +tutti.editProtocol.table.header.calcifySample=Prélèvement de pièces calcifiées +tutti.editProtocol.table.header.calcifySample.tip=Prélèvement de pièces calcifiées +tutti.editProtocol.table.header.countIfNoFrequency=Dénombrement +tutti.editProtocol.table.header.countIfNoFrequency.tip=Dénombrement +tutti.editProtocol.table.header.lengthStep=Classe de Taille +tutti.editProtocol.table.header.lengthStep.tip=Comment mesurer les classes de taille (si vide alors pas de mesure) +tutti.editProtocol.table.header.maturity=Maturité +tutti.editProtocol.table.header.maturity.tip=Catégorisation sur la maturité ? +tutti.editProtocol.table.header.sex=Sexe +tutti.editProtocol.table.header.sex.tip=Catégorisation sur le sexe ? +tutti.editProtocol.table.header.size=Catégorie Tri +tutti.editProtocol.table.header.size.tip=Catégorisation sur la catégorie de tri ? +tutti.editProtocol.table.header.speciesReferenceTaxonId=Espèce +tutti.editProtocol.table.header.speciesReferenceTaxonId.tip=Espèce (code refTax - nom scientifique) +tutti.editProtocol.table.header.speciesSurveyCode=Code +tutti.editProtocol.table.header.speciesSurveyCode.tip=Code campagne (non synchronisable) +tutti.editProtocol.table.header.weight=Pesée +tutti.editProtocol.table.header.weight.tip=Pesée +tutti.editSpeciesBatch.table.header.ageCategory=Age +tutti.editSpeciesBatch.table.header.comment=Commentaire +tutti.editSpeciesBatch.table.header.computedNumber=Nombre +tutti.editSpeciesBatch.table.header.file=Pièces jointes +tutti.editSpeciesBatch.table.header.maturityCategory=Maturité +tutti.editSpeciesBatch.table.header.sexCategory=Sexe +tutti.editSpeciesBatch.table.header.sizeCategory=Class. Tri +tutti.editSpeciesBatch.table.header.sortedUnsortedCategory=V/HV (kg) +tutti.editSpeciesBatch.table.header.species=Espèce +tutti.editSpeciesBatch.table.header.toConfirm=A Confirmer +tutti.editSpeciesBatch.table.header.weight=Poids sous-échantillonné (kg) +tutti.editSpeciesFrequencies.table.header.lengthStep=Classe de taille +tutti.editSpeciesFrequencies.table.header.number=Nombre +tutti.editSpeciesFrequencies.table.header.weight=Poids observé (kg) +tutti.editSpeciesFrequencies.field.simpleCounting=Nombre +tutti.splitSpeciesBatch.table.header.category=Catégorie +tutti.splitSpeciesBatch.table.header.selected=Sélection +tutti.splitSpeciesBatch.table.header.weight=Poids (kg) tutti.timeeditor.H=H tutti.title.about=À propos de Tutti tutti.title.about.translate=Traduire Tutti -tutti.title.attachment=Pièces jointes -tutti.title.choose.dbExportFile=Exporter la base de données -tutti.title.choose.dbImportFile=Importer la base de données -tutti.title.choose.exportTemporaryGearExampleFile=Exporter un exemple de référentiel Engin -tutti.title.choose.exportTemporaryPersonExampleFile=Exporter un exemple de référentiel Personne -tutti.title.choose.exportTemporarySpeciesExampleFile=Exporter un exemple de référentiel Espèce -tutti.title.choose.exportTemporaryVesselExampleFile=Exporter un exemple de référentiel Navire -tutti.title.choose.importTemporaryGearFile=Importer un réferentiel Engin -tutti.title.choose.importTemporaryPersonFile=Importer un réferentiel Personne -tutti.title.choose.importTemporarySpeciesFile=Importer un réferentiel Espèce -tutti.title.choose.importTemporaryVesselFile=Importer un réferentiel Navire -tutti.title.choose.protocolCaracteristicExportFile=Exporter les caractéristiques -tutti.title.choose.protocolCaracteristicImportFile=Importer les caractéristiques -tutti.title.choose.protocolExportFile=Exporter le protocole -tutti.title.choose.protocolImportFile=Importer le protocole -tutti.title.choose.protocolSpeciesExportFile=Exporter les espèces -tutti.title.choose.protocolSpeciesImportFile=Importer les espèces +tutti.attachmentEditor.title=Pièces jointes +tutti.dbManager.title.choose.dbExportFile=Exporter la base de données +tutti.dbManager.title.choose.dbImportFile=Importer la base de données +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 +tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile=Exporter un exemple de référentiel Navire +tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile=Importer un réferentiel Engin +tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile=Importer un réferentiel Personne +tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile=Importer un réferentiel Espèce +tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile=Importer un réferentiel Navire +tutti.editProtocol.title.choose.caracteristicExportFile=Exporter les caractéristiques +tutti.editProtocol.title.choose.caracteristicImportFile=Importer les caractéristiques +tutti.selectCruise.title.choose.exportFile=Exporter le protocole +tutti.selectCruise.title.choose.importFile=Importer le protocole +tutti.editProtocol.title.choose.speciesExportFile=Exporter les espèces +tutti.editProtocol.title.choose.speciesImportFile=Importer les espèces tutti.title.comment=Commentaire tutti.title.config=Configuration tutti.title.create.cruise=Créer une nouvelle campagne @@ -491,7 +514,7 @@ tutti.tooltip.attachment.button.save=Enregistrer la pièce jointe en local tutti.tooltip.attachment.none=Pas de pièce-jointes tutti.tooltip.comment.none=Pas de commentaire -tutti.tooltip.distanceInMilles=%s milles marins +tutti.editFishingOperation.field.trawlDistance.inMilles.tip=%s milles marins 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 @@ -553,170 +576,169 @@ 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.warn.invalid.batch.model=L'arbre d'échantillonage n'est pas compatible. Les captures ne seront pas visibles. -tutti.warn.invalid.selected.data=Les données sélectionnées ne sont pas valides, impossible de saisir ou valider les captures. -tuttihelp.createSpeciesBatch.action.addSpecies.tip=Sélectionner une autre espèce -tuttihelp.createSpeciesBatch.action.cancel.tip= -tuttihelp.createSpeciesBatch.action.save.tip= -tuttihelp.createSpeciesBatch.field.batchWeightField.tip= -tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.tip= -tuttihelp.createSpeciesBatch.field.speciesComboBox.tip= -tuttihelp.dbManager.action.closeDb.tip=Fermer la base de données en cours d'utilisation -tuttihelp.dbManager.action.exportAndCleanDb.tip=Exporter la base de données au format zip puis supprimer les fichiers de Tutti -tuttihelp.dbManager.action.exportDb.tip=Exporter la base de données au format zip -tuttihelp.dbManager.action.importDb.tip=Importer la base de données au format zip -tuttihelp.dbManager.action.installDb.tip=Télécharger puis installer la base de données -tuttihelp.dbManager.action.openDb.tip=Ouvrir la base de données -tuttihelp.dbManager.action.upgradeDb.tip=Mettre à jour les référentiels si nécessaire -tuttihelp.editCatchBatch.action.cancelEditCatchBatch.tip=Réinitialiser l'édition de la capture -tuttihelp.editCatchBatch.action.computeWeights.tip=Elever les poids -tuttihelp.editCatchBatch.action.importPupitri.tip=Import Pupitri -tuttihelp.editCatchBatch.action.saveCatchBatch.tip=Sauver la capture -tuttihelp.editCatchBatch.field.benthosTotalSampleSortedWeight.tip= -tuttihelp.editCatchBatch.field.benthosTotalSortedWeight.tip= -tuttihelp.editCatchBatch.field.benthosTotalUnsortedWeight.tip= -tuttihelp.editCatchBatch.field.benthosTotalWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalRejectedWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalSortedCarousselWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalSortedTremisWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalSortedWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalUnsortedWeight.tip= -tuttihelp.editCatchBatch.field.catchTotalWeight.tip= -tuttihelp.editCatchBatch.field.macroWasteTotalWeight.tip= -tuttihelp.editCatchBatch.field.speciesTotalSampleSortedWeight.tip= -tuttihelp.editCatchBatch.field.speciesTotalSortedWeight.tip= -tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.tip= -tuttihelp.editCatchBatch.field.speciesTotalWeight.tip= -tuttihelp.editCruise.action.closeEditCruise.tip= -tuttihelp.editCruise.action.generateName.tip= -tuttihelp.editCruise.action.saveCruise.tip= -tuttihelp.editCruise.field.beginDate.tip= -tuttihelp.editCruise.field.comment.tip= -tuttihelp.editCruise.field.country.tip= -tuttihelp.editCruise.field.endDate.tip= -tuttihelp.editCruise.field.multirigNumber.tip= -tuttihelp.editCruise.field.name.tip= -tuttihelp.editCruise.field.program.tip= -tuttihelp.editCruise.field.surveyPart.tip= -tuttihelp.editCruise.field.year.tip= -tuttihelp.editCruise.filterVessel.tip= -tuttihelp.editCruise.list.gear.tip= -tuttihelp.editCruise.list.headOfMission.tip= -tuttihelp.editCruise.list.headOfSortRoom.tip= -tuttihelp.editCruise.list.vessel.tip= -tuttihelp.editFishingOperation.action.attachments.tip= -tuttihelp.editFishingOperation.action.cancelEditFishingOperation.tip=Annuler la création du trait -tuttihelp.editFishingOperation.action.importCasino.tip=Import Casino -tuttihelp.editFishingOperation.action.saveEditFishingOperation.tip=Enregistrer le trait -tuttihelp.editFishingOperation.field.comment.tip= -tuttihelp.editFishingOperation.field.duration.tip= -tuttihelp.editFishingOperation.field.fishingOperationNumber.tip= -tuttihelp.editFishingOperation.field.fishingOperationRectiligne.tip= -tuttihelp.editFishingOperation.field.fishingOperationValid.tip= -tuttihelp.editFishingOperation.field.gear.tip= -tuttihelp.editFishingOperation.field.gearDate.tip= -tuttihelp.editFishingOperation.field.gearLatitude.tip= -tuttihelp.editFishingOperation.field.gearLongitude.tip= -tuttihelp.editFishingOperation.field.gearShootingEnd.tip= -tuttihelp.editFishingOperation.field.gearShootingEndLatitude.tip= -tuttihelp.editFishingOperation.field.gearShootingEndLongitude.tip= -tuttihelp.editFishingOperation.field.gearShootingStart.tip= -tuttihelp.editFishingOperation.field.gearShootingStartLatitude.tip= -tuttihelp.editFishingOperation.field.gearTime.tip= -tuttihelp.editFishingOperation.field.location.tip= -tuttihelp.editFishingOperation.field.multirigAggregation.tip= -tuttihelp.editFishingOperation.field.stationNumber.tip= -tuttihelp.editFishingOperation.field.strata.tip= -tuttihelp.editFishingOperation.field.subStrata.tip= -tuttihelp.editFishingOperation.field.trawlDistance.tip= -tuttihelp.editFishingOperation.field.vessel.tip= -tuttihelp.editFishingOperation.gearShootingStartLongitude.tip= -tuttihelp.editFishingOperation.list.recorderPerson.tip= -tuttihelp.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne -tuttihelp.editProgram.action.saveProgram.tip=Enregistrer la série de campagne -tuttihelp.editProgram.field.comment.tip= -tuttihelp.editProgram.field.name.tip= -tuttihelp.editProgram.field.zone.tip= -tuttihelp.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole -tuttihelp.editProtocol.action.closeEditProtocol.tip= -tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques (sans les affecter à un écran) -tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip=Exporter les caractéristiques du protocole -tuttihelp.editProtocol.action.exportProtocolSpecies.tip=Exporter les espèces du protocole -tuttihelp.editProtocol.action.importProtocolCaracteristic.tip=importer les caractéristiques dans le protocole -tuttihelp.editProtocol.action.importProtocolSpecies.tip=importer les espèces dans le protocole -tuttihelp.editProtocol.action.removeSpeciesProtocol.tip=Supprimer l'espèce -tuttihelp.editProtocol.action.saveProtocol.tip=Enregistrer le protocol -tuttihelp.editProtocol.action.selectOtherSpecies.tip=Sélectionner une autre espèce -tuttihelp.editProtocol.field..tip= -tuttihelp.editProtocol.field.comment.tip= -tuttihelp.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG -tuttihelp.editSpeciesBatch.action.removeSpeciesBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils -tuttihelp.editSpeciesBatch.action.removeSpeciesSubBatch.tip=Supprimer tous les lots fils du lot sélectionné -tuttihelp.editSpeciesBatch.action.splitSpeciesBatch.tip=Catégoriser le lot courant (celui de la ligne sélectionné) -tuttihelp.editSpeciesBatch.createSpeciesBatch.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalInertWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalSortedWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip= -tuttihelp.editSpeciesBatch.field.speciesTotalWeight.tip= -tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.all.tip=Pas de filtre (tous les lots sont visibles) -tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.leaf.tip=Voir uniquement les lots *feuilles* -tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.root.tip=Voir uniquement les lots *parents* -tuttihelp.editSpeciesBatch.filterSpeciesBatch.tip=Pour filtrer les lots -tuttihelp.editSpeciesBatch.renameSpeciesBatch.tip= -tuttihelp.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche -tuttihelp.main.action.about.tip=À Propos -tuttihelp.main.action.actions.tip=Actions -tuttihelp.main.action.administration.tip=Administrer Tutti -tuttihelp.main.action.changeLocale.tip=Changer de langue -tuttihelp.main.action.changeLocaleFR.tip=Passer en français -tuttihelp.main.action.changeLocaleUK.tip=Passer en anglais -tuttihelp.main.action.configuration.tip=Configurer Tutti -tuttihelp.main.action.editCatches.tip=Editer les catpures -tuttihelp.main.action.editProgram.tip=Editer la série de campagne -tuttihelp.main.action.editSelectedCruise.tip=Éditer la campagne sélectionnée -tuttihelp.main.action.editSelectedProtocol.tip=Éditer le protocole sélectionné -tuttihelp.main.action.exit.tip=Quitter l'application -tuttihelp.main.action.file.tip=Fichier -tuttihelp.main.action.help.tip=Aide -tuttihelp.main.action.importTemporaryReferential.tip=Importer des référentiels temporaires -tuttihelp.main.action.manageDb.tip=Gérer la base de données utilisée par Tutti -tuttihelp.main.action.selectCruise.tip=Sélectionner la campagne à utiliser -tuttihelp.main.action.showHelp.tip=Accéder à l'aide de l'application -tuttihelp.main.action.site.tip=Accéder au site du projet Tutti -tuttihelp.main.action.updateApplication.tip=Vérifier les mises à jour logicielles -tuttihelp.main.action.validateCatches.tip=Valider les captures -tuttihelp.manageTemporaryReferential.action.exportTemporaryGearExample.tip=Exporter un exemple de référentiel Engin -tuttihelp.manageTemporaryReferential.action.exportTemporaryPersonExample.tip=Exporter un exemple de référentiel Personne -tuttihelp.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip=Exporter un exemple de référentiel Espèces -tuttihelp.manageTemporaryReferential.action.exportTemporaryVesselExample.tip=Exporter un exemple de référentiel Navire -tuttihelp.manageTemporaryReferential.action.importTemporaryGear.tip=Importer un référentiel temporaire d'engins -tuttihelp.manageTemporaryReferential.action.importTemporaryPerson.tip=Importer un référentiel temporaire de personnes -tuttihelp.manageTemporaryReferential.action.importTemporarySpecies.tip=Importer un référentiel temporaire d'espèces -tuttihelp.manageTemporaryReferential.action.importTemporaryVessel.tip=Importer un référentiel temporaire de navires -tuttihelp.manageTemporaryReferential.label.referential.gear.tip= -tuttihelp.manageTemporaryReferential.label.referential.person.tip= -tuttihelp.manageTemporaryReferential.label.referential.species.tip= -tuttihelp.manageTemporaryReferential.label.referential.vessel.tip= -tuttihelp.selectCruise.action.cloneProtocol.tip=Dupliquer le protocole sélectionné -tuttihelp.selectCruise.action.deleteProtocol.tip=Supprimer le protocole sélectioné -tuttihelp.selectCruise.action.editCatches.tip=Saisir des captures -tuttihelp.selectCruise.action.editCruise.tip=Éditer la campagne sélectionnée -tuttihelp.selectCruise.action.editProgram.tip=Éditer le programme sélectionné -tuttihelp.selectCruise.action.editProtocol.tip=Éditer le protocol sélectionné -tuttihelp.selectCruise.action.exportProtocol.tip=Exporter le protocole sélectionné -tuttihelp.selectCruise.action.importProtocol.tip=Importer un protocole -tuttihelp.selectCruise.action.newCruise.tip=Créer une nouvelle campagne -tuttihelp.selectCruise.action.newProgram.tip=Créer une nouvelle série de campagne -tuttihelp.selectCruise.action.newProtocol.tip=Créer un nouveau protocole -tuttihelp.selectCruise.action.validateCatches.tip=Valider les captures -tuttihelp.selectCruise.field.cruise.tip= -tuttihelp.selectCruise.field.program.tip= -tuttihelp.selectCruise.field.protocol.tip= -tuttihelp.splitSpeciesBatch.action.cancel.tip= -tuttihelp.splitSpeciesBatch.action.save.tip= -tuttihelp.splitSpeciesBatch.field.batchWeightField.tip= -tuttihelp.splitSpeciesBatch.field.categoryField.tip= -tuttihelp.splitSpeciesBatch.field.sampleWeightField.tip= -tuttihelp.splitSpeciesBatch.field.speciesField.tip= +tutti.fishingOperations.warn.invalid.batch.model=L'arbre d'échantillonage n'est pas compatible. Les captures ne seront pas visibles. +tutti.selectCruise.warn.invalid.selected.data=Les données sélectionnées ne sont pas valides, impossible de saisir ou valider les captures. +tutti.createSpeciesBatch.action.addSpecies.tip=Sélectionner une autre espèce +tutti.createSpeciesBatch.action.cancel.tip= +tutti.createSpeciesBatch.action.save.tip= +tutti.createSpeciesBatch.field.batchWeight.tip= +tutti.createSpeciesBatch.field.sortedUnsortedCategory.tip= +tutti.createSpeciesBatch.field.species.tip= +tutti.dbManager.action.closeDb.tip=Fermer la base de données en cours d'utilisation +tutti.dbManager.action.exportAndCleanDb.tip=Exporter la base de données au format zip puis supprimer les fichiers de Tutti +tutti.dbManager.action.exportDb.tip=Exporter la base de données au format zip +tutti.dbManager.action.importDb.tip=Importer la base de données au format zip +tutti.dbManager.action.installDb.tip=Télécharger puis installer la base de données +tutti.dbManager.action.openDb.tip=Ouvrir la base de données +tutti.dbManager.action.upgradeDb.tip=Mettre à jour les référentiels si nécessaire +tutti.editCatchBatch.action.cancelEditCatchBatch.tip=Réinitialiser l'édition de la capture +tutti.editCatchBatch.action.computeWeights.tip=Elever les poids +tutti.editCatchBatch.action.importPupitri.tip=Import Pupitri +tutti.editCatchBatch.action.saveCatchBatch.tip=Sauver la capture +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip= +tutti.editCatchBatch.field.benthosTotalSortedWeight.tip= +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.tip= +tutti.editCatchBatch.field.benthosTotalWeight.tip= +tutti.editCatchBatch.field.catchTotalRejectedWeight.tip= +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip= +tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip= +tutti.editCatchBatch.field.catchTotalSortedWeight.tip= +tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip= +tutti.editCatchBatch.field.catchTotalWeight.tip= +tutti.editCatchBatch.field.macroWasteTotalWeight.tip= +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip= +tutti.editCatchBatch.field.speciesTotalSortedWeight.tip= +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.tip= +tutti.editCatchBatch.field.speciesTotalWeight.tip= +tutti.editCruise.action.closeEditCruise.tip= +tutti.editCruise.action.generateName.tip= +tutti.editCruise.action.saveCruise.tip= +tutti.editCruise.field.beginDate.tip= +tutti.editCruise.field.comment.tip= +tutti.editCruise.field.country.tip= +tutti.editCruise.field.endDate.tip= +tutti.editCruise.field.multirigNumber.tip= +tutti.editCruise.field.name.tip= +tutti.editCruise.field.program.tip= +tutti.editCruise.field.surveyPart.tip= +tutti.editCruise.field.year.tip= +tutti.editCruise.filterVessel.tip= +tutti.editCruise.field.gear.tip= +tutti.editCruise.field.headOfMission.tip= +tutti.editCruise.field.headOfSortRoom.tip= +tutti.editCruise.field.vessel.tip= +tutti.editFishingOperation.action.attachments.tip= +tutti.editFishingOperation.action.cancelEditFishingOperation.tip=Annuler la création du trait +tutti.editFishingOperation.action.importCasino.tip=Import Casino +tutti.editFishingOperation.action.saveEditFishingOperation.tip=Enregistrer le trait +tutti.editFishingOperation.field.comment.tip= +tutti.editFishingOperation.field.duration.tip= +tutti.editFishingOperation.field.fishingOperationNumber.tip= +tutti.editFishingOperation.field.fishingOperationRectiligne.tip= +tutti.editFishingOperation.field.fishingOperationValid.tip= +tutti.editFishingOperation.field.gear.tip= +tutti.editFishingOperation.field.gearDate.tip= +tutti.editFishingOperation.field.gearLatitude.tip= +tutti.editFishingOperation.field.gearLongitude.tip= +tutti.editFishingOperation.field.gearShootingEnd.tip= +tutti.editFishingOperation.field.gearShootingEndLatitude.tip= +tutti.editFishingOperation.field.gearShootingEndLongitude.tip= +tutti.editFishingOperation.field.gearShootingStart.tip= +tutti.editFishingOperation.field.gearShootingStartLatitude.tip= +tutti.editFishingOperation.field.gearTime.tip= +tutti.editFishingOperation.field.location.tip= +tutti.editFishingOperation.field.multirigAggregation.tip= +tutti.editFishingOperation.field.stationNumber.tip= +tutti.editFishingOperation.field.strata.tip= +tutti.editFishingOperation.field.subStrata.tip= +tutti.editFishingOperation.field.trawlDistance.tip= +tutti.editFishingOperation.field.vessel.tip= +tutti.editFishingOperation.field.gearShootingStartLongitude.tip= +tutti.editFishingOperation.list.recorderPerson.tip= +tutti.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne +tutti.editProgram.action.saveProgram.tip=Enregistrer la série de campagne +tutti.editProgram.field.comment.tip= +tutti.editProgram.field.name.tip= +tutti.editProgram.field.zone.tip= +tutti.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole +tutti.editProtocol.action.closeEditProtocol.tip= +tutti.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques (sans les affecter à un écran) +tutti.editProtocol.action.exportProtocolCaracteristic.tip=Exporter les caractéristiques du protocole +tutti.editProtocol.action.exportProtocolSpecies.tip=Exporter les espèces du protocole +tutti.editProtocol.action.importProtocolCaracteristic.tip=importer les caractéristiques dans le protocole +tutti.editProtocol.action.importProtocolSpecies.tip=importer les espèces dans le protocole +tutti.editProtocol.action.removeSpeciesProtocol.tip=Supprimer l'espèce +tutti.editProtocol.action.saveProtocol.tip=Enregistrer le protocol +tutti.editProtocol.action.selectOtherSpecies.tip=Sélectionner une autre espèce +tutti.editProtocol.field.comment.tip= +tutti.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG +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.splitSpeciesBatch.tip=Catégoriser le lot courant (celui de la ligne sélectionné) +tutti.editSpeciesBatch.createSpeciesBatch.tip= +tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalWeight.tip= +tutti.editSpeciesBatch.filterSpeciesBatch.mode.all.tip=Pas de filtre (tous les lots sont visibles) +tutti.editSpeciesBatch.filterSpeciesBatch.mode.leaf.tip=Voir uniquement les lots *feuilles* +tutti.editSpeciesBatch.filterSpeciesBatch.mode.root.tip=Voir uniquement les lots *parents* +tutti.editSpeciesBatch.filterSpeciesBatch.tip=Pour filtrer les lots +tutti.editSpeciesBatch.renameSpeciesBatch.tip= +tutti.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche +tutti.main.action.about.tip=À Propos +tutti.main.menu.actions.tip=Actions +tutti.main.menu.administration.tip=Administrer Tutti +tutti.main.action.changeLocale.tip=Changer de langue +tutti.main.action.changeLocaleFR.tip=Passer en français +tutti.main.action.changeLocaleUK.tip=Passer en anglais +tutti.main.action.configuration.tip=Configurer Tutti +tutti.main.action.editCatches.tip=Editer les catpures +tutti.main.action.editProgram.tip=Editer la série de campagne +tutti.main.action.editSelectedCruise.tip=Éditer la campagne sélectionnée +tutti.main.action.editSelectedProtocol.tip=Éditer le protocole sélectionné +tutti.main.action.exit.tip=Quitter l'application +tutti.main.menu.file.tip=Fichier +tutti.main.menu.help.tip=Aide +tutti.main.action.importTemporaryReferential.tip=Importer des référentiels temporaires +tutti.main.action.manageDb.tip=Gérer la base de données utilisée par Tutti +tutti.main.action.selectCruise.tip=Sélectionner la campagne à utiliser +tutti.main.action.showHelp.tip=Accéder à l'aide de l'application +tutti.main.action.site.tip=Accéder au site du projet Tutti +tutti.main.action.updateApplication.tip=Vérifier les mises à jour logicielles +tutti.main.action.validateCatches.tip=Valider les captures +tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip=Exporter un exemple de référentiel Engin +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip=Exporter un exemple de référentiel Personne +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip=Exporter un exemple de référentiel Espèces +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.tip=Exporter un exemple de référentiel Navire +tutti.manageTemporaryReferential.action.importTemporaryGear.tip=Importer un référentiel temporaire d'engins +tutti.manageTemporaryReferential.action.importTemporaryPerson.tip=Importer un référentiel temporaire de personnes +tutti.manageTemporaryReferential.action.importTemporarySpecies.tip=Importer un référentiel temporaire d'espèces +tutti.manageTemporaryReferential.action.importTemporaryVessel.tip=Importer un référentiel temporaire de navires +tutti.manageTemporaryReferential.label.referential.gear.tip= +tutti.manageTemporaryReferential.label.referential.person.tip= +tutti.manageTemporaryReferential.label.referential.species.tip= +tutti.manageTemporaryReferential.label.referential.vessel.tip= +tutti.selectCruise.action.cloneProtocol.tip=Dupliquer le protocole sélectionné +tutti.selectCruise.action.deleteProtocol.tip=Supprimer le protocole sélectioné +tutti.selectCruise.action.editCatches.tip=Saisir des captures +tutti.selectCruise.action.editCruise.tip=Éditer la campagne sélectionnée +tutti.selectCruise.action.editProgram.tip=Éditer le programme sélectionné +tutti.selectCruise.action.editProtocol.tip=Éditer le protocol sélectionné +tutti.selectCruise.action.exportProtocol.tip=Exporter le protocole sélectionné +tutti.selectCruise.action.importProtocol.tip=Importer un protocole +tutti.selectCruise.action.newCruise.tip=Créer une nouvelle campagne +tutti.selectCruise.action.newProgram.tip=Créer une nouvelle série de campagne +tutti.selectCruise.action.newProtocol.tip=Créer un nouveau protocole +tutti.selectCruise.action.validateCatches.tip=Valider les captures +tutti.selectCruise.field.cruise.tip= +tutti.selectCruise.field.program.tip= +tutti.selectCruise.field.protocol.tip= +tutti.splitSpeciesBatch.action.cancel.tip= +tutti.splitSpeciesBatch.action.save.tip= +tutti.splitSpeciesBatch.field.batchWeightField.tip= +tutti.splitSpeciesBatch.field.categoryField.tip= +tutti.splitSpeciesBatch.field.sampleWeightField.tip= +tutti.splitSpeciesBatch.field.speciesField.tip= Added: trunk/tutti-ui-swing/src/main/resources/icons/action-sampleOrder.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-sampleOrder.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL