This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit cb5581f25dc3f174f2641820974df5135fd2e02e Merge: 7a1de1f fa88c97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 2 11:20:14 2015 +0100 fixes #1181 mettre à jour les traductions Merge branch 'feature/1181-internationalisation' into develop .../chorem/lima/business/LimaServiceConfig.java | 2 +- .../resources/i18n/lima-business_en_GB.properties | 134 +--- .../resources/i18n/lima-business_fr_FR.properties | 120 +--- .../resources/i18n/lima-callao_en_GB.properties | 31 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 674 ++++++++++----------- .../resources/i18n/lima-swing_fr_FR.properties | 7 +- .../src/main/resources/lima-config.properties | 2 +- .../chorem/lima/web/service/DocumentService.java | 8 +- .../main/resources/i18n/lima-web_en_GB.properties | 5 + .../main/resources/i18n/lima-web_fr_FR.properties | 5 + 11 files changed, 422 insertions(+), 568 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.