Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f3437ba3 by tchemit at 2019-04-28T12:51:05Z update pom - - - - - c3206aa8 by tchemit at 2019-04-28T13:18:16Z Il manques des traductions... - - - - - 7 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage observe.common.TargetCatchDto.table.speciesThon.tip observe.common.TargetCatchDto.table.weightCategory.tip observe.common.TargetCatchDto.table.well.tip +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well @@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage observe.common.TargetDiscardDto.table.reasonForDiscard.tip observe.common.TargetDiscardDto.table.species.tip observe.common.TargetDiscardDto.table.weightCategory.tip +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetLengthDto.count observe.common.TargetLengthDto.length observe.common.TargetLengthDto.tagNumber ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss ===================================== @@ -69,6 +69,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss ===================================== @@ -75,6 +75,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts) observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts) observe.common.SetLonglineDto.snapWeight=Snap weight (kg) observe.common.SetLonglineDto.swivelWeight=swivel weight (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.SetLonglineDto.timeBetweenHooks=time between hooks observe.common.SetLonglineDto.title=Fishing operation observe.common.SetLonglineDto.totalBasketsCount=Total baskets count @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category observe.common.TargetCatchDto.table.weightCategory.tip=Weight category observe.common.TargetCatchDto.table.well=Well observe.common.TargetCatchDto.table.well.tip=Well +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetCatchDto.title=Target catch observe.common.TargetCatchDto.type=Target catch observe.common.TargetCatchDto.types=Target catches @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t) observe.common.TargetDiscardDto.table.weight.tip=Weight (in t) observe.common.TargetDiscardDto.table.weightCategory=Weight category observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetLengthDto.count=Count observe.common.TargetLengthDto.length=Length (cm) 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) observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd) observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg) observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s) observe.common.SetLonglineDto.title=Operación de pesca observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso observe.common.TargetCatchDto.table.well=Cuba observe.common.TargetCatchDto.table.well.tip=Cuba +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetCatchDto.title=Captura de túnidos observe.common.TargetCatchDto.type=Captura de túnidos observe.common.TargetCatchDto.types=Capturas de túnidos @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso observe.common.TargetDiscardDto.table.weight.tip=Peso (en t) observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetLengthDto.count=Número observe.common.TargetLengthDto.length=Talla (cm) 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) observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd) observe.common.SetLonglineDto.snapWeight=Poids snap (kg) observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineDto.title=Opération de pêche observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids observe.common.TargetCatchDto.table.well=Cuve observe.common.TargetCatchDto.table.well.tip=Cuve +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetCatchDto.title=Thons conservés observe.common.TargetCatchDto.type=Thons conservés observe.common.TargetCatchDto.types=Thons conservés @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids observe.common.TargetDiscardDto.table.weight.tip=Poids (en t) observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetLengthDto.count=Nombre observe.common.TargetLengthDto.length=Taille (en cm) observe.common.TargetLengthDto.table.count=Effectif ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f4054443251e66d6b148550236b... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f4054443251e66d6b148550236b... You're receiving this email because of your account on gitlab.com.