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 33d23a9b86adedd662dd0c3e3d2834945b4cdb96 Merge: bb9e63d b52b940 Author: Tony Chemit <chemit@codelutin.com> Date: Sun Jan 1 15:29:27 2017 +0100 Merge branch 'feature/28' into 'develop' Utilisation de templates pour le A propos + correction lien manquants (Closes #28) See merge request !104 .../src/main/config/ObserveSwingApplication.ini | 21 ++++++++ .../ObserveSwingApplicationConfig.java | 14 ++++++ ...pplication-swing-configuration_en_GB.properties | 3 ++ ...pplication-swing-configuration_es_ES.properties | 3 ++ ...pplication-swing-configuration_fr_FR.properties | 3 ++ application-swing/pom.xml | 24 ++++++++-- .../application/swing/ObserveTextGenerator.java | 21 ++++++++ .../ui/actions/menu/help/ShowAboutAction.java | 19 ++++---- .../src/main/resources/ftl/about_en.ftl | 56 ++++++++++++++++++++++ .../src/main/resources/ftl/about_es.ftl | 56 ++++++++++++++++++++++ .../src/main/resources/ftl/about_fr.ftl | 56 ++++++++++++++++++++++ .../src/main/resources/ftl/translate_en.ftl | 47 ++++++++++++++++++ .../src/main/resources/ftl/translate_es.ftl | 47 ++++++++++++++++++ .../src/main/resources/ftl/translate_fr.ftl | 47 ++++++++++++++++++ .../i18n/application-swing_en_GB.properties | 2 - .../i18n/application-swing_es_ES.properties | 2 - .../i18n/application-swing_fr_FR.properties | 2 - pom.xml | 2 +- 18 files changed, 404 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.