This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 968dc7e940354ba6f074812e7a5d18395836834a Merge: 3998c48 93c030e Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:37:47 2015 +0000 Merge branch 'release/4.0' 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.