This is an automated email from the git hooks/post-receive script. New change to branch master-3.x in repository tutti. See http://git.codelutin.com/tutti.git from 99d2135 Merge branch 'release/3.13.11' into master-3.x adds db95b7f [jgitflow-maven-plugin]updating poms for 3.13.12-SNAPSHOT development adds 66d91da [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c17d8a1 Merge branch 'master-3.x' into develop-3.x adds 8928e4d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds d7e5c61 utilisation de la même unité que celle du modèle (refs #7039) adds 0b3be13 fixes #7039: [CAPTURE] Lespoids de captures sont tous en Kg Merge branch 'feature/7039' into develop-3.x adds 0f99c26 consolidation des espèces de tous les lots avant l'import (refs #7042) adds 197200c fixes #7042: [IMPORT BIGFIN] erreur import fichier bigfin sur lot sexé Merge branch 'feature/7042' into develop-3.x adds 9b74d5f lissage des traductions (refs #7040) adds 3ae69f3 fixes #7040: Les libéllés dans les onglets espèces - benthos - macro-déchets non cohérent avec l'écran résumé Merge branch 'feature/7040' into develop-3.x adds bb11bac lissage des noms d'action d'import-export (refs #6089) adds 1995381 fixes #6089: [ERGO] modification de libellés Merge branch 'feature/6089' into develop-3.x adds 903662d lissage des traductions 2 (refs #7040) adds 9682094 [jgitflow-maven-plugin]updating poms for branch'release/3.13.12' with non-snapshot versions adds 9087285 Merge branch 'release/3.13.12' into master-3.x No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/bigfin/BigfinImportService.java | 15 ++++- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/action/ExportAllCaracteristicAction.java | 2 +- .../swing/action/ExportProtocolBenthosAction.java | 2 +- .../action/ExportProtocolCaracteristicAction.java | 2 +- .../swing/action/ExportProtocolSpeciesAction.java | 2 +- .../tutti/ui/swing/action/ExportPupitriAction.java | 2 +- .../swing/action/ImportProtocolBenthosAction.java | 2 +- .../action/ImportProtocolCaracteristicAction.java | 2 +- .../swing/action/ImportProtocolSpeciesAction.java | 2 +- .../operation/catches/EditCatchesSvgHandler.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 69 +++++++++++----------- 19 files changed, 72 insertions(+), 50 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.