This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 33d23a9 Merge branch 'feature/28' into 'develop' adds 934348b Ajouter un bundle i18n (Closes #29) new 2dc15f4 Merge branch 'feature/29' into 'develop' The 1 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 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 Summary of changes: application-swing/pom.xml | 16 +++++++ .../src/main/assembly/{map.xml => i18n.xml} | 16 +++++-- .../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, 65 insertions(+), 58 deletions(-) copy application-swing/src/main/assembly/{map.xml => i18n.xml} (79%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.