This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git from 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 new bb11bac lissage des noms d'action d'import-export (refs #6089) new 1995381 fixes #6089: [ERGO] modification de libellés Merge branch 'feature/6089' into develop-3.x new 903662d lissage des traductions 2 (refs #7040) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 903662d7991f7f537046ba2bbd2b0ca283d75859 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 12:37:11 2015 +0200 lissage des traductions 2 (refs #7040) commit 19953810c109a6edef0950ba878cf31a5ccd4bc0 Merge: 3ae69f3 bb11bac Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 12:27:26 2015 +0200 fixes #6089: [ERGO] modification de libellés Merge branch 'feature/6089' into develop-3.x commit bb11bac2c28b943eaec0b7b6902e4a1561f690ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 12:27:23 2015 +0200 lissage des noms d'action d'import-export (refs #6089) Summary of changes: .../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 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 67 +++++++++++----------- 10 files changed, 49 insertions(+), 40 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.