Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3

Commits:

• 21b1e5e5
  by Tony Chemit at 2018-03-02T14:01:51Z

  [jgitflow-maven-plugin]updating poms for branch'release/2.2' with non-snapshot versions[skip ci]

• cf404afa
  by Tony Chemit at 2018-03-02T14:04:38Z

  Fix bad release version on extra modules
  

• d6dc6c4a
  by Tony Chemit at 2018-03-02T14:31:52Z

  optimize i18n
  

• 6b8af716
  by Tony CHEMIT at 2018-03-02T14:37:43Z

  optimize i18n
  

• be9a82ca
  by Tony CHEMIT at 2018-03-02T14:38:40Z

  [jgitflow-maven-plugin]merging 'release/2.2' into 'master'

• a75c7903
  by Tony CHEMIT at 2018-03-02T14:38:41Z

  [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]

• 7dbe3fb2
  by Tony CHEMIT at 2018-03-02T14:38:41Z

  [jgitflow-maven-plugin]merging 'master' into 'develop'

• 671462c7
  by Tony CHEMIT at 2018-03-02T14:38:41Z

  [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]

2 changed files:

• t3-web/src/main/resources/i18n/t3-web_en_GB.properties
• t3-web/src/main/resources/i18n/t3-web_fr_FR.properties

Changes:

 t3.common.useSamplesOnly=Database 'Samples only'

 t3.common.useWeightCategoriesInStratum=Use Weight categories -10/+10 in stratum

 t3.common.useWells=Use wells

-t3.common.user.outputDatabases=List of configured target databases

 t3.common.user.inputDatabases=List of configured working databases

+t3.common.user.outputDatabases=List of configured target databases

 t3.common.users=Users list

 t3.common.vesselFilter=Filter on vessels

 t3.common.vesselSimpleTypes.to.select=Types simplifiés de navire à sélectionner

 t3.common.useSamplesOnly=Base échantillon seulement

 t3.common.useWeightCategoriesInStratum=Utiliser les catégories de poids -10/+10Kg dans la stratification

 t3.common.useWells=Utilisation des plans de cuve

-t3.common.user.outputDatabases=Liste des configurations de bases de sortie

 t3.common.user.inputDatabases=Liste des configurations de bases de travail

+t3.common.user.outputDatabases=Liste des configurations de bases de sortie

 t3.common.users=Liste des utilisateurs

 t3.common.vesselFilter=Filter les navires

 t3.common.vesselSimpleTypes.to.select=Types simplifiés de navire à sélectionner