Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d7cfd38e by Tony Chemit at 2021-09-23T18:32:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-14' with non-snapshot versions[skip ci] - - - - - 91c61cbe by Tony Chemit at 2021-09-23T18:50:22+02:00 fix i18n - - - - - 1ef42688 by Tony Chemit at 2021-09-23T18:51:19+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-14' into 'master' - - - - - 6afd2e23 by Tony Chemit at 2021-09-23T18:51:23+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 019835da by Tony Chemit at 2021-09-23T18:51:24+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 234bde64 by Tony Chemit at 2021-09-23T18:51:25+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1 changed file: - services/i18n/src/main/i18n/translations/services_en_GB.properties Changes: ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -408,7 +408,7 @@ observe.common.exist.on.remote=%1$s (already exist) observe.constant.AcquisitionMode.individual=By individu observe.constant.AcquisitionMode.number=By effectif observe.constant.BatchWeightComputedValueSource.fromPackagingMeanWeight=Computed from packaging mean weight -<F extends DataDto&FloatingObjectAware, P extends DataDto&FloatingObjectPartAware>Computed from species mean weight +observe.constant.BatchWeightComputedValueSource.fromSpeciesMeanWeight=Computed from species mean weight observe.constant.CatchAcquisitionMode.GROUPED=Batch observe.constant.CatchAcquisitionMode.INDIVIDUAL=Individual observe.constant.CatchComputedValueSource.fromData=Computed from data View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d3787c812240945e27e824ec4... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d3787c812240945e27e824ec4... You're receiving this email because of your account on gitlab.com.