branch develop updated (9ad742d -> ee23ea1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 9ad742d fixes #7226: Impossible d'enregistrer une nouvelle relation taille-poids Merge branch 'feature/7226' into develop new d6c7df0 changement de version du modèle + ajout de la base de test pour cette nouvelle version (refs #7226) new ee23ea1 optimize i18n 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 ee23ea11c6adf8627a8a1cde3b997dce9cef883f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jun 13 15:35:15 2015 +0200 optimize i18n commit d6c7df065a741692b62e2fadea7599b08e67553a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jun 13 15:35:03 2015 +0200 changement de version du modèle + ajout de la base de test pour cette nouvelle version (refs #7226) Summary of changes: .../resources/i18n/observe-business_en_GB.properties | 2 +- .../resources/i18n/observe-business_es_ES.properties | 2 +- .../resources/i18n/observe-business_fr_FR.properties | 2 +- .../src/test/resources/db/4.0.1/referentiel.sql.gz | Bin 0 -> 138260 bytes .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- observe-entities/src/main/xmi/observe-seine.properties | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 observe-business/src/test/resources/db/4.0.1/referentiel.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit d6c7df065a741692b62e2fadea7599b08e67553a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jun 13 15:35:03 2015 +0200 changement de version du modèle + ajout de la base de test pour cette nouvelle version (refs #7226) --- .../src/test/resources/db/4.0.1/referentiel.sql.gz | Bin 0 -> 138260 bytes .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- observe-entities/src/main/xmi/observe-seine.properties | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/observe-business/src/test/resources/db/4.0.1/referentiel.sql.gz b/observe-business/src/test/resources/db/4.0.1/referentiel.sql.gz new file mode 100644 index 0000000..e53fcd1 Binary files /dev/null and b/observe-business/src/test/resources/db/4.0.1/referentiel.sql.gz differ diff --git a/observe-entities/src/main/xmi/observe-common.properties b/observe-entities/src/main/xmi/observe-common.properties index 6506995..62323b7 100644 --- a/observe-entities/src/main/xmi/observe-common.properties +++ b/observe-entities/src/main/xmi/observe-common.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0 +model.tagvalue.version=4.0.1 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index 2296621..1340a65 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0 +model.tagvalue.version=4.0.1 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index f603e53..e04f24e 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0 +model.tagvalue.version=4.0.1 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ee23ea11c6adf8627a8a1cde3b997dce9cef883f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jun 13 15:35:15 2015 +0200 optimize i18n --- .../src/main/resources/i18n/observe-business_en_GB.properties | 2 +- .../src/main/resources/i18n/observe-business_es_ES.properties | 2 +- .../src/main/resources/i18n/observe-business_fr_FR.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties index 117ebd0..4a1d43f 100644 --- a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties +++ b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties @@ -15,7 +15,6 @@ observe.common.catchFateLongline= observe.common.catchLongline=Catches observe.common.catchWeight= observe.common.country=Country -observe.common.gender=Gender observe.common.detectionMode=Detection mode observe.common.encounter=Encounter observe.common.encounterType= @@ -31,6 +30,7 @@ observe.common.gearCaracteristic=Gear caracteristic observe.common.gearCaracteristicType=Gear caracteristic type observe.common.gearUseFeaturesLongline= observe.common.gearUseFeaturesSeine= +observe.common.gender=Gender observe.common.gps.activity= observe.common.gps.gpsPoint= observe.common.gps.gpsPointInterval= diff --git a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties index 607b945..729e862 100644 --- a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties +++ b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties @@ -13,7 +13,6 @@ observe.common.branchlineLength= observe.common.branchlinesComposition= observe.common.catchFateLongline= observe.common.catchLongline= -observe.common.gender=Sexo observe.common.catchWeight=Peso estimado (en t) observe.common.country=País observe.common.detectionMode=Modo de detección @@ -31,6 +30,7 @@ observe.common.gearCaracteristic= observe.common.gearCaracteristicType= observe.common.gearUseFeaturesLongline= observe.common.gearUseFeaturesSeine= +observe.common.gender=Sexo observe.common.gps.activity=Actividad observe.common.gps.gpsPoint=Punto GPS observe.common.gps.gpsPointInterval=Intervalo de puntos diff --git a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties index 24cb557..6160b02 100644 --- a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties +++ b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties @@ -14,7 +14,6 @@ observe.common.branchlinesComposition=Composition des avançons observe.common.catchFateLongline=Devenir capture observe.common.catchLongline=Capture observe.common.catchWeight=Poids estimé (en t) -observe.common.gender=Sexe observe.common.country=Pays observe.common.detectionMode=Mode détection observe.common.encounter=Rencontre @@ -31,6 +30,7 @@ observe.common.gearCaracteristic=Caractéristique d'un équipement observe.common.gearCaracteristicType=Type de caractéristique d'équipement observe.common.gearUseFeaturesLongline=Équipement observe.common.gearUseFeaturesSeine=Équipement +observe.common.gender=Sexe observe.common.gps.activity=Activité observe.common.gps.gpsPoint=Point GPS observe.common.gps.gpsPointInterval=Intervalle de points -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm