Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 39574208 by Tony CHEMIT at 2018-03-19T22:22:40Z Fix migration scripts - - - - - 3c029fe5 by Tony CHEMIT at 2018-03-23T17:54:54Z [jgitflow-maven-plugin]updating poms for branch'release/2.5' with non-snapshot versions[skip ci] - - - - - 6869f44a by Tony CHEMIT at 2018-03-23T18:04:20Z use ird t3 data 1.7 - - - - - 7672dd82 by Tony CHEMIT at 2018-03-23T18:21:51Z fix i18n - - - - - 72eadee5 by Tony CHEMIT at 2018-03-23T18:22:48Z [jgitflow-maven-plugin]merging 'release/2.5' into 'master' - - - - - 51310a1c by Tony CHEMIT at 2018-03-23T18:22:49Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 65dd3bdc by Tony CHEMIT at 2018-03-23T18:22:49Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 33a86930 by Tony CHEMIT at 2018-03-23T18:22:49Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 3 changed files: - pom.xml - t3-web/src/main/resources/i18n/t3-web_en_GB.properties - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ <projectId>ird-t3</projectId> <stageId>frirdt3</stageId> <applicationName>t3</applicationName> - <t3-data.version>1.6</t3-data.version> + <t3-data.version>1.7</t3-data.version> <lib.version.java4all.i18n>4.0-alpha-11</lib.version.java4all.i18n> <env>dev</env> ===================================== t3-web/src/main/resources/i18n/t3-web_en_GB.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_en_GB.properties +++ b/t3-web/src/main/resources/i18n/t3-web_en_GB.properties @@ -1,4 +1,3 @@ -t3.common.password=Password t3.action.applyFilter=Apply t3.action.back.to.configuration.step1=Back to step 1 of configuration t3.action.back.to.configuration.step2=Back to step 2 of configuration ===================================== t3-web/src/main/resources/i18n/t3-web_fr_FR.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties +++ b/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties @@ -9,7 +9,6 @@ t3.action.connectToDatabase=Se connecter à la base t3.action.create=Créer t3.action.create.parametersProfile=Créer un profile de paramètre t3.action.create.user=Créer un utilisateur -t3.common.password=Mot de passe t3.action.delete=Supprimer t3.action.deleteComputedData=Suppression des données calculées t3.action.deleteTrips=Suppression des marées View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/cdf9ffad7f04258a53c81954f5495c0d... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/cdf9ffad7f04258a53c81954f5495c0d... You're receiving this email because of your account on gitlab.com.