This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 3998c48 Merge branch 'release/4.0-RC4' adds 5eb7a22 [jgitflow-maven-plugin]updating poms for 4.0-RC5-SNAPSHOT development adds 3d96d02 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 56834e2 Merge branch 'master' into develop adds a616426 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds fa09976 fix NPe sur une caracteristique de type qualitative (fixes #7023) adds e5ed78f utilisation de la même unité que celle du modèle (refs #7039) adds d89f57a consolidation des espèces de tous les lots avant l'import (refs #7042) adds 646a237 lissage des traductions (refs #7040) adds 6e36136 lissage des noms d'action d'import-export (refs #6089) adds ac3ba55 lissage des traductions 2 (refs #7040) adds 191df94 ajout d'un fichier d'export générique plus complet (refs #5156) adds 90b1330 mise à jour de l'aide sur l'import générique (refs #5156) adds 6e65029 ajout des spécifications dans l'aide (refs #5156) adds e0be46c fixes #5156: Mettre à jour l'aide en ligne Merge branch 'feature/5156' into develop adds 659ca6f [jgitflow-maven-plugin]updating poms for branch '4.0' with snapshot versions adds 93c030e [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions adds 968dc7e Merge branch 'release/4.0' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../FishingOperationPersistenceServiceImpl.java | 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 +- tutti-ui-swing/src/main/assembly/help.xml | 8 + .../filtered-resources/tutti-help-fr.properties | 58 +- .../src/main/help/export/accidentalCatch.csv | 6 - tutti-ui-swing/src/main/help/export/catch.csv | 9 - .../src/main/help/export/exportCruise-example.zip | Bin 4327 -> 0 bytes .../src/main/help/export/gearCaracteristics.csv | 1 - .../src/main/help/export/genericFormat-example.zip | Bin 0 -> 75501 bytes .../src/main/help/export/individualObservation.csv | 12 - .../src/main/help/export/marineLitter.csv | 2 - tutti-ui-swing/src/main/help/export/operation.csv | 2 - tutti-ui-swing/src/main/help/export/parameter.csv | 19 - tutti-ui-swing/src/main/help/export/species.csv | 5 - tutti-ui-swing/src/main/help/export/survey.csv | 2 - tutti-ui-swing/src/main/help/fr/genericFormat.html | 602 ++++++--------------- tutti-ui-swing/src/main/help/fr/index.html | 6 +- tutti-ui-swing/src/main/help/fr/menu.html | 28 +- tutti-ui-swing/src/main/help/fr/navbar.js | 6 +- tutti-ui-swing/src/main/help/fr/selectCruise.html | 8 - .../operation/catches/EditCatchesSvgHandler.java | 2 +- .../actions/ExportAllCaracteristicAction.java | 2 +- .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../protocol/actions/ExportPupitriAction.java | 2 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolCaracteristicAction.java | 2 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 69 +-- 38 files changed, 315 insertions(+), 583 deletions(-) delete mode 100644 tutti-ui-swing/src/main/help/export/accidentalCatch.csv delete mode 100644 tutti-ui-swing/src/main/help/export/catch.csv delete mode 100644 tutti-ui-swing/src/main/help/export/exportCruise-example.zip delete mode 100644 tutti-ui-swing/src/main/help/export/gearCaracteristics.csv create mode 100644 tutti-ui-swing/src/main/help/export/genericFormat-example.zip delete mode 100644 tutti-ui-swing/src/main/help/export/individualObservation.csv delete mode 100644 tutti-ui-swing/src/main/help/export/marineLitter.csv delete mode 100644 tutti-ui-swing/src/main/help/export/operation.csv delete mode 100644 tutti-ui-swing/src/main/help/export/parameter.csv delete mode 100644 tutti-ui-swing/src/main/help/export/species.csv delete mode 100644 tutti-ui-swing/src/main/help/export/survey.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.