This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See http://git.nuiton.org/i18n.git commit ea1d988c33b3035072fc54df2efd002298328226 Merge: c1a7307 85bcbcd Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:55 2014 +0200 Merge branch 'release/3.2' .gitignore | 13 ++ i18n-maven-plugin/pom.xml | 26 +-- .../org/nuiton/i18n/plugin/AbstractI18nMojo.java | 3 +- .../i18n/plugin/parser/impl/ParserJavaMojo.java | 36 ++-- i18n-maven-plugin/src/site/site_en.xml | 22 +-- i18n-maven-plugin/src/site/site_fr.xml | 22 +-- nuiton-i18n-editor/src/site/site_fr.xml | 2 +- nuiton-i18n/pom.xml | 7 +- .../src/main/java/org/nuiton/i18n/I18nUtil.java | 8 +- .../org/nuiton/i18n/bundle/I18nBundleUtil.java | 8 +- .../org/nuiton/util/converter/LocaleConverter.java | 2 + .../org/nuiton/util/converter/package-info.java | 1 + .../org.apache.commons.beanutils.Converter | 1 - nuiton-i18n/src/site/apt/index.apt | 45 ----- nuiton-i18n/src/site/en/apt/index.apt | 45 ----- nuiton-i18n/src/site/site_en.xml | 37 +--- nuiton-i18n/src/site/site_fr.xml | 37 +--- .../nuiton/util/converter/LocaleConverterTest.java | 1 + pom.xml | 97 +++++---- src/site/apt/{index.apt => history.apt} | 39 +--- src/site/apt/index.apt | 219 --------------------- src/site/en/apt/{index.apt => history.apt} | 44 +---- src/site/en/apt/index.apt | 211 -------------------- src/site/site_en.xml | 35 +--- src/site/site_fr.xml | 51 +---- 25 files changed, 139 insertions(+), 873 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.