Author: tchemit Date: 2013-03-15 11:20:17 +0100 (Fri, 15 Mar 2013) New Revision: 630 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/630 Log: normalize i18n Added: trunk/tutti-ui-swing/src/main/help/fr/config.html Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderButton.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/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/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/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/catches/species/SpeciesBatchUI.css 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/split/SplitSpeciesBatchUI.css 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/protocol/EditProtocolUI.css 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/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/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.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-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java 2013-03-15 10:20:17 UTC (rev 630) @@ -42,14 +42,14 @@ DB_DIRECTORY( "tutti.persistence.db.directory", - n_("tutti.option.persistence.db.directory.description"), + n_("tutti.config.option.persistence.db.directory.description"), "${tutti.data.directory}/db", File.class, true, true), DB_ATTACHMENT_DIRECTORY( "tutti.persistence.db.attachment.directory", - n_("tutti.option.persistence.db.attachment.directory.description"), + n_("tutti.config.option.persistence.db.attachment.directory.description"), "${tutti.data.directory}/meas_files", File.class, true, @@ -57,7 +57,7 @@ CACHE_DIRECTORY( "tutti.persistence.cache.directory", - n_("tutti.option.persistence.cache.directory.description"), + n_("tutti.config.option.persistence.cache.directory.description"), "${tutti.data.directory}/dbcache", File.class, true, @@ -65,7 +65,7 @@ PROTOCOL_DIRECTORY( "tutti.persistence.protocol.directory", - n_("tutti.option.persistence.protocol.directory.description"), + n_("tutti.config.option.persistence.protocol.directory.description"), "${tutti.data.directory}/protocol", File.class, true, @@ -73,7 +73,7 @@ DB_CONFIGURATION_PATH( "tutti.persistence.db.configurationPath", - n_("tutti.option.persistence.db.configurationPath.description"), + n_("tutti.config.option.persistence.db.configurationPath.description"), "${tutti.data.directory}/dbconf/conf.properties", File.class, true, @@ -81,7 +81,7 @@ DB_ENUMERATION_PATH( "tutti.persistence.db.enumerationPath", - n_("tutti.option.persistence.db.enumerationPath.description"), + n_("tutti.config.option.persistence.db.enumerationPath.description"), "${tutti.data.directory}/dbconf/enumerations-v3.properties", File.class, true, @@ -89,7 +89,7 @@ DB_NAME( "tutti.persistence.db.name", - n_("tutti.option.persistence.db.name.description"), + n_("tutti.config.option.persistence.db.name.description"), "allegro", String.class, true, @@ -97,56 +97,56 @@ JDBC_USERNAME( "tutti.persistence.jdbc.username", - n_("tutti.option.persistence.jdbc.username.description"), + n_("tutti.config.option.persistence.jdbc.username.description"), "sa", String.class, true, true), JDBC_PASSWORD( "tutti.persistence.jdbc.password", - n_("tutti.option.persistence.jdbc.password.description"), + n_("tutti.config.option.persistence.jdbc.password.description"), "", String.class, true, true), JDBC_URL( "tutti.persistence.jdbc.url", - n_("tutti.option.persistence.jdbc.url.description"), + n_("tutti.config.option.persistence.jdbc.url.description"), "jdbc:hsqldb:file:${tutti.persistence.db.directory}/${tutti.persistence.db.name}", String.class, true, true), JDBC_DRIVER( "tutti.persistence.jdbc.driver", - n_("tutti.option.persistence.jdbc.driver.description"), + n_("tutti.config.option.persistence.jdbc.driver.description"), jdbcDriver.class.getName(), Class.class, true, true), HIBERNATE_DIALECT( "tutti.persistence.hibernate.dialect", - n_("tutti.option.persistence.hibernate.dialect.description"), + n_("tutti.config.option.persistence.hibernate.dialect.description"), HSQLDialect.class.getName(), Class.class, true, true), HIBERNATE_SHOW_SQL( "tutti.persistence.hibernate.showSql", - n_("tutti.option.persistence.hibernate.showSql.description"), + n_("tutti.config.option.persistence.hibernate.showSql.description"), Boolean.FALSE.toString(), boolean.class, true, true), HIBERNATE_USE_SQL_COMMENT( "tutti.persistence.hibernate.useSqlComment", - n_("tutti.option.persistence.hibernate.useSqlComment.description"), + n_("tutti.config.option.persistence.hibernate.useSqlComment.description"), Boolean.FALSE.toString(), boolean.class, true, true), HIBERNATE_FORMAT_SQL( "tutti.persistence.hibernate.formatSql", - n_("tutti.option.persistence.hibernate.formatSql.description"), + n_("tutti.config.option.persistence.hibernate.formatSql.description"), Boolean.FALSE.toString(), boolean.class, true, Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-03-15 10:20:17 UTC (rev 630) @@ -1,18 +1,18 @@ -tutti.option.persistence.cache.directory.description= -tutti.option.persistence.db.attachment.directory.description= -tutti.option.persistence.db.configurationPath.description= -tutti.option.persistence.db.directory.description= -tutti.option.persistence.db.enumerationPath.description= -tutti.option.persistence.db.name.description= -tutti.option.persistence.hibernate.dialect.description= -tutti.option.persistence.hibernate.formatSql.description= -tutti.option.persistence.hibernate.showSql.description= -tutti.option.persistence.hibernate.useSqlComment.description= -tutti.option.persistence.jdbc.driver.description= -tutti.option.persistence.jdbc.password.description= -tutti.option.persistence.jdbc.url.description= -tutti.option.persistence.jdbc.username.description= -tutti.option.persistence.protocol.directory.description= +tutti.config.option.persistence.cache.directory.description= +tutti.config.option.persistence.db.attachment.directory.description= +tutti.config.option.persistence.db.configurationPath.description= +tutti.config.option.persistence.db.directory.description= +tutti.config.option.persistence.db.enumerationPath.description= +tutti.config.option.persistence.db.name.description= +tutti.config.option.persistence.hibernate.dialect.description= +tutti.config.option.persistence.hibernate.formatSql.description= +tutti.config.option.persistence.hibernate.showSql.description= +tutti.config.option.persistence.hibernate.useSqlComment.description= +tutti.config.option.persistence.jdbc.driver.description= +tutti.config.option.persistence.jdbc.password.description= +tutti.config.option.persistence.jdbc.url.description= +tutti.config.option.persistence.jdbc.username.description= +tutti.config.option.persistence.protocol.directory.description= tutti.persistence.batch.validation.horsVracBenthosNotFound= tutti.persistence.batch.validation.horsVracSpeciesNotFound= tutti.persistence.batch.validation.onlySpeciesBatchStructure= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-03-15 10:20:17 UTC (rev 630) @@ -1,18 +1,18 @@ -tutti.option.persistence.cache.directory.description=Répertoire où sont stoquées les caches de persistence -tutti.option.persistence.db.attachment.directory.description=Répoertoire où sont stoquées les pièces-jointes -tutti.option.persistence.db.configurationPath.description=Chemin du fichier de configuration d'Adagio -tutti.option.persistence.db.directory.description=Répertoire où est la base de données -tutti.option.persistence.db.enumerationPath.description=Chemin du fichier de correspondance des constantes -tutti.option.persistence.db.name.description=Nom du fichier de la base de données -tutti.option.persistence.hibernate.dialect.description=Le dialect hibernate utilisée pour communiquer avec la base de données -tutti.option.persistence.hibernate.formatSql.description=Option pour ajouter les commentaires dans les requètes sql générées. -tutti.option.persistence.hibernate.showSql.description=Option pour afficher ou non les requète sql dans les logs -tutti.option.persistence.hibernate.useSqlComment.description=Option pour ajouter les commentaires dans les requètes sql générées -tutti.option.persistence.jdbc.driver.description=Le pilote JDBC utilisé pour communiquer avec la base de données -tutti.option.persistence.jdbc.password.description=Mot de passe de l'utilisateur pour se connecter à la base de données -tutti.option.persistence.jdbc.url.description=URL de connexion à la base de données -tutti.option.persistence.jdbc.username.description=Login de l'utilisateur pour se connecter à la base de données -tutti.option.persistence.protocol.directory.description=Répertoire où sont conservés les protocoles +tutti.config.option.persistence.cache.directory.description=Répertoire où sont stoquées les caches de persistence +tutti.config.option.persistence.db.attachment.directory.description=Répoertoire où sont stoquées les pièces-jointes +tutti.config.option.persistence.db.configurationPath.description=Chemin du fichier de configuration d'Adagio +tutti.config.option.persistence.db.directory.description=Répertoire où est la base de données +tutti.config.option.persistence.db.enumerationPath.description=Chemin du fichier de correspondance des constantes +tutti.config.option.persistence.db.name.description=Nom du fichier de la base de données +tutti.config.option.persistence.hibernate.dialect.description=Le dialect hibernate utilisée pour communiquer avec la base de données +tutti.config.option.persistence.hibernate.formatSql.description=Option pour ajouter les commentaires dans les requètes sql générées. +tutti.config.option.persistence.hibernate.showSql.description=Option pour afficher ou non les requète sql dans les logs +tutti.config.option.persistence.hibernate.useSqlComment.description=Option pour ajouter les commentaires dans les requètes sql générées +tutti.config.option.persistence.jdbc.driver.description=Le pilote JDBC utilisé pour communiquer avec la base de données +tutti.config.option.persistence.jdbc.password.description=Mot de passe de l'utilisateur pour se connecter à la base de données +tutti.config.option.persistence.jdbc.url.description=URL de connexion à la base de données +tutti.config.option.persistence.jdbc.username.description=Login de l'utilisateur pour se connecter à la base de données +tutti.config.option.persistence.protocol.directory.description=Répertoire où sont conservés les protocoles tutti.persistence.batch.validation.horsVracBenthosNotFound=Lot 'Hors Vrac > Benthos' non trouvé ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.horsVracNotFound=Lot 'Hors Vrac' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.horsVracSpeciesNotFound=Lot 'Hors Vrac > Espèces' non trouvé ou configuré avec d'autres critères de classement. Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java 2013-03-15 10:20:17 UTC (rev 630) @@ -42,7 +42,7 @@ BASEDIR( "tutti.basedir", - n_("tutti.option.basedir.description"), + n_("tutti.config.option.basedir.description"), "${user.home}/.tutti", File.class, true, @@ -50,46 +50,46 @@ ), DATA_DIRECTORY( "tutti.data.directory", - n_("tutti.option.data.directory.description"), + n_("tutti.config.option.data.directory.description"), "${tutti.basedir}/data", File.class, true, true), TMP_DIRECTORY( "tutti.tmp.directory", - n_("tutti.option.tmp.directory.description"), + n_("tutti.config.option.tmp.directory.description"), "${tutti.data.directory}/temp", File.class), CSV_SEPARATOR( "tutti.csv.separator", - n_("tutti.option.csv.separator.description"), + n_("tutti.config.option.csv.separator.description"), ";", char.class), // TRANSIENT CONFIG VERSION( "tutti.version", - n_("tutti.option.version.description"), + n_("tutti.config.option.version.description"), "", Version.class, true, true), SITE_URL( "tutti.site.url", - n_("tutti.option.site.url.description"), + n_("tutti.config.option.site.url.description"), "http://maven-site.forge.codelutin.com/tutti", URL.class, true, true), ORGANIZATION_NAME( "tutti.organizationName", - n_("tutti.option.organizationName.description"), + n_("tutti.config.option.organizationName.description"), "", String.class, true, true), INCEPTION_YEAR( "tutti.inceptionYear", - n_("tutti.option.inceptionYear.description"), + n_("tutti.config.option.inceptionYear.description"), "2012", Integer.class, true, Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-03-15 10:20:17 UTC (rev 630) @@ -1,11 +1,11 @@ -tutti.option.basedir.description= -tutti.option.csv.separator.description= -tutti.option.data.directory.description= -tutti.option.inceptionYear.description= -tutti.option.organizationName.description= -tutti.option.site.url.description= -tutti.option.tmp.directory.description= -tutti.option.version.description= +tutti.config.option.basedir.description= +tutti.config.option.csv.separator.description= +tutti.config.option.data.directory.description= +tutti.config.option.inceptionYear.description= +tutti.config.option.organizationName.description= +tutti.config.option.site.url.description= +tutti.config.option.tmp.directory.description= +tutti.config.option.version.description= tutti.property.attachment= tutti.property.caracteristic= tutti.property.country= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-03-15 10:20:17 UTC (rev 630) @@ -1,11 +1,11 @@ -tutti.option.basedir.description=Répertoire principale -tutti.option.csv.separator.description=Caractère séparateur pour les import / export de fichier au format csv. -tutti.option.data.directory.description=Répertoire de données de l'application. Vous pouvez utiliser l'expression ${tutti.data.directory} pour le référence dans d'autres propriétés de configuration (ex\: ${tutti.data.directory}/tmp). -tutti.option.inceptionYear.description=Année de démarrage du projet. -tutti.option.organizationName.description=Nom de l'organisation dans la licence -tutti.option.site.url.description=Url du site internet de l'application -tutti.option.tmp.directory.description=Répertoire temporaire utilisée par l'application (est nettoyé à chaque démarrage de l'application). -tutti.option.version.description=Version courante de l'application +tutti.config.option.basedir.description=Répertoire principale +tutti.config.option.csv.separator.description=Caractère séparateur pour les import / export de fichier au format csv. +tutti.config.option.data.directory.description=Répertoire de données de l'application. Vous pouvez utiliser l'expression ${tutti.data.directory} pour le référence dans d'autres propriétés de configuration (ex\: ${tutti.data.directory}/tmp). +tutti.config.option.inceptionYear.description=Année de démarrage du projet. +tutti.config.option.organizationName.description=Nom de l'organisation dans la licence +tutti.config.option.site.url.description=Url du site internet de l'application +tutti.config.option.tmp.directory.description=Répertoire temporaire utilisée par l'application (est nettoyé à chaque démarrage de l'application). +tutti.config.option.version.description=Version courante de l'application tutti.property.attachment=Pièce jointe tutti.property.caracteristic=Caractéristique tutti.property.country=Pays 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-15 10:20:17 UTC (rev 630) @@ -1,29 +1,5 @@ -### -# #%L -# Tutti :: UI -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 - 2013 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Mar 15 07:24:19 CET 2013 -tuttihelp.config.help= +#Fri Mar 15 10:49:19 CET 2013 tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.field.batchWeight.help=createSpeciesBatch.html\#fields tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=createSpeciesBatch.html\#fields @@ -37,7 +13,6 @@ 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 tutti.editBenthosBatch.help=editBenthosBatch.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions @@ -59,28 +34,28 @@ 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.close.help=editCruise.html\#actions 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.gear.help=editCruise.html\#fields +tutti.editCruise.field.headOfMission.help=editCruise.html\#fields +tutti.editCruise.field.headOfSortRoom.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.vessel.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.resetFishingOperationValidState.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 @@ -96,6 +71,7 @@ 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.gearShootingStartLongitude.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 @@ -104,11 +80,8 @@ 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 +tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#fields tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.comment.help=editProgram.html\#fields @@ -116,8 +89,7 @@ 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.closeEditProtocol.help=editProtocol.html\#actions tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions @@ -127,13 +99,13 @@ 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.name.help=editProtocol.html\#fields +tutti.editProtocol.field.species.help=editProtocol.html\#fields tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fields +tutti.editProtocol.help=editProtocol.html 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 @@ -148,6 +120,19 @@ tutti.editSpeciesBatch.field.speciesTotalWeight.help=editSpeciesBatch.html\#fields tutti.editSpeciesBatch.filterSpeciesBatch.help=editSpeciesBatch.html tutti.editSpeciesBatch.help=editSpeciesBatch.html +tutti.editSpeciesFrequencies.action.cancel.help=editSpeciesFrequencies.html#actions +tutti.editSpeciesFrequencies.action.generate.help=editSpeciesFrequencies.html#actions +tutti.editSpeciesFrequencies.action.save.help=editSpeciesFrequencies.html#actions +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.maxStep.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.minStep.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.mode.autoGen.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.mode.rafale.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.mode.simple.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html#fields tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields @@ -203,3 +188,7 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html +tuttihelp.config.help=config.help +tuttihelp.editAccidentalBatch.help=editAccidentalBatch.html +tuttihelp.editMacroWasteBatch.help=editMacroWasteBatch.html +tuttihelp.editPlanktonBatch.help=editPlanktonBatch.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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-15 10:20:17 UTC (rev 630) @@ -1,29 +1,5 @@ -### -# #%L -# Tutti :: UI -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 - 2013 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Mar 15 07:24:19 CET 2013 -tuttihelp.config.help= +#Fri Mar 15 10:49:19 CET 2013 tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.field.batchWeight.help=createSpeciesBatch.html\#fields tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=createSpeciesBatch.html\#fields @@ -37,7 +13,6 @@ 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 tutti.editBenthosBatch.help=editBenthosBatch.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions @@ -59,28 +34,28 @@ 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.close.help=editCruise.html\#actions 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.gear.help=editCruise.html\#fields +tutti.editCruise.field.headOfMission.help=editCruise.html\#fields +tutti.editCruise.field.headOfSortRoom.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.vessel.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.resetFishingOperationValidState.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 @@ -96,6 +71,7 @@ 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.gearShootingStartLongitude.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 @@ -104,11 +80,8 @@ 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 +tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#fields tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.comment.help=editProgram.html\#fields @@ -116,8 +89,7 @@ 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.closeEditProtocol.help=editProtocol.html\#actions tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions @@ -127,12 +99,12 @@ 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.name.help=editProtocol.html\#fields +tutti.editProtocol.field.species.help=editProtocol.html\#fields tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fields +tutti.editProtocol.help=editProtocol.html tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fields tutti.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.createSpeciesBatch.help=editSpeciesBatch.html\#actions @@ -148,6 +120,19 @@ tutti.editSpeciesBatch.field.speciesTotalWeight.help=editSpeciesBatch.html\#fields tutti.editSpeciesBatch.filterSpeciesBatch.help=editSpeciesBatch.html tutti.editSpeciesBatch.help=editSpeciesBatch.html +tutti.editSpeciesFrequencies.action.cancel.help=editSpeciesFrequencies.html#actions +tutti.editSpeciesFrequencies.action.generate.help=editSpeciesFrequencies.html#actions +tutti.editSpeciesFrequencies.action.save.help=editSpeciesFrequencies.html#actions +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.maxStep.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.minStep.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.mode.autoGen.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.mode.rafale.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.mode.simple.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html#fields +tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html#fields tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields @@ -203,3 +188,7 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html +tuttihelp.config.help=config.help +tuttihelp.editAccidentalBatch.help=editAccidentalBatch.html +tuttihelp.editMacroWasteBatch.help=editMacroWasteBatch.html +tuttihelp.editPlanktonBatch.help=editPlanktonBatch.html Added: trunk/tutti-ui-swing/src/main/help/fr/config.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/config.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/config.html 2013-03-15 10:20:17 UTC (rev 630) @@ -0,0 +1,24 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Configuration</title> +</head> +<body> + +<h1>Configuration</h1> + +<p>Sur cette écran on peut configurer l'application...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/config.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-03-15 10:20:17 UTC (rev 630) @@ -44,7 +44,7 @@ TUTTI_LAUNCH_MODE( "tutti.launch.mode", - n_("tutti.option.launch.mode.description"), + n_("tutti.config.option.launch.mode.description"), null, String.class, true, @@ -53,154 +53,154 @@ TUTTI_I18N_DIRECTORY( "tutti.i18n.directory", - n_("tutti.option.i18n.directory.description"), + n_("tutti.config.option.i18n.directory.description"), "${tutti.basedir}/i18n", File.class ), TUTTI_HELP_DIRECTORY( "tutti.help.directory", - n_("tutti.option.help.directory.description"), + n_("tutti.config.option.help.directory.description"), "${tutti.basedir}/help", File.class ), TUTTI_I18N_LOCALE( "tutti.i18n.locale", - n_("tutti.option.i18n.locale.description"), + n_("tutti.config.option.i18n.locale.description"), Locale.FRANCE.getCountry(), Locale.class ), TUTTI_UPDATE_URL( "tutti.update.application.url", - n_("tutti.option.update.url.description"), + n_("tutti.config.option.update.url.description"), "http://appup.forge.codelutin.com/tutti/update-tutti.properties", String.class ), UI_CONFIG_FILE( "tutti.ui.config.file", - n_("tutti.option.ui.config.file.description"), + n_("tutti.config.option.ui.config.file.description"), "${tutti.data.directory}/tuttiUI.xml", File.class ), TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE( - "tutti.option.weights.rate.difference.totalAndSorted", - n_("tutti.option.weights.rate.difference.totalAndSorted.description"), + "tutti.config.option.weights.rate.difference.totalAndSorted", + n_("tutti.config.option.weights.rate.difference.totalAndSorted.description"), "1.0", Float.class ), TREMIE_CAROUSSEL_VESSEL_ID( - "tutti.option.tremieCarousselVessel", - n_("tutti.option.tremieCarousselVessel.description"), + "tutti.config.option.tremieCarousselVessel", + n_("tutti.config.option.tremieCarousselVessel.description"), "", String.class ), PROGRAM_ID( "tutti.programId", - n_("tutti.option.programId.description"), + n_("tutti.config.option.programId.description"), null, String.class ), CRUISE_ID( "tutti.cruiseId", - n_("tutti.option.cruiseId.description"), + n_("tutti.config.option.cruiseId.description"), null, String.class ), PROTOCOL_ID( "tutti.protocolId", - n_("tutti.option.protocolId.description"), + n_("tutti.config.option.protocolId.description"), null, String.class ), SAMPLING_CATEGORY_ORDER_IDS( - "tutti.option.samplingCategoryOrderIds", - n_("tutti.option.samplingCategoryOrderIds.description"), + "tutti.config.option.samplingCategoryOrderIds", + n_("tutti.config.option.samplingCategoryOrderIds.description"), "198,196,174,1430", Integer[].class ), AUTO_POPUP_NUMBER_EDITOR( "tutti.ui.autoPopupNumberEditor", - n_("tutti.option.ui.autoPopupNumberEditor.description"), + n_("tutti.config.option.ui.autoPopupNumberEditor.description"), String.valueOf(false), Boolean.class ), SHOW_NUMBER_EDITOR_BUTTON( "tutti.ui.showNumberEditorButton", - n_("tutti.option.ui.showNumberEditorButton.description"), + n_("tutti.config.option.ui.showNumberEditorButton.description"), String.valueOf(true), Boolean.class ), COLOR_ROW_READ_ONLY( "tutti.ui.color.rowReadOnly", - n_("tutti.option.ui.color.rowReadOnly.description"), + n_("tutti.config.option.ui.color.rowReadOnly.description"), new Color(192, 192, 192).toString(), Color.class ), COLOR_ROW_INVALID( "tutti.ui.color.rowInvalid", - n_("tutti.option.ui.color.rowInvalid.description"), + n_("tutti.config.option.ui.color.rowInvalid.description"), new Color(255, 128, 128).toString(), Color.class ), COLOR_CELL_WITH_VALUE( "tutti.ui.color.cellWithValue", - n_("tutti.option.ui.color.cellWithValue.description"), + n_("tutti.config.option.ui.color.cellWithValue.description"), new Color(128, 255, 128).toString(), Color.class ), COLOR_ROW_TO_CONFIRM( "tutti.ui.color.rowToConfirm", - n_("tutti.option.ui.color.rowToConfirm.description"), + n_("tutti.config.option.ui.color.rowToConfirm.description"), Color.ORANGE.toString(), Color.class ), COLOR_BLOCKING_LAYER( "tutti.ui.color.blockingLayer", - n_("tutti.option.ui.color.blockingLayer.description"), + n_("tutti.config.option.ui.color.blockingLayer.description"), new Color(200, 200, 200).toString(), Color.class ), COLOR_COMPUTED_WEIGHTS( "tutti.ui.color.computedWeights", - n_("tutti.option.ui.color.computedWeights.description"), + n_("tutti.config.option.ui.color.computedWeights.description"), Color.BLUE.toString(), Color.class ), SHORTCUT_CLOSE_POPUP( "tutti.ui.shortcut.closePopup", - n_("tutti.option.ui.shortcut.closePopup.description"), + n_("tutti.config.option.ui.shortcut.closePopup.description"), "alt pressed F", KeyStroke.class ), COORDINATE_EDITOR_TYPE( "tutti.ui.coordinateEditorType", - n_("tutti.option.ui.coordinateEditorType.description"), + n_("tutti.config.option.ui.coordinateEditorType.description"), CoordinateEditorType.DD.toString(), CoordinateEditorType.class ), DATE_FORMAT( "tutti.ui.dateFormat", - n_("tutti.option.ui.dateFormat.description"), + n_("tutti.config.option.ui.dateFormat.description"), "dd/MM/yyyy", String.class ); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -38,7 +38,7 @@ public ReloadTuttiAction(MainUIHandler handler) { super(handler, true, null); - setActionDescription(_("tutti.action.reloadTutti")); + setActionDescription(_("tutti.main.action.reloadTutti")); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderButton.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderButton.java 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderButton.java 2013-03-15 10:20:17 UTC (rev 630) @@ -58,7 +58,7 @@ List<Caracteristic> model) { setIcon(SwingUtil.createActionIcon("sampleOrder")); - setToolTipText(_("tutti.action.sampleOrder.tip")); + setToolTipText(_("tutti.config.action.sampleOrder.tip")); popup = new SampleOrderEditorUI(context); 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-15 10:20:17 UTC (rev 630) @@ -46,7 +46,7 @@ } #nameLabel { - text: "tutti.editCruise.label.cruise.name"; + text: "tutti.editCruise.field.name"; labelFor: {nameField}; toolTipText: "tutti.editCruise.field.name.tip"; _help: {"tutti.editCruise.field.name.help"}; @@ -54,11 +54,11 @@ #nameField { text: {model.getName()}; - _validatorLabel : {_("tutti.editCruise.label.cruise.name")}; + _validatorLabel : {_("tutti.editCruise.field.name")}; } #yearLabel { - text: "tutti.editCruise.label.cruise.year"; + text: "tutti.editCruise.field.year"; labelFor: {yearField}; toolTipText: "tutti.editCruise.field.year.tip"; _help: {"tutti.editCruise.field.year.help"}; @@ -69,11 +69,11 @@ model: {model.getYear()}; useFloat: false; numberPattern: {INT_4_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.editCruise.label.cruise.year")}; + _validatorLabel : {_("tutti.editCruise.field.year")}; } #surveyPartLabel { - text: "tutti.editCruise.label.cruise.surveyPart"; + text: "tutti.editCruise.field.surveyPart"; labelFor: {surveyPartField}; toolTipText: "tutti.editCruise.field.surveyPart.tip"; _help: {"tutti.editCruise.field.surveyPart.help"}; @@ -81,11 +81,11 @@ #surveyPartField { text: {model.getSurveyPart()}; - _validatorLabel : {_("tutti.editCruise.label.cruise.surveyPart")}; + _validatorLabel : {_("tutti.editCruise.field.surveyPart")}; } #countryLabel { - text: "tutti.editCruise.label.cruise.country"; + text: "tutti.editCruise.field.country"; labelFor: {countryComboBox}; toolTipText: "tutti.editCruise.field.country.tip"; _help: {"tutti.editCruise.field.country.help"}; @@ -94,11 +94,11 @@ #countryComboBox { property: country; selectedItem: {model.getCountry()}; - _validatorLabel : {_("tutti.editCruise.label.cruise.country")}; + _validatorLabel : {_("tutti.editCruise.field.country")}; } #programLabel { - text: "tutti.editCruise.label.cruise.program"; + text: "tutti.editCruise.field.program"; labelFor: {programComboBox}; toolTipText: "tutti.editCruise.field.program.tip"; _help: {"tutti.editCruise.field.program.help"}; @@ -107,11 +107,11 @@ #programComboBox { property: program; selectedItem: {model.getProgram()}; - _validatorLabel : {_("tutti.editCruise.label.cruise.program")}; + _validatorLabel : {_("tutti.editCruise.field.program")}; } #beginDateLabel { - text: "tutti.editCruise.label.cruise.beginDate"; + text: "tutti.editCruise.field.beginDate"; labelFor: {beginDateField}; toolTipText: "tutti.editCruise.field.beginDate.tip"; _help: {"tutti.editCruise.field.beginDate.help"}; @@ -119,11 +119,11 @@ #beginDateField { date: {model.getBeginDate()}; - _validatorLabel : {_("tutti.editCruise.label.cruise.beginDate")}; + _validatorLabel : {_("tutti.editCruise.field.beginDate")}; } #endDateLabel { - text: "tutti.editCruise.label.cruise.endDate"; + text: "tutti.editCruise.field.endDate"; labelFor: {endDateField}; toolTipText: "tutti.editCruise.field.endDate.tip"; _help: {"tutti.editCruise.field.endDate.help"}; @@ -131,11 +131,11 @@ #endDateField { date: {model.getEndDate()}; - _validatorLabel : {_("tutti.editCruise.label.cruise.endDate")}; + _validatorLabel : {_("tutti.editCruise.field.endDate")}; } #multirigNumberLabel { - text: "tutti.editCruise.label.cruise.multirigNumber"; + text: "tutti.editCruise.field.multirigNumber"; labelFor: {multirigNumberField}; toolTipText: "tutti.editCruise.field.multirigNumber.tip"; _help: {"tutti.editCruise.field.multirigNumber.help"}; @@ -146,11 +146,11 @@ model: {model.getMultirigNumber()}; useFloat: false; numberPattern: {INT_1_DIGITS_PATTERN}; - _validatorLabel : {_("tutti.editCruise.label.cruise.multirigNumber")}; + _validatorLabel : {_("tutti.editCruise.field.multirigNumber")}; } #filterVesselLabel { - text: "tutti.editCruise.label.filterVesselType"; + text: "tutti.editCruise.filterVesselType"; _strongStyle: true; actionIcon: filter; toolTipText: "tutti.editCruise.filterVessel.tip"; @@ -158,24 +158,24 @@ } #filterVesselAllButton { - text: "tutti.editCruise.label.filterVesselType.all"; - toolTipText: "tutti.editCruise.label.filterVesselType.all.tip"; + text: "tutti.editCruise.filterVesselType.all"; + toolTipText: "tutti.editCruise.filterVesselType.all.tip"; value: "all"; selected: {model.isVesselTypeAll()}; buttonGroup: "filterVesselType"; } #filterVesselScientificButton { - text: "tutti.editCruise.label.filterVesselType.scientific"; - toolTipText: "tutti.editCruise.label.filterVesselType.scientific.tip"; + text: "tutti.editCruise.filterVesselType.scientific"; + toolTipText: "tutti.editCruise.filterVesselType.scientific.tip"; value: "scientific"; selected: {model.isVesselTypeScientific()}; buttonGroup: "filterVesselType"; } #filterVesselFishingButton { - text: "tutti.editCruise.label.filterVesselType.fishing"; - toolTipText: "tutti.editCruise.label.filterVesselType.fishing.tip"; + text: "tutti.editCruise.filterVesselType.fishing"; + toolTipText: "tutti.editCruise.filterVesselType.fishing.tip"; value: "fishing"; selected: {model.isVesselTypeFishing()}; buttonGroup: "filterVesselType"; @@ -183,45 +183,45 @@ #vesselList { property: vessel; - border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.list.vessel"))}; - _validatorLabel : {_("tutti.editCruise.label.list.vessel")}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.vessel"))}; + _validatorLabel : {_("tutti.editCruise.field.vessel")}; toolTipText: "tutti.editCruise.field.vessel.tip"; _help: {"tutti.editCruise.field.vessel.help"}; } #gearList { property: gear; - border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.list.gear"))}; - _validatorLabel : {_("tutti.editCruise.label.list.gear")}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.gear"))}; + _validatorLabel : {_("tutti.editCruise.field.gear")}; toolTipText: "tutti.editCruise.field.gear.tip"; _help: {"tutti.editCruise.field.gear.help"}; } #headOfMissionList { property: headOfMission; - border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.list.headOfMission"))}; - _validatorLabel : {_("tutti.editCruise.label.list.headOfMission")}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.headOfMission"))}; + _validatorLabel : {_("tutti.editCruise.field.headOfMission")}; toolTipText: "tutti.editCruise.field.headOfMission.tip"; _help: {"tutti.editCruise.field.headOfMission.help"}; } #headOfSortRoomList { property: headOfSortRoom; - border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.list.headOfSortRoom"))}; - _validatorLabel : {_("tutti.editCruise.label.list.headOfSortRoom")}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.headOfSortRoom"))}; + _validatorLabel : {_("tutti.editCruise.field.headOfSortRoom")}; toolTipText: "tutti.editCruise.field.headOfSortRoom.tip"; _help: {"tutti.editCruise.field.headOfSortRoom.help"}; } #commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.editCruise.label.comment"))}; + border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.comment"))}; toolTipText: "tutti.editCruise.field.comment.tip"; _help: {"tutti.editCruise.field.comment.help"}; } #commentField { text: {model.getComment()}; - _validatorLabel : {_("tutti.editCruise.label.comment")}; + _validatorLabel : {_("tutti.editCruise.field.comment")}; } #saveButton { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -70,7 +70,7 @@ getContext().getMainUI(), _("tutti.dbManager.title.choose.dbExportFile"), _("tutti.dbManager.action.chooseDbExportFile"), - "^.*\\.zip", _("tutti.file.zip") + "^.*\\.zip", _("tutti.common.file.zip") ); if (file == null) { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -68,7 +68,7 @@ getContext().getMainUI(), _("tutti.dbManager.title.choose.dbExportFile"), _("tutti.dbManager.action.chooseDbExportFile"), - "^.*\\.zip", _("tutti.file.zip") + "^.*\\.zip", _("tutti.common.file.zip") ); if (file == null) { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -66,7 +66,7 @@ getContext().getMainUI(), _("tutti.dbManager.title.choose.dbImportFile"), _("tutti.dbManager.action.chooseDbFile"), - "^.*\\.zip", _("tutti.file.zip") + "^.*\\.zip", _("tutti.common.file.zip") ); doAction = file != null; 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -67,7 +67,7 @@ getContext().getMainUI(), _("tutti.selectCruise.title.choose.exportFile"), _("tutti.selectCruise.action.chooseProtocolFile"), - "^.+\\.tuttiProtocol$", _("tutti.file.protocol") + "^.+\\.tuttiProtocol$", _("tutti.common.file.protocol") ); doAction = file != null; if (doAction) { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -70,7 +70,7 @@ getContext().getMainUI(), _("tutti.selectCruise.title.choose.importFile"), _("tutti.selectCruise.action.chooseProtocolFile"), - "^.+\\.tuttiProtocol$", _("tutti.file.protocol") + "^.+\\.tuttiProtocol$", _("tutti.common.file.protocol") ); doAction = file != null; 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-03-15 10:20:17 UTC (rev 630) @@ -44,7 +44,7 @@ } #programLabel { - text: "tutti.selectCruise.label.program"; + text: "tutti.selectCruise.field.program"; actionIcon: program; toolTipText: "tutti.selectCruise.field.program.tip"; _help: {"tutti.selectCruise.field.program.help"}; @@ -55,7 +55,7 @@ beanType: {Program.class}; selectedItem: {model.getProgram()}; enabled: {!programCombobox.isEmpty()}; - _validatorLabel : {_("tutti.selectCruise.label.program")}; + _validatorLabel : {_("tutti.selectCruise.field.program")}; } #editProgramButton { @@ -78,7 +78,7 @@ } #cruiseLabel { - text: "tutti.selectCruise.label.cruise"; + text: "tutti.selectCruise.field.cruise"; labelFor: {cruiseCombobox}; actionIcon: cruise; toolTipText: "tutti.selectCruise.field.cruise.tip"; @@ -89,7 +89,7 @@ property: cruise; selectedItem: {model.getCruise()}; enabled: {!cruiseCombobox.isEmpty()}; - _validatorLabel : {_("tutti.selectCruise.label.cruise")}; + _validatorLabel : {_("tutti.selectCruise.field.cruise")}; } #editCruiseButton { @@ -113,7 +113,7 @@ } #protocolLabel { - text: "tutti.selectCruise.label.protocol"; + text: "tutti.selectCruise.field.protocol"; labelFor: {protocolCombobox}; actionIcon: protocol; toolTipText: "tutti.selectCruise.field.protocol.tip"; @@ -124,7 +124,7 @@ property: protocol; selectedItem: {model.getProtocol()}; enabled: {!protocolCombobox.isEmpty()}; - _validatorLabel : {_("tutti.selectCruise.label.protocol")}; + _validatorLabel : {_("tutti.selectCruise.field.protocol")}; } #newProtocolComboBox { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-15 10:20:17 UTC (rev 630) @@ -527,17 +527,17 @@ } #durationField { - text: {TuttiUIUtil.getDuration(model.getGearShootingStartDate(), model.getGearShootingEndDate())}; + text: {handler.getDuration(model.getGearShootingStartDate(), model.getGearShootingEndDate())}; enabled: false; _validatorLabel : {_("tutti.editFishingOperation.field.duration")}; } #recorderPersonList { property: recorderPerson; - border: {BorderFactory.createTitledBorder(_("tutti.label.list.recorderPerson"))}; - _validatorLabel : {_("tutti.label.list.recorderPerson")}; - toolTipText: "tutti.editFishingOperation.list.recorderPerson.tip"; - _help: {"tutti.editFishingOperation.list.recorderPerson.help"}; + border: {BorderFactory.createTitledBorder(_("tutti.editFishingOperation.field.recorderPerson"))}; + _validatorLabel : {_("tutti.editFishingOperation.field.recorderPerson.tip")}; + toolTipText: "tutti.editFishingOperation.field.recorderPerson.tip"; + _help: {"tutti.editFishingOperation.field.recorderPerson.help"}; } #commentPane { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-15 10:20:17 UTC (rev 630) @@ -50,6 +50,7 @@ import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXDatePicker; @@ -526,6 +527,17 @@ TuttiUIUtil.setProperty(getModel(), property, value); } + public String getDuration(Date startDate, Date endDate) { + String duration = ""; + if (startDate != null && endDate != null && !startDate.after(endDate)) { + duration = DurationFormatUtils.formatPeriod( + startDate.getTime(), + endDate.getTime(), + _("tutti.editFishingOperation.duration.format")); + } + return duration; + } + //------------------------------------------------------------------------// //-- Protected methods --// //------------------------------------------------------------------------// 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-03-15 10:20:17 UTC (rev 630) @@ -163,7 +163,7 @@ #renameSpeciesBatchMenu { actionIcon: batch-rename; text: "tutti.editSpeciesBatch.tutti.action.renameSpeciesBatch"; - toolTipText: "tutti.editSpeciesBatch.renameSpeciesBatch.tip"; + toolTipText: "tutti.editSpeciesBatch.action.renameSpeciesBatch.tip"; mnemonic: C; _tuttiAction: {RenameSpeciesBatchAction.class}; enabled: {model.isTableViewModeAll() && model.isRenameSpeciesBatchEnabled()}; @@ -183,7 +183,7 @@ #createSpeciesBatchButton { actionIcon: batch-create; text: "tutti.editSpeciesBatch.tutti.action.createSpeciesBatch"; - toolTipText: "tutti.editSpeciesBatch.createSpeciesBatch.tip"; + toolTipText: "tutti.editSpeciesBatch.action.createSpeciesBatch.tip"; mnemonic: C; enabled: {model.isCreateSpeciesBatchEnabled()}; _help: {"tutti.editSpeciesBatch.action.createSpeciesBatch.help"}; @@ -202,14 +202,14 @@ #filterSpeciesBatchLabel { actionIcon: filter; - text: "tutti.editSpeciesBatch.label.filterSpeciesBatchMode"; + text: "tutti.editSpeciesBatch.filterSpeciesBatchMode"; toolTipText: "tutti.editSpeciesBatch.filterSpeciesBatch.tip"; _strongStyle: true; _help: {"tutti.editSpeciesBatch.filterSpeciesBatch.help"}; } #filterSpeciesBatchAllButton { - text: "tutti.editSpeciesBatch.label.filterSpeciesBatchMode.mode.all"; + text: "tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.all"; toolTipText: "tutti.editSpeciesBatch.filterSpeciesBatch.mode.all.tip"; value: "all"; selected: {model.isTableViewModeAll()}; @@ -217,7 +217,7 @@ } #filterSpeciesBatchLeafButton { - text: "tutti.editSpeciesBatch.label.filterSpeciesBatchMode.mode.leaf"; + text: "tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.leaf"; toolTipText: "tutti.editSpeciesBatch.filterSpeciesBatch.mode.leaf.tip"; value: "leaf"; selected: {model.isTableViewModeLeaf()}; 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-15 10:20:17 UTC (rev 630) @@ -763,12 +763,12 @@ if (parentBatch.getWeight() != null) { String htmlMessage = String.format( CONFIRMATION_FORMAT, - _("tutti.dialog.catches.species.split.weightNotNull.message"), - _("tutti.dialog.catches.species.split.weightNotNull.help")); + _("tutti.editSpeciesBatch.split.weightNotNull.message"), + _("tutti.editSpeciesBatch.split.weightNotNull.help")); int i = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.dialog.catches.species.split.weightNotNull.title"), + _("tutti.editSpeciesBatch.split.weightNotNull.title"), JOptionPane.OK_CANCEL_OPTION); if (i == JOptionPane.OK_OPTION) { @@ -936,7 +936,7 @@ } public String getFilterSpeciesBatchRootButtonText(int rootNumber) { - return _("tutti.editSpeciesBatch.label.filterSpeciesBatchMode.mode.root", rootNumber); + return _("tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.root", rootNumber); } protected void recomputeBatchActionEnable() { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-03-15 10:20:17 UTC (rev 630) @@ -37,7 +37,7 @@ } #categoryLabel { - text: "tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.category"; + text: "tutti.splitSpeciesBatch.field.category"; toolTipText: "tutti.splitSpeciesBatch.field.categoryField.tip"; labelFor: {categoryComboBox}; _help: {"tutti.splitSpeciesBatch.field.categoryField.help"}; @@ -48,7 +48,7 @@ } #speciesLabel { - text: "tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.species"; + text: "tutti.splitSpeciesBatch.field.species"; toolTipText: "tutti.splitSpeciesBatch.field.speciesField.tip"; labelFor: {speciesField}; _help: {"tutti.splitSpeciesBatch.field.speciesField.help"}; @@ -61,7 +61,7 @@ } #batchWeightLabel { - text: "tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.batchWeight"; + text: "tutti.splitSpeciesBatch.field.batchWeight"; toolTipText: "tutti.splitSpeciesBatch.field.batchWeightField.tip"; labelFor: {batchWeightField}; _help: {"tutti.splitSpeciesBatch.field.batchWeightField.help"}; @@ -74,7 +74,7 @@ } #sampleWeightLabel { - text: "tutti.splitSpeciesBatch.label.sampleCategoryConfiguration.sampleWeight"; + text: "tutti.splitSpeciesBatch.field.sampleWeight"; toolTipText: "tutti.splitSpeciesBatch.field.sampleWeightField.tip"; labelFor: {sampleWeightField}; _help: {"tutti.splitSpeciesBatch.field.sampleWeightField.help"}; 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-15 10:20:17 UTC (rev 630) @@ -37,7 +37,7 @@ } #nameLabel { - text: "tutti.editProgram.label.program.name"; + text: "tutti.editProgram.field.program.name"; labelFor: {nameField}; toolTipText: "tutti.editProgram.field.name.tip"; _help: {"tutti.editProgram.field.name.help"}; @@ -45,7 +45,7 @@ #nameField { text: {model.getName()}; - _validatorLabel : {_("tutti.editProgram.label.program.name")}; + _validatorLabel : {_("tutti.editProgram.field.program.name")}; } #commentPane { @@ -56,11 +56,11 @@ #commentField { text: {getStringValue(model.getComment())}; - _validatorLabel : {_("tutti.editProgram.label.comment")}; + _validatorLabel : {_("tutti.editProgram.field.comment")}; } #zoneLabel { - text: "tutti.editProgram.label.program.zone"; + text: "tutti.editProgram.field.program.zone"; labelFor: {zoneComboBox}; toolTipText: "tutti.editProgram.field.zone.tip"; _help: {"tutti.editProgram.field.zone.help"}; @@ -69,7 +69,7 @@ #zoneComboBox { property: zone; selectedItem: {model.getZone()}; - _validatorLabel : {_("tutti.editProgram.label.program.zone")}; + _validatorLabel : {_("tutti.editProgram.field.program.zone")}; } #saveButton { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-15 10:20:17 UTC (rev 630) @@ -42,7 +42,7 @@ } #nameLabel { - text: "tutti.editProtocol.label.protocol.name"; + text: "tutti.editProtocol.field.protocol.name"; labelFor: {nameField}; toolTipText: "tutti.editProtocol.field.protocol.name.tip"; _help: {"tutti.editProtocol.field.name.help"}; @@ -50,7 +50,7 @@ #nameField { text: {model.getName()}; - _validatorLabel : {_("tutti.editProtocol.label.protocol.name")}; + _validatorLabel : {_("tutti.editProtocol.field.protocol.name")}; } #commentPane { @@ -61,7 +61,7 @@ #commentField { text: {getStringValue(model.getComment())}; - _validatorLabel : {_("tutti.editProtocol.label.comment")}; + _validatorLabel : {_("tutti.editProtocol.field.comment")}; } #saveWarningContainer { @@ -95,7 +95,7 @@ #speciesComboBox { enabled: {!speciesComboBox.isEmpty()}; - toolTipText: "tutti.editProtocol.field..tip"; + toolTipText: "tutti.editProtocol.field.species.tip"; _help: {"tutti.editProtocol.field.species.help"}; } 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -66,7 +66,7 @@ getContext().getMainUI(), _("tutti.editProtocol.title.choose.caracteristicExportFile"), _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), - "^.*\\.csv", _("tutti.file.csv") + "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -67,7 +67,7 @@ getContext().getMainUI(), _("tutti.editProtocol.title.choose.caracteristicExportFile"), _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), - "^.*\\.csv", _("tutti.file.csv") + "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -69,7 +69,7 @@ getContext().getMainUI(), _("tutti.editProtocol.title.choose.speciesExportFile"), _("tutti.editProtocol.action.chooseProtocolSpeciesFile"), - "^.*\\.csv", _("tutti.file.csv") + "^.*\\.csv", _("tutti.common.file.csv") ); if (file == null) { 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -66,7 +66,7 @@ getContext().getMainUI(), _("tutti.editProtocol.title.choose.caracteristicImportFile"), _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), - "^.*\\.csv", _("tutti.file.csv") + "^.*\\.csv", _("tutti.common.file.csv") ); doAction = file != null; 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -70,7 +70,7 @@ getContext().getMainUI(), _("tutti.editProtocol.title.choose.speciesImportFile"), _("tutti.editProtocol.action.chooseProtocolSpeciesFile"), - "^.*\\.csv", _("tutti.file.csv") + "^.*\\.csv", _("tutti.common.file.csv") ); doAction = file != null; 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -67,7 +67,7 @@ getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), - "^.*\\.csv", _("tutti.file.csv") + "^.*\\.csv", _("tutti.common.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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -68,7 +68,7 @@ getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), - "^.*\\.csv", _("tutti.file.csv") + "^.*\\.csv", _("tutti.common.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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -67,7 +67,7 @@ getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), - "^.*\\.csv", _("tutti.file.csv") + "^.*\\.csv", _("tutti.common.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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -67,7 +67,7 @@ getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), - "^.*\\.csv", _("tutti.file.csv") + "^.*\\.csv", _("tutti.common.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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -66,7 +66,7 @@ getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), - "^.*\\.csv", _("tutti.file.csv")); + "^.*\\.csv", _("tutti.common.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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -66,7 +66,7 @@ getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), - "^.*\\.csv", _("tutti.file.csv")); + "^.*\\.csv", _("tutti.common.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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -65,7 +65,7 @@ getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), - "^.*\\.csv", _("tutti.file.csv")); + "^.*\\.csv", _("tutti.common.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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-03-15 10:20:17 UTC (rev 630) @@ -65,7 +65,7 @@ getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), - "^.*\\.csv", _("tutti.file.csv")); + "^.*\\.csv", _("tutti.common.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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css 2013-03-15 10:20:17 UTC (rev 630) @@ -32,8 +32,8 @@ } #speciesLabel { - text: "tutti.manageTemporaryReferential.label.referential.species"; - toolTipText: "tutti.manageTemporaryReferential.label.referential.species.tip"; + text: "tutti.manageTemporaryReferential.field.species"; + toolTipText: "tutti.manageTemporaryReferential.field.species.tip"; icon: {SwingUtil.createImageIcon("action-species.gif")}; } @@ -56,8 +56,8 @@ } #vesselLabel { - text: "tutti.manageTemporaryReferential.label.referential.vessel"; - toolTipText: "tutti.manageTemporaryReferential.label.referential.vessel.tip"; + text: "tutti.manageTemporaryReferential.field.vessel"; + toolTipText: "tutti.manageTemporaryReferential.field.vessel.tip"; actionIcon: vessel; } @@ -80,8 +80,8 @@ } #gearLabel { - text: "tutti.manageTemporaryReferential.label.referential.gear"; - toolTipText: "tutti.manageTemporaryReferential.label.referential.gear.tip"; + text: "tutti.manageTemporaryReferential.field.gear"; + toolTipText: "tutti.manageTemporaryReferential.field.gear.tip"; actionIcon: gear; } @@ -104,8 +104,8 @@ } #personLabel { - text: "tutti.manageTemporaryReferential.label.referential.person"; - toolTipText: "tutti.manageTemporaryReferential.label.referential.person.tip"; + text: "tutti.manageTemporaryReferential.field.person"; + toolTipText: "tutti.manageTemporaryReferential.field.person.tip"; actionIcon: person; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-15 10:20:17 UTC (rev 630) @@ -270,11 +270,11 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, message, - _("tutti.dialog.askSaveBeforeLeaving.help")); + _("tutti.common.askSaveBeforeLeaving.help")); int result = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.dialog.askSaveBeforeLeaving.title"), + _("tutti.common.askSaveBeforeLeaving.title"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); return result; @@ -284,11 +284,11 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, message, - _("tutti.dialog.askCancelEditBeforeLeaving.help")); + _("tutti.common.askCancelEditBeforeLeaving.help")); int i = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.dialog.askCancelEditBeforeLeaving.title"), + _("tutti.common.askCancelEditBeforeLeaving.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -303,13 +303,13 @@ // file exists ask user to overwrite String htmlMessage = String.format( CONFIRMATION_FORMAT, - _("tutti.dialog.askOverwriteFile.message", file), - _("tutti.dialog.askOverwriteFile.help")); + _("tutti.common.askOverwriteFile.message", file), + _("tutti.common.askOverwriteFile.help")); result = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.dialog.askOverwriteFile.title"), + _("tutti.common.askOverwriteFile.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION; } else { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-03-15 10:20:17 UTC (rev 630) @@ -28,10 +28,8 @@ import fr.ifremer.tutti.TuttiTechnicalException; import jaxx.runtime.JAXXBinding; import jaxx.runtime.JAXXObject; -import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; @@ -52,7 +50,6 @@ import java.net.URL; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; -import java.util.Date; import static org.nuiton.i18n.I18n._; @@ -163,17 +160,6 @@ return new TuttiColorHighlighter(predicate, color, true); } - public static String getDuration(Date startDate, Date endDate) { - String duration = ""; - if (startDate != null && endDate != null && !startDate.after(endDate)) { - duration = DurationFormatUtils.formatPeriod( - startDate.getTime(), - endDate.getTime(), - _("tutti.duration.format")); - } - return duration; - } - public static int computeDistanceInMeters(Float startLatitude, Float startLongitude, Float endLatitude, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2013-03-15 10:20:17 UTC (rev 630) @@ -61,7 +61,7 @@ protected AttachmentCellRenderer(Decorator<Attachment> decorator) { setHorizontalAlignment(CENTER); setIcon(SwingUtil.createActionIcon("edit-attachment")); - this.noneText = n_("tutti.tooltip.attachment.none"); + this.noneText = n_("tutti.attachmentEditor.none.tip"); this.decorator = decorator; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css 2013-03-15 10:20:17 UTC (rev 630) @@ -37,15 +37,15 @@ #openAttachmentButton { actionIcon: "open-file"; - toolTipText: "tutti.tooltip.attachment.button.open"; + toolTipText: "tutti.attachmentEditor.action.open.tip"; } #saveAttachmentButton { actionIcon: "import"; - toolTipText: "tutti.tooltip.attachment.button.save"; + toolTipText: "tutti.attachmentEditor.action.save.tip"; } #removeAttachmentButton { actionIcon: "delete"; - toolTipText: "tutti.tooltip.attachment.button.remove"; + toolTipText: "tutti.attachmentEditor.action.remove.tip"; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java 2013-03-15 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java 2013-03-15 10:20:17 UTC (rev 630) @@ -55,7 +55,7 @@ protected CommentCellRenderer() { setHorizontalAlignment(CENTER); setIcon(SwingUtil.createActionIcon("edit-comment")); - this.noneText = n_("tutti.tooltip.comment.none"); + this.noneText = n_("tutti.commentEditor.none.tip"); } @Override 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-15 10:20:17 UTC (rev 630) @@ -0,0 +1,750 @@ +swing.error.desktop.browse.not.supported= +swing.error.desktop.not.supported= +tutti.about.bottomText= +tutti.about.message= +tutti.about.translate.content= +tutti.action.cancel= +tutti.action.removeCaracteristic= +tutti.config.action.sampleOrder.tip= +tutti.action.validate= +tutti.application.config= +tutti.application.name= +tutti.attachmentEditor.action.closeAttachment.tip= +tutti.attachmentEditor.action.open.tip= +tutti.attachmentEditor.action.remove.tip= +tutti.attachmentEditor.action.save.tip= +tutti.attachmentEditor.action.tip= +tutti.attachmentEditor.deleteAttachment.message= +tutti.attachmentEditor.deleteAttachment.title= +tutti.attachmentEditor.field.file= +tutti.attachmentEditor.field.fileComment= +tutti.attachmentEditor.field.fileName= +tutti.attachmentEditor.none.tip= +tutti.attachmentEditor.saveAttachment.button= +tutti.attachmentEditor.saveAttachment.fail.message= +tutti.attachmentEditor.saveAttachment.fail.title= +tutti.attachmentEditor.saveAttachment.success.message= +tutti.attachmentEditor.saveAttachment.success.title= +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.commentEditor.action.close.tip= +tutti.commentEditor.action.tip= +tutti.commentEditor.none.tip= +tutti.common.error= +tutti.config.action.reload.actions= +tutti.config.action.reload.application= +tutti.config.action.reload.ui= +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.config.option.cruiseId.description= +tutti.config.option.help.directory.description= +tutti.config.option.i18n.directory.description= +tutti.config.option.i18n.locale.description= +tutti.config.option.launch.mode.description= +tutti.config.option.programId.description= +tutti.config.option.protocolId.description= +tutti.config.option.samplingCategoryOrderIds.description= +tutti.config.option.tremieCarousselVessel.description= +tutti.config.option.ui.autoPopupNumberEditor.description= +tutti.config.option.ui.color.blockingLayer.description= +tutti.config.option.ui.color.cellWithValue.description= +tutti.config.option.ui.color.computedWeights.description= +tutti.config.option.ui.color.rowInvalid.description= +tutti.config.option.ui.color.rowReadOnly.description= +tutti.config.option.ui.color.rowToConfirm.description= +tutti.config.option.ui.config.file.description= +tutti.config.option.ui.coordinateEditorType.description= +tutti.config.option.ui.dateFormat.description= +tutti.config.option.ui.shortcut.closePopup.description= +tutti.config.option.ui.showNumberEditorButton.description= +tutti.config.option.update.url.description= +tutti.config.option.weights.rate.difference.totalAndSorted.description= +tutti.createMelag.error.message= +tutti.createMelag.error.title= +tutti.createMelag.message= +tutti.createMelag.title= +tutti.createSpeciesBatch.action.addSpecies= +tutti.createSpeciesBatch.action.addSpecies.tip= +tutti.createSpeciesBatch.action.cancel= +tutti.createSpeciesBatch.action.cancel.tip= +tutti.createSpeciesBatch.action.save= +tutti.createSpeciesBatch.action.save.tip= +tutti.createSpeciesBatch.field.batchWeight= +tutti.createSpeciesBatch.field.batchWeight.tip= +tutti.createSpeciesBatch.field.sortedUnsortedCategory= +tutti.createSpeciesBatch.field.sortedUnsortedCategory.tip= +tutti.createSpeciesBatch.field.species= +tutti.createSpeciesBatch.field.species.tip= +tutti.dbManager.action.chooseDbExportFile= +tutti.dbManager.action.chooseDbFile= +tutti.dbManager.action.closeDb= +tutti.dbManager.action.closeDb.tip= +tutti.dbManager.action.exportAndCleanDb= +tutti.dbManager.action.exportAndCleanDb.tip= +tutti.dbManager.action.exportDb= +tutti.dbManager.action.exportDb.tip= +tutti.dbManager.action.importDb= +tutti.dbManager.action.importDb.tip= +tutti.dbManager.action.installDb= +tutti.dbManager.action.installDb.tip= +tutti.dbManager.action.openDb= +tutti.dbManager.action.openDb.tip= +tutti.dbManager.action.upgradeDb= +tutti.dbManager.action.upgradeDb.tip= +tutti.dbManager.info.db.loaded= +tutti.dbManager.info.no.db.exist= +tutti.dbManager.info.no.db.loaded= +tutti.dbManager.title.choose.dbExportFile= +tutti.dbManager.title.choose.dbImportFile= +tutti.common.askCancelEditBeforeLeaving.help= +tutti.common.askCancelEditBeforeLeaving.title= +tutti.common.askOverwriteFile.help= +tutti.common.askOverwriteFile.message= +tutti.common.askOverwriteFile.title= +tutti.common.askSaveBeforeLeaving.help= +tutti.common.askSaveBeforeLeaving.title= +tutti.editAccidentalBatch.table.header.comment= +tutti.editAccidentalBatch.table.header.file= +tutti.editAccidentalBatch.table.header.speciesByCode= +tutti.editAccidentalBatch.table.header.speciesByGenusCode= +tutti.editAccidentalBatch.table.header.weight= +tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight= +tutti.editBenthosBatch.field.benthosTotalSortedWeight= +tutti.editBenthosBatch.field.benthosTotalUnsortedWeight= +tutti.editBenthosBatch.field.benthosTotalWeight= +tutti.editBenthosBatch.table.header.comment= +tutti.editBenthosBatch.table.header.file= +tutti.editBenthosBatch.table.header.number= +tutti.editBenthosBatch.table.header.sampleWeight= +tutti.editBenthosBatch.table.header.speciesByCode= +tutti.editBenthosBatch.table.header.speciesByGenusCode= +tutti.editBenthosBatch.table.header.toConfirm= +tutti.editBenthosBatch.table.header.weight= +tutti.editCatchBatch.action.cancelEditCatchBatch= +tutti.editCatchBatch.action.cancelEditCatchBatch.tip= +tutti.editCatchBatch.action.computeWeights= +tutti.editCatchBatch.action.computeWeights.error.incoherentCategoryWeight= +tutti.editCatchBatch.action.computeWeights.error.incoherentParentCategoryWeight= +tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightCategory= +tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightFrequency= +tutti.editCatchBatch.action.computeWeights.error.incoherentSpeciesTotalSorted= +tutti.editCatchBatch.action.computeWeights.error.incoherentTotal= +tutti.editCatchBatch.action.computeWeights.error.noWeight= +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help= +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message= +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title= +tutti.editCatchBatch.action.computeWeights.tip= +tutti.editCatchBatch.action.importPupitri= +tutti.editCatchBatch.action.importPupitri.tip= +tutti.editCatchBatch.action.saveCatchBatch= +tutti.editCatchBatch.action.saveCatchBatch.tip= +tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch= +tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch= +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight= +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip= +tutti.editCatchBatch.field.benthosTotalSortedWeight= +tutti.editCatchBatch.field.benthosTotalSortedWeight.tip= +tutti.editCatchBatch.field.benthosTotalUnsortedWeight= +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.tip= +tutti.editCatchBatch.field.benthosTotalWeight= +tutti.editCatchBatch.field.benthosTotalWeight.tip= +tutti.editCatchBatch.field.catchTotalRejectedWeight= +tutti.editCatchBatch.field.catchTotalRejectedWeight.tip= +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight= +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip= +tutti.editCatchBatch.field.catchTotalSortedTremisWeight= +tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip= +tutti.editCatchBatch.field.catchTotalSortedWeight= +tutti.editCatchBatch.field.catchTotalSortedWeight.tip= +tutti.editCatchBatch.field.catchTotalUnsortedWeight= +tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip= +tutti.editCatchBatch.field.catchTotalWeight= +tutti.editCatchBatch.field.catchTotalWeight.tip= +tutti.editCatchBatch.field.macroWasteTotalWeight= +tutti.editCatchBatch.field.macroWasteTotalWeight.tip= +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight= +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip= +tutti.editCatchBatch.field.speciesTotalSortedWeight= +tutti.editCatchBatch.field.speciesTotalSortedWeight.tip= +tutti.editCatchBatch.field.speciesTotalUnsortedWeight= +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.tip= +tutti.editCatchBatch.field.speciesTotalWeight= +tutti.editCatchBatch.field.speciesTotalWeight.tip= +tutti.editCatchBatch.legend.benthos= +tutti.editCatchBatch.legend.macroWaste= +tutti.editCatchBatch.legend.species= +tutti.editCatchBatch.legend.total= +tutti.editCruise.action.closeEditCruise= +tutti.editCruise.action.closeEditCruise.tip= +tutti.editCruise.action.generateCampaignName= +tutti.editCruise.action.generateName.tip= +tutti.editCruise.action.saveCruise= +tutti.editCruise.action.saveCruise.tip= +tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise= +tutti.editCruise.askSaveBeforeLeaving.saveCruise= +tutti.editCruise.field.beginDate= +tutti.editCruise.field.beginDate.tip= +tutti.editCruise.field.comment= +tutti.editCruise.field.comment.tip= +tutti.editCruise.field.country= +tutti.editCruise.field.country.tip= +tutti.editCruise.field.endDate= +tutti.editCruise.field.endDate.tip= +tutti.editCruise.field.gear= +tutti.editCruise.field.gear.tip= +tutti.editCruise.field.headOfMission= +tutti.editCruise.field.headOfMission.tip= +tutti.editCruise.field.headOfSortRoom= +tutti.editCruise.field.headOfSortRoom.tip= +tutti.editCruise.field.multirigNumber= +tutti.editCruise.field.multirigNumber.tip= +tutti.editCruise.field.name= +tutti.editCruise.field.name.tip= +tutti.editCruise.field.program= +tutti.editCruise.field.program.tip= +tutti.editCruise.field.surveyPart= +tutti.editCruise.field.surveyPart.tip= +tutti.editCruise.field.vessel= +tutti.editCruise.field.vessel.tip= +tutti.editCruise.field.year= +tutti.editCruise.field.year.tip= +tutti.editCruise.filterVessel.tip= +tutti.editCruise.filterVesselType= +tutti.editCruise.filterVesselType.all= +tutti.editCruise.filterVesselType.all.tip= +tutti.editCruise.filterVesselType.fishing= +tutti.editCruise.filterVesselType.fishing.tip= +tutti.editCruise.filterVesselType.scientific= +tutti.editCruise.filterVesselType.scientific.tip= +tutti.editFishingOperation.action.attachments.tip= +tutti.editFishingOperation.action.cancelEditFishingOperation= +tutti.editFishingOperation.action.cancelEditFishingOperation.tip= +tutti.editFishingOperation.action.editFishingOperation.tip= +tutti.editFishingOperation.action.importCasino= +tutti.editFishingOperation.action.importCasino.tip= +tutti.editFishingOperation.action.resetEditFishingOperation= +tutti.editFishingOperation.action.resetEditFishingOperation.tip= +tutti.editFishingOperation.action.resetFishingOperationValidState= +tutti.editFishingOperation.action.resetFishingOperationValidState.tip= +tutti.editFishingOperation.action.saveEditFishingOperation.tip= +tutti.editFishingOperation.action.saveFishingOperation= +tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation= +tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation= +tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation= +tutti.editFishingOperation.duration.format= +tutti.editFishingOperation.field.comment= +tutti.editFishingOperation.field.comment.tip= +tutti.editFishingOperation.field.duration= +tutti.editFishingOperation.field.duration.tip= +tutti.editFishingOperation.field.fishingOperationInvalid= +tutti.editFishingOperation.field.fishingOperationNumber= +tutti.editFishingOperation.field.fishingOperationNumber.tip= +tutti.editFishingOperation.field.fishingOperationRectiligne= +tutti.editFishingOperation.field.fishingOperationRectiligne.tip= +tutti.editFishingOperation.field.fishingOperationValid= +tutti.editFishingOperation.field.fishingOperationValid.tip= +tutti.editFishingOperation.field.fishingOperationValidity= +tutti.editFishingOperation.field.gear= +tutti.editFishingOperation.field.gear.tip= +tutti.editFishingOperation.field.gearDate= +tutti.editFishingOperation.field.gearDate.tip= +tutti.editFishingOperation.field.gearLatitude= +tutti.editFishingOperation.field.gearLatitude.tip= +tutti.editFishingOperation.field.gearLongitude= +tutti.editFishingOperation.field.gearLongitude.tip= +tutti.editFishingOperation.field.gearShootingEnd= +tutti.editFishingOperation.field.gearShootingEnd.tip= +tutti.editFishingOperation.field.gearShootingEndDate= +tutti.editFishingOperation.field.gearShootingEndLatitude= +tutti.editFishingOperation.field.gearShootingEndLatitude.tip= +tutti.editFishingOperation.field.gearShootingEndLatitudeDegree= +tutti.editFishingOperation.field.gearShootingEndLatitudeMinute= +tutti.editFishingOperation.field.gearShootingEndLatitudeSecond= +tutti.editFishingOperation.field.gearShootingEndLongitude= +tutti.editFishingOperation.field.gearShootingEndLongitude.tip= +tutti.editFishingOperation.field.gearShootingEndLongitudeDegree= +tutti.editFishingOperation.field.gearShootingEndLongitudeMinute= +tutti.editFishingOperation.field.gearShootingEndLongitudeSecond= +tutti.editFishingOperation.field.gearShootingStart= +tutti.editFishingOperation.field.gearShootingStart.tip= +tutti.editFishingOperation.field.gearShootingStartDate= +tutti.editFishingOperation.field.gearShootingStartLatitude= +tutti.editFishingOperation.field.gearShootingStartLatitude.tip= +tutti.editFishingOperation.field.gearShootingStartLatitudeDegree= +tutti.editFishingOperation.field.gearShootingStartLatitudeMinute= +tutti.editFishingOperation.field.gearShootingStartLatitudeSecond= +tutti.editFishingOperation.field.gearShootingStartLongitude= +tutti.editFishingOperation.field.gearShootingStartLongitude.tip= +tutti.editFishingOperation.field.gearShootingStartLongitudeDegree= +tutti.editFishingOperation.field.gearShootingStartLongitudeMinute= +tutti.editFishingOperation.field.gearShootingStartLongitudeSecond= +tutti.editFishingOperation.field.gearTime= +tutti.editFishingOperation.field.gearTime.tip= +tutti.editFishingOperation.field.location= +tutti.editFishingOperation.field.location.tip= +tutti.editFishingOperation.field.multirigAggregation= +tutti.editFishingOperation.field.multirigAggregation.tip= +tutti.editFishingOperation.field.recorderPerson= +tutti.editFishingOperation.field.recorderPerson.tip= +tutti.editFishingOperation.field.stationNumber= +tutti.editFishingOperation.field.stationNumber.tip= +tutti.editFishingOperation.field.strata= +tutti.editFishingOperation.field.strata.tip= +tutti.editFishingOperation.field.subStrata= +tutti.editFishingOperation.field.subStrata.tip= +tutti.editFishingOperation.field.trawlDistance= +tutti.editFishingOperation.field.trawlDistance.inMilles.tip= +tutti.editFishingOperation.field.trawlDistance.tip= +tutti.editFishingOperation.field.vessel= +tutti.editFishingOperation.field.vessel.tip= +tutti.editFishingOperation.label.traitReminder= +tutti.editFishingOperation.label.traitReminder.inCreation= +tutti.editFishingOperation.pane.other= +tutti.editFishingOperation.tab.gearUseFeature= +tutti.editFishingOperation.tab.general= +tutti.editFishingOperation.tab.vesselUseFeature= +tutti.editMacroWasteBatch.table.header.comment= +tutti.editMacroWasteBatch.table.header.file= +tutti.editMacroWasteBatch.table.header.macroWasteCategory= +tutti.editMacroWasteBatch.table.header.macroWasteSizeCategory= +tutti.editMacroWasteBatch.table.header.number= +tutti.editMacroWasteBatch.table.header.weight= +tutti.editPlanktonBatch.table.header.comment= +tutti.editPlanktonBatch.table.header.file= +tutti.editPlanktonBatch.table.header.sampleWeight= +tutti.editPlanktonBatch.table.header.speciesByCode= +tutti.editPlanktonBatch.table.header.speciesByGenusCode= +tutti.editPlanktonBatch.table.header.toConfirm= +tutti.editPlanktonBatch.table.header.weight= +tutti.editProgram.action.closeEditProgram= +tutti.editProgram.action.closeEditProgram.tip= +tutti.editProgram.action.saveProgram= +tutti.editProgram.action.saveProgram.tip= +tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram= +tutti.editProgram.askSaveBeforeLeaving.saveProgram= +tutti.editProgram.field.comment= +tutti.editProgram.field.comment.tip= +tutti.editProgram.field.name.tip= +tutti.editProgram.field.program.name= +tutti.editProgram.field.program.zone= +tutti.editProgram.field.zone.tip= +tutti.editProtocol.action.addSpeciesProtocol.tip= +tutti.editProtocol.action.chooseProtocolCaracteristicFile= +tutti.editProtocol.action.chooseProtocolSpeciesFile= +tutti.editProtocol.action.closeEditProtocol= +tutti.editProtocol.action.closeEditProtocol.tip= +tutti.editProtocol.action.exportProtocolAllCaracteristic= +tutti.editProtocol.action.exportProtocolAllCaracteristic.tip= +tutti.editProtocol.action.exportProtocolCaracteristic= +tutti.editProtocol.action.exportProtocolCaracteristic.tip= +tutti.editProtocol.action.exportProtocolSpecies= +tutti.editProtocol.action.exportProtocolSpecies.tip= +tutti.editProtocol.action.importProtocolCaracteristic= +tutti.editProtocol.action.importProtocolCaracteristic.tip= +tutti.editProtocol.action.importProtocolSpecies= +tutti.editProtocol.action.importProtocolSpecies.tip= +tutti.editProtocol.action.removeSpeciesProtocol= +tutti.editProtocol.action.removeSpeciesProtocol.tip= +tutti.editProtocol.action.saveProtocol= +tutti.editProtocol.action.saveProtocol.tip= +tutti.editProtocol.action.selectOtherSpecies= +tutti.editProtocol.action.selectOtherSpecies.tip= +tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol= +tutti.editProtocol.askSaveBeforeLeaving.saveProtocol= +tutti.editProtocol.field..tip= +tutti.editProtocol.field.comment= +tutti.editProtocol.field.comment.tip= +tutti.editProtocol.field.protocol.name= +tutti.editProtocol.field.protocol.name.tip= +tutti.editProtocol.tab.accidental= +tutti.editProtocol.tab.benthos= +tutti.editProtocol.tab.caracteristic= +tutti.editProtocol.tab.caracteristic.gearUseFeature= +tutti.editProtocol.tab.caracteristic.lengthClasses= +tutti.editProtocol.tab.caracteristic.vesselUseFeature= +tutti.editProtocol.tab.info= +tutti.editProtocol.tab.plankton= +tutti.editProtocol.tab.species= +tutti.editProtocol.table.header.age= +tutti.editProtocol.table.header.age.tip= +tutti.editProtocol.table.header.calcifySample= +tutti.editProtocol.table.header.calcifySample.tip= +tutti.editProtocol.table.header.countIfNoFrequency= +tutti.editProtocol.table.header.countIfNoFrequency.tip= +tutti.editProtocol.table.header.lengthStep= +tutti.editProtocol.table.header.lengthStep.tip= +tutti.editProtocol.table.header.maturity= +tutti.editProtocol.table.header.maturity.tip= +tutti.editProtocol.table.header.sex= +tutti.editProtocol.table.header.sex.tip= +tutti.editProtocol.table.header.size= +tutti.editProtocol.table.header.size.tip= +tutti.editProtocol.table.header.speciesReferenceTaxonId= +tutti.editProtocol.table.header.speciesReferenceTaxonId.tip= +tutti.editProtocol.table.header.speciesSurveyCode= +tutti.editProtocol.table.header.speciesSurveyCode.tip= +tutti.editProtocol.table.header.weight= +tutti.editProtocol.table.header.weight.tip= +tutti.editProtocol.title.choose.caracteristicExportFile= +tutti.editProtocol.title.choose.caracteristicImportFile= +tutti.editProtocol.title.choose.speciesExportFile= +tutti.editProtocol.title.choose.speciesImportFile= +tutti.editProtocol.warn.clone= +tutti.editProtocol.warn.import= +tutti.editSpeciesBatch.action.createMelag.tip= +tutti.editSpeciesBatch.action.removeSpeciesBatch.tip= +tutti.editSpeciesBatch.action.removeSpeciesSubBatch.tip= +tutti.editSpeciesBatch.action.splitSpeciesBatch.tip= +tutti.editSpeciesBatch.action.createSpeciesBatch.tip= +tutti.editSpeciesBatch.field.speciesTotalInertWeight= +tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight= +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight= +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalSortedWeight= +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight= +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalWeight= +tutti.editSpeciesBatch.field.speciesTotalWeight.tip= +tutti.editSpeciesBatch.filterSpeciesBatch.mode.all.tip= +tutti.editSpeciesBatch.filterSpeciesBatch.mode.leaf.tip= +tutti.editSpeciesBatch.filterSpeciesBatch.mode.root.tip= +tutti.editSpeciesBatch.filterSpeciesBatch.tip= +tutti.editSpeciesBatch.filterSpeciesBatchMode= +tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.all= +tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.leaf= +tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.root= +tutti.editSpeciesBatch.action.renameSpeciesBatch.tip= +tutti.editSpeciesBatch.split.weightNotNull.help= +tutti.editSpeciesBatch.split.weightNotNull.message= +tutti.editSpeciesBatch.split.weightNotNull.title= +tutti.editSpeciesBatch.table.header.ageCategory= +tutti.editSpeciesBatch.table.header.comment= +tutti.editSpeciesBatch.table.header.computedNumber= +tutti.editSpeciesBatch.table.header.file= +tutti.editSpeciesBatch.table.header.maturityCategory= +tutti.editSpeciesBatch.table.header.sexCategory= +tutti.editSpeciesBatch.table.header.sizeCategory= +tutti.editSpeciesBatch.table.header.sortedUnsortedCategory= +tutti.editSpeciesBatch.table.header.species= +tutti.editSpeciesBatch.table.header.toConfirm= +tutti.editSpeciesBatch.table.header.weight= +tutti.editSpeciesBatch.tutti.action.createMelag= +tutti.editSpeciesBatch.tutti.action.createSpeciesBatch= +tutti.editSpeciesBatch.tutti.action.removeSpeciesBatch= +tutti.editSpeciesBatch.tutti.action.removeSpeciesSubBatch= +tutti.editSpeciesBatch.tutti.action.renameSpeciesBatch= +tutti.editSpeciesBatch.tutti.action.splitSpeciesBatch= +tutti.editSpeciesFrequencies.action.cancel= +tutti.editSpeciesFrequencies.action.cancel.tip= +tutti.editSpeciesFrequencies.action.generate= +tutti.editSpeciesFrequencies.action.generate.tip= +tutti.editSpeciesFrequencies.action.save= +tutti.editSpeciesFrequencies.action.save.tip= +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic= +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip= +tutti.editSpeciesFrequencies.field.maxStep= +tutti.editSpeciesFrequencies.field.maxStep.tip= +tutti.editSpeciesFrequencies.field.minStep= +tutti.editSpeciesFrequencies.field.minStep.tip= +tutti.editSpeciesFrequencies.field.mode.autoGen= +tutti.editSpeciesFrequencies.field.mode.autoGen.tip= +tutti.editSpeciesFrequencies.field.mode.rafale= +tutti.editSpeciesFrequencies.field.mode.rafale.tip= +tutti.editSpeciesFrequencies.field.mode.simple= +tutti.editSpeciesFrequencies.field.mode.simple.tip= +tutti.editSpeciesFrequencies.field.mode.simpleCounting= +tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip= +tutti.editSpeciesFrequencies.field.rafaleStep= +tutti.editSpeciesFrequencies.field.rafaleStep.tip= +tutti.editSpeciesFrequencies.field.simpleCounting= +tutti.editSpeciesFrequencies.field.simpleCounting.tip= +tutti.editSpeciesFrequencies.field.step= +tutti.editSpeciesFrequencies.field.step.tip= +tutti.editSpeciesFrequencies.label.no.configuration= +tutti.editSpeciesFrequencies.table.header.lengthStep= +tutti.editSpeciesFrequencies.table.header.number= +tutti.editSpeciesFrequencies.table.header.weight= +tutti.error.errorpane.htmlmessage= +tutti.common.file.csv= +tutti.common.file.protocol= +tutti.common.file.zip= +tutti.fishingOperations.action.newFishingOperation.tip= +tutti.fishingOperations.info.no.fishingOperation.selected= +tutti.fishingOperations.warn.invalid.batch.model= +tutti.flash.info.all.caractristic.exported= +tutti.flash.info.caracteristic.imported.in.protocol= +tutti.flash.info.caractristic.exported.from.protocol= +tutti.flash.info.cruiseCreated= +tutti.flash.info.cruiseSaved= +tutti.flash.info.db.closed= +tutti.flash.info.db.exported= +tutti.flash.info.db.exported.and.clean= +tutti.flash.info.db.imported= +tutti.flash.info.db.installed= +tutti.flash.info.db.opened= +tutti.flash.info.programCreated= +tutti.flash.info.programSaved= +tutti.flash.info.protocolCreated= +tutti.flash.info.protocolSaved= +tutti.flash.info.species.add.to.protocol= +tutti.flash.info.species.exported.from.protocol= +tutti.flash.info.species.imported.in.protocol= +tutti.flash.info.species.imported.in.protocol.oneReplaced= +tutti.flash.info.species.imported.in.protocol.severalReplaced= +tutti.flash.info.species.remove.from.protocol= +tutti.flash.info.species.replaced= +tutti.label.catches.planktonTotalSampleWeight= +tutti.label.catches.planktonTotalWeight= +tutti.label.comment= +tutti.label.tab.accidentel= +tutti.label.tab.benthos= +tutti.label.tab.catches= +tutti.label.tab.catchesCaracteristics= +tutti.label.tab.fishingOperation= +tutti.label.tab.macroDechet= +tutti.label.tab.observationIndividuel= +tutti.label.tab.plancton= +tutti.label.tab.species= +tutti.legend.frequencyConfiguration= +tutti.legend.splitSpeciesBatchConfiguration= +tutti.main.action.about= +tutti.main.action.about.tip= +tutti.main.action.changeLocale.tip= +tutti.main.action.changeLocaleFR= +tutti.main.action.changeLocaleFR.tip= +tutti.main.action.changeLocaleUK= +tutti.main.action.changeLocaleUK.tip= +tutti.main.action.configuration= +tutti.main.action.configuration.tip= +tutti.main.action.editCatches= +tutti.main.action.editCatches.tip= +tutti.main.action.editProgram.tip= +tutti.main.action.editSelectedCruise= +tutti.main.action.editSelectedCruise.tip= +tutti.main.action.editSelectedProgram= +tutti.main.action.editSelectedProtocol= +tutti.main.action.editSelectedProtocol.tip= +tutti.main.action.exit= +tutti.main.action.exit.tip= +tutti.main.action.importTemporaryReferential= +tutti.main.action.importTemporaryReferential.tip= +tutti.main.action.manageDb= +tutti.main.action.manageDb.tip= +tutti.main.action.reloadTutti= +tutti.main.action.selectCruise= +tutti.main.action.selectCruise.tip= +tutti.main.action.showHelp= +tutti.main.action.showHelp.tip= +tutti.main.action.site= +tutti.main.action.site.tip= +tutti.main.action.updateApplication= +tutti.main.action.updateApplication.tip= +tutti.main.action.validateCatches= +tutti.main.action.validateCatches.tip= +tutti.main.menu.actions= +tutti.main.menu.actions.tip= +tutti.main.menu.administration= +tutti.main.menu.administration.tip= +tutti.main.menu.changeLocale= +tutti.main.menu.file= +tutti.main.menu.file.tip= +tutti.main.menu.help= +tutti.main.menu.help.tip= +tutti.manageTemporaryReferential.action.chooseReferentialGearFile= +tutti.manageTemporaryReferential.action.chooseReferentialPersonFile= +tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile= +tutti.manageTemporaryReferential.action.chooseReferentialVesselFile= +tutti.manageTemporaryReferential.action.exportTemporaryGearExample= +tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip= +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample= +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip= +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample= +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip= +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample= +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.tip= +tutti.manageTemporaryReferential.action.importTemporaryGear= +tutti.manageTemporaryReferential.action.importTemporaryGear.tip= +tutti.manageTemporaryReferential.action.importTemporaryPerson= +tutti.manageTemporaryReferential.action.importTemporaryPerson.tip= +tutti.manageTemporaryReferential.action.importTemporarySpecies= +tutti.manageTemporaryReferential.action.importTemporarySpecies.tip= +tutti.manageTemporaryReferential.action.importTemporaryVessel= +tutti.manageTemporaryReferential.action.importTemporaryVessel.tip= +tutti.manageTemporaryReferential.field.gear= +tutti.manageTemporaryReferential.field.gear.tip= +tutti.manageTemporaryReferential.field.person= +tutti.manageTemporaryReferential.field.person.tip= +tutti.manageTemporaryReferential.field.species= +tutti.manageTemporaryReferential.field.species.tip= +tutti.manageTemporaryReferential.field.vessel= +tutti.manageTemporaryReferential.field.vessel.tip= +tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile= +tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile= +tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile= +tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile= +tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile= +tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile= +tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile= +tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile= +tutti.message.action.running= +tutti.sampleCategoryType.age= +tutti.sampleCategoryType.maturity= +tutti.sampleCategoryType.sex= +tutti.sampleCategoryType.size= +tutti.sampleCategoryType.sortedUnsorted= +tutti.selectCruise.action.chooseProtocolFile= +tutti.selectCruise.action.cloneProtocol= +tutti.selectCruise.action.cloneProtocol.tip= +tutti.selectCruise.action.deleteProtocol= +tutti.selectCruise.action.deleteProtocol.message= +tutti.selectCruise.action.deleteProtocol.tip= +tutti.selectCruise.action.deleteProtocol.title= +tutti.selectCruise.action.editCatches= +tutti.selectCruise.action.editCatches.tip= +tutti.selectCruise.action.editCruise= +tutti.selectCruise.action.editCruise.tip= +tutti.selectCruise.action.editProgram= +tutti.selectCruise.action.editProgram.tip= +tutti.selectCruise.action.editProtocol= +tutti.selectCruise.action.editProtocol.tip= +tutti.selectCruise.action.exportProtocol= +tutti.selectCruise.action.exportProtocol.tip= +tutti.selectCruise.action.importProtocol= +tutti.selectCruise.action.importProtocol.tip= +tutti.selectCruise.action.newCruise= +tutti.selectCruise.action.newCruise.tip= +tutti.selectCruise.action.newProgram= +tutti.selectCruise.action.newProgram.tip= +tutti.selectCruise.action.newProtocol= +tutti.selectCruise.action.newProtocol.tip= +tutti.selectCruise.action.validateCatches= +tutti.selectCruise.action.validateCatches.tip= +tutti.selectCruise.field.cruise= +tutti.selectCruise.field.cruise.tip= +tutti.selectCruise.field.program= +tutti.selectCruise.field.program.tip= +tutti.selectCruise.field.protocol= +tutti.selectCruise.field.protocol.tip= +tutti.selectCruise.title.choose.exportFile= +tutti.selectCruise.title.choose.importFile= +tutti.selectCruise.warn.invalid.selected.data= +tutti.splitSpeciesBatch.action.cancel= +tutti.splitSpeciesBatch.action.cancel.tip= +tutti.splitSpeciesBatch.action.save= +tutti.splitSpeciesBatch.action.save.tip= +tutti.splitSpeciesBatch.field.batchWeight= +tutti.splitSpeciesBatch.field.batchWeightField.tip= +tutti.splitSpeciesBatch.field.category= +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= +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.timeeditor.H= +tutti.title.about= +tutti.title.about.translate= +tutti.title.comment= +tutti.title.config= +tutti.title.create.cruise= +tutti.title.create.program= +tutti.title.create.protocol= +tutti.title.createBatch= +tutti.title.edit.cruise= +tutti.title.edit.operations= +tutti.title.edit.program= +tutti.title.edit.protocol= +tutti.title.editFrequency= +tutti.title.home= +tutti.title.import.temporary.referential= +tutti.title.manageDb= +tutti.title.noSelectedCruise= +tutti.title.noSelectedProgram= +tutti.title.noSelectedProtocol= +tutti.title.nodb= +tutti.title.sampleOrder= +tutti.title.selectSpecies= +tutti.title.selectedCruise= +tutti.title.selectedProgram= +tutti.title.selectedProtocol= +tutti.title.splitBatch= +tutti.title.validate.operations= +tutti.to.be.done= +tutti.ui.common.error= +tutti.validator.error.comment.too.long= +tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue= +tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required= +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= 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 09:48:31 UTC (rev 629) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-15 10:20:17 UTC (rev 630) @@ -3,415 +3,320 @@ 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.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.cancel=Annuler tutti.action.cancelEditCruise=Annuler -tutti.editFishingOperation.action.cancelEditFishingOperation=Annuler tutti.action.cancelEditProgram=Annuler tutti.action.cancelEditProtocol=Annuler -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.action.removeCaracteristic=Supprimer la caractéristique +tutti.config.action.sampleOrder.tip=Réordonner les catégories d'échantilonnage +tutti.action.validate=Valider +tutti.application.config=Configuration de l'application Tutti +tutti.application.name=Tutti tutti.attachmentEditor.action.close=Fermer tutti.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes +tutti.attachmentEditor.action.open.tip=Ouvrir la pièce jointe +tutti.attachmentEditor.action.remove.tip=Supprimer la pièce jointe +tutti.attachmentEditor.action.save.tip=Enregistrer la pièce jointe en local +tutti.attachmentEditor.action.tip=Pièces jointes +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.field.file=Fichier +tutti.attachmentEditor.field.fileComment=Commentaire +tutti.attachmentEditor.field.fileName=Nom +tutti.attachmentEditor.none.tip=Pas de pièce-jointes +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.attachmentEditor.text=(%s) +tutti.attachmentEditor.title=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.commentEditor.none.tip=Pas de commentaire +tutti.common.error=Erreur 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.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.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 tutti.config.category.applications=Application tutti.config.category.applications.description=Application tutti.config.category.shortcuts=Raccourcis 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.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.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.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.config.option.cruiseId.description=Identifiant de la dernière campagne utilisée +tutti.config.option.help.directory.description=Répertoire des fichiers d'aide +tutti.config.option.i18n.directory.description=Répertoire des fichiers de traductions +tutti.config.option.i18n.locale.description=Langue utilisée dans l'application +tutti.config.option.launch.mode.description=Mode de démarrage de l'application +tutti.config.option.programId.description=Identifiant de la dernière série de campagne utilisée +tutti.config.option.protocolId.description=Identifiant du dernier protocole utilisé +tutti.config.option.samplingCategoryOrderIds.description=Ordre des catégories d'échantillonnage +tutti.config.option.tremieCarousselVessel.description=Navire ayant un caroussel et un trémie (Thalassa) +tutti.config.option.ui.autoPopupNumberEditor.description=Toujours afficher le pavé numérique lors de l'édition d'un nombre +tutti.config.option.ui.color.blockingLayer.description=Couleur utilisée pour bloquer l'interface lors d'une action longue +tutti.config.option.ui.color.cellWithValue.description=Couleur d'une cellule avec des données +tutti.config.option.ui.color.computedWeights.description=Couleur des données calculées +tutti.config.option.ui.color.rowInvalid.description=Ligne invalide +tutti.config.option.ui.color.rowReadOnly.description=Cellule non éditable +tutti.config.option.ui.color.rowToConfirm.description=Ligne à confirmer +tutti.config.option.ui.config.file.description=Chemin du fichier de configuration des interfaces graphiques +tutti.config.option.ui.coordinateEditorType.description=Type de l'éditeur de coordonnées +tutti.config.option.ui.dateFormat.description=Format de dates +tutti.config.option.ui.shortcut.closePopup.description=Fermer une popup +tutti.config.option.ui.showNumberEditorButton.description=Afficher le pavé numérique de saisie +tutti.config.option.update.url.description=URL de mise à jour +tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie. tutti.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.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.createSpeciesBatch.action.addSpecies=... +tutti.createSpeciesBatch.action.addSpecies.tip=Sélectionner une autre espèce +tutti.createSpeciesBatch.action.cancel=Annuler +tutti.createSpeciesBatch.action.cancel.tip= +tutti.createSpeciesBatch.action.save=Enregistrer +tutti.createSpeciesBatch.action.save.tip= +tutti.createSpeciesBatch.field.batchWeight=Poids du lot (kg) +tutti.createSpeciesBatch.field.batchWeight.tip= +tutti.createSpeciesBatch.field.sortedUnsortedCategory=V / HV +tutti.createSpeciesBatch.field.sortedUnsortedCategory.tip= +tutti.createSpeciesBatch.field.species=Espèce du lot +tutti.createSpeciesBatch.field.species.tip= +tutti.dbManager.action.chooseDbExportFile=Exporter la base de données +tutti.dbManager.action.chooseDbFile=Choisir la base à importer +tutti.dbManager.action.closeDb=Fermer +tutti.dbManager.action.closeDb.tip=Fermer la base de données en cours d'utilisation +tutti.dbManager.action.exportAndCleanDb=Exporter et supprimer +tutti.dbManager.action.exportAndCleanDb.tip=Exporter la base de données au format zip puis supprimer les fichiers de Tutti +tutti.dbManager.action.exportDb=Exporter +tutti.dbManager.action.exportDb.tip=Exporter la base de données au format zip +tutti.dbManager.action.importDb=Importer une base +tutti.dbManager.action.importDb.tip=Importer la base de données au format zip +tutti.dbManager.action.installDb=Installer +tutti.dbManager.action.installDb.tip=Télécharger puis installer la base de données +tutti.dbManager.action.openDb=Ouvrir +tutti.dbManager.action.openDb.tip=Ouvrir la base de données +tutti.dbManager.action.upgradeDb=Vérifier les mises à jour +tutti.dbManager.action.upgradeDb.tip=Mettre à jour les référentiels si nécessaire 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.dbManager.title.choose.dbExportFile=Exporter la base de données +tutti.dbManager.title.choose.dbImportFile=Importer la base de données +tutti.common.askCancelEditBeforeLeaving.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour rester sur cet écran</li><li><strong>OK</strong> pour quitter l'écran en abandonnant les modifications</li></ul> +tutti.common.askCancelEditBeforeLeaving.title=Modifications non enregistrées mais invalides +tutti.common.askOverwriteFile.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour ne pas écraser le fichier et annuler l'opération</li><li><strong>Oui</strong> pour écraser le fichier et continuer l'opération</li></ul> +tutti.common.askOverwriteFile.message=Le fichier %s existe déjà, confirmer pour l'écraser. +tutti.common.askOverwriteFile.title=Confirmer l'écrasement d'un fichier... +tutti.common.askSaveBeforeLeaving.help=Que voulez-vous faire?<ul><li><strong>Annuler</strong> pour rester sur cet écran</li><li><strong>Non</strong> pour quitter l'écran en abandonnant les modifications en cours</li><li><strong>Oui</strong> pour quitter l'écran après enregistrement des modifications</li></ul> +tutti.common.askSaveBeforeLeaving.title=Modifications non enregistrées +tutti.editAccidentalBatch.table.header.comment=Commentaire +tutti.editAccidentalBatch.table.header.file=Pièces-jointes +tutti.editAccidentalBatch.table.header.speciesByCode=Espèce +tutti.editAccidentalBatch.table.header.speciesByGenusCode=Espèce +tutti.editAccidentalBatch.table.header.weight=Poids observé +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.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.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser +tutti.editCatchBatch.action.cancelEditCatchBatch.tip=Réinitialiser l'édition de la capture +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.editCatchBatch.action.computeWeights.tip=Elever les poids +tutti.editCatchBatch.action.importPupitri=Import Pupitri +tutti.editCatchBatch.action.importPupitri.tip=Import Pupitri +tutti.editCatchBatch.action.saveCatchBatch=Sauver +tutti.editCatchBatch.action.saveCatchBatch.tip=Sauver la capture +tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture n'est pas valide et ne peut pas être enregistrée. +tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées. tutti.editCatchBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié (kg) +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.tip= tutti.editCatchBatch.field.benthosTotalSortedWeight=Poids total VRAC (kg) +tutti.editCatchBatch.field.benthosTotalSortedWeight.tip= tutti.editCatchBatch.field.benthosTotalUnsortedWeight=Poids total HORS VRAC (kg) +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.tip= 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.benthosTotalWeight.tip= tutti.editCatchBatch.field.catchTotalRejectedWeight=Poids total NON TRIÉ (kg) +tutti.editCatchBatch.field.catchTotalRejectedWeight.tip= tutti.editCatchBatch.field.catchTotalSortedCarousselWeight=Caroussel observé (*) +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip= tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Tremie (*) +tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip= tutti.editCatchBatch.field.catchTotalSortedWeight=Poids total VRAC (kg) +tutti.editCatchBatch.field.catchTotalSortedWeight.tip= tutti.editCatchBatch.field.catchTotalUnsortedWeight=Poids total HORS VRAC (kg) +tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip= tutti.editCatchBatch.field.catchTotalWeight=Poids TOTAL (kg) +tutti.editCatchBatch.field.catchTotalWeight.tip= tutti.editCatchBatch.field.macroWasteTotalWeight=Poids TOTAL (kg) -tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné -tutti.label.catches.planktonTotalWeight=Poids total -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.macroWasteTotalWeight.tip= 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.speciesTotalSampleSortedWeight.tip= tutti.editCatchBatch.field.speciesTotalSortedWeight=Poids total VRAC (kg) +tutti.editCatchBatch.field.speciesTotalSortedWeight.tip= tutti.editCatchBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg) +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.tip= tutti.editCatchBatch.field.speciesTotalWeight=Poids TOTAL (kg) -tutti.label.comment=Commentaire -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.editCatchBatch.field.speciesTotalWeight.tip= +tutti.editCatchBatch.legend.benthos=Benthos +tutti.editCatchBatch.legend.macroWaste=Macro déchets +tutti.editCatchBatch.legend.species=Espèces +tutti.editCatchBatch.legend.total=Capture +tutti.editCruise.action.closeEditCruise=Fermer +tutti.editCruise.action.closeEditCruise.tip= +tutti.editCruise.action.generateCampaignName=Générer le nom +tutti.editCruise.action.generateName.tip= +tutti.editCruise.action.saveCruise=Enregistrer +tutti.editCruise.action.saveCruise.tip= +tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise=La campagne n'est pas valide et ne peut pas être enregistrée. +tutti.editCruise.askSaveBeforeLeaving.saveCruise=Des modifications sur la campagne n'ont pas été enregistrées. +tutti.editCruise.field.beginDate=Date de début +tutti.editCruise.field.beginDate.tip= +tutti.editCruise.field.comment=Commentaire +tutti.editCruise.field.comment.tip= +tutti.editCruise.field.country=Pays +tutti.editCruise.field.country.tip= +tutti.editCruise.field.endDate=Date de fin +tutti.editCruise.field.endDate.tip= +tutti.editCruise.field.gear=Engin(s) +tutti.editCruise.field.gear.tip= +tutti.editCruise.field.headOfMission=Chef(s) de mission +tutti.editCruise.field.headOfMission.tip= +tutti.editCruise.field.headOfSortRoom=Reponsable(s) de salle de tri +tutti.editCruise.field.headOfSortRoom.tip= +tutti.editCruise.field.multirigNumber=Nombre de poches +tutti.editCruise.field.multirigNumber.tip= +tutti.editCruise.field.name=Nom +tutti.editCruise.field.name.tip= +tutti.editCruise.field.program=Série +tutti.editCruise.field.program.tip= +tutti.editCruise.field.surveyPart=Série partielle +tutti.editCruise.field.surveyPart.tip= +tutti.editCruise.field.vessel=Navire(s) +tutti.editCruise.field.vessel.tip= +tutti.editCruise.field.year=Année +tutti.editCruise.field.year.tip= +tutti.editCruise.filterVessel.tip= +tutti.editCruise.filterVesselType=Filtre \: +tutti.editCruise.filterVesselType.all=Tout +tutti.editCruise.filterVesselType.all.tip=Tout les navires +tutti.editCruise.filterVesselType.fishing=Pro +tutti.editCruise.filterVesselType.fishing.tip=Uniquement les navires pro +tutti.editCruise.filterVesselType.scientific=Scientifique +tutti.editCruise.filterVesselType.scientific.tip=Uniquement les navires scientifiques +tutti.editFishingOperation.action.attachments.tip= +tutti.editFishingOperation.action.cancelEditFishingOperation=Annuler +tutti.editFishingOperation.action.cancelEditFishingOperation.tip=Annuler la création du trait +tutti.editFishingOperation.action.editFishingOperation.tip=Éditer l'opération de pêche +tutti.editFishingOperation.action.importCasino=Import Casino +tutti.editFishingOperation.action.importCasino.tip=Import Casino +tutti.editFishingOperation.action.resetEditFishingOperation=Réinitialiser +tutti.editFishingOperation.action.resetEditFishingOperation.tip=Réinitialiser l'édition du trait +tutti.editFishingOperation.action.resetFishingOperationValidState=Réinitialiser +tutti.editFishingOperation.action.resetFishingOperationValidState.tip= +tutti.editFishingOperation.action.saveEditFishingOperation.tip=Enregistrer le trait +tutti.editFishingOperation.action.saveFishingOperation=Enregistrer +tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation=Le trait modifié n'est pas valide et ne peut pas être enregistré. +tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation=Le trait n'a pas été créé. +tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation=Des modifications sur le trait n'ont pas été enregistrées. +tutti.editFishingOperation.duration.format=dj Hh m'm' +tutti.editFishingOperation.field.comment=Commentaire +tutti.editFishingOperation.field.comment.tip= tutti.editFishingOperation.field.duration=Durée +tutti.editFishingOperation.field.duration.tip= tutti.editFishingOperation.field.fishingOperationInvalid=Trait invalide tutti.editFishingOperation.field.fishingOperationNumber=Numéro de Trait +tutti.editFishingOperation.field.fishingOperationNumber.tip= tutti.editFishingOperation.field.fishingOperationRectiligne=Trait rectiligne +tutti.editFishingOperation.field.fishingOperationRectiligne.tip= tutti.editFishingOperation.field.fishingOperationValid=Trait valide +tutti.editFishingOperation.field.fishingOperationValid.tip= tutti.editFishingOperation.field.fishingOperationValidity=Validité du trait tutti.editFishingOperation.field.gear=Engin +tutti.editFishingOperation.field.gear.tip= tutti.editFishingOperation.field.gearDate=Date +tutti.editFishingOperation.field.gearDate.tip= tutti.editFishingOperation.field.gearLatitude=Latitude (%s) +tutti.editFishingOperation.field.gearLatitude.tip= tutti.editFishingOperation.field.gearLongitude=Longitude (%s) +tutti.editFishingOperation.field.gearLongitude.tip= tutti.editFishingOperation.field.gearShootingEnd=Fin de traine +tutti.editFishingOperation.field.gearShootingEnd.tip= tutti.editFishingOperation.field.gearShootingEndDate=Date de fin de traine tutti.editFishingOperation.field.gearShootingEndLatitude=Latitude de fin de traine +tutti.editFishingOperation.field.gearShootingEndLatitude.tip= 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.gearShootingEndLongitude.tip= 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.gearShootingStart.tip= tutti.editFishingOperation.field.gearShootingStartDate=Date de début de traine tutti.editFishingOperation.field.gearShootingStartLatitude=Latitude de début de traine +tutti.editFishingOperation.field.gearShootingStartLatitude.tip= 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.gearShootingStartLongitude.tip= 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.gearTime.tip= tutti.editFishingOperation.field.location=Localité +tutti.editFishingOperation.field.location.tip= tutti.editFishingOperation.field.multirigAggregation=Numéro de poche -tutti.editFishingOperation.pane.other=Autres caractéristiques +tutti.editFishingOperation.field.multirigAggregation.tip= +tutti.editFishingOperation.field.recorderPerson=Saisisseur(s) +tutti.editFishingOperation.field.recorderPerson.tip= tutti.editFishingOperation.field.stationNumber=Code Station +tutti.editFishingOperation.field.stationNumber.tip= tutti.editFishingOperation.field.strata=Strate +tutti.editFishingOperation.field.strata.tip= tutti.editFishingOperation.field.subStrata=Sous strate +tutti.editFishingOperation.field.subStrata.tip= tutti.editFishingOperation.field.trawlDistance=Distance chalutée (m) +tutti.editFishingOperation.field.trawlDistance.inMilles.tip=%s milles marins +tutti.editFishingOperation.field.trawlDistance.tip= 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.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.editFishingOperation.field.vessel.tip= +tutti.editFishingOperation.label.traitReminder=Trait \: %s +tutti.editFishingOperation.label.traitReminder.inCreation=en cours de création +tutti.editFishingOperation.pane.other=Autres caractéristiques tutti.editFishingOperation.tab.gearUseFeature=Mise en oeuvre de l'engin tutti.editFishingOperation.tab.general=Trait tutti.editFishingOperation.tab.vesselUseFeature=Hydrologie et paramètres environnementaux -tutti.label.tab.macroDechet=Macro déchets -tutti.label.tab.observationIndividuel=Observations individuelles -tutti.label.tab.plancton=Plancton -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.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.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 -tutti.option.i18n.directory.description=Répertoire des fichiers de traductions -tutti.option.i18n.locale.description=Langue utilisée dans l'application -tutti.option.launch.mode.description=Mode de démarrage de l'application -tutti.option.programId.description=Identifiant de la dernière série de campagne utilisée -tutti.option.protocolId.description=Identifiant du dernier protocole utilisé -tutti.option.samplingCategoryOrderIds.description=Ordre des catégories d'échantillonnage -tutti.option.tremieCarousselVessel.description=Navire ayant un caroussel et un trémie (Thalassa) -tutti.option.ui.autoPopupNumberEditor.description=Toujours afficher le pavé numérique lors de l'édition d'un nombre -tutti.option.ui.color.blockingLayer.description=Couleur utilisée pour bloquer l'interface lors d'une action longue -tutti.option.ui.color.cellWithValue.description=Couleur d'une cellule avec des données -tutti.option.ui.color.computedWeights.description=Couleur des données calculées -tutti.option.ui.color.rowInvalid.description=Ligne invalide -tutti.option.ui.color.rowReadOnly.description=Cellule non éditable -tutti.option.ui.color.rowToConfirm.description=Ligne à confirmer -tutti.option.ui.config.file.description=Chemin du fichier de configuration des interfaces graphiques -tutti.option.ui.coordinateEditorType.description=Type de l'éditeur de coordonnées -tutti.option.ui.dateFormat.description=Format de dates -tutti.option.ui.shortcut.closePopup.description=Fermer une popup -tutti.option.ui.showNumberEditorButton.description=Afficher le pavé numérique de saisie -tutti.option.update.url.description=URL de mise à jour -tutti.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.sampleCategoryType.age=Age -tutti.sampleCategoryType.maturity=Maturité -tutti.sampleCategoryType.sex=Sexe -tutti.sampleCategoryType.size=Class Tri. -tutti.sampleCategoryType.sortedUnsorted=V/HV -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.editMacroWasteBatch.table.header.comment=Commentaire tutti.editMacroWasteBatch.table.header.file=Pièces jointes tutti.editMacroWasteBatch.table.header.macroWasteCategory=Catégorie @@ -425,6 +330,55 @@ tutti.editPlanktonBatch.table.header.speciesByGenusCode=Espèce tutti.editPlanktonBatch.table.header.toConfirm=A Confirmer tutti.editPlanktonBatch.table.header.weight=Poids +tutti.editProgram.action.closeEditProgram=Fermer +tutti.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne +tutti.editProgram.action.saveProgram=Enregistrer +tutti.editProgram.action.saveProgram.tip=Enregistrer la série de campagne +tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram=La série de campagne n'est pas valide et ne peut pas être enregistrée. +tutti.editProgram.askSaveBeforeLeaving.saveProgram=Des modifications sur la série de campagne n'ont pas été enregistrées. +tutti.editProgram.field.comment=Commentaire +tutti.editProgram.field.comment.tip= +tutti.editProgram.field.name.tip= +tutti.editProgram.field.program.name=Nom +tutti.editProgram.field.program.zone=Zone +tutti.editProgram.field.zone.tip= +tutti.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole +tutti.editProtocol.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques +tutti.editProtocol.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces +tutti.editProtocol.action.closeEditProtocol=Fermer +tutti.editProtocol.action.closeEditProtocol.tip= +tutti.editProtocol.action.exportProtocolAllCaracteristic=Exporter toutes les caractéristiques +tutti.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques (sans les affecter à un écran) +tutti.editProtocol.action.exportProtocolCaracteristic=Exporter les caractéristiques +tutti.editProtocol.action.exportProtocolCaracteristic.tip=Exporter les caractéristiques du protocole +tutti.editProtocol.action.exportProtocolSpecies=Exporter les espèces +tutti.editProtocol.action.exportProtocolSpecies.tip=Exporter les espèces du protocole +tutti.editProtocol.action.importProtocolCaracteristic=Importer les caractéristiques +tutti.editProtocol.action.importProtocolCaracteristic.tip=importer les caractéristiques dans le protocole +tutti.editProtocol.action.importProtocolSpecies=Importer les espèces +tutti.editProtocol.action.importProtocolSpecies.tip=importer les espèces dans le protocole +tutti.editProtocol.action.removeSpeciesProtocol=Supprimer l'espèce +tutti.editProtocol.action.removeSpeciesProtocol.tip=Supprimer l'espèce +tutti.editProtocol.action.saveProtocol=Enregistrer +tutti.editProtocol.action.saveProtocol.tip=Enregistrer le protocol +tutti.editProtocol.action.selectOtherSpecies=... +tutti.editProtocol.action.selectOtherSpecies.tip=Sélectionner une autre espèce +tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol=Le protocole n'est pas valide et ne peut pas être enregistré. +tutti.editProtocol.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées. +tutti.editProtocol.field..tip= +tutti.editProtocol.field.comment=Commentaire +tutti.editProtocol.field.comment.tip= +tutti.editProtocol.field.protocol.name=Nom +tutti.editProtocol.field.protocol.name.tip= +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.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 @@ -445,6 +399,41 @@ 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.editProtocol.title.choose.caracteristicExportFile=Exporter les caractéristiques +tutti.editProtocol.title.choose.caracteristicImportFile=Importer les caractéristiques +tutti.editProtocol.title.choose.speciesExportFile=Exporter les espèces +tutti.editProtocol.title.choose.speciesImportFile=Importer les espèces +tutti.editProtocol.warn.clone=Le protocole que vous venez de cloner ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". +tutti.editProtocol.warn.import=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". +tutti.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG +tutti.editSpeciesBatch.action.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.action.createSpeciesBatch.tip= +tutti.editSpeciesBatch.field.speciesTotalInertWeight=Poids inerte trié (kg) +tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg) +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié (kg) +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalSortedWeight=Poids total VRAC (kg) +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg) +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip= +tutti.editSpeciesBatch.field.speciesTotalWeight=Poids TOTAL (kg) +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.filterSpeciesBatchMode=Filtre +tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.all=Aucun +tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.leaf=Feuilles +tutti.editSpeciesBatch.filterSpeciesBatchMode.mode.root=Parents (%s) +tutti.editSpeciesBatch.action.renameSpeciesBatch.tip= +tutti.editSpeciesBatch.split.weightNotNull.help=Que voulez-vous faire ? <ul><li><strong>Annuler</strong> pour ne pas catégoriser le lot et garder le poids sous-échantilloné</li><li><strong>OK</strong> pour catégoriser le lot et supprimer le poids sous-échantillonné</li></ul>. +tutti.editSpeciesBatch.split.weightNotNull.message=Pour catégoriser un lot, il ne doit pas avoir de poids sous-échantillonné. +tutti.editSpeciesBatch.split.weightNotNull.title=Poids sous-échantillonné non nul tutti.editSpeciesBatch.table.header.ageCategory=Age tutti.editSpeciesBatch.table.header.comment=Commentaire tutti.editSpeciesBatch.table.header.computedNumber=Nombre @@ -456,19 +445,157 @@ tutti.editSpeciesBatch.table.header.species=Espèce tutti.editSpeciesBatch.table.header.toConfirm=A Confirmer tutti.editSpeciesBatch.table.header.weight=Poids sous-échantillonné (kg) +tutti.editSpeciesBatch.title.batchActions=Actions +tutti.editSpeciesBatch.tutti.action.createMelag=Èspèces d'un MELAG +tutti.editSpeciesBatch.tutti.action.createSpeciesBatch=Créer un lot pour une espèce +tutti.editSpeciesBatch.tutti.action.removeSpeciesBatch=Supprimer le lot +tutti.editSpeciesBatch.tutti.action.removeSpeciesSubBatch=Supprimer les lots fils +tutti.editSpeciesBatch.tutti.action.renameSpeciesBatch=Corriger l'espèce +tutti.editSpeciesBatch.tutti.action.splitSpeciesBatch=Catégoriser le lot +tutti.editSpeciesFrequencies.action.cancel=Annuler +tutti.editSpeciesFrequencies.action.cancel.tip= +tutti.editSpeciesFrequencies.action.generate=Générer +tutti.editSpeciesFrequencies.action.generate.tip= +tutti.editSpeciesFrequencies.action.save=Enregistrer +tutti.editSpeciesFrequencies.action.save.tip= +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip= +tutti.editSpeciesFrequencies.field.maxStep=Classe max +tutti.editSpeciesFrequencies.field.maxStep.tip= +tutti.editSpeciesFrequencies.field.minStep=Classe min +tutti.editSpeciesFrequencies.field.minStep.tip= +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.field.rafaleStep=Classe de taille à incrémenter +tutti.editSpeciesFrequencies.field.rafaleStep.tip= +tutti.editSpeciesFrequencies.field.simpleCounting=Nombre +tutti.editSpeciesFrequencies.field.simpleCounting.tip= +tutti.editSpeciesFrequencies.field.step=Pas de la classe de taille +tutti.editSpeciesFrequencies.field.step.tip= +tutti.editSpeciesFrequencies.label.no.configuration=< Pas de configuration > 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.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.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> +tutti.common.file.csv=Extension d'un fichier csv +tutti.common.file.protocol=Extension d'un fichier de protocole Tutti +tutti.common.file.zip=Extension d'une archive zip +tutti.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche +tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > +tutti.fishingOperations.warn.invalid.batch.model=L'arbre d'échantillonage n'est pas compatible. Les captures ne seront pas visibles. +tutti.flash.info.all.caractristic.exported=Toutes les caractéristiques exportées dans le fichier <strong>%s</strong>. +tutti.flash.info.caracteristic.imported.in.protocol=Caractéristiques importées dans le protocole depuis le fichier <strong>%s</strong>. +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.label.catches.planktonTotalSampleWeight=Poids total échantillonné +tutti.label.catches.planktonTotalWeight=Poids total +tutti.label.comment=Commentaire +tutti.label.tab.accidentel=Captures accidentelles +tutti.label.tab.benthos=Benthos +tutti.label.tab.catches=Captures +tutti.label.tab.catchesCaracteristics=Résumé +tutti.label.tab.fishingOperation=Trait +tutti.label.tab.macroDechet=Macro déchets +tutti.label.tab.observationIndividuel=Observations individuelles +tutti.label.tab.plancton=Plancton +tutti.label.tab.species=Espèces +tutti.legend.frequencyConfiguration=Configuration +tutti.legend.splitSpeciesBatchConfiguration=Configuration +tutti.main.action.about=À propos +tutti.main.action.about.tip=À Propos +tutti.main.action.changeLocale.tip=Changer de langue +tutti.main.action.changeLocaleFR=Français +tutti.main.action.changeLocaleFR.tip=Passer en français +tutti.main.action.changeLocaleUK=Anglais +tutti.main.action.changeLocaleUK.tip=Passer en anglais +tutti.main.action.configuration=Configuration +tutti.main.action.configuration.tip=Configurer Tutti +tutti.main.action.editCatches=Saisir les captures +tutti.main.action.editCatches.tip=Editer les catpures +tutti.main.action.editProgram.tip=Editer la série de campagne +tutti.main.action.editSelectedCruise=Campagne +tutti.main.action.editSelectedCruise.tip=Éditer la campagne sélectionnée +tutti.main.action.editSelectedProgram=Série de campagne +tutti.main.action.editSelectedProtocol=Protocole +tutti.main.action.editSelectedProtocol.tip=Éditer le protocole sélectionné +tutti.main.action.exit=Quitter +tutti.main.action.exit.tip=Quitter l'application +tutti.main.action.importTemporaryReferential=Référentiels temporaires +tutti.main.action.importTemporaryReferential.tip=Importer des référentiels temporaires +tutti.main.action.manageDb=Gestionnaire de base +tutti.main.action.manageDb.tip=Gérer la base de données utilisée par Tutti +tutti.main.action.reloadTutti=Redémarrer Tutti +tutti.main.action.selectCruise=Sélectionner une campagne +tutti.main.action.selectCruise.tip=Sélectionner la campagne à utiliser +tutti.main.action.showHelp=Aide +tutti.main.action.showHelp.tip=Accéder à l'aide de l'application +tutti.main.action.site=Site +tutti.main.action.site.tip=Accéder au site du projet Tutti +tutti.main.action.updateApplication=Vérifier les mises à jour +tutti.main.action.updateApplication.tip=Vérifier les mises à jour logicielles +tutti.main.action.validateCatches=Valider les captures +tutti.main.action.validateCatches.tip=Valider les captures +tutti.main.menu.actions=Actions +tutti.main.menu.actions.tip=Actions +tutti.main.menu.administration=Administration +tutti.main.menu.administration.tip=Administrer Tutti +tutti.main.menu.changeLocale=Langue +tutti.main.menu.file=Fichier +tutti.main.menu.file.tip=Fichier +tutti.main.menu.help=Aide +tutti.main.menu.help.tip=Aide +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.manageTemporaryReferential.action.exportTemporaryGearExample=Exporter +tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip=Exporter un exemple de référentiel Engin +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample=Exporter +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip=Exporter un exemple de référentiel Personne +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample=Exporter +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip=Exporter un exemple de référentiel Espèces +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample=Exporter +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.tip=Exporter un exemple de référentiel Navire +tutti.manageTemporaryReferential.action.importTemporaryGear=Importer +tutti.manageTemporaryReferential.action.importTemporaryGear.tip=Importer un référentiel temporaire d'engins +tutti.manageTemporaryReferential.action.importTemporaryPerson=Importer +tutti.manageTemporaryReferential.action.importTemporaryPerson.tip=Importer un référentiel temporaire de personnes +tutti.manageTemporaryReferential.action.importTemporarySpecies=Importer +tutti.manageTemporaryReferential.action.importTemporarySpecies.tip=Importer un référentiel temporaire d'espèces +tutti.manageTemporaryReferential.action.importTemporaryVessel=Importer +tutti.manageTemporaryReferential.action.importTemporaryVessel.tip=Importer un référentiel temporaire de navires +tutti.manageTemporaryReferential.field.gear=Référentiel Engin +tutti.manageTemporaryReferential.field.gear.tip= +tutti.manageTemporaryReferential.field.person=Référentiel Personne +tutti.manageTemporaryReferential.field.person.tip= +tutti.manageTemporaryReferential.field.species=Référentiel Espèce +tutti.manageTemporaryReferential.field.species.tip= +tutti.manageTemporaryReferential.field.vessel=Référentiel Navire +tutti.manageTemporaryReferential.field.vessel.tip= 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 @@ -477,12 +604,70 @@ 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.message.action.running=<html>Action <strong>%s</strong> en cours d'execution...<hr/></html> +tutti.sampleCategoryType.age=Age +tutti.sampleCategoryType.maturity=Maturité +tutti.sampleCategoryType.sex=Sexe +tutti.sampleCategoryType.size=Class Tri. +tutti.sampleCategoryType.sortedUnsorted=V/HV +tutti.selectCruise.action.chooseProtocolFile=Choisir le fichier de protocole +tutti.selectCruise.action.cloneProtocol=Cloner +tutti.selectCruise.action.cloneProtocol.tip=Dupliquer le protocole sélectionné +tutti.selectCruise.action.deleteProtocol=Supprimer +tutti.selectCruise.action.deleteProtocol.message=Vous êtes sur le point de supprimer le protocol %s +tutti.selectCruise.action.deleteProtocol.tip=Supprimer le protocole sélectioné +tutti.selectCruise.action.deleteProtocol.title=Supprimer le protocole sélectioné +tutti.selectCruise.action.editCatches=Saisir les captures +tutti.selectCruise.action.editCatches.tip=Saisir des captures +tutti.selectCruise.action.editCruise=Éditer +tutti.selectCruise.action.editCruise.tip=Éditer la campagne sélectionnée +tutti.selectCruise.action.editProgram=Éditer +tutti.selectCruise.action.editProgram.tip=Éditer le programme sélectionné +tutti.selectCruise.action.editProtocol=Éditer +tutti.selectCruise.action.editProtocol.tip=Éditer le protocol sélectionné +tutti.selectCruise.action.exportProtocol=Exporter +tutti.selectCruise.action.exportProtocol.tip=Exporter le protocole sélectionné +tutti.selectCruise.action.importProtocol=Importer +tutti.selectCruise.action.importProtocol.tip=Importer un protocole +tutti.selectCruise.action.newCruise=Nouveau +tutti.selectCruise.action.newCruise.tip=Créer une nouvelle campagne +tutti.selectCruise.action.newProgram=Nouveau +tutti.selectCruise.action.newProgram.tip=Créer une nouvelle série de campagne +tutti.selectCruise.action.newProtocol=Nouveau +tutti.selectCruise.action.newProtocol.tip=Créer un nouveau protocole +tutti.selectCruise.action.validateCatches=Valider les captures +tutti.selectCruise.action.validateCatches.tip=Valider les captures +tutti.selectCruise.field.cruise=Campagne +tutti.selectCruise.field.cruise.tip= +tutti.selectCruise.field.program=Série de campagne +tutti.selectCruise.field.program.tip= +tutti.selectCruise.field.protocol=Protocol de saisie +tutti.selectCruise.field.protocol.tip= 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.selectCruise.warn.invalid.selected.data=Les données sélectionnées ne sont pas valides, impossible de saisir ou valider les captures. +tutti.splitSpeciesBatch.action.cancel=Annuler +tutti.splitSpeciesBatch.action.cancel.tip= +tutti.splitSpeciesBatch.action.save=Enregistrer +tutti.splitSpeciesBatch.action.save.tip= +tutti.splitSpeciesBatch.field.batchWeight=Poids total à catégoriser +tutti.splitSpeciesBatch.field.batchWeightField.tip= +tutti.splitSpeciesBatch.field.category=Catégorie +tutti.splitSpeciesBatch.field.categoryField.tip= +tutti.splitSpeciesBatch.field.sampleWeight=Poids total catégorisé +tutti.splitSpeciesBatch.field.sampleWeightField.tip= +tutti.splitSpeciesBatch.field.species=Espèce +tutti.splitSpeciesBatch.field.speciesField.tip= +tutti.splitSpeciesBatch.table.header.category=Catégorie +tutti.splitSpeciesBatch.table.header.selected=Sélection +tutti.splitSpeciesBatch.table.header.weight=Poids (kg) +tutti.table.fishing.gearUseFeature.header.key=Caractéristique +tutti.table.fishing.gearUseFeature.header.value=Valeur +tutti.table.fishing.vesselUseFeature.header.key=Caractéristique +tutti.table.fishing.vesselUseFeature.header.value=Valeur +tutti.timeeditor.H=H +tutti.title.about=À propos de Tutti +tutti.title.about.translate=Traduire Tutti tutti.title.comment=Commentaire tutti.title.config=Configuration tutti.title.create.cruise=Créer une nouvelle campagne @@ -509,12 +694,6 @@ tutti.title.splitBatch=Catégorisation du lot tutti.title.validate.operations=Validation des opérations de pêches (%s) tutti.to.be.done=< A FAIRE > -tutti.tooltip.attachment.button.open=Ouvrir la pièce jointe -tutti.tooltip.attachment.button.remove=Supprimer la pièce jointe -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.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 @@ -576,169 +755,3 @@ 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.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=