This is an automated email from the git hooks/post-receive script. New change to branch master-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from add1438 [jgitflow-maven-plugin]merging 'release/5.2.1' into 'master-5.x' adds d3326f4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 20113b8 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' adds bbb31d4 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 64a0649 Templates de traduction mis à jour (fixes #8967) adds 4deda11 prepare version 5.3 adds 66b7da1 Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966) adds fc5dab8 le calendrier reste en anglais (fixes #8952) adds 7636482 Le libellé observe.common.label a sauté (fixes #8951) adds bc821a4 Petites mises au point sur le widget positions(fixes #8964) adds 6861d0b Improve log (remove deprecated stuff out of it) adds dabad6a fix doc adds d423f43 Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) adds 5dc2c39 Revert "Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966)" adds 1ef80d4 Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966) (la vrai correction...) adds afde26e Bascule distant-> local lorsque la connexion serveur a été perdue (Fixes #8957) adds 6f8e734 Ajout d'un mojo pour merger les trads (TODO a déplacer dans le projet i18n) adds 8477f14 Les corrections orthographiques (fixes #8975) adds 17c1d3f [jgitflow-maven-plugin]updating poms for branch'release/5.3' with non-snapshot versions adds ee276c1 add missing license header adds 396d7b3 [jgitflow-maven-plugin]merging 'release/5.3' into 'master-5.x' No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 2 +- ...pplication-swing-configuration_fr_FR.properties | 42 ++-- .../src/main/resources/log4j.properties | 5 +- .../src/main/resources/observe-log4j.properties | 3 + application-swing-decoration/pom.xml | 2 +- .../swing/decoration/DecoratorService.java | 5 + .../application-swing-decoration_en_GB.properties | 1 + .../application-swing-decoration_es_ES.properties | 1 + .../application-swing-decoration_fr_FR.properties | 17 +- application-swing-validation/pom.xml | 2 +- ...ivityLonglineDto-ui-create-error-validation.xml | 20 +- ...ivityLonglineDto-ui-update-error-validation.xml | 25 ++- .../SetLonglineDto-ui-create-error-validation.xml | 80 ++++--- .../SetLonglineDto-ui-update-error-validation.xml | 80 ++++--- ...ActivitySeineDto-ui-create-error-validation.xml | 21 +- ...ActivitySeineDto-ui-update-error-validation.xml | 21 +- .../application-swing-validation_en_GB.properties | 2 +- .../application-swing-validation_fr_FR.properties | 52 ++--- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../swing/ui/content/ContentUIInitializer.java | 1 + .../swing/ui/storage/StorageUIHandler.java | 13 +- .../swing/ui/tree/ObserveTreeHelper.java | 4 +- .../ui/tree/node/AbstrctReferenceNodeSupport.java | 30 +-- .../ui/tree/node/DataReferenceNodeSupport.java | 18 +- .../swing/ui/tree/node/ProgramLonglineNode.java | 2 - .../tree/node/ReferentialReferenceNodeSupport.java | 22 +- .../renderer/AbstractObserveTreeCellRenderer.java | 9 +- .../main/resources/ftl/connexionTestResult_en.ftl | 2 +- .../main/resources/ftl/connexionTestResult_es.ftl | 6 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 4 +- .../ftl/dataSourceConnectionReport_en.ftl | 62 +++--- .../ftl/dataSourceConnectionReport_es.ftl | 74 +++---- .../ftl/dataSourceConnectionReport_fr.ftl | 20 +- .../resources/ftl/dataSourceInformation_en.ftl | 20 +- .../resources/ftl/dataSourceInformation_es.ftl | 18 +- .../resources/ftl/dataSourceInformation_fr.ftl | 4 +- .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 8 +- .../src/main/resources/ftl/dataSourcePolicy_es.ftl | 8 +- .../ftl/dataSourceSelectModeResume_en.ftl | 18 +- .../ftl/dataSourceSelectModeResume_es.ftl | 8 +- .../ftl/dataSourceSelectModeResume_fr.ftl | 10 +- .../ftl/storageModelDataSourceConfiguration_en.ftl | 26 +-- .../ftl/storageModelDataSourceConfiguration_es.ftl | 26 +-- .../i18n/application-swing_fr_FR.properties | 134 ++++++------ application-web-configuration/pom.xml | 2 +- .../application-web-configuration_fr_FR.properties | 2 +- .../src/main/resources/observeweb-log4j.conf | 3 + application-web/pom.xml | 8 +- .../controller/v1/DataSourceServiceController.java | 14 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- .../fr/ird/observe/ObserveTopiaConfiguration.java | 4 +- pom.xml | 12 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- .../services-topia-validation_en_GB.properties | 34 +-- .../services-topia-validation_fr_FR.properties | 66 +++--- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- .../ObserveTopiaApplicationContextFactory.java | 46 +++- .../resources/i18n/services-topia_en_GB.properties | 2 +- services/pom.xml | 2 +- src/site/rst/administration-web.rst.vm | 8 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- .../maven/plugins/toolbox/MergeI18nBundleMojo.java | 243 +++++++++++++++++++++ topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 74 files changed, 857 insertions(+), 551 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>.