This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2dc15f4f611ad367f168d944889925356c66808b Merge: 33d23a9 934348b Author: Tony Chemit <chemit@codelutin.com> Date: Sun Jan 1 15:58:05 2017 +0100 Merge branch 'feature/29' into 'develop' Ajouter un bundle i18n (Closes #29) See merge request !105 application-swing/pom.xml | 16 +++++++ application-swing/src/main/assembly/i18n.xml | 49 ++++++++++++++++++++ .../application/swing/ObserveResourceManager.java | 54 ++++++++-------------- .../observe/application/swing/ObserveRunner.java | 8 ++-- .../ui/actions/menu/help/ShowAboutAction.java | 5 +- .../src/main/resources/ftl/translate_en.ftl | 8 ++-- .../src/main/resources/ftl/translate_es.ftl | 8 ++-- .../src/main/resources/ftl/translate_fr.ftl | 8 ++-- 8 files changed, 102 insertions(+), 54 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.