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

Commits:

5 changed files:

Changes:

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -418,6 +418,7 @@ observe.common.ActivitySeineDto.vesselActivitySeine=Vessel activity
    418 418 
     observe.common.ActivitySeineDto.vesselActivitySeine.comment=Only activity of type %s allows you to fill a set.
    419 419 
     observe.common.ActivitySeineDto.vesselSpeed=Vessel speed
    420 420 
     observe.common.ActivitySeineDto.wind=Wind
    421 
    +observe.common.ActivitySeineStubDto.seaSurfaceTemperature=Sea surface temperature
    421 422 
     observe.common.BaitHaulingStatusDto.type=Bait hauling status
    422 423 
     observe.common.BaitHaulingStatusDto.types=Bait hauling statuses
    423 424 
     observe.common.BaitSettingStatusDto.type=Bait setting status
    ... ... @@ -657,6 +658,7 @@ observe.common.FloatingObjectDto.table.type=Type
    657 658 
     observe.common.FloatingObjectDto.title=Floatting object
    658 659 
     observe.common.FloatingObjectDto.type=Floating object
    659 660 
     observe.common.FloatingObjectDto.types=Floating objects
    661 
    +observe.common.FloatingObjectPartDto.objectMaterial=Object material
    660 662 
     observe.common.FloatingObjectPartDto.title=Floating object parts
    661 663 
     observe.common.FloatingObjectPartDto.type=Floating object part
    662 664 
     observe.common.FloatingObjectPartDto.types=Floating object parts
    ... ... @@ -696,6 +698,7 @@ observe.common.GearCaracteristicDto.unit=Unit
    696 698 
     observe.common.GearCaracteristicTypeDto.type=Gear caracteristic type
    697 699 
     observe.common.GearCaracteristicTypeDto.types=Gear caracteristic types
    698 700 
     observe.common.GearDto.availableGearCaracteristic=Available caracteristics
    701 
    +observe.common.GearDto.gearCaracteristic=Gear caracteristic
    699 702 
     observe.common.GearDto.gearCaracteristicTab=Caracteristics of the gear
    700 703 
     observe.common.GearDto.generalTab=General caracteristics
    701 704 
     observe.common.GearDto.selectedGearCaracteristic=Selected caracteristics
    ... ... @@ -729,7 +732,9 @@ observe.common.GearUseFeaturesLonglineDto.title=Gears
    729 732 
     observe.common.GearUseFeaturesLonglineDto.type=Gear uses features
    730 733 
     observe.common.GearUseFeaturesLonglineDto.types=Gear uses features
    731 734 
     observe.common.GearUseFeaturesLonglineDto.usedInTrip=Used in trip
    735 
    +observe.common.GearUseFeaturesMeasurementLonglineDto.gearCaracteristic=Gear caracteristic
    732 736 
     observe.common.GearUseFeaturesMeasurementLonglineDto.title=Gear uses feature measurements
    737 
    +observe.common.GearUseFeaturesMeasurementSeineDto.gearCaracteristic=Gear caracteristic
    733 738 
     observe.common.GearUseFeaturesMeasurementSeineDto.title=Gear uses feature measurements
    734 739 
     observe.common.GearUseFeaturesSeineDto.action.addMeasurement=Add
    735 740 
     observe.common.GearUseFeaturesSeineDto.action.addMeasurement.tip=Add a new measurement
    ... ... @@ -981,6 +986,8 @@ observe.common.ObjectObservedSpeciesDto.type=Object observed species
    981 986 
     observe.common.ObjectObservedSpeciesDto.types=Object observed species
    982 987 
     observe.common.ObjectOperationDto.type=Object operation
    983 988 
     observe.common.ObjectOperationDto.types=Object operations
    989 
    +observe.common.ObjectOperationDto.whenArriving=When arriving
    990 
    +observe.common.ObjectOperationDto.whenLeaving=When leaving
    984 991 
     observe.common.ObjectSchoolEstimateDto.action.create=Insert this estimate
    985 992 
     observe.common.ObjectSchoolEstimateDto.action.create.tip=Insert this estimate
    986 993 
     observe.common.ObjectSchoolEstimateDto.title=School estimate
    ... ... @@ -1081,6 +1088,8 @@ observe.common.RouteDto.title=Route
    1081 1088 
     observe.common.RouteDto.titles=Routes
    1082 1089 
     observe.common.RouteDto.type=Route
    1083 1090 
     observe.common.RouteDto.types=Routes
    1091 
    +observe.common.RouteStubDto.endLogValue=End log value
    1092 
    +observe.common.RouteStubDto.startLogValue=Start log value
    1084 1093 
     observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size measure type
    1085 1094 
     observe.common.Sample.length.computed.tip=Length was computed
    1086 1095 
     observe.common.Sample.length.observed.tip=Length was observed
    ... ... @@ -1182,6 +1191,7 @@ observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.message=The cu
    1182 1191 
     observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.title=Can't delete basket
    1183 1192 
     observe.common.SetLonglineDetailCompositionDto.basket.invalid.nextFloatline1Length=The floatline 2 (%s) is not equals to the floatline 1 of the next basket(%s)
    1184 1193 
     observe.common.SetLonglineDetailCompositionDto.baskets=Baskets
    1194 
    +observe.common.SetLonglineDetailCompositionDto.basketsPerSectionCount=Baskets per section count
    1185 1195 
     observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length=Floatline 1 length (m)
    1186 1196 
     observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length.tip=Floatline 1 length (m)
    1187 1197 
     observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline2Length=Floatline 2 length (m)
    ... ... @@ -1194,6 +1204,7 @@ observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.message=Th
    1194 1204 
     observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.title=Can't delete branchline
    1195 1205 
     observe.common.SetLonglineDetailCompositionDto.branchlineDetailTab=Branchline detail
    1196 1206 
     observe.common.SetLonglineDetailCompositionDto.branchlines=Branchlines
    1207 
    +observe.common.SetLonglineDetailCompositionDto.branchlinesPerBasketCount=Branchlines per basket count
    1197 1208 
     observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength=Branchline length (m)
    1198 1209 
     observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength.tip=Branchline length (m)
    1199 1210 
     observe.common.SetLonglineDetailCompositionDto.branchlinesTable.haulingIdentifier=Hauling Id
    ... ... @@ -1206,6 +1217,7 @@ observe.common.SetLonglineDetailCompositionDto.canGenerate=Can generate
    1206 1217 
     observe.common.SetLonglineDetailCompositionDto.compositionTab=Composition
    1207 1218 
     observe.common.SetLonglineDetailCompositionDto.firstTemplate.template.notCompilant.basketCount=Template %s is not compliant with the number of baskets per section (%s)
    1208 1219 
     observe.common.SetLonglineDetailCompositionDto.generateTab=generation
    1220 
    +observe.common.SetLonglineDetailCompositionDto.haulingBreaks=Hauling breaks
    1209 1221 
     observe.common.SetLonglineDetailCompositionDto.message.updating=Updating composition details
    1210 1222 
     observe.common.SetLonglineDetailCompositionDto.section.cant.delete.message=The current section can not be deleted since it used by other data.
    1211 1223 
     observe.common.SetLonglineDetailCompositionDto.section.cant.delete.title=Can't delete section
    ... ... @@ -1224,6 +1236,7 @@ observe.common.SetLonglineDetailCompositionDto.sectionsTable.template=Template
    1224 1236 
     observe.common.SetLonglineDetailCompositionDto.sectionsTable.template.tip=Template used to generate baskets floatline lengths
    1225 1237 
     observe.common.SetLonglineDetailCompositionDto.title=Detailed composition
    1226 1238 
     observe.common.SetLonglineDetailCompositionDto.title.section.cant.use.firstTemplate=Can't use the first template while generating
    1239 
    +observe.common.SetLonglineDetailCompositionDto.totalSectionsCount=Total sections count
    1227 1240 
     observe.common.SetLonglineDetailCompositionDto.type=Detailed composition
    1228 1241 
     observe.common.SetLonglineDto.action.reset.homeId.tip=Reset home id
    1229 1242 
     observe.common.SetLonglineDto.basketsPerSectionCount=Baskets per section count
    ... ... @@ -1285,6 +1298,7 @@ observe.common.SetLonglineGlobalCompositionDto.floatlinesCompositionTab=Floatlin
    1285 1298 
     observe.common.SetLonglineGlobalCompositionDto.hooksComposition=hooks composition
    1286 1299 
     observe.common.SetLonglineGlobalCompositionDto.hooksCompositionProportionSum=hooks composition proportion sum
    1287 1300 
     observe.common.SetLonglineGlobalCompositionDto.hooksCompositionTab=Hooks
    1301 
    +observe.common.SetLonglineGlobalCompositionDto.mitigationType=Mitigation type
    1288 1302 
     observe.common.SetLonglineGlobalCompositionDto.mitigationTypeTab=Mitigation
    1289 1303 
     observe.common.SetLonglineGlobalCompositionDto.selectedMitigationType=Selected mitigations
    1290 1304 
     observe.common.SetLonglineGlobalCompositionDto.title=Global composition
    ... ... @@ -1330,6 +1344,7 @@ observe.common.SexDto.types=Sexes
    1330 1344 
     observe.common.ShipOwnerDto.type=Ship owner
    1331 1345 
     observe.common.ShipOwnerDto.types=Ship owners
    1332 1346 
     observe.common.SizeMeasureDto.delete.message=Confirm to delete current size measure.
    1347 
    +observe.common.SizeMeasureDto.size=Size (cm)
    1333 1348 
     observe.common.SizeMeasureDto.table.size=Size (cm)
    1334 1349 
     observe.common.SizeMeasureDto.table.size.tip=Size (cm)
    1335 1350 
     observe.common.SizeMeasureDto.table.sizeMeasureType=Measure type
    ... ... @@ -1364,6 +1379,7 @@ observe.common.SpeciesFateDto.types=Species fates
    1364 1379 
     observe.common.SpeciesGroupDto.availableSpeciesGroupReleaseMode=Available release modes
    1365 1380 
     observe.common.SpeciesGroupDto.generalTab=General caracteristics
    1366 1381 
     observe.common.SpeciesGroupDto.selectedSpeciesGroupReleaseMode=Selected release modes
    1382 
    +observe.common.SpeciesGroupDto.speciesGroupReleaseMode=Release mode
    1367 1383 
     observe.common.SpeciesGroupDto.speciesGroupReleaseModeTab=Release modes
    1368 1384 
     observe.common.SpeciesGroupDto.type=Species group
    1369 1385 
     observe.common.SpeciesGroupDto.types=Species groups
    ... ... @@ -1631,6 +1647,7 @@ observe.common.WeightMeasureDto.table.weightMeasureType.tip=Measure type
    1631 1647 
     observe.common.WeightMeasureDto.title=Weight measures
    1632 1648 
     observe.common.WeightMeasureDto.type=Weight measure
    1633 1649 
     observe.common.WeightMeasureDto.types=Weight measures
    1650 
    +observe.common.WeightMeasureDto.weight=Measure (kg)
    1634 1651 
     observe.common.WeightMeasureTypeDto.type=Weight measure type
    1635 1652 
     observe.common.WeightMeasureTypeDto.types=Weight measure types
    1636 1653 
     observe.common.WindDto.speedRange=Speed range

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -418,6 +418,7 @@ observe.common.ActivitySeineDto.vesselActivitySeine=Actividad buque
    418 418 
     observe.common.ActivitySeineDto.vesselActivitySeine.comment=Solo la actividad %1$s permite introducir un lance
    419 419 
     observe.common.ActivitySeineDto.vesselSpeed=Velocidad del barco (nd)
    420 420 
     observe.common.ActivitySeineDto.wind=Fuerza del viento
    421 
    +observe.common.ActivitySeineStubDto.seaSurfaceTemperature=Temperatura en superficie
    421 422 
     observe.common.BaitHaulingStatusDto.type=Estado del cebo en la virada
    422 423 
     observe.common.BaitHaulingStatusDto.types=Estados del cebo en la virada
    423 424 
     observe.common.BaitSettingStatusDto.type=Estado del cebo en la calada
    ... ... @@ -657,6 +658,7 @@ observe.common.FloatingObjectDto.table.type=Tipo
    657 658 
     observe.common.FloatingObjectDto.title=Objeto flotante
    658 659 
     observe.common.FloatingObjectDto.type=Objeto flotante
    659 660 
     observe.common.FloatingObjectDto.types=Objetos flotantes
    661 
    +observe.common.FloatingObjectPartDto.objectMaterial=Object material \#TODO
    660 662 
     observe.common.FloatingObjectPartDto.title=Componentes del objeto flotante
    661 663 
     observe.common.FloatingObjectPartDto.type=Componente del objeto flotante
    662 664 
     observe.common.FloatingObjectPartDto.types=Componentes del objeto flotante
    ... ... @@ -696,6 +698,7 @@ observe.common.GearCaracteristicDto.unit=Unidad
    696 698 
     observe.common.GearCaracteristicTypeDto.type=Tipo de característica del equipamiento
    697 699 
     observe.common.GearCaracteristicTypeDto.types=Tipos de características del equipamiento
    698 700 
     observe.common.GearDto.availableGearCaracteristic=Características disponibles
    701 
    +observe.common.GearDto.gearCaracteristic=Característica del equipamiento
    699 702 
     observe.common.GearDto.gearCaracteristicTab=Características del equipamiento
    700 703 
     observe.common.GearDto.generalTab=Características generales
    701 704 
     observe.common.GearDto.selectedGearCaracteristic=Características seleccionadas
    ... ... @@ -729,7 +732,9 @@ observe.common.GearUseFeaturesLonglineDto.title=Equipos
    729 732 
     observe.common.GearUseFeaturesLonglineDto.type=Equipamiento
    730 733 
     observe.common.GearUseFeaturesLonglineDto.types=Equipamientos
    731 734 
     observe.common.GearUseFeaturesLonglineDto.usedInTrip=Utilizado en la marea
    735 
    +observe.common.GearUseFeaturesMeasurementLonglineDto.gearCaracteristic=Característica del equipamiento
    732 736 
     observe.common.GearUseFeaturesMeasurementLonglineDto.title=Medidas
    737 
    +observe.common.GearUseFeaturesMeasurementSeineDto.gearCaracteristic=Característica del equipamiento
    733 738 
     observe.common.GearUseFeaturesMeasurementSeineDto.title=Medidas
    734 739 
     observe.common.GearUseFeaturesSeineDto.action.addMeasurement=Añadir
    735 740 
     observe.common.GearUseFeaturesSeineDto.action.addMeasurement.tip=Añadir una nueva característica
    ... ... @@ -981,6 +986,8 @@ observe.common.ObjectObservedSpeciesDto.type=Fauna observada
    981 986 
     observe.common.ObjectObservedSpeciesDto.types=Fauna observada
    982 987 
     observe.common.ObjectOperationDto.type=Operación sobre el objeto
    983 988 
     observe.common.ObjectOperationDto.types=Operaciones sobre el objeto
    989 
    +observe.common.ObjectOperationDto.whenArriving=Al llegar
    990 
    +observe.common.ObjectOperationDto.whenLeaving=Al dejar
    984 991 
     observe.common.ObjectSchoolEstimateDto.action.create=Insertar estimación
    985 992 
     observe.common.ObjectSchoolEstimateDto.action.create.tip=Insertar la nueva estimación en la tabla
    986 993 
     observe.common.ObjectSchoolEstimateDto.title=Estimación del banco
    ... ... @@ -1081,6 +1088,8 @@ observe.common.RouteDto.title=Ruta
    1081 1088 
     observe.common.RouteDto.titles=Rutas
    1082 1089 
     observe.common.RouteDto.type=Ruta
    1083 1090 
     observe.common.RouteDto.types=Rutas
    1091 
    +observe.common.RouteStubDto.endLogValue=Corredera de tarde (millas)
    1092 
    +observe.common.RouteStubDto.startLogValue=Día de observación
    1084 1093 
     observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utilizar el tipo de medida por defecto
    1085 1094 
     observe.common.Sample.length.computed.tip=Longitud calculada
    1086 1095 
     observe.common.Sample.length.observed.tip=Longitud observada
    ... ... @@ -1182,6 +1191,7 @@ observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.message=La can
    1182 1191 
     observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.title=Imposible de eliminar la canasta
    1183 1192 
     observe.common.SetLonglineDetailCompositionDto.basket.invalid.nextFloatline1Length=La longitud de orinque 2 (%s) no es igual a la longitud del orinque 1 de la cesta que sigue (%s)
    1184 1193 
     observe.common.SetLonglineDetailCompositionDto.baskets=Canastas
    1194 
    +observe.common.SetLonglineDetailCompositionDto.basketsPerSectionCount=Baskets per section count \#TODO
    1185 1195 
     observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length=Orinque 1 (m)
    1186 1196 
     observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length.tip=Longitud Orinque 1 (m)
    1187 1197 
     observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline2Length=Orinque 2 (m)
    ... ... @@ -1194,6 +1204,7 @@ observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.message=La
    1194 1204 
     observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.title=Imposible de eliminar la brazolada
    1195 1205 
     observe.common.SetLonglineDetailCompositionDto.branchlineDetailTab=Detalle de la brazolada
    1196 1206 
     observe.common.SetLonglineDetailCompositionDto.branchlines=Brazoladas
    1207 
    +observe.common.SetLonglineDetailCompositionDto.branchlinesPerBasketCount=Branchlines per basket count \#TODO
    1197 1208 
     observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength=Brazolada (m)
    1198 1209 
     observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength.tip=Longitud Brazolada (m)
    1199 1210 
     observe.common.SetLonglineDetailCompositionDto.branchlinesTable.haulingIdentifier=Id Virada
    ... ... @@ -1206,6 +1217,7 @@ observe.common.SetLonglineDetailCompositionDto.canGenerate=Autorizar la creació
    1206 1217 
     observe.common.SetLonglineDetailCompositionDto.compositionTab=Composición
    1207 1218 
     observe.common.SetLonglineDetailCompositionDto.firstTemplate.template.notCompilant.basketCount=El patrón a utilizar %s no es compatible con el número de canastas por sección (%s)
    1208 1219 
     observe.common.SetLonglineDetailCompositionDto.generateTab=Definición de los modelos
    1220 
    +observe.common.SetLonglineDetailCompositionDto.haulingBreaks=Hauling breaks \#TODO
    1209 1221 
     observe.common.SetLonglineDetailCompositionDto.message.updating=Composición detallada del palangre en proceso de modificación
    1210 1222 
     observe.common.SetLonglineDetailCompositionDto.section.cant.delete.message=La sección no puede ser eliminada porque está en uso por otros datos
    1211 1223 
     observe.common.SetLonglineDetailCompositionDto.section.cant.delete.title=Imposible eliminar la sección
    ... ... @@ -1224,6 +1236,7 @@ observe.common.SetLonglineDetailCompositionDto.sectionsTable.template=Patrón
    1224 1236 
     observe.common.SetLonglineDetailCompositionDto.sectionsTable.template.tip=Patrón empleado para generar las medidas de la línea de canastas
    1225 1237 
     observe.common.SetLonglineDetailCompositionDto.title=Esquema del palangre
    1226 1238 
     observe.common.SetLonglineDetailCompositionDto.title.section.cant.use.firstTemplate=Imposible de utilizar el primer modelo durante la generación
    1239 
    +observe.common.SetLonglineDetailCompositionDto.totalSectionsCount=Total sections count \#TODO
    1227 1240 
     observe.common.SetLonglineDetailCompositionDto.type=Esquema del palangre
    1228 1241 
     observe.common.SetLonglineDto.action.reset.homeId.tip=Reiniciar el identificador
    1229 1242 
     observe.common.SetLonglineDto.basketsPerSectionCount=Número de canastas por sección
    ... ... @@ -1285,6 +1298,7 @@ observe.common.SetLonglineGlobalCompositionDto.floatlinesCompositionTab=Orinques
    1285 1298 
     observe.common.SetLonglineGlobalCompositionDto.hooksComposition=Anzuelos
    1286 1299 
     observe.common.SetLonglineGlobalCompositionDto.hooksCompositionProportionSum=Suma de las proporciones de anzuelos (%)
    1287 1300 
     observe.common.SetLonglineGlobalCompositionDto.hooksCompositionTab=Anzuelos
    1301 
    +observe.common.SetLonglineGlobalCompositionDto.mitigationType=Mitigaciones
    1288 1302 
     observe.common.SetLonglineGlobalCompositionDto.mitigationTypeTab=Mitigaciones
    1289 1303 
     observe.common.SetLonglineGlobalCompositionDto.selectedMitigationType=Mitigaciones seleccionadas
    1290 1304 
     observe.common.SetLonglineGlobalCompositionDto.title=Composición global del palangre
    ... ... @@ -1330,6 +1344,7 @@ observe.common.SexDto.types=Sexos
    1330 1344 
     observe.common.ShipOwnerDto.type=Compañía armadora
    1331 1345 
     observe.common.ShipOwnerDto.types=Compañías armadoras
    1332 1346 
     observe.common.SizeMeasureDto.delete.message=Confirmar la eliminación de la medida del talla seleccionada
    1347 
    +observe.common.SizeMeasureDto.size=Talla (cm)
    1333 1348 
     observe.common.SizeMeasureDto.table.size=Talla (cm)
    1334 1349 
     observe.common.SizeMeasureDto.table.size.tip=Talla (cm)
    1335 1350 
     observe.common.SizeMeasureDto.table.sizeMeasureType=Tipo de medida
    ... ... @@ -1364,6 +1379,7 @@ observe.common.SpeciesFateDto.types=Devenir de la especie
    1364 1379 
     observe.common.SpeciesGroupDto.availableSpeciesGroupReleaseMode=Modos de liberación disponibles
    1365 1380 
     observe.common.SpeciesGroupDto.generalTab=Características generales
    1366 1381 
     observe.common.SpeciesGroupDto.selectedSpeciesGroupReleaseMode=Modos de liberación seleccionados
    1382 
    +observe.common.SpeciesGroupDto.speciesGroupReleaseMode=Modos de liberación
    1367 1383 
     observe.common.SpeciesGroupDto.speciesGroupReleaseModeTab=Modos de liberación
    1368 1384 
     observe.common.SpeciesGroupDto.type=Grupo de especies
    1369 1385 
     observe.common.SpeciesGroupDto.types=Grupos de especies
    ... ... @@ -1631,6 +1647,7 @@ observe.common.WeightMeasureDto.table.weightMeasureType.tip=Tipo de medida de pe
    1631 1647 
     observe.common.WeightMeasureDto.title=Medidas de peso
    1632 1648 
     observe.common.WeightMeasureDto.type=Medida de peso
    1633 1649 
     observe.common.WeightMeasureDto.types=Medidas de peso
    1650 
    +observe.common.WeightMeasureDto.weight=Medida de peso (kg)
    1634 1651 
     observe.common.WeightMeasureTypeDto.type=Tipo de medida de peso
    1635 1652 
     observe.common.WeightMeasureTypeDto.types=Tipos de medida de peso
    1636 1653 
     observe.common.WindDto.speedRange=Rango velocidad viento

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -418,6 +418,7 @@ observe.common.ActivitySeineDto.vesselActivitySeine=Activité bateau
    418 418 
     observe.common.ActivitySeineDto.vesselActivitySeine.comment=Seule l'activité %1$s permet de saisir une calée.
    419 419 
     observe.common.ActivitySeineDto.vesselSpeed=Vitesse bateau (nd)
    420 420 
     observe.common.ActivitySeineDto.wind=Vent Beaufort
    421 
    +observe.common.ActivitySeineStubDto.seaSurfaceTemperature=Température surface
    421 422 
     observe.common.BaitHaulingStatusDto.type=Statut de l'appât au virage
    422 423 
     observe.common.BaitHaulingStatusDto.types=Statuts de l'appât au virage
    423 424 
     observe.common.BaitSettingStatusDto.type=Statut de l'appât au filage
    ... ... @@ -657,6 +658,7 @@ observe.common.FloatingObjectDto.table.type=Type
    657 658 
     observe.common.FloatingObjectDto.title=Objet flottant
    658 659 
     observe.common.FloatingObjectDto.type=Objet flottant
    659 660 
     observe.common.FloatingObjectDto.types=Objets flottant
    661 
    +observe.common.FloatingObjectPartDto.objectMaterial=Matériaux d'un objet flottant
    660 662 
     observe.common.FloatingObjectPartDto.title=Matériaux d'un objet flottant
    661 663 
     observe.common.FloatingObjectPartDto.type=Matérial d'un objet flottant
    662 664 
     observe.common.FloatingObjectPartDto.types=Matériaux d'un objet flottant
    ... ... @@ -696,6 +698,7 @@ observe.common.GearCaracteristicDto.unit=Unité
    696 698 
     observe.common.GearCaracteristicTypeDto.type=Type de caractéristique d'équipement
    697 699 
     observe.common.GearCaracteristicTypeDto.types=Types de caractéristique d'équipement
    698 700 
     observe.common.GearDto.availableGearCaracteristic=Caractéristiques disponibles
    701 
    +observe.common.GearDto.gearCaracteristic=Caractéristiques de l'équipement
    699 702 
     observe.common.GearDto.gearCaracteristicTab=Caractéristiques de l'équipement
    700 703 
     observe.common.GearDto.generalTab=Caractéristiques générales
    701 704 
     observe.common.GearDto.selectedGearCaracteristic=Caractéristiques utilisées
    ... ... @@ -729,7 +732,9 @@ observe.common.GearUseFeaturesLonglineDto.title=Équipements
    729 732 
     observe.common.GearUseFeaturesLonglineDto.type=Équipement
    730 733 
     observe.common.GearUseFeaturesLonglineDto.types=Équipements
    731 734 
     observe.common.GearUseFeaturesLonglineDto.usedInTrip=Utilisé dans la marée
    735 
    +observe.common.GearUseFeaturesMeasurementLonglineDto.gearCaracteristic=Caractéristiques de l'équipement
    732 736 
     observe.common.GearUseFeaturesMeasurementLonglineDto.title=Mesures
    737 
    +observe.common.GearUseFeaturesMeasurementSeineDto.gearCaracteristic=Caractéristiques de l'équipement
    733 738 
     observe.common.GearUseFeaturesMeasurementSeineDto.title=Mesures
    734 739 
     observe.common.GearUseFeaturesSeineDto.action.addMeasurement=Ajouter
    735 740 
     observe.common.GearUseFeaturesSeineDto.action.addMeasurement.tip=Ajouter une nouvelle caractéristique
    ... ... @@ -981,6 +986,8 @@ observe.common.ObjectObservedSpeciesDto.type=Faune observée
    981 986 
     observe.common.ObjectObservedSpeciesDto.types=Faune observée
    982 987 
     observe.common.ObjectOperationDto.type=Opération sur l'objet
    983 988 
     observe.common.ObjectOperationDto.types=Opérations sur l'objet
    989 
    +observe.common.ObjectOperationDto.whenArriving=À l'arrivée
    990 
    +observe.common.ObjectOperationDto.whenLeaving=Au départ
    984 991 
     observe.common.ObjectSchoolEstimateDto.action.create=Insérer cette estimation
    985 992 
     observe.common.ObjectSchoolEstimateDto.action.create.tip=Insérer la nouvelle estimation dans la table
    986 993 
     observe.common.ObjectSchoolEstimateDto.title=Estimation banc
    ... ... @@ -1081,6 +1088,8 @@ observe.common.RouteDto.title=Route
    1081 1088 
     observe.common.RouteDto.titles=Routes
    1082 1089 
     observe.common.RouteDto.type=Route
    1083 1090 
     observe.common.RouteDto.types=Routes
    1091 
    +observe.common.RouteStubDto.endLogValue=Loch du soir (milles)
    1092 
    +observe.common.RouteStubDto.startLogValue=Loch du matin (milles)
    1084 1093 
     observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut
    1085 1094 
     observe.common.Sample.length.computed.tip=La longueur a été calculée
    1086 1095 
     observe.common.Sample.length.observed.tip=La longueur a été observée
    ... ... @@ -1182,6 +1191,7 @@ observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.message=Le pan
    1182 1191 
     observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.title=Impossible de supprimer le panier
    1183 1192 
     observe.common.SetLonglineDetailCompositionDto.basket.invalid.nextFloatline1Length=La longueur d'orin 2 (%s) n'est pas égale à la longueur d'orin 1 du panier suivant (%s)
    1184 1193 
     observe.common.SetLonglineDetailCompositionDto.baskets=Paniers
    1194 
    +observe.common.SetLonglineDetailCompositionDto.basketsPerSectionCount=Nombre de paniers par section
    1185 1195 
     observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length=Orin 1 (m)
    1186 1196 
     observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length.tip=Longueur Orin 1 (m)
    1187 1197 
     observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline2Length=Orin 2 (m)
    ... ... @@ -1194,6 +1204,7 @@ observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.message=L'
    1194 1204 
     observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.title=Impossible de supprimer l'avançon
    1195 1205 
     observe.common.SetLonglineDetailCompositionDto.branchlineDetailTab=Détail avançon
    1196 1206 
     observe.common.SetLonglineDetailCompositionDto.branchlines=Avançons
    1207 
    +observe.common.SetLonglineDetailCompositionDto.branchlinesPerBasketCount=Nombre d'avançons par panier
    1197 1208 
     observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength=Avançon (m)
    1198 1209 
     observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength.tip=Longueur Avançon (m)
    1199 1210 
     observe.common.SetLonglineDetailCompositionDto.branchlinesTable.haulingIdentifier=Id Virage
    ... ... @@ -1206,6 +1217,7 @@ observe.common.SetLonglineDetailCompositionDto.canGenerate=Autoriser la généra
    1206 1217 
     observe.common.SetLonglineDetailCompositionDto.compositionTab=Composition
    1207 1218 
     observe.common.SetLonglineDetailCompositionDto.firstTemplate.template.notCompilant.basketCount=Le patron à utiliser %s n'est pas compatible avec le nombre de paniers par section (%s)
    1208 1219 
     observe.common.SetLonglineDetailCompositionDto.generateTab=Définition des modèles
    1220 
    +observe.common.SetLonglineDetailCompositionDto.haulingBreaks=Coupure de ligne
    1209 1221 
     observe.common.SetLonglineDetailCompositionDto.message.updating=Composition détaillée de la palangre en cours de modification
    1210 1222 
     observe.common.SetLonglineDetailCompositionDto.section.cant.delete.message=La section ne peut pas être supprimée car elle est utilisée dans des données.
    1211 1223 
     observe.common.SetLonglineDetailCompositionDto.section.cant.delete.title=Impossible de supprimer la section
    ... ... @@ -1224,6 +1236,7 @@ observe.common.SetLonglineDetailCompositionDto.sectionsTable.template=Patron
    1224 1236 
     observe.common.SetLonglineDetailCompositionDto.sectionsTable.template.tip=Patron
    1225 1237 
     observe.common.SetLonglineDetailCompositionDto.title=Schéma de palangre
    1226 1238 
     observe.common.SetLonglineDetailCompositionDto.title.section.cant.use.firstTemplate=Impossible d'utiliser le premier modèle lors de la génération
    1239 
    +observe.common.SetLonglineDetailCompositionDto.totalSectionsCount=Nombre de sections
    1227 1240 
     observe.common.SetLonglineDetailCompositionDto.type=Schéma de palangre
    1228 1241 
     observe.common.SetLonglineDto.action.reset.homeId.tip=Réinitialiser l'id métier
    1229 1242 
     observe.common.SetLonglineDto.basketsPerSectionCount=Nombre de paniers par section
    ... ... @@ -1285,6 +1298,7 @@ observe.common.SetLonglineGlobalCompositionDto.floatlinesCompositionTab=Orins
    1285 1298 
     observe.common.SetLonglineGlobalCompositionDto.hooksComposition=Hameçons
    1286 1299 
     observe.common.SetLonglineGlobalCompositionDto.hooksCompositionProportionSum=Somme des proportions d'hameçons (%)
    1287 1300 
     observe.common.SetLonglineGlobalCompositionDto.hooksCompositionTab=Hameçons
    1301 
    +observe.common.SetLonglineGlobalCompositionDto.mitigationType=Type d'atténuation
    1288 1302 
     observe.common.SetLonglineGlobalCompositionDto.mitigationTypeTab=Atténuations
    1289 1303 
     observe.common.SetLonglineGlobalCompositionDto.selectedMitigationType=Atténuations sélectionnées
    1290 1304 
     observe.common.SetLonglineGlobalCompositionDto.title=Composition globale de la palangre
    ... ... @@ -1330,6 +1344,7 @@ observe.common.SexDto.types=Sexes
    1330 1344 
     observe.common.ShipOwnerDto.type=Armateur
    1331 1345 
     observe.common.ShipOwnerDto.types=Armateurs
    1332 1346 
     observe.common.SizeMeasureDto.delete.message=Confirmer la suppression de la mesure de la taille sélectionnée.
    1347 
    +observe.common.SizeMeasureDto.size=Mesure (cm)
    1333 1348 
     observe.common.SizeMeasureDto.table.size=Mesure (cm)
    1334 1349 
     observe.common.SizeMeasureDto.table.size.tip=Mesure (cm)
    1335 1350 
     observe.common.SizeMeasureDto.table.sizeMeasureType=Type de mesure
    ... ... @@ -1364,6 +1379,7 @@ observe.common.SpeciesFateDto.types=Devenirs espèce
    1364 1379 
     observe.common.SpeciesGroupDto.availableSpeciesGroupReleaseMode=Modes de libération disponibles
    1365 1380 
     observe.common.SpeciesGroupDto.generalTab=Caractéristiques générales
    1366 1381 
     observe.common.SpeciesGroupDto.selectedSpeciesGroupReleaseMode=Modes de libération sélectionnés
    1382 
    +observe.common.SpeciesGroupDto.speciesGroupReleaseMode=Mode de libération
    1367 1383 
     observe.common.SpeciesGroupDto.speciesGroupReleaseModeTab=Modes de libération
    1368 1384 
     observe.common.SpeciesGroupDto.type=Groupe espèce
    1369 1385 
     observe.common.SpeciesGroupDto.types=Groupes espèce
    ... ... @@ -1631,6 +1647,7 @@ observe.common.WeightMeasureDto.table.weightMeasureType.tip=Type de mesure
    1631 1647 
     observe.common.WeightMeasureDto.title=Mesures de poids
    1632 1648 
     observe.common.WeightMeasureDto.type=Mesure de poids
    1633 1649 
     observe.common.WeightMeasureDto.types=Mesures de poids
    1650 
    +observe.common.WeightMeasureDto.weight=Mesure (kg)
    1634 1651 
     observe.common.WeightMeasureTypeDto.type=Type de mesure de poids
    1635 1652 
     observe.common.WeightMeasureTypeDto.types=Types de mesure de poids
    1636 1653 
     observe.common.WindDto.speedRange=Libellé vitesse vent

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2020.10</version>
    29 
    +    <version>2020.14</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -155,7 +155,7 @@
    155 155 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    156 156 
         <buildDate>${maven.build.timestamp}</buildDate>
    157 157
    158 
    -    <observeToolkitVersion>3.7.24</observeToolkitVersion>
    158 
    +    <observeToolkitVersion>3.7.26</observeToolkitVersion>
    159 159 
         <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
    160 160 
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    161 161 
         <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->

  • validation/src/main/i18n/getters/validation-fields.getter
    ... ... @@ -19,6 +19,7 @@ observe.common.ActivitySeineDto.time
    19 19 
     observe.common.ActivitySeineDto.vesselActivitySeine
    20 20 
     observe.common.ActivitySeineDto.vesselSpeed
    21 21 
     observe.common.ActivitySeineDto.wind
    22 
    +observe.common.ActivitySeineStubDto.seaSurfaceTemperature
    22 23 
     observe.common.BaitsCompositionDto.baitSettingStatus
    23 24 
     observe.common.BaitsCompositionDto.baitType
    24 25 
     observe.common.BaitsCompositionDto.individualSize
    ... ... @@ -57,6 +58,8 @@ observe.common.CatchLonglineDto.section
    57 58 
     observe.common.CatchLonglineDto.speciesCatch
    58 59 
     observe.common.CatchLonglineDto.stomachFullness
    59 60 
     observe.common.CatchLonglineDto.totalWeight
    61 
    +observe.common.CountryDto.iso2Code
    62 
    +observe.common.CountryDto.iso3Code
    60 63 
     observe.common.DataDto.baitHaulingStatus
    61 64 
     observe.common.DataDto.captain
    62 65 
     observe.common.DataDto.dataQuality
    ... ... @@ -70,20 +73,36 @@ observe.common.DataDto.settingIdentifier
    70 73 
     observe.common.DataDto.speciesFate
    71 74 
     observe.common.DataDto.startDate
    72 75 
     observe.common.DataDto.vessel
    76 
    +observe.common.EncounterDto.count
    77 
    +observe.common.EncounterDto.distance
    78 
    +observe.common.EncounterDto.encounterType
    73 79 
     observe.common.FloatingObjectDto.materialsValid
    74 80 
     observe.common.FloatingObjectDto.objectOperation
    75 81 
     observe.common.FloatingObjectDto.supportVesselName
    82 
    +observe.common.FloatingObjectPartDto.objectMaterial
    76 83 
     observe.common.FloatlinesCompositionDto.length
    77 84 
     observe.common.FloatlinesCompositionDto.lineType
    78 85 
     observe.common.FloatlinesCompositionDto.proportion
    86 
    +observe.common.GearCaracteristicDto.gearCaracteristicType
    87 
    +observe.common.GearDto.gearCaracteristic
    88 
    +observe.common.GearUseFeaturesLonglineDto.gear
    89 
    +observe.common.GearUseFeaturesLonglineDto.number
    90 
    +observe.common.GearUseFeaturesMeasurementLonglineDto.gearCaracteristic
    91 
    +observe.common.GearUseFeaturesMeasurementSeineDto.gearCaracteristic
    92 
    +observe.common.GearUseFeaturesSeineDto.gear
    93 
    +observe.common.GearUseFeaturesSeineDto.number
    94 
    +observe.common.HarbourDto.locode
    95 
    +observe.common.HarbourDto.name
    79 96 
     observe.common.HooksCompositionDto.hookOffset
    80 97 
     observe.common.HooksCompositionDto.hookSize
    81 98 
     observe.common.HooksCompositionDto.hookType
    82 99 
     observe.common.HooksCompositionDto.proportion
    100 
    +observe.common.I18nReferentialDto.label
    83 101 
     observe.common.I18nReferentialDto.label1
    84 102 
     observe.common.I18nReferentialDto.label2
    85 103 
     observe.common.I18nReferentialDto.label3
    86 104 
     observe.common.IdDto.comment
    105 
    +observe.common.IdDto.country
    87 106 
     observe.common.IdDto.homeId
    88 107 
     observe.common.IdDto.latitude
    89 108 
     observe.common.IdDto.longitude
    ... ... @@ -92,6 +111,7 @@ observe.common.IdDto.quadrant
    92 111 
     observe.common.IdDto.sex
    93 112 
     observe.common.IdDto.sizeMeasureType
    94 113 
     observe.common.IdDto.species
    114 
    +observe.common.IdDto.weightMeasureType
    95 115 
     observe.common.LengthLengthParameterDto.inputOutputFormula
    96 116 
     observe.common.LengthLengthParameterDto.inputSizeMeasureType
    97 117 
     observe.common.LengthLengthParameterDto.outputInputFormula
    ... ... @@ -118,7 +138,16 @@ observe.common.ObjectMaterialDto.objectMaterialType
    118 138 
     observe.common.ObjectMaterialDto.parent
    119 139 
     observe.common.ObjectMaterialDto.standardCode
    120 140 
     observe.common.ObjectMaterialDto.validation
    141 
    +observe.common.ObjectObservedSpeciesDto.count
    142 
    +observe.common.ObjectObservedSpeciesDto.speciesStatus
    143 
    +observe.common.ObjectOperationDto.whenArriving
    144 
    +observe.common.ObjectOperationDto.whenLeaving
    121 145 
     observe.common.ObjectSchoolEstimateDto.totalWeight
    146 
    +observe.common.OrganismDto.description
    147 
    +observe.common.PersonDto.firstName
    148 
    +observe.common.PersonDto.lastName
    149 
    +observe.common.ProgramDto.gearType
    150 
    +observe.common.ProgramDto.organism
    122 151 
     observe.common.ReferentialDto.code
    123 152 
     observe.common.ReferentialDto.status
    124 153 
     observe.common.ReferentialDto.uri
    ... ... @@ -126,8 +155,19 @@ observe.common.RouteDto.activitySeine
    126 155 
     observe.common.RouteDto.date
    127 156 
     observe.common.RouteDto.endLogValue
    128 157 
     observe.common.RouteDto.startLogValue
    158 
    +observe.common.RouteStubDto.endLogValue
    159 
    +observe.common.RouteStubDto.startLogValue
    129 160 
     observe.common.SchoolEstimateDto.meanWeight
    130 161 
     observe.common.SchoolEstimateDto.totalWeight
    162 
    +observe.common.SensorBrandDto.brandName
    163 
    +observe.common.SensorUsedDto.sensorBrand
    164 
    +observe.common.SensorUsedDto.sensorDataFormat
    165 
    +observe.common.SensorUsedDto.sensorSerialNo
    166 
    +observe.common.SensorUsedDto.sensorType
    167 
    +observe.common.SetLonglineDetailCompositionDto.basketsPerSectionCount
    168 
    +observe.common.SetLonglineDetailCompositionDto.branchlinesPerBasketCount
    169 
    +observe.common.SetLonglineDetailCompositionDto.haulingBreaks
    170 
    +observe.common.SetLonglineDetailCompositionDto.totalSectionsCount
    131 171 
     observe.common.SetLonglineDto.basketsPerSectionCount
    132 172 
     observe.common.SetLonglineDto.branchlinesPerBasketCount
    133 173 
     observe.common.SetLonglineDto.haulingBreaks
    ... ... @@ -171,6 +211,7 @@ observe.common.SetLonglineGlobalCompositionDto.floatlinesComposition
    171 211 
     observe.common.SetLonglineGlobalCompositionDto.floatlinesCompositionProportionSum
    172 212 
     observe.common.SetLonglineGlobalCompositionDto.hooksComposition
    173 213 
     observe.common.SetLonglineGlobalCompositionDto.hooksCompositionProportionSum
    214 
    +observe.common.SetLonglineGlobalCompositionDto.mitigationType
    174 215 
     observe.common.SetSeineDto.currentDirection
    175 216 
     observe.common.SetSeineDto.currentMeasureDepth
    176 217 
     observe.common.SetSeineDto.currentSpeed
    ... ... @@ -188,8 +229,19 @@ observe.common.SetSeineDto.supportVesselName
    188 229 
     observe.common.SetSeineNonTargetCatchDto.nonTargetCatch
    189 230 
     observe.common.SetSeineSchoolEstimateDto.schoolEstimate
    190 231 
     observe.common.SetSeineTargetCatchDto.targetCatch
    232 
    +observe.common.SizeMeasureDto.size
    233 
    +observe.common.SpeciesDto.faoCode
    234 
    +observe.common.SpeciesDto.maxLength
    235 
    +observe.common.SpeciesDto.maxWeight
    236 
    +observe.common.SpeciesDto.minLength
    237 
    +observe.common.SpeciesDto.minWeight
    238 
    +observe.common.SpeciesDto.scientificLabel
    239 
    +observe.common.SpeciesDto.speciesGroup
    240 
    +observe.common.SpeciesDto.wormsId
    241 
    +observe.common.SpeciesGroupDto.speciesGroupReleaseMode
    191 242 
     observe.common.TargetCatchDto.catchWeight
    192 243 
     observe.common.TargetCatchDto.reasonForDiscard
    244 
    +observe.common.TargetCatchDto.weightCategory
    193 245 
     observe.common.TargetCatchDto.well
    194 246 
     observe.common.TargetLengthDto.count
    195 247 
     observe.common.TargetLengthDto.length
    ... ... @@ -213,6 +265,8 @@ observe.common.TdrDto.medianFishingDepth
    213 265 
     observe.common.TdrDto.minFishingDepth
    214 266 
     observe.common.TdrDto.section
    215 267 
     observe.common.TdrDto.sensorBrand
    268 
    +observe.common.TransmittingBuoyDto.transmittingBuoyOperation
    269 
    +observe.common.TransmittingBuoyDto.transmittingBuoyType
    216 270 
     observe.common.TripLonglineDto.activityLongline
    217 271 
     observe.common.TripLonglineDto.dataEntryOperator
    218 272 
     observe.common.TripLonglineDto.totalFishingOperationsNumber
    ... ... @@ -221,4 +275,19 @@ observe.common.TripSeineDto.dataEntryOperator
    221 275 
     observe.common.TripSeineDto.formsUrl
    222 276 
     observe.common.TripSeineDto.reportsUrl
    223 277 
     observe.common.TripSeineDto.route
    278 
    +observe.common.VesselDto.capacity
    279 
    +observe.common.VesselDto.changeDate
    280 
    +observe.common.VesselDto.flagCountry
    281 
    +observe.common.VesselDto.length
    282 
    +observe.common.VesselDto.power
    283 
    +observe.common.VesselDto.searchMaximum
    284 
    +observe.common.VesselDto.shipOwner
    285 
    +observe.common.VesselDto.vesselSizeCategory
    286 
    +observe.common.VesselDto.vesselType
    287 
    +observe.common.VesselDto.yearService
    288 
    +observe.common.VesselSizeCategoryDto.capacityLabel
    289 
    +observe.common.VesselSizeCategoryDto.gaugeLabel
    290 
    +observe.common.WeightMeasureDto.weight
    291 
    +observe.common.WindDto.speedRange
    292 
    +observe.common.WindDto.waveHeight
    224 293 
     observe.common.WithFormula.coefficients

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.