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

Commits:

7 changed files:

Changes:

  • client-core/src/main/i18n/getters/jaxx.getter
    ... ... @@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage
    570 570 
     observe.common.TargetCatchDto.table.speciesThon.tip
    571 571 
     observe.common.TargetCatchDto.table.weightCategory.tip
    572 572 
     observe.common.TargetCatchDto.table.well.tip
    573 
    +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver
    573 574 
     observe.common.TargetCatchDto.title
    574 575 
     observe.common.TargetCatchDto.weightCategory
    575 576 
     observe.common.TargetCatchDto.well
    ... ... @@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage
    581 582 
     observe.common.TargetDiscardDto.table.reasonForDiscard.tip
    582 583 
     observe.common.TargetDiscardDto.table.species.tip
    583 584 
     observe.common.TargetDiscardDto.table.weightCategory.tip
    585 
    +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver
    584 586 
     observe.common.TargetLengthDto.count
    585 587 
     observe.common.TargetLengthDto.length
    586 588 
     observe.common.TargetLengthDto.tagNumber

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss
    ... ... @@ -69,6 +69,7 @@
    69 69 
       horizontalTextPosition:{JCheckBox.LEFT};
    70 70 
       _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER};
    71 71 
       selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())};
    72 
    +  text:"observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver";
    72 73 
     }
    73 74
    74 75 
     #moveUp {

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss
    ... ... @@ -75,6 +75,7 @@
    75 75 
       horizontalTextPosition:{JCheckBox.LEFT};
    76 76 
       _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER};
    77 77 
       selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())};
    78 
    +  text:"observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver";
    78 79 
     }
    79 80
    80 81 
     #moveUp {

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts)
    1253 1253 
     observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts)
    1254 1254 
     observe.common.SetLonglineDto.snapWeight=Snap weight (kg)
    1255 1255 
     observe.common.SetLonglineDto.swivelWeight=swivel weight (kg)
    1256 
    -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer?
    1257 
    -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer?
    1258 1256 
     observe.common.SetLonglineDto.timeBetweenHooks=time between hooks
    1259 1257 
     observe.common.SetLonglineDto.title=Fishing operation
    1260 1258 
     observe.common.SetLonglineDto.totalBasketsCount=Total baskets count
    ... ... @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category
    1387 1385 
     observe.common.TargetCatchDto.table.weightCategory.tip=Weight category
    1388 1386 
     observe.common.TargetCatchDto.table.well=Well
    1389 1387 
     observe.common.TargetCatchDto.table.well.tip=Well
    1388 
    +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer?
    1390 1389 
     observe.common.TargetCatchDto.title=Target catch
    1391 1390 
     observe.common.TargetCatchDto.type=Target catch
    1392 1391 
     observe.common.TargetCatchDto.types=Target catches
    ... ... @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t)
    1410 1409 
     observe.common.TargetDiscardDto.table.weight.tip=Weight (in t)
    1411 1410 
     observe.common.TargetDiscardDto.table.weightCategory=Weight category
    1412 1411 
     observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category
    1412 
    +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer?
    1413 1413 
     observe.common.TargetLengthDto.count=Count
    1414 1414 
     observe.common.TargetLengthDto.length=Length (cm)
    1415 1415 
     observe.common.TargetLengthDto.table.count=Count

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Velocidad del barco (nd)
    1253 1253 
     observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd)
    1254 1254 
     observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg)
    1255 1255 
     observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg)
    1256 
    -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
    1257 
    -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
    1258 1256 
     observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s)
    1259 1257 
     observe.common.SetLonglineDto.title=Operación de pesca
    1260 1258 
     observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas
    ... ... @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso
    1387 1385 
     observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso
    1388 1386 
     observe.common.TargetCatchDto.table.well=Cuba
    1389 1387 
     observe.common.TargetCatchDto.table.well.tip=Cuba
    1388 
    +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
    1390 1389 
     observe.common.TargetCatchDto.title=Captura de túnidos
    1391 1390 
     observe.common.TargetCatchDto.type=Captura de túnidos
    1392 1391 
     observe.common.TargetCatchDto.types=Capturas de túnidos
    ... ... @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso
    1410 1409 
     observe.common.TargetDiscardDto.table.weight.tip=Peso (en t)
    1411 1410 
     observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso
    1412 1411 
     observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso
    1412 
    +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador?
    1413 1413 
     observe.common.TargetLengthDto.count=Número
    1414 1414 
     observe.common.TargetLengthDto.length=Talla (cm)
    1415 1415 
     observe.common.TargetLengthDto.table.count=Número

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vitesse bateau (nd)
    1253 1253 
     observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd)
    1254 1254 
     observe.common.SetLonglineDto.snapWeight=Poids snap (kg)
    1255 1255 
     observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg)
    1256 
    -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1257 
    -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1258 1256 
     observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s)
    1259 1257 
     observe.common.SetLonglineDto.title=Opération de pêche
    1260 1258 
     observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers
    ... ... @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids
    1387 1385 
     observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids
    1388 1386 
     observe.common.TargetCatchDto.table.well=Cuve
    1389 1387 
     observe.common.TargetCatchDto.table.well.tip=Cuve
    1388 
    +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1390 1389 
     observe.common.TargetCatchDto.title=Thons conservés
    1391 1390 
     observe.common.TargetCatchDto.type=Thons conservés
    1392 1391 
     observe.common.TargetCatchDto.types=Thons conservés
    ... ... @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids
    1410 1409 
     observe.common.TargetDiscardDto.table.weight.tip=Poids (en t)
    1411 1410 
     observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids
    1412 1411 
     observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids
    1412 
    +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1413 1413 
     observe.common.TargetLengthDto.count=Nombre
    1414 1414 
     observe.common.TargetLengthDto.length=Taille (en cm)
    1415 1415 
     observe.common.TargetLengthDto.table.count=Effectif

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2019.8.14</version>
    29 
    +    <version>2019.8.15</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>

    • —
    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.