This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 48410886ecdc51a57d8f08f6a0c30a512659d896 Merge: cfb619c c810cdb Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 3 14:55:12 2015 +0100 Modification de libellés pour la sclérochronologie (fixes #6556) .../i18n/wao-persistence_en_GB.properties | 2 +- .../i18n/wao-persistence_fr_FR.properties | 2 +- .../service/csv/ContactImportExportModel.java | 78 +++++++++++----------- .../fr/ifremer/wao/web/WaoI18nTextProvider.java | 30 +++++++++ .../main/resources/i18n/wao-web_en_GB.properties | 3 +- .../main/resources/i18n/wao-web_fr_FR.properties | 3 +- wao-web/src/main/resources/struts.xml | 2 +- .../content/sclerochronology/sampling-plan.jsp | 2 +- 8 files changed, 77 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.