This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from afde26e Bascule distant-> local lorsque la connexion serveur a été perdue (Fixes #8957) new 6f8e734 Ajout d'un mojo pour merger les trads (TODO a déplacer dans le projet i18n) new 8477f14 Les corrections orthographiques (fixes #8975) The 2 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 8477f14d8a113dc23c89badda48a759e1df35f3d Author: Tony CHEMIT <dev@tchemit.fr> Date: Thu Jan 19 20:02:03 2017 +0100 Les corrections orthographiques (fixes #8975) commit 6f8e73423f575968d66cf2c68fc8221142a0f668 Author: Tony CHEMIT <dev@tchemit.fr> Date: Thu Jan 19 20:01:42 2017 +0100 Ajout d'un mojo pour merger les trads (TODO a déplacer dans le projet i18n) Summary of changes: ...pplication-swing-configuration_fr_FR.properties | 42 ++-- .../application-swing-decoration_fr_FR.properties | 16 +- .../application-swing-validation_en_GB.properties | 2 +- .../application-swing-validation_fr_FR.properties | 52 ++--- .../i18n/application-swing_fr_FR.properties | 134 ++++++------- .../application-web-configuration_fr_FR.properties | 2 +- .../services-topia-validation_en_GB.properties | 34 ++-- .../services-topia-validation_fr_FR.properties | 66 +++--- .../resources/i18n/services-topia_en_GB.properties | 2 +- .../maven/plugins/toolbox/MergeI18nBundleMojo.java | 221 +++++++++++++++++++++ 10 files changed, 396 insertions(+), 175 deletions(-) create mode 100644 toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MergeI18nBundleMojo.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.