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 bb9e63d Merge branch 'feature/27' into 'develop' adds b52b940 Utilisation de templates pour le A propos + correction lien manquants (Closes #28) new 33d23a9 Merge branch 'feature/28' 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 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 Summary of changes: .../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 ++++++++++++++++++++++ ...connexionTestResult_en.ftl => translate_en.ftl} | 45 +++++++++-------- ...connexionTestResult_en.ftl => translate_es.ftl} | 45 +++++++++-------- ...connexionTestResult_en.ftl => translate_fr.ftl} | 45 +++++++++-------- .../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, 335 insertions(+), 84 deletions(-) create mode 100644 application-swing/src/main/resources/ftl/about_en.ftl create mode 100644 application-swing/src/main/resources/ftl/about_es.ftl create mode 100644 application-swing/src/main/resources/ftl/about_fr.ftl copy application-swing/src/main/resources/ftl/{connexionTestResult_en.ftl => translate_en.ftl} (52%) copy application-swing/src/main/resources/ftl/{connexionTestResult_en.ftl => translate_es.ftl} (52%) copy application-swing/src/main/resources/ftl/{connexionTestResult_en.ftl => translate_fr.ftl} (52%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.