Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe

Commits:

5 changed files:

Changes:

  • core/api/services/src/main/i18n/getters/labels.getter
    ... ... @@ -1049,6 +1049,7 @@ observe.data.ps.observation.Catch.totalCount.short
    1049 1049
     observe.data.ps.observation.Catch.totalCountComputed.computed.tip
    
    1050 1050
     observe.data.ps.observation.Catch.totalCountComputed.observed.tip
    
    1051 1051
     observe.data.ps.observation.Catch.type
    
    1052
    +observe.data.ps.observation.Catch.weightMeasureMethod
    
    1052 1053
     observe.data.ps.observation.FloatingObject.action.add
    
    1053 1054
     observe.data.ps.observation.FloatingObject.action.add.tip
    
    1054 1055
     observe.data.ps.observation.FloatingObject.buoysTab
    

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -1227,7 +1227,7 @@ observe.data.ps.observation.Activity.validation.speed.bound.inter=Speed between
    1227 1227
     observe.data.ps.observation.Catch.action.create=Create a new catch
    
    1228 1228
     observe.data.ps.observation.Catch.action.save=Insert this catch
    
    1229 1229
     observe.data.ps.observation.Catch.action.save.tip=Insert this catch
    
    1230
    -observe.data.ps.observation.Catch.catchWeight=Weight estimated (in t)
    
    1230
    +observe.data.ps.observation.Catch.catchWeight=Total weight estimated (in t)
    
    1231 1231
     observe.data.ps.observation.Catch.catchWeight.short=Weight
    
    1232 1232
     observe.data.ps.observation.Catch.catchWeight.validation.required=Weight or estimated count must be filled
    
    1233 1233
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Catch weight was computed (%s)
    
    ... ... @@ -1239,7 +1239,7 @@ observe.data.ps.observation.Catch.meanLength.short=Length
    1239 1239
     observe.data.ps.observation.Catch.meanLength.validation.notFilled=Weight or mean size must be filled.
    
    1240 1240
     observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=Mean length was computed (%s)
    
    1241 1241
     observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=Mean weight was observed
    
    1242
    -observe.data.ps.observation.Catch.meanWeight=Mean weight (in Kg)
    
    1242
    +observe.data.ps.observation.Catch.meanWeight=Mean weight (in kg)
    
    1243 1243
     observe.data.ps.observation.Catch.meanWeight.short=Mean weight
    
    1244 1244
     observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Weight or mean size must be filled.
    
    1245 1245
     observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Mean weight was computed (%s)
    
    ... ... @@ -1257,6 +1257,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip=Count was comp
    1257 1257
     observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Count was observed
    
    1258 1258
     observe.data.ps.observation.Catch.type=Catch
    
    1259 1259
     observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species.
    
    1260
    +observe.data.ps.observation.Catch.weightMeasureMethod=Total weight measure method
    
    1260 1261
     observe.data.ps.observation.FloatingObject.action.add=Add FAD
    
    1261 1262
     observe.data.ps.observation.FloatingObject.action.add.tip=Add a FAD to the activity
    
    1262 1263
     observe.data.ps.observation.FloatingObject.buoysTab=Beacon
    
    ... ... @@ -1354,14 +1355,14 @@ observe.data.ps.observation.SampleMeasure.picturesReferences.short=Pictures refe
    1354 1355
     observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate
    
    1355 1356
     observe.data.ps.observation.SampleMeasure.title=Samples
    
    1356 1357
     observe.data.ps.observation.SampleMeasure.type=Sample measure
    
    1357
    -observe.data.ps.observation.SampleMeasure.weight=Individual weight (in Kg)
    
    1358
    +observe.data.ps.observation.SampleMeasure.weight=Individual weight (in kg)
    
    1358 1359
     observe.data.ps.observation.SampleMeasure.weight.short=Weight
    
    1359 1360
     observe.data.ps.observation.SampleMeasure.weight.validation.required=Weight or size must be filled.
    
    1360 1361
     observe.data.ps.observation.SchoolEstimate.action.create=Create a new estimate
    
    1361 1362
     observe.data.ps.observation.SchoolEstimate.action.save=Insert this estimate
    
    1362 1363
     observe.data.ps.observation.SchoolEstimate.action.save.tip=Insert this estimate
    
    1363
    -observe.data.ps.observation.SchoolEstimate.meanWeight=Mean weight (in Kg)
    
    1364
    -observe.data.ps.observation.SchoolEstimate.meanWeight.short=Mean weight (in Kg)
    
    1364
    +observe.data.ps.observation.SchoolEstimate.meanWeight=Mean weight (in kg)
    
    1365
    +observe.data.ps.observation.SchoolEstimate.meanWeight.short=Mean weight (in kg)
    
    1365 1366
     observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required=Mean weight or total weight is required.
    
    1366 1367
     observe.data.ps.observation.SchoolEstimate.species=Target species
    
    1367 1368
     observe.data.ps.observation.SchoolEstimate.title=School estimate
    
    ... ... @@ -1475,7 +1476,7 @@ observe.referential.common.LengthWeightParameter.lengthWeightFormula=Length weig
    1475 1476
     observe.referential.common.LengthWeightParameter.lengthWeightFormulaInformation=Length weight formula permits to compute weight from the length, must contains variable L
    
    1476 1477
     observe.referential.common.LengthWeightParameter.meanLength=Mean length
    
    1477 1478
     observe.referential.common.LengthWeightParameter.meanValues=Mean values
    
    1478
    -observe.referential.common.LengthWeightParameter.meanWeight=Mean weight (in Kg)
    
    1479
    +observe.referential.common.LengthWeightParameter.meanWeight=Mean weight (in kg)
    
    1479 1480
     observe.referential.common.LengthWeightParameter.type=Length weight parameter
    
    1480 1481
     observe.referential.common.LengthWeightParameter.validation.invalid.lengthWeightFormula=Formula is not valid.
    
    1481 1482
     observe.referential.common.LengthWeightParameter.validation.invalid.uniqueKey=Tuple (species/ocean/gender/sizeMeasureType/startDate) must be unique.
    
    ... ... @@ -1633,7 +1634,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation
    1633 1634
     observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Code should starts with %1$s-
    
    1634 1635
     observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=Validation formula is not valid.
    
    1635 1636
     observe.referential.ps.common.ObjectMaterial.validationInformation=Validation formula must contains variable x
    
    1636
    -observe.referential.ps.common.ObjectMaterialType.type=Floating objet material type
    
    1637
    +observe.referential.ps.common.ObjectMaterialType.type=Data type of properties/material of FOB
    
    1637 1638
     observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Domain
    
    1638 1639
     observe.referential.ps.common.ObjectOperation.type=Object operation
    
    1639 1640
     observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=At least one domain must be selected.
    
    ... ... @@ -1671,7 +1672,7 @@ observe.referential.ps.common.WeightCategory.allowLanding=Allow for Landing
    1671 1672
     observe.referential.ps.common.WeightCategory.allowLogbook=Allow for Logbook
    
    1672 1673
     observe.referential.ps.common.WeightCategory.allowWellPlan=Allow for Well plan
    
    1673 1674
     observe.referential.ps.common.WeightCategory.atLeastOneSelected=Domain
    
    1674
    -observe.referential.ps.common.WeightCategory.meanWeight=Mean weight (in Kg)
    
    1675
    +observe.referential.ps.common.WeightCategory.meanWeight=Mean weight (in kg)
    
    1675 1676
     observe.referential.ps.common.WeightCategory.type=Weight category
    
    1676 1677
     observe.referential.ps.common.WeightCategory.validation.atLeastOneSelected=At least one domain must be selected.
    
    1677 1678
     observe.referential.ps.landing.Destination.type=Destination
    

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -1227,7 +1227,7 @@ observe.data.ps.observation.Activity.validation.speed.bound.inter=la velocidad e
    1227 1227
     observe.data.ps.observation.Catch.action.create=Crear una captura
    
    1228 1228
     observe.data.ps.observation.Catch.action.save=Insertar captura
    
    1229 1229
     observe.data.ps.observation.Catch.action.save.tip=Insertar captura
    
    1230
    -observe.data.ps.observation.Catch.catchWeight=Pesos estimados (en t)
    
    1230
    +observe.data.ps.observation.Catch.catchWeight=Pesos total estimados (en t)
    
    1231 1231
     observe.data.ps.observation.Catch.catchWeight.short=Peso
    
    1232 1232
     observe.data.ps.observation.Catch.catchWeight.validation.required=Debe seleccionar uno de los dos valores (peso o count)
    
    1233 1233
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Peso estimado calculado
    
    ... ... @@ -1239,7 +1239,7 @@ observe.data.ps.observation.Catch.meanLength.short=Talla
    1239 1239
     observe.data.ps.observation.Catch.meanLength.validation.notFilled=Debe seleccionar uno de los dos valores (peso medio o talla media).
    
    1240 1240
     observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=La talla media se calculó
    
    1241 1241
     observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=La talla media se observó
    
    1242
    -observe.data.ps.observation.Catch.meanWeight=Peso medio (en Kg)
    
    1242
    +observe.data.ps.observation.Catch.meanWeight=Peso medio (en kg)
    
    1243 1243
     observe.data.ps.observation.Catch.meanWeight.short=Peso medio
    
    1244 1244
     observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Debe seleccionar uno de los dos valores (peso medio o talla media).
    
    1245 1245
     observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=El peso medio se calculó
    
    ... ... @@ -1257,6 +1257,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip=El número est
    1257 1257
     observe.data.ps.observation.Catch.totalCountComputed.observed.tip=El número estimado se observo
    
    1258 1258
     observe.data.ps.observation.Catch.type=Captura
    
    1259 1259
     observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species. \#TODO
    
    1260
    +observe.data.ps.observation.Catch.weightMeasureMethod=Método de medición de total peso
    
    1260 1261
     observe.data.ps.observation.FloatingObject.action.add=Añadir un FOB
    
    1261 1262
     observe.data.ps.observation.FloatingObject.action.add.tip=Añadir un objeto flotante a la actividad
    
    1262 1263
     observe.data.ps.observation.FloatingObject.buoysTab=Baliza
    
    ... ... @@ -1354,14 +1355,14 @@ observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref. foto
    1354 1355
     observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate
    
    1355 1356
     observe.data.ps.observation.SampleMeasure.title=Sample measures
    
    1356 1357
     observe.data.ps.observation.SampleMeasure.type=Sample measures
    
    1357
    -observe.data.ps.observation.SampleMeasure.weight=Peso individual (en Kg)
    
    1358
    +observe.data.ps.observation.SampleMeasure.weight=Peso individual (en kg)
    
    1358 1359
     observe.data.ps.observation.SampleMeasure.weight.short=Weight
    
    1359 1360
     observe.data.ps.observation.SampleMeasure.weight.validation.required=TODO
    
    1360 1361
     observe.data.ps.observation.SchoolEstimate.action.create=Crear una nueva estimación
    
    1361 1362
     observe.data.ps.observation.SchoolEstimate.action.save=Insertar estimación
    
    1362 1363
     observe.data.ps.observation.SchoolEstimate.action.save.tip=Insertar la nueva estimación en la tabla
    
    1363
    -observe.data.ps.observation.SchoolEstimate.meanWeight=Peso medio (en Kg)
    
    1364
    -observe.data.ps.observation.SchoolEstimate.meanWeight.short=Peso medio (en Kg)
    
    1364
    +observe.data.ps.observation.SchoolEstimate.meanWeight=Peso medio (en kg)
    
    1365
    +observe.data.ps.observation.SchoolEstimate.meanWeight.short=Peso medio (en kg)
    
    1365 1366
     observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required=TODO
    
    1366 1367
     observe.data.ps.observation.SchoolEstimate.species=Especie de atún (no se puede modificar una vez se haya creado la estimación)
    
    1367 1368
     observe.data.ps.observation.SchoolEstimate.title=Estimación del banco
    
    ... ... @@ -1418,10 +1419,10 @@ observe.data.ps.pairing.ActivityPairingResultItem.type=Observed activity \#TODO
    1418 1419
     observe.error.DuplicateLengthWeightParameterException=Found multiple length weight relation for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s \#TODO
    
    1419 1420
     observe.error.LengthLengthParameterNotFoundException=No length length relation found for species\: %s, ocean\: %s, sex\: %s, date\: %s \: %s \#TODO
    
    1420 1421
     observe.error.LengthWeightParameterNotFoundException=No length weight relation found for species\: %s, ocean\: %s, sex\: %s, date\: %s \: %s \#TODO
    
    1421
    -observe.referential.MinMaxWeight.maxWeight=Peso max (en Kg)
    
    1422
    -observe.referential.MinMaxWeight.minMaxWeight=Peso min-max (en Kg)
    
    1423
    -observe.referential.MinMaxWeight.minMeanMaxWeight=Peso min-mean-max (en Kg)
    
    1424
    -observe.referential.MinMaxWeight.minWeight=Peso min (en Kg)
    
    1422
    +observe.referential.MinMaxWeight.maxWeight=Peso max (en kg)
    
    1423
    +observe.referential.MinMaxWeight.minMaxWeight=Peso min-max (en kg)
    
    1424
    +observe.referential.MinMaxWeight.minMeanMaxWeight=Peso min-mean-max (en kg)
    
    1425
    +observe.referential.MinMaxWeight.minWeight=Peso min (en kg)
    
    1425 1426
     observe.referential.Referential.action.back.to.list=Volver a la lista
    
    1426 1427
     observe.referential.Referential.action.back.to.list.tip=Volver a la lista de datos
    
    1427 1428
     observe.referential.Referential.action.changeId.choose.new.id=Change referential id of type\: %s \#TODO
    
    ... ... @@ -1475,7 +1476,7 @@ observe.referential.common.LengthWeightParameter.lengthWeightFormula=Relación d
    1475 1476
     observe.referential.common.LengthWeightParameter.lengthWeightFormulaInformation=La relación talla-peso permite calcular el peso a partir de la talla, debe contener la variable L
    
    1476 1477
     observe.referential.common.LengthWeightParameter.meanLength=Talla media (en cm)
    
    1477 1478
     observe.referential.common.LengthWeightParameter.meanValues=Valores medios
    
    1478
    -observe.referential.common.LengthWeightParameter.meanWeight=Peso medio (en Kg)
    
    1479
    +observe.referential.common.LengthWeightParameter.meanWeight=Peso medio (en kg)
    
    1479 1480
     observe.referential.common.LengthWeightParameter.type=Relación Tamaño-Peso
    
    1480 1481
     observe.referential.common.LengthWeightParameter.validation.invalid.lengthWeightFormula=Relación de peso introducida no es coherente.
    
    1481 1482
     observe.referential.common.LengthWeightParameter.validation.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO
    
    ... ... @@ -1633,7 +1634,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation \#TODO
    1633 1634
     observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Code should starts with %1$s- \#TODO
    
    1634 1635
     observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=La formule de validation n'est pas cohérente. \#TODO
    
    1635 1636
     observe.referential.ps.common.ObjectMaterial.validationInformation=La formule de validation doit contenir la variable x \#TODO
    
    1636
    -observe.referential.ps.common.ObjectMaterialType.type=Type d'objet flottant \#TODO
    
    1637
    +observe.referential.ps.common.ObjectMaterialType.type=observe.referential.ps.common.ObjectMaterialType.type=Data type of properties/material of FOB \#TODO
    
    1637 1638
     observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Domain
    
    1638 1639
     observe.referential.ps.common.ObjectOperation.type=Operación sobre el objeto
    
    1639 1640
     observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=At least one domain must be selected.
    
    ... ... @@ -1671,7 +1672,7 @@ observe.referential.ps.common.WeightCategory.allowLanding=Allow for Landing
    1671 1672
     observe.referential.ps.common.WeightCategory.allowLogbook=Allow for Logbook
    
    1672 1673
     observe.referential.ps.common.WeightCategory.allowWellPlan=Allow for Well plan
    
    1673 1674
     observe.referential.ps.common.WeightCategory.atLeastOneSelected=Domain
    
    1674
    -observe.referential.ps.common.WeightCategory.meanWeight=Peso medio (en Kg)
    
    1675
    +observe.referential.ps.common.WeightCategory.meanWeight=Peso medio (en kg)
    
    1675 1676
     observe.referential.ps.common.WeightCategory.type=Categoría de peso
    
    1676 1677
     observe.referential.ps.common.WeightCategory.validation.atLeastOneSelected=At least one main must be selected.
    
    1677 1678
     observe.referential.ps.landing.Destination.type=Destination
    

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -1227,7 +1227,7 @@ observe.data.ps.observation.Activity.validation.speed.bound.inter=La vitesse ent
    1227 1227
     observe.data.ps.observation.Catch.action.create=Nouvelle capture
    
    1228 1228
     observe.data.ps.observation.Catch.action.save=Insérer cette capture
    
    1229 1229
     observe.data.ps.observation.Catch.action.save.tip=Insérer cette capture
    
    1230
    -observe.data.ps.observation.Catch.catchWeight=Poids estimé (en t)
    
    1230
    +observe.data.ps.observation.Catch.catchWeight=Poids total estimé (en t)
    
    1231 1231
     observe.data.ps.observation.Catch.catchWeight.short=Poids
    
    1232 1232
     observe.data.ps.observation.Catch.catchWeight.validation.required=Une des deux valeurs (poids ou taille moyenne) devrait être renseignée.
    
    1233 1233
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s)
    
    ... ... @@ -1239,7 +1239,7 @@ observe.data.ps.observation.Catch.meanLength.short=Taille
    1239 1239
     observe.data.ps.observation.Catch.meanLength.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée.
    
    1240 1240
     observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=La taille moyenne a été calculée (%s)
    
    1241 1241
     observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=La taille moyenne a été observée
    
    1242
    -observe.data.ps.observation.Catch.meanWeight=Poids moyen (en Kg)
    
    1242
    +observe.data.ps.observation.Catch.meanWeight=Poids moyen (en kg)
    
    1243 1243
     observe.data.ps.observation.Catch.meanWeight.short=Poids moy
    
    1244 1244
     observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée.
    
    1245 1245
     observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s)
    
    ... ... @@ -1257,6 +1257,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip=Le nombre esti
    1257 1257
     observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Le nombre estimé a été observé
    
    1258 1258
     observe.data.ps.observation.Catch.type=Captures
    
    1259 1259
     observe.data.ps.observation.Catch.validation.missing.observedSystem=Un des systèmes observés %s doit être sélectionné pour l'espèce sélectionnée.
    
    1260
    +observe.data.ps.observation.Catch.weightMeasureMethod=Méthode de mesure du poids total
    
    1260 1261
     observe.data.ps.observation.FloatingObject.action.add=Ajouter un DCP
    
    1261 1262
     observe.data.ps.observation.FloatingObject.action.add.tip=Ajouter un objet flottant à l'activité
    
    1262 1263
     observe.data.ps.observation.FloatingObject.buoysTab=Balise
    
    ... ... @@ -1354,14 +1355,14 @@ observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref photo
    1354 1355
     observe.data.ps.observation.SampleMeasure.speciesFate.short=Devenir
    
    1355 1356
     observe.data.ps.observation.SampleMeasure.title=Échantillons
    
    1356 1357
     observe.data.ps.observation.SampleMeasure.type=Échantillon
    
    1357
    -observe.data.ps.observation.SampleMeasure.weight=Poids individuel (en Kg)
    
    1358
    +observe.data.ps.observation.SampleMeasure.weight=Poids individuel (en kg)
    
    1358 1359
     observe.data.ps.observation.SampleMeasure.weight.short=Poids
    
    1359 1360
     observe.data.ps.observation.SampleMeasure.weight.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée.
    
    1360 1361
     observe.data.ps.observation.SchoolEstimate.action.create=Nouvelle estimation
    
    1361 1362
     observe.data.ps.observation.SchoolEstimate.action.save=Insérer cette estimation
    
    1362 1363
     observe.data.ps.observation.SchoolEstimate.action.save.tip=Insérer la nouvelle estimation dans la table
    
    1363
    -observe.data.ps.observation.SchoolEstimate.meanWeight=Poids moyen (en Kg)
    
    1364
    -observe.data.ps.observation.SchoolEstimate.meanWeight.short=Poids moyen (en Kg)
    
    1364
    +observe.data.ps.observation.SchoolEstimate.meanWeight=Poids moyen (en kg)
    
    1365
    +observe.data.ps.observation.SchoolEstimate.meanWeight.short=Poids moyen (en kg)
    
    1365 1366
     observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required=Une des deux valeurs (poids estimé, poids total) doit être renseignée.
    
    1366 1367
     observe.data.ps.observation.SchoolEstimate.species=Espèce de thon (ne peut pas être modifié une fois l'estimation crée)
    
    1367 1368
     observe.data.ps.observation.SchoolEstimate.title=Estimation banc
    
    ... ... @@ -1418,10 +1419,10 @@ observe.data.ps.pairing.ActivityPairingResultItem.type=Activité observée
    1418 1419
     observe.error.DuplicateLengthWeightParameterException=Plusieurs relations taille-poids ont été trouvées pour l'espèce\: %s, l'océan\: %s, le sexe\: %s et la date\: %s \:\n * %s
    
    1419 1420
     observe.error.LengthLengthParameterNotFoundException=Aucune relation taille-taille trouvée pour l'espèce\: %s, l'océan\: %s, le sexe\: %s et la date\: %s
    
    1420 1421
     observe.error.LengthWeightParameterNotFoundException=Aucune relation taille-poids trouvée pour l'espèce\: %s, l'océan\: %s, le sexe\: %s et la date\: %s
    
    1421
    -observe.referential.MinMaxWeight.maxWeight=Poids max (en Kg)
    
    1422
    -observe.referential.MinMaxWeight.minMaxWeight=Poids min-max (en Kg)
    
    1423
    -observe.referential.MinMaxWeight.minMeanMaxWeight=Poids min-moyen-max (en Kg)
    
    1424
    -observe.referential.MinMaxWeight.minWeight=Poids min (en Kg)
    
    1422
    +observe.referential.MinMaxWeight.maxWeight=Poids max (en kg)
    
    1423
    +observe.referential.MinMaxWeight.minMaxWeight=Poids min-max (en kg)
    
    1424
    +observe.referential.MinMaxWeight.minMeanMaxWeight=Poids min-moyen-max (en kg)
    
    1425
    +observe.referential.MinMaxWeight.minWeight=Poids min (en kg)
    
    1425 1426
     observe.referential.Referential.action.back.to.list=Retour à la liste
    
    1426 1427
     observe.referential.Referential.action.back.to.list.tip=Retour à la liste des données
    
    1427 1428
     observe.referential.Referential.action.changeId.choose.new.id=Changer l'identifiant du référentiel de type \: %s
    
    ... ... @@ -1475,7 +1476,7 @@ observe.referential.common.LengthWeightParameter.lengthWeightFormula=Relation Po
    1475 1476
     observe.referential.common.LengthWeightParameter.lengthWeightFormulaInformation=La relation poids permet de calculer le poids à partir de la taille
    
    1476 1477
     observe.referential.common.LengthWeightParameter.meanLength=Taille moyenne (en cm)
    
    1477 1478
     observe.referential.common.LengthWeightParameter.meanValues=Valeurs moyennes
    
    1478
    -observe.referential.common.LengthWeightParameter.meanWeight=Poids moyen (en Kg)
    
    1479
    +observe.referential.common.LengthWeightParameter.meanWeight=Poids moyen (en kg)
    
    1479 1480
     observe.referential.common.LengthWeightParameter.type=Relation Taille-Poids
    
    1480 1481
     observe.referential.common.LengthWeightParameter.validation.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente.
    
    1481 1482
     observe.referential.common.LengthWeightParameter.validation.invalid.uniqueKey=Le tuple (espèce/sexe/océan/type de measure/date de début) doit être unique
    
    ... ... @@ -1633,7 +1634,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation
    1633 1634
     observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Le code doit commencer par %1$s-
    
    1634 1635
     observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=La formule de validation n'est pas cohérente.
    
    1635 1636
     observe.referential.ps.common.ObjectMaterial.validationInformation=La formule de validation doit contenir la variable x
    
    1636
    -observe.referential.ps.common.ObjectMaterialType.type=Type d'objet flottant
    
    1637
    +observe.referential.ps.common.ObjectMaterialType.type=Type de données des propriétés/matériaux de FOB
    
    1637 1638
     observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Sous-domaine
    
    1638 1639
     observe.referential.ps.common.ObjectOperation.type=Opération sur l'objet
    
    1639 1640
     observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=Veuillez sélectionner au moins un sous domaine.
    
    ... ... @@ -1671,7 +1672,7 @@ observe.referential.ps.common.WeightCategory.allowLanding=Autorisé pour les dé
    1671 1672
     observe.referential.ps.common.WeightCategory.allowLogbook=Autorisé pour le livre de bord
    
    1672 1673
     observe.referential.ps.common.WeightCategory.allowWellPlan=Autorisé pour les plan de cuves
    
    1673 1674
     observe.referential.ps.common.WeightCategory.atLeastOneSelected=Sous-domaine
    
    1674
    -observe.referential.ps.common.WeightCategory.meanWeight=Poids moyen (en Kg)
    
    1675
    +observe.referential.ps.common.WeightCategory.meanWeight=Poids moyen (en kg)
    
    1675 1676
     observe.referential.ps.common.WeightCategory.type=Catégorie de poids
    
    1676 1677
     observe.referential.ps.common.WeightCategory.validation.atLeastOneSelected=Veuillez sélectionner au moins un sous domaine.
    
    1677 1678
     observe.referential.ps.landing.Destination.type=Destination
    

  • model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties
    ... ... @@ -23,7 +23,7 @@ data.ll.common.Trip=species
    23 23
     data.ll.landing.Landing=vessel
    
    24 24
     data.ps.localmarket.Sample=well
    
    25 25
     data.ps.logbook.Catch=weightMeasureMethod.validation.required
    
    26
    -data.ps.observation.Catch=minWeight,maxWeight
    
    26
    +data.ps.observation.Catch=minWeight,maxWeight,weightMeasureMethod
    
    27 27
     data.ps.observation.SchoolEstimate=species
    
    28 28
     data.ps.observation.Set=startTime,haulingStartTimeStamp,haulingEndTimeStamp,endTimeStamp
    
    29 29
     referential.common.Species=codeAndHomeId