Author: tchemit Date: 2013-09-23 14:20:59 +0200 (Mon, 23 Sep 2013) New Revision: 1205 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1205 Log: fix and optimize i18n Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 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/operation/catches/benthos/CreateBenthosMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 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-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostExportService.java 2013-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostExportService.java 2013-09-23 12:20:59 UTC (rev 1205) @@ -643,7 +643,7 @@ AttachmentRowModel csvAttachmentModel = new AttachmentRowModel(csvSeparator); File attachmentDirectory = new File(directory, ATTACHMENTS_DIRECTORY); - TuttiIOUtil.forceMkdir(attachmentDirectory, _("tutti.service.multipost.attachment.mkdirDir.error", attachmentDirectory)); + TuttiIOUtil.forceMkdir(attachmentDirectory, _("tutti.service.multipost.attachment.mkdir.error", attachmentDirectory)); file2zip.add(attachmentDirectory); for (AttachmentRow attachmentRow : attachmentRows) { File attachmentFile = attachmentRow.getFile(); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-09-23 12:20:59 UTC (rev 1205) @@ -81,7 +81,7 @@ tutti.service.exportSumatra.header.weight= tutti.service.mkDir.error= tutti.service.multipost.attachment.copy.error= -tutti.service.multipost.attachment.mkdirDir.error= +tutti.service.multipost.attachment.mkdir.error= tutti.service.multipost.export.attachments.error= tutti.service.multipost.export.batches.error= tutti.service.multipost.export.deleteTempDirectory.error= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-09-23 12:20:59 UTC (rev 1205) @@ -82,7 +82,6 @@ tutti.service.mkDir.error=Erreur à la création du dossier %s tutti.service.multipost.attachment.copy.error=Erreur lors de l'export de la pièce-jointe %s tutti.service.multipost.attachment.mkdir.error=Impossible de créer le répertoire %s -tutti.service.multipost.attachment.mkdirDir.error= tutti.service.multipost.export.attachments.error=Erreur lors de l'export des pièces-jointes tutti.service.multipost.export.batches.error=Erreur lors de l'export des lots tutti.service.multipost.export.deleteTempDirectory.error=Erreur lors de la suppression du dossier temporaire 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-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 2013-09-23 12:20:59 UTC (rev 1205) @@ -43,7 +43,7 @@ actionIcon: install-db; text: {handler.getInstallButtonText(model.isDbExist())}; toolTipText: {handler.getInstallButtonTip(model.isDbExist())}; - i18nMnemonic: {handler.getInstallButtonMnemonic(model.isDbExist())}; + i18nMnemonic: "tutti.dbManager.action.installDb.mnemonic"; _tuttiAction: {InstallOrReinstallDbAction.class}; _help: {"tutti.dbManager.action.installDb.help"}; } 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-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-09-23 12:20:59 UTC (rev 1205) @@ -27,10 +27,13 @@ import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.Version; import javax.swing.JComponent; import javax.swing.SwingUtilities; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import static org.nuiton.i18n.I18n._; @@ -81,6 +84,24 @@ initUI(ui); + getModel().addPropertyChangeListener(TuttiUIContext.PROPERTY_DB_EXIST, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + + Boolean dbExist = (Boolean) evt.getNewValue(); + String mnemonic; + if (dbExist) { + mnemonic = _("tutti.dbManager.action.reinstallDb.mnemonic"); + } else { + mnemonic = _("tutti.dbManager.action.installDb.mnemonic"); + } + if (StringUtils.isNotBlank(mnemonic)) { + ui.getInstallOrReinstallDbButton().setMnemonic(mnemonic.charAt(0)); + } + + } + }); + SwingUtilities.invokeLater( new Runnable() { @Override @@ -124,14 +145,4 @@ } return result; } - - public String getInstallButtonMnemonic(boolean dbExist) { - String result; - if (dbExist) { - result = _("tutti.dbManager.action.reinstallDb.mnemonic"); - } else { - result = _("tutti.dbManager.action.installDb.mnemonic"); - } - return result; - } } 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-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-09-23 12:20:59 UTC (rev 1205) @@ -94,7 +94,7 @@ // close db - progressionModel.setMessage(_("tutti.exportDb.closeDb")); + progressionModel.setMessage(_("tutti.exportDb.step.closeDb")); // clear all caches getContext().getPersistenceService().clearAllCaches(); @@ -111,14 +111,14 @@ // export db progressionModel.increments(1); - progressionModel.setMessage(_("tutti.exportDb.createArchive", file)); + progressionModel.setMessage(_("tutti.exportDb.step.createArchive", file)); getContext().getPersistenceService().exportDb(file); // clean files progressionModel.increments(1); - progressionModel.setMessage(_("tutti.exportDb.reloadApplication")); + progressionModel.setMessage(_("tutti.exportDb.step.reloadApplication")); // Close the application, will exit and restart application RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java 2013-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java 2013-09-23 12:20:59 UTC (rev 1205) @@ -26,6 +26,7 @@ import com.google.common.collect.Maps; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyRowModel; +import fr.ifremer.tutti.ui.swing.util.WeightUnit; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightDialog; import jaxx.runtime.SwingUtil; @@ -51,8 +52,16 @@ protected Float sortedWeight = null; + /** + * Weight unit. + * + * @since 2.5 + */ + protected final WeightUnit weightUnit; + public CreateBenthosMelagAction(BenthosBatchUIHandler handler) { super(handler, false); + weightUnit = getConfig().getBenthosWeightUnit(); } @Override @@ -127,8 +136,9 @@ protected Float openMelagWeightDialog() { Frame frame = SwingUtil.getParentContainer(getUI(), Frame.class); - final EnterMelagWeightDialog dialog = new EnterMelagWeightDialog(frame, - getConfig().getShortcutClosePopup()); + EnterMelagWeightDialog dialog = new EnterMelagWeightDialog( + frame, getConfig().getShortcutClosePopup()); + dialog.setWeightUnit(weightUnit); SwingUtil.center(frame, dialog); dialog.pack(); dialog.setVisible(true); @@ -142,16 +152,17 @@ @Override public void doAction() throws Exception { - String melagComment = _("tutti.createBenthosMelag.comment.part1"); + String unitLabel = weightUnit.getShortLabel(); + String melagComment = _("tutti.createBenthosMelag.comment.part1") + "\n"; for (BenthosBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { Float weight = sampleMelagWeight * sampleWeight / sortedWeight; batch.getFinestCategory().setCategoryWeight(weight); } - melagComment += _("tutti.createBenthosMelag.comment.part2", sampleWeight, decorate(batch.getSpecies())); + melagComment += _("tutti.createBenthosMelag.comment.part2", sampleWeight, unitLabel, decorate(batch.getSpecies())) + "\n"; } - melagComment += _("tutti.createBenthosMelag.comment.part3", melagWeight); + melagComment += _("tutti.createBenthosMelag.comment.part3", melagWeight, unitLabel); for (BenthosBatchRowModel batch : selectedRows.keySet()) { String comment = batch.getComment(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2013-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2013-09-23 12:20:59 UTC (rev 1205) @@ -64,13 +64,13 @@ // public static final ColumnIdentifier<IndividualObservationBatchRowModel> CALCIFIED_PIECE_SAMPLING_CODE = ColumnIdentifier.newId( // IndividualObservationBatchRowModel.PROPERTY_CALCIFIED_PIECE_SAMPLING_CODE, -// n_("tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode"), -// n_("tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode.tip")); +// ("tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode"), +// ("tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode.tip")); // // public static final ColumnIdentifier<IndividualObservationBatchRowModel> SAMPLING_CODE = ColumnIdentifier.newId( // IndividualObservationBatchRowModel.PROPERTY_SAMPLING_CODE, -// n_("tutti.editIndividualObservationBatch.table.header.samplingCode"), -// n_("tutti.editIndividualObservationBatch.table.header.samplingCode.tip")); +// ("tutti.editIndividualObservationBatch.table.header.samplingCode"), +// ("tutti.editIndividualObservationBatch.table.header.samplingCode.tip")); public static final ColumnIdentifier<IndividualObservationBatchRowModel> COMMENT = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_COMMENT, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java 2013-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java 2013-09-23 12:20:59 UTC (rev 1205) @@ -26,6 +26,7 @@ import com.google.common.collect.Maps; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; +import fr.ifremer.tutti.ui.swing.util.WeightUnit; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightDialog; import jaxx.runtime.SwingUtil; @@ -51,8 +52,16 @@ protected Float sortedWeight = null; + /** + * Weight unit. + * + * @since 2.5 + */ + protected final WeightUnit weightUnit; + public CreateSpeciesMelagAction(SpeciesBatchUIHandler handler) { super(handler, false); + weightUnit = getConfig().getSpeciesWeightUnit(); } @Override @@ -127,8 +136,11 @@ protected Float openMelagWeightDialog() { Frame frame = SwingUtil.getParentContainer(getUI(), Frame.class); - final EnterMelagWeightDialog dialog = new EnterMelagWeightDialog(frame, - getConfig().getShortcutClosePopup()); + EnterMelagWeightDialog dialog = new EnterMelagWeightDialog( + frame, getConfig().getShortcutClosePopup()); + + dialog.setWeightUnit(weightUnit); + SwingUtil.center(frame, dialog); dialog.pack(); dialog.setVisible(true); @@ -142,16 +154,17 @@ @Override public void doAction() throws Exception { - String melagComment = _("tutti.createSpeciesMelag.comment.part1"); + String unitLabel = weightUnit.getShortLabel(); + String melagComment = _("tutti.createSpeciesMelag.comment.part1")+"\n"; for (SpeciesBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { Float weight = sampleMelagWeight * sampleWeight / sortedWeight; batch.getFinestCategory().setCategoryWeight(weight); } - melagComment += _("tutti.createSpeciesMelag.comment.part2", sampleWeight, decorate(batch.getSpecies())); + melagComment += _("tutti.createSpeciesMelag.comment.part2", sampleWeight, unitLabel, decorate(batch.getSpecies()))+"\n"; } - melagComment += _("tutti.createSpeciesMelag.comment.part3", melagWeight); + melagComment += _("tutti.createSpeciesMelag.comment.part3", melagWeight, unitLabel); for (SpeciesBatchRowModel batch : selectedRows.keySet()) { String comment = batch.getComment(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css 2013-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css 2013-09-23 12:20:59 UTC (rev 1205) @@ -23,11 +23,11 @@ */ #dialog { - title: "tutti.createSpeciesMelag.title"; + title: {_("tutti.createSpeciesMelag.title", weightUnit.getShortLabel())}; } #message { - text: "tutti.createSpeciesMelag.message"; + text: {_("tutti.createSpeciesMelag.message", weightUnit.getShortLabel())}; horizontalAlignment: {JLabel.CENTER}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 2013-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 2013-09-23 12:20:59 UTC (rev 1205) @@ -23,6 +23,8 @@ --> <JDialog id='dialog' layout='{new BorderLayout()}'> <import> + fr.ifremer.tutti.ui.swing.util.WeightUnit + java.awt.Component; java.awt.event.WindowAdapter; java.awt.event.WindowEvent; @@ -53,6 +55,8 @@ ]]></script> + <WeightUnit id='weightUnit' javaBean='WeightUnit.KG'/> + <Table id='table' fill='both' constraints='BorderLayout.CENTER'> <row> <cell insets='10, 10, 5, 10'> 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-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-23 12:20:59 UTC (rev 1205) @@ -47,13 +47,8 @@ tutti.attachmentEditor.none.tip= tutti.attachmentEditor.saveAttachment.button= tutti.attachmentEditor.saveAttachment.error.message= -tutti.attachmentEditor.saveAttachment.fail.message= -tutti.attachmentEditor.saveAttachment.fail.title= tutti.attachmentEditor.saveAttachment.success.message= tutti.attachmentEditor.saveAttachment.title= -tutti.attachmentEditor.saveAttachment.warning.help= -tutti.attachmentEditor.saveAttachment.warning.message= -tutti.attachmentEditor.saveAttachment.warning.title= tutti.attachmentEditor.text= tutti.attachmentEditor.title= tutti.caracteristicMapEditor.none.tip= @@ -67,8 +62,6 @@ tutti.common.askBeforeDelete.help= tutti.common.askBeforeEditProtocol.help= tutti.common.askBeforeEditProtocol.title= -tutti.common.askBeforeEditProtocole.help= -tutti.common.askBeforeEditProtocole.title= tutti.common.askBeforeImportProtocol.help= tutti.common.askCancelEditBeforeLeaving.help= tutti.common.askCancelEditBeforeLeaving.title= @@ -79,9 +72,7 @@ tutti.common.askSaveBeforeLeaving.title= tutti.common.cancel= tutti.common.cancel.mnemonic= -tutti.common.caracteristic.notFound= tutti.common.datefield.tip= -tutti.common.editProtocol.categories.not.compatible= tutti.common.file.csv= tutti.common.file.pdf= tutti.common.file.protocol= @@ -91,7 +82,6 @@ tutti.common.file.tuttiMarineLitter= tutti.common.file.tuttiSpecies= tutti.common.file.zip= -tutti.common.protocol.categories.not.compatible= tutti.common.unit=Unit tutti.common.unit.g=Gramme tutti.common.unit.kg=kilogram @@ -102,12 +92,9 @@ tutti.config.action.reload.actions= tutti.config.action.reload.application= tutti.config.action.reload.ui= -tutti.config.action.sampleOrder.tip= tutti.config.application= tutti.config.category.applications= tutti.config.category.applications.description= -tutti.config.category.sampleCategoryModel= -tutti.config.category.sampleCategoryModel.description= tutti.config.category.technical= tutti.config.category.technical.description= tutti.config.category.ui= @@ -143,15 +130,8 @@ tutti.config.option.ui.weight.unit.species.description= tutti.config.option.update.application.url.description= tutti.config.option.update.db.url.description= -tutti.config.option.update.url.description= tutti.config.option.weights.rate.difference.totalAndSorted.description= tutti.config.parse.error= -tutti.config.sampleCategoryModel.passwordDialog.error.message= -tutti.config.sampleCategoryModel.passwordDialog.error.title= -tutti.config.sampleCategoryModel.passwordDialog.message= -tutti.config.sampleCategoryModel.passwordDialog.title= -tutti.config.sampleCategoryModel.title= -tutti.config.sampleOrder.title= tutti.config.save.error= tutti.config.title= tutti.context.helpPage.notFound= @@ -159,9 +139,6 @@ tutti.createAccidentalBatch.action.cancel= tutti.createAccidentalBatch.action.cancel.mnemonic= tutti.createAccidentalBatch.action.cancel.tip= -tutti.createAccidentalBatch.action.save= -tutti.createAccidentalBatch.action.save.mnemonic= -tutti.createAccidentalBatch.action.save.tip= tutti.createAccidentalBatch.action.saveAndClose= tutti.createAccidentalBatch.action.saveAndClose.mnemonic= tutti.createAccidentalBatch.action.saveAndClose.tip= @@ -187,9 +164,6 @@ tutti.createBenthosBatch.action.cancel= tutti.createBenthosBatch.action.cancel.mnemonic= tutti.createBenthosBatch.action.cancel.tip= -tutti.createBenthosBatch.action.save= -tutti.createBenthosBatch.action.save.mnemonic= -tutti.createBenthosBatch.action.save.tip= tutti.createBenthosBatch.action.saveAndClose= tutti.createBenthosBatch.action.saveAndClose.mnemonic= tutti.createBenthosBatch.action.saveAndClose.tip= @@ -206,7 +180,6 @@ tutti.createBenthosBatch.field.sampleCategory.tip= tutti.createBenthosBatch.field.sampleWeight= tutti.createBenthosBatch.field.sampleWeight.tip= -tutti.createBenthosBatch.field.sampleWeightField.tip= tutti.createBenthosBatch.field.species= tutti.createBenthosBatch.field.species.tip= tutti.createBenthosBatch.title= @@ -221,9 +194,6 @@ tutti.createIndividualObservationBatch.action.cancel= tutti.createIndividualObservationBatch.action.cancel.mnemonic= tutti.createIndividualObservationBatch.action.cancel.tip= -tutti.createIndividualObservationBatch.action.save= -tutti.createIndividualObservationBatch.action.save.mnemonic= -tutti.createIndividualObservationBatch.action.save.tip= tutti.createIndividualObservationBatch.action.saveAndClose= tutti.createIndividualObservationBatch.action.saveAndClose.mnemonic= tutti.createIndividualObservationBatch.action.saveAndClose.tip= @@ -242,9 +212,6 @@ tutti.createMarineLitterBatch.action.cancel= tutti.createMarineLitterBatch.action.cancel.mnemonic= tutti.createMarineLitterBatch.action.cancel.tip= -tutti.createMarineLitterBatch.action.save= -tutti.createMarineLitterBatch.action.save.mnemonic= -tutti.createMarineLitterBatch.action.save.tip= tutti.createMarineLitterBatch.action.saveAndClose= tutti.createMarineLitterBatch.action.saveAndClose.mnemonic= tutti.createMarineLitterBatch.action.saveAndClose.tip= @@ -266,9 +233,6 @@ tutti.createSpeciesBatch.action.cancel= tutti.createSpeciesBatch.action.cancel.mnemonic= tutti.createSpeciesBatch.action.cancel.tip= -tutti.createSpeciesBatch.action.save= -tutti.createSpeciesBatch.action.save.mnemonic= -tutti.createSpeciesBatch.action.save.tip= tutti.createSpeciesBatch.action.saveAndClose= tutti.createSpeciesBatch.action.saveAndClose.mnemonic= tutti.createSpeciesBatch.action.saveAndClose.tip= @@ -305,12 +269,6 @@ tutti.dbManager.action.chooseDbBackupFile= tutti.dbManager.action.chooseDbExportFile= tutti.dbManager.action.chooseDbFile= -tutti.dbManager.action.closeDb= -tutti.dbManager.action.closeDb.mnemonic= -tutti.dbManager.action.closeDb.tip= -tutti.dbManager.action.exportAndCleanDb= -tutti.dbManager.action.exportAndCleanDb.mnemonic= -tutti.dbManager.action.exportAndCleanDb.tip= tutti.dbManager.action.exportDb= tutti.dbManager.action.exportDb.mnemonic= tutti.dbManager.action.exportDb.tip= @@ -318,7 +276,6 @@ tutti.dbManager.action.importDb.backup.db= tutti.dbManager.action.importDb.mnemonic= tutti.dbManager.action.importDb.tip= -tutti.dbManager.action.importdb.backup.db= tutti.dbManager.action.importdb.couldNotOpen= tutti.dbManager.action.importdb.no.backup.db.choosen= tutti.dbManager.action.importdb.no.import.file.choosen= @@ -472,17 +429,12 @@ tutti.editBenthosFrequencies.action.generate= tutti.editBenthosFrequencies.action.generate.mnemonic= tutti.editBenthosFrequencies.action.generate.tip= -tutti.editBenthosFrequencies.action.save= -tutti.editBenthosFrequencies.action.save.mnemonic= -tutti.editBenthosFrequencies.action.save.tip= tutti.editBenthosFrequencies.action.saveAndClose= tutti.editBenthosFrequencies.action.saveAndClose.mnemonic= tutti.editBenthosFrequencies.action.saveAndClose.tip= tutti.editBenthosFrequencies.action.saveAndContinue= tutti.editBenthosFrequencies.action.saveAndContinue.mnemonic= tutti.editBenthosFrequencies.action.saveAndContinue.tip= -tutti.editBenthosFrequencies.batchCategory= -tutti.editBenthosFrequencies.batchSpecies= tutti.editBenthosFrequencies.error.length.doublon= tutti.editBenthosFrequencies.field.lengthStepCaracteristic= tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip= @@ -728,8 +680,6 @@ tutti.editIndividualObservationBatch.action.removeBatch.confirm.title= tutti.editIndividualObservationBatch.action.removeBatch.mnemonic= tutti.editIndividualObservationBatch.action.removeBatch.tip= -tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode= -tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode.tip= tutti.editIndividualObservationBatch.table.header.comment= tutti.editIndividualObservationBatch.table.header.comment.tip= tutti.editIndividualObservationBatch.table.header.file= @@ -738,18 +688,12 @@ tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic.tip= tutti.editIndividualObservationBatch.table.header.otherCaracteristics= tutti.editIndividualObservationBatch.table.header.otherCaracteristics.tip= -tutti.editIndividualObservationBatch.table.header.samplingCode= -tutti.editIndividualObservationBatch.table.header.samplingCode.tip= tutti.editIndividualObservationBatch.table.header.size= tutti.editIndividualObservationBatch.table.header.size.tip= tutti.editIndividualObservationBatch.table.header.species= tutti.editIndividualObservationBatch.table.header.species.tip= tutti.editIndividualObservationBatch.table.header.weight= tutti.editIndividualObservationBatch.table.header.weight.tip= -tutti.editIndividualObservationBatch.table.header.weightG= -tutti.editIndividualObservationBatch.table.header.weightG.tip= -tutti.editIndividualObservationBatch.table.header.weightKG= -tutti.editIndividualObservationBatch.table.header.weightKG.tip= tutti.editIndividualObservationCaracteristics.action.cancel= tutti.editIndividualObservationCaracteristics.action.cancel.mnemonic= tutti.editIndividualObservationCaracteristics.action.cancel.tip= @@ -793,10 +737,6 @@ tutti.editMarineLitterBatch.table.header.number.tip= tutti.editMarineLitterBatch.table.header.weight= tutti.editMarineLitterBatch.table.header.weight.tip= -tutti.editMarineLitterBatch.table.header.weightG= -tutti.editMarineLitterBatch.table.header.weightG.tip= -tutti.editMarineLitterBatch.table.header.weightKG= -tutti.editMarineLitterBatch.table.header.weightKG.tip= tutti.editProgram.action.closeEditProgram= tutti.editProgram.action.closeEditProgram.mnemonic= tutti.editProgram.action.closeEditProgram.tip= @@ -903,9 +843,6 @@ tutti.editProtocol.warn.clean= tutti.editProtocol.warn.clone= tutti.editProtocol.warn.import= -tutti.editSampleCategoryModel.action.cancel= -tutti.editSampleCategoryModel.action.cancel.mnemonic= -tutti.editSampleCategoryModel.action.cancel.tip= tutti.editSampleCategoryModel.action.close= tutti.editSampleCategoryModel.action.close.mnemonic= tutti.editSampleCategoryModel.action.close.tip= @@ -1011,17 +948,12 @@ tutti.editSpeciesFrequencies.action.generate= tutti.editSpeciesFrequencies.action.generate.mnemonic= tutti.editSpeciesFrequencies.action.generate.tip= -tutti.editSpeciesFrequencies.action.save= -tutti.editSpeciesFrequencies.action.save.mnemonic= -tutti.editSpeciesFrequencies.action.save.tip= tutti.editSpeciesFrequencies.action.saveAndClose= tutti.editSpeciesFrequencies.action.saveAndClose.mnemonic= tutti.editSpeciesFrequencies.action.saveAndClose.tip= tutti.editSpeciesFrequencies.action.saveAndContinue= tutti.editSpeciesFrequencies.action.saveAndContinue.mnemonic= tutti.editSpeciesFrequencies.action.saveAndContinue.tip= -tutti.editSpeciesFrequencies.batchCategory= -tutti.editSpeciesFrequencies.batchSpecies= tutti.editSpeciesFrequencies.error.length.doublon= tutti.editSpeciesFrequencies.field.lengthStepCaracteristic= tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip= @@ -1068,15 +1000,11 @@ tutti.exportCruise.action.success= tutti.exportCruiseForSumatra.action.chooseFile= tutti.exportCruiseForSumatra.action.success= -tutti.exportCruiseForSumatra.choose.exportFile.default= tutti.exportCruiseForSumatra.title.choose.exportFile= -tutti.exportDb.closeDb= -tutti.exportDb.createArchive= -tutti.exportDb.openDb= -tutti.exportDb.reloadApplication= tutti.exportDb.step.closeDb= tutti.exportDb.step.createArchive= tutti.exportDb.step.openDb= +tutti.exportDb.step.reloadApplication= tutti.exportProgram.action.success= tutti.exportProtocol.action.success= tutti.fishingOperations.action.deleteFishingOperation.mnemonic= @@ -1108,7 +1036,6 @@ tutti.flash.info.db.not.opened= tutti.flash.info.db.opened= tutti.flash.info.db.schema.updated= -tutti.flash.info.db.schema.updating= tutti.flash.info.programCreated= tutti.flash.info.programSaved= tutti.flash.info.protocolCreated= @@ -1131,18 +1058,12 @@ tutti.help.mkDir.error= tutti.i18n.deleteCache.error= tutti.i18n.mkDir.error= -tutti.importDb.openDb= -tutti.importDb.step.backupDb= tutti.importDb.step.check.dbContext= tutti.importDb.step.checkSchemaVersion= tutti.importDb.step.closeDb= tutti.importDb.step.openDb= tutti.importDb.step.unzipArchive= tutti.importDb.step.will.migrateSchema= -tutti.importDb.unzipArchive= -tutti.importDbAtNextStart.step.backupDb= -tutti.importDbAtNextStart.step.closeDb= -tutti.importDbAtNextStart.step.reloadApplication= tutti.importProtocol.action.success= tutti.importPupitri.carrouselFile.extension= tutti.importPupitri.carrouselFile.extension.description= @@ -1153,9 +1074,6 @@ tutti.importPupitri.title= tutti.importPupitri.trunkFile.extension= tutti.importPupitri.trunkFile.extension.description= -tutti.installDb.step.backupDb= -tutti.installDb.step.closeDb= -tutti.installDb.step.destroyDb= tutti.label.tab.accidental= tutti.label.tab.benthos= tutti.label.tab.catches= @@ -1325,11 +1243,6 @@ tutti.reinstallDb.step.backupDb= tutti.reinstallDb.step.closeDb= tutti.reinstallDb.step.reloadApplication= -tutti.sampleCategoryModel.passwordDialog.error.message= -tutti.sampleCategoryModel.passwordDialog.error.title= -tutti.sampleCategoryModel.passwordDialog.message= -tutti.sampleCategoryModel.passwordDialog.title= -tutti.sampleOrder.caracteristicNotFound= tutti.selectBenthos.title= tutti.selectCruise.action.chooseCruiseExportFile= tutti.selectCruise.action.chooseProgramExportFile= @@ -1407,8 +1320,6 @@ tutti.splitBenthosBatch.field.category.tip= tutti.splitBenthosBatch.field.sampleWeight= tutti.splitBenthosBatch.field.sampleWeight.tip= -tutti.splitBenthosBatch.field.species= -tutti.splitBenthosBatch.field.speciesField.tip= tutti.splitBenthosBatch.table.header.category= tutti.splitBenthosBatch.table.header.selected= tutti.splitBenthosBatch.table.header.weight= @@ -1425,8 +1336,6 @@ tutti.splitSpeciesBatch.field.categoryField.tip= tutti.splitSpeciesBatch.field.sampleWeight= tutti.splitSpeciesBatch.field.sampleWeightField.tip= -tutti.splitSpeciesBatch.field.species= -tutti.splitSpeciesBatch.field.speciesField.tip= tutti.splitSpeciesBatch.table.header.category= tutti.splitSpeciesBatch.table.header.selected= tutti.splitSpeciesBatch.table.header.weight= @@ -1441,12 +1350,10 @@ tutti.updateApplication.message.success= tutti.updateApplication.noUpdate= tutti.updateApplication.title.success= -tutti.validateCruise.action.export.all.chooseFile.defaultFile= tutti.validateCruise.action.export.all.chooseFile.label= tutti.validateCruise.action.export.all.chooseFile.title= tutti.validateCruise.action.export.all.success= tutti.validateCruise.action.export.all.tip= -tutti.validateCruise.action.export.operation.chooseFile.defaultFile= tutti.validateCruise.action.export.operation.chooseFile.label= tutti.validateCruise.action.export.operation.chooseFile.title= tutti.validateCruise.action.export.operation.success= @@ -1499,4 +1406,3 @@ tutti.vesselUseFeatureTable.table.header.key= tutti.vesselUseFeatureTable.table.header.value= tutti.vesselUseFeatureTable.title= -{handler.getInstallButtonMnemonic(model.isDbExist())}= 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-09-23 11:37:47 UTC (rev 1204) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-23 12:20:59 UTC (rev 1205) @@ -47,13 +47,8 @@ tutti.attachmentEditor.none.tip=Pas de pièce-jointes tutti.attachmentEditor.saveAttachment.button=Enregistrer tutti.attachmentEditor.saveAttachment.error.message=Erreur lors de l'enregistrement de la pièce jointe %1s dans le fichier %2s -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.title=Enregistrer la pièce-jointe -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.attachmentEditor.text=(%s) tutti.attachmentEditor.title=Pièces jointes tutti.caracteristicMapEditor.none.tip=Pas de caractéristiques @@ -97,12 +92,9 @@ tutti.config.action.reload.actions=Recharger les actions tutti.config.action.reload.application=Recharger l'application tutti.config.action.reload.ui=Recharger l'interface graphique -tutti.config.action.sampleOrder.tip=Réordonner les catégories d’échantillonnage tutti.config.application=Configuration de l'application Tutti tutti.config.category.applications=Application tutti.config.category.applications.description=Application -tutti.config.category.sampleCategoryModel=Catégories de captures -tutti.config.category.sampleCategoryModel.description=Configurer les catégories de captures tutti.config.category.technical=Technique tutti.config.category.technical.description=Informations techniques tutti.config.category.ui=Interface utilisateur @@ -140,7 +132,6 @@ tutti.config.option.update.db.url.description=URL de mise à jour de la base de données tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie tutti.config.parse.error=Erreur de parsing du fichier de configuration -tutti.config.sampleOrder.title=Catégorie d'échantillonnage tutti.config.save.error=Erreur lors de la sauvegarde de la configuration dans le fichier %s tutti.config.title=Configuration tutti.context.helpPage.notFound=La page d'aide %s n'a pas été trouvée @@ -192,9 +183,9 @@ tutti.createBenthosBatch.field.species=Espèce du lot tutti.createBenthosBatch.field.species.tip=Espèce du lot tutti.createBenthosBatch.title=Créer un lot -tutti.createBenthosMelag.comment.part1=Traitement issu d'un mélange composé de \:\n -tutti.createBenthosMelag.comment.part2=- %skg de %s\n -tutti.createBenthosMelag.comment.part3=avec un poids d'élévation de %skg +tutti.createBenthosMelag.comment.part1=Traitement issu d'un mélange composé de \: +tutti.createBenthosMelag.comment.part2=- %s%s de %s +tutti.createBenthosMelag.comment.part3=avec un poids d'élévation de %s%s tutti.createBenthosMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations tutti.createBenthosMelag.error.title=Erreur tutti.createIndividualObservationBatch.action.addSpecies=... @@ -267,22 +258,17 @@ tutti.createSpeciesMelag.action.validate=Valider tutti.createSpeciesMelag.action.validate.mnemonic=V tutti.createSpeciesMelag.action.validate.tip=Valider la création du MELAG (mélange) -tutti.createSpeciesMelag.comment.part1=Traitement issu d'un mélange composé de \:\n -tutti.createSpeciesMelag.comment.part2=- %skg de %s\n -tutti.createSpeciesMelag.comment.part3=avec un poids d'élévation de %skg +tutti.createSpeciesMelag.comment.part1=Traitement issu d'un mélange composé de \: +tutti.createSpeciesMelag.comment.part2=- %s%s de %s +tutti.createSpeciesMelag.comment.part3=avec un poids d'élévation de %s%s tutti.createSpeciesMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations tutti.createSpeciesMelag.error.title=Erreur -tutti.createSpeciesMelag.message=Combien pesait le MELAG (mélange) (kg) ? -tutti.createSpeciesMelag.title=Poids du MELAG (mélange) (kg) +tutti.createSpeciesMelag.message=Combien pesait le MELAG (mélange) (%s) ? +tutti.createSpeciesMelag.title=Poids du MELAG (mélange) (%s) tutti.dbMabager.title=Gérer les bases de données tutti.dbManager.action.chooseDbBackupFile=Sauvegarder la base de données tutti.dbManager.action.chooseDbExportFile=Exporter la base de données tutti.dbManager.action.chooseDbFile=Choisir la base à importer -tutti.dbManager.action.closeDb=Fermer la base -tutti.dbManager.action.closeDb.mnemonic=F -tutti.dbManager.action.closeDb.tip=Fermer la base en cours d'utilisation -tutti.dbManager.action.exportAndCleanDb.mnemonic=s -tutti.dbManager.action.exportAndCleanDb.tip=Exporter la base de données au format zip puis supprimer les fichiers de l'application tutti.dbManager.action.exportDb=Exporter tutti.dbManager.action.exportDb.mnemonic=x tutti.dbManager.action.exportDb.tip=Exporter la base de données au format zip @@ -290,7 +276,6 @@ tutti.dbManager.action.importDb.backup.db=Avant de pouvoir importer une nouvelle base, vous devez sauvegarder la base courante. tutti.dbManager.action.importDb.mnemonic=i tutti.dbManager.action.importDb.tip=Importer la base de données au format zip -tutti.dbManager.action.importdb.backup.db=Avant de pouvoir importer une nouvelle base, vous devez sauvegarder la base courante. tutti.dbManager.action.importdb.couldNotOpen=Impossible d'ouvrir la base importée tutti.dbManager.action.importdb.no.backup.db.choosen=Import annulé (vous n'avez pas choisi de fichier de sauvegarde). tutti.dbManager.action.importdb.no.import.file.choosen=Import annulé (vous n'avez pas choisi de fichier d'import). @@ -306,7 +291,6 @@ tutti.dbManager.action.reinstallDb=Réinstaller tutti.dbManager.action.reinstallDb.mnemonic=n tutti.dbManager.action.reinstallDb.tip=Télécharger puis ré-installer la base de données -tutti.dbManager.action.removeBatch.confirm.message= tutti.dbManager.action.upgradeDb=Mettre à jour les référentiels tutti.dbManager.action.upgradeDb.check=Recherche des mises à jour de la base tutti.dbManager.action.upgradeDb.mnemonic=V @@ -696,8 +680,6 @@ tutti.editIndividualObservationBatch.action.removeBatch.confirm.title=Suppression d'une observation individuelle tutti.editIndividualObservationBatch.action.removeBatch.mnemonic=S tutti.editIndividualObservationBatch.action.removeBatch.tip=Supprimer la ligne sélectionnée -tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode= -tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode.tip=Code de prélèvement pièce calcifiée tutti.editIndividualObservationBatch.table.header.comment=Commentaire tutti.editIndividualObservationBatch.table.header.comment.tip=Commentaire tutti.editIndividualObservationBatch.table.header.file=Pièces jointes @@ -706,8 +688,6 @@ tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic.tip=Classe de taille tutti.editIndividualObservationBatch.table.header.otherCaracteristics=Autres caractéristiques tutti.editIndividualObservationBatch.table.header.otherCaracteristics.tip=Autres caractéristiques -tutti.editIndividualObservationBatch.table.header.samplingCode= -tutti.editIndividualObservationBatch.table.header.samplingCode.tip=Code prélèvement autre tutti.editIndividualObservationBatch.table.header.size=Taille tutti.editIndividualObservationBatch.table.header.size.tip=Taille tutti.editIndividualObservationBatch.table.header.species=Espèce @@ -962,7 +942,6 @@ tutti.editSpeciesBatch.table.header.species=Espèce tutti.editSpeciesBatch.table.header.toConfirm=A Confirmer tutti.editSpeciesBatch.table.header.weight=Poids sous-échantillonné -tutti.editSpeciesBatch.table.header.weight.tip=Poids sous-échantillonné tutti.editSpeciesFrequencies.action.cancel=Annuler tutti.editSpeciesFrequencies.action.cancel.mnemonic=A tutti.editSpeciesFrequencies.action.cancel.tip=Annuler l'édition des mensurations @@ -1006,7 +985,6 @@ tutti.editSpeciesFrequencies.table.header.lengthStep=Classe de taille tutti.editSpeciesFrequencies.table.header.number=Nombre tutti.editSpeciesFrequencies.table.header.weight=Poids observé -tutti.editSpeciesFrequencies.table.header.weight.tip=Poids observé tutti.editSpeciesFrequencies.title=Mensuration tutti.error.about.could.not.reach.url=Récupération des versions de mises à jour impossible (l'url <strong>%s</strong> n'est pas joignable) tutti.error.delete.startActionFile=Impossible de supprimer le fichier %s @@ -1022,14 +1000,11 @@ tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>. tutti.exportCruiseForSumatra.action.chooseFile=Choisir le fichier d'export tutti.exportCruiseForSumatra.action.success=Les captures ont correctement été exporté dans le fichier %s -tutti.exportCruiseForSumatra.choose.exportFile.default=sumatra_%s_%s tutti.exportCruiseForSumatra.title.choose.exportFile=Exporter les captures de la campagne -tutti.exportDb.closeDb= -tutti.exportDb.createArchive= -tutti.exportDb.reloadApplication=Redémarrage de l'application tutti.exportDb.step.closeDb=Fermeture de la base courante tutti.exportDb.step.createArchive=Création de l'archive %s tutti.exportDb.step.openDb=Réouverture de la base courante +tutti.exportDb.step.reloadApplication=Redémarrage de l'application tutti.exportProgram.action.success=La série de campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>. tutti.exportProtocol.action.success=Protocole [%1s] exporté dans le fichier <strong>%2s</strong>. tutti.fishingOperations.action.deleteFishingOperation.mnemonic=S @@ -1099,7 +1074,6 @@ tutti.importPupitri.title=Import Pupitri tutti.importPupitri.trunkFile.extension=tnk tutti.importPupitri.trunkFile.extension.description=Fichier du trémie (.tnk) -tutti.installDb.step.closeDb=Fermeture de la base <strong>%s</strong> tutti.label.tab.accidental=Captures accidentelles tutti.label.tab.benthos=Benthos tutti.label.tab.catches=Captures @@ -1346,12 +1320,9 @@ tutti.splitBenthosBatch.field.category.tip=Choisir le mode de catégorisation tutti.splitBenthosBatch.field.sampleWeight=Poids total catégorisé tutti.splitBenthosBatch.field.sampleWeight.tip=Somme des poids saisis ci-dessous -tutti.splitBenthosBatch.field.species=Espèce -tutti.splitBenthosBatch.field.speciesField.tip=Espèce du lot père tutti.splitBenthosBatch.table.header.category=Catégorie tutti.splitBenthosBatch.table.header.selected=Sélection tutti.splitBenthosBatch.table.header.weight=Poids -tutti.splitBenthosBatch.table.header.weight.tip=Poids tutti.splitBenthosBatch.title=Catégorisation du lot tutti.splitSpeciesBatch.action.cancel=Annuler tutti.splitSpeciesBatch.action.cancel.mnemonic=A @@ -1365,12 +1336,9 @@ tutti.splitSpeciesBatch.field.categoryField.tip=Choisir le mode de catégorisation tutti.splitSpeciesBatch.field.sampleWeight=Poids total catégorisé tutti.splitSpeciesBatch.field.sampleWeightField.tip=Somme des poids saisis ci-dessous -tutti.splitSpeciesBatch.field.species=Espèce -tutti.splitSpeciesBatch.field.speciesField.tip=Espèce du lot père tutti.splitSpeciesBatch.table.header.category=Catégorie tutti.splitSpeciesBatch.table.header.selected=Sélection tutti.splitSpeciesBatch.table.header.weight=Poids -tutti.splitSpeciesBatch.table.header.weight.tip=Poids tutti.splitSpeciesBatch.title=Catégorisation du lot tutti.timeeditor.H=H tutti.update.db=Base de données @@ -1438,4 +1406,3 @@ tutti.vesselUseFeatureTable.table.header.key=Caractéristique tutti.vesselUseFeatureTable.table.header.value=Valeur tutti.vesselUseFeatureTable.title=Autres paramètres -{handler.getInstallButtonMnemonic(model.isDbExist())}=