This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 64b7743 Merge branch 'feature/7619-LL-VerifEcranCapteursUtilisées' into 'develop' adds d477978 Update third parties file adds 8d06ef4 Ajout de trace dans les appels des services Ajouter un fonction pour récupéré la liste des espèces échantillonables (see #7604). adds 3ef9dc9 correcton du checkLastUpdate (see #7607). adds 9ff8a1c Fix build adds 1982207 Ajout de méthodes de filtre sur le drapeau discarded (See #7607) adds fe910b8 Faire fonctionner la sauvegarde et amélioration du code de service (See #7607) new 899ba3f Fixes #7607 #7607 Merge branch 'feature/7607-PS-VerfiEcranEchantillonCapture' into develop new d15184a Revert "Update third parties file" new 2970df4 Revue des enumeration de l'ui The 3 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 2970df468dc31af236c77e8c2cdc177d83ae9337 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 10:31:32 2016 +0100 Revue des enumeration de l'ui commit d15184a56bb4c7b1cccaed998c9cdf1f2cde7672 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 10:28:34 2016 +0100 Revert "Update third parties file" This reverts commit d477978efaee6a33704282cdc5374f0daabddc7f. commit 899ba3f40b40f51b851037776d64bd47178eafae Merge: d477978 fe910b8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 09:29:42 2016 +0100 Fixes #7607 #7607 Merge branch 'feature/7607-PS-VerfiEcranEchantillonCapture' into develop Summary of changes: .../content/ref/impl/ProgramObservationEnum.java | 60 +++++------- .../impl/longline/CatchAcquisitionModeEnum.java | 4 +- .../content/table/impl/seine/CodeMesureEnum.java | 38 ++------ .../impl/seine/ModeSaisieEchantillonEnum.java | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 29 ++++++ .../observe-application-swing_en_GB.properties | 36 +++---- .../observe-application-swing_es_ES.properties | 34 +++---- .../observe-application-swing_fr_FR.properties | 34 +++---- .../v1/seine/TargetSampleServiceController.java | 8 ++ .../ird/observe/entities/seine/TargetCatchs.java | 11 +++ .../service/seine/TargetSampleService.java | 6 ++ .../services/dto/seine/TargetCatchDtos.java | 15 +++ .../service/seine/TargetCatchServiceTopia.java | 107 ++++++++++----------- .../service/seine/TargetSampleServiceTopia.java | 57 +++++++++-- 14 files changed, 257 insertions(+), 186 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 899ba3f40b40f51b851037776d64bd47178eafae Merge: d477978 fe910b8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 09:29:42 2016 +0100 Fixes #7607 #7607 Merge branch 'feature/7607-PS-VerfiEcranEchantillonCapture' into develop .../table/impl/seine/TargetSampleUIHandler.java | 29 ++++++ .../v1/seine/TargetSampleServiceController.java | 8 ++ .../ird/observe/entities/seine/TargetCatchs.java | 11 +++ .../service/seine/TargetSampleService.java | 6 ++ .../services/dto/seine/TargetCatchDtos.java | 15 +++ .../service/seine/TargetCatchServiceTopia.java | 107 ++++++++++----------- .../service/seine/TargetSampleServiceTopia.java | 57 +++++++++-- 7 files changed, 169 insertions(+), 64 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d15184a56bb4c7b1cccaed998c9cdf1f2cde7672 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 10:28:34 2016 +0100 Revert "Update third parties file" This reverts commit d477978efaee6a33704282cdc5374f0daabddc7f. --- .../src/license/THIRD-PARTY.properties | 33 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/license/THIRD-PARTY.properties b/observe-application-swing/src/license/THIRD-PARTY.properties index 75af5fa..f9b0e2c 100644 --- a/observe-application-swing/src/license/THIRD-PARTY.properties +++ b/observe-application-swing/src/license/THIRD-PARTY.properties @@ -2,7 +2,6 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - AL 2.0 -# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 # - Apache Software License, version 1.1 @@ -41,9 +40,39 @@ # Please fill the missing licenses for dependencies : # # -#Thu Mar 10 07:32:59 CET 2016 +#Mon Jan 04 17:04:37 CET 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +it.geosolutions.jaiext.affine--jt-affine--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.algebra--jt-algebra--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.bandcombine--jt-bandcombine--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.bandmerge--jt-bandmerge--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.bandselect--jt-bandselect--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.binarize--jt-binarize--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.border--jt-border--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.buffer--jt-buffer--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.classifier--jt-classifier--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.colorconvert--jt-colorconvert--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.colorindexer--jt-colorindexer--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.crop--jt-crop--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.errordiffusion--jt-errordiffusion--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.format--jt-format--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.imagefunction--jt-imagefunction--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.iterators--jt-iterators--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.lookup--jt-lookup--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.mosaic--jt-mosaic--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.nullop--jt-nullop--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.orderdither--jt-orderdither--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.piecewise--jt-piecewise--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.rescale--jt-rescale--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.rlookup--jt-rlookup--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.scale--jt-scale--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.stats--jt-stats--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.translate--jt-translate--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.utilities--jt-utilities--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.vectorbin--jt-vectorbin--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.warp--jt-warp--1.0.8=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.zonal--jt-zonal--1.0.8=The Apache Software License, Version 2.0 javax.media--jai_codec--1.1.3=JDL (Java Distribution License) javax.media--jai_core--1.1.3=JDL (Java Distribution License) javax.media--jai_imageio--1.1=JDL (Java Distribution License) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 2970df468dc31af236c77e8c2cdc177d83ae9337 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 10:31:32 2016 +0100 Revue des enumeration de l'ui --- .../content/ref/impl/ProgramObservationEnum.java | 60 +++++++++------------- .../impl/longline/CatchAcquisitionModeEnum.java | 4 +- .../content/table/impl/seine/CodeMesureEnum.java | 38 ++++---------- .../impl/seine/ModeSaisieEchantillonEnum.java | 4 +- .../observe-application-swing_en_GB.properties | 36 ++++++------- .../observe-application-swing_es_ES.properties | 34 ++++++------ .../observe-application-swing_fr_FR.properties | 34 ++++++------ 7 files changed, 88 insertions(+), 122 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramObservationEnum.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramObservationEnum.java index eac18db..35f6828 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramObservationEnum.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramObservationEnum.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.ref.impl; import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; /** * Une énumeration pour définir les différents niveaux d'observations effectués @@ -33,42 +32,29 @@ import static org.nuiton.i18n.I18n.t; */ public enum ProgramObservationEnum { - value0(n("observe.common.program.observation.value.0")), - value1(n("observe.common.program.observation.value.1")), - value2(n("observe.common.program.observation.value.2")), - value3(n("observe.common.program.observation.value.3")), - value4(n("observe.common.program.observation.value.4")), - value5(n("observe.common.program.observation.value.5")), - value6(n("observe.common.program.observation.value.6")), - value7(n("observe.common.program.observation.value.7")), - value8(n("observe.common.program.observation.value.8")), - value9(n("observe.common.program.observation.value.9")); - - private String i18nKey; - - ProgramObservationEnum(String i18nKey) { - this.i18nKey = i18nKey; - } - - public static ProgramObservationEnum valueOf(int ordinal) - throws IllegalArgumentException { - - for (ProgramObservationEnum o : values()) { - if (o.ordinal() == ordinal) { - return o; - } - } - throw new IllegalArgumentException("could not find a " + - ProgramObservationEnum.class.getSimpleName() + - " value for ordinal " + ordinal); - } - - public String getI18nKey() { - return i18nKey; + value0, + value1, + value2, + value3, + value4, + value5, + value6, + value7, + value8, + value9; + + static { + + n("observe.programObservationEnum.value0"); + n("observe.programObservationEnum.value1"); + n("observe.programObservationEnum.value2"); + n("observe.programObservationEnum.value3"); + n("observe.programObservationEnum.value4"); + n("observe.programObservationEnum.value5"); + n("observe.programObservationEnum.value6"); + n("observe.programObservationEnum.value7"); + n("observe.programObservationEnum.value8"); + n("observe.programObservationEnum.value9"); } - @Override - public String toString() { - return t(i18nKey); - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java index 1965114..01ff486 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java @@ -33,9 +33,9 @@ import static org.nuiton.i18n.I18n.t; */ public enum CatchAcquisitionModeEnum { - INDIVIDUAL(n("observe.catchLongline.acquisitionMode.individual")), + INDIVIDUAL(n("observe.catchAcquisitionModeEnum.INDIVIDUAL")), - GROUPED(n("observe.catchLongline.acquisitionMode.grouped")); + GROUPED(n("observe.catchAcquisitionModeEnum.GROUPED")); private String i18nKey; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/CodeMesureEnum.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/CodeMesureEnum.java index 78ad2cd..cf5a3d3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/CodeMesureEnum.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/CodeMesureEnum.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.table.impl.seine; import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; /** * Définition des codes mesures utilisés pour saisir et afficher les @@ -34,38 +33,19 @@ import static org.nuiton.i18n.I18n.t; public enum CodeMesureEnum implements Comparable<CodeMesureEnum> { /** inconnue */ - unknown(n("observe.common.measureType.unknown")), + unknown, - /** appartient a ce vessel */ - ld1(n("observe.common.measureType.ld1")), + /** mesure LD1 */ + ld1, - /** appartien a un autre vessel */ - lf(n("observe.common.measureType.lf")); + /** mesure LF */ + lf; - private String i18nKey; + static { - CodeMesureEnum(String i18nKey) { - this.i18nKey = i18nKey; - } - - public static CodeMesureEnum valueOf(int ordinal) - throws IllegalArgumentException { - for (CodeMesureEnum o : values()) { - if (o.ordinal() == ordinal) { - return o; - } - } - throw new IllegalArgumentException( - "could not find a " + CodeMesureEnum.class.getSimpleName() + - " value for ordinal " + ordinal); - } - - public String getI18nKey() { - return i18nKey; - } + n("observe.codeMesureEnum.unknown"); + n("observe.codeMesureEnum.ld1"); + n("observe.codeMesureEnum.lf"); - @Override - public String toString() { - return t(i18nKey); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java index 413328d..068f3aa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java @@ -37,7 +37,7 @@ public enum ModeSaisieEchantillonEnum { * L'observateur entre un effectif et une classe de taille, il ne peut pas * saisir le poids (celui sera déduit par calcul). */ - byEffectif(n("observe.common.acquisitionMode.count")), + byEffectif(n("observe.modeSaisieEchantillonEnum.byEffectif")), /** * Le mode de saisie par individu. @@ -45,7 +45,7 @@ public enum ModeSaisieEchantillonEnum { * L'observateur saisie les poids individuel, il ne peut pas saisir * d'effectif, l'effectif est de 1. */ - byIndividu(n("observe.common.acquisitionMode.individu")); + byIndividu(n("observe.modeSaisieEchantillonEnum.byIndividu")); private String i18nKey; diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index f5da3ec..2cace96 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -654,9 +654,9 @@ observe.branchlinesComposition.title=Branchlines observe.branchlinesComposition.topType=Top part type observe.branchlinesComposition.tracelineType=Traceline type observe.broughtOnDeck.comment=Only species brought on deck can be sampled +observe.catchAcquisitionModeEnum.GROUPED=Batch +observe.catchAcquisitionModeEnum.INDIVIDUAL=Individual observe.catchLongline.acquisitionMode=Acquisition mode -observe.catchLongline.acquisitionMode.grouped=Batch -observe.catchLongline.acquisitionMode.individual=Individual observe.catchLongline.action.create=Insert this catch observe.catchLongline.action.create.tip=Insert this catch observe.catchLongline.action.new= @@ -738,9 +738,10 @@ observe.choice.not.create.fin.veille.activity.and.continue= observe.choice.quit=Quit observe.choice.save=Save observe.choice.useRemoteStorage=Use a remote storage +observe.codeMesureEnum.ld1=LD1 +observe.codeMesureEnum.lf=LF +observe.codeMesureEnum.unknown=Unknown observe.common.acquisitionMode= -observe.common.acquisitionMode.count= -observe.common.acquisitionMode.individu= observe.common.activities=Activities observe.common.activities.list=List of activities observe.common.activity=Activity @@ -879,10 +880,7 @@ observe.common.meanValues= observe.common.meanWeight= observe.common.meanWeightComputed.computed.tip= observe.common.meanWeightComputed.observed.tip= -observe.common.measureType= -observe.common.measureType.ld1= -observe.common.measureType.lf= -observe.common.measureType.unknown= +observe.common.measureType=Measure type observe.common.minLengthMax= observe.common.minWeightMax= observe.common.mitigationType= @@ -927,16 +925,6 @@ observe.common.picturesReferences= observe.common.power= observe.common.previousFpaZone= observe.common.program= -observe.common.program.observation.value.0= -observe.common.program.observation.value.1= -observe.common.program.observation.value.2= -observe.common.program.observation.value.3= -observe.common.program.observation.value.4= -observe.common.program.observation.value.5= -observe.common.program.observation.value.6= -observe.common.program.observation.value.7= -observe.common.program.observation.value.8= -observe.common.program.observation.value.9= observe.common.reasonForDiscard= observe.common.reasonForNoFishing= observe.common.reasonForNullSet= @@ -1569,6 +1557,8 @@ observe.message.validation.start.maree= observe.message.validation.start.referentiel= observe.message.validation.use.storage= observe.message.warning.will.be.delete= +observe.modeSaisieEchantillonEnum.byEffectif= +observe.modeSaisieEchantillonEnum.byIndividu= observe.model.version= observe.navigationMenu.closeRouteAction= observe.navigationMenu.closeTripAction= @@ -1634,6 +1624,16 @@ observe.ownership.unknown=Unknown observe.person.country=Nationality observe.program.tab.general=General caracteristics observe.program.tab.observations=Observations +observe.programObservationEnum.value0=observed +observe.programObservationEnum.value1=non observed +observe.programObservationEnum.value2=value not defined +observe.programObservationEnum.value3=value not defined +observe.programObservationEnum.value4=value not defined +observe.programObservationEnum.value5=value not defined +observe.programObservationEnum.value6=value not defined +observe.programObservationEnum.value7=value not defined +observe.programObservationEnum.value8=value not defined +observe.programObservationEnum.value9=value not defined observe.route.message.active.found= observe.route.message.active.found.for.other.trip= observe.route.message.creating= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index b54b83a..ca509f4 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -654,9 +654,9 @@ observe.branchlinesComposition.title= observe.branchlinesComposition.topType= observe.branchlinesComposition.tracelineType= observe.broughtOnDeck.comment=Sólo las especies subidas a bordo se pueden muestrear. +observe.catchAcquisitionModeEnum.GROUPED= +observe.catchAcquisitionModeEnum.INDIVIDUAL= observe.catchLongline.acquisitionMode= -observe.catchLongline.acquisitionMode.grouped= -observe.catchLongline.acquisitionMode.individual= observe.catchLongline.action.create= observe.catchLongline.action.create.tip= observe.catchLongline.action.new= @@ -738,9 +738,10 @@ observe.choice.not.create.fin.veille.activity.and.continue=No crear la actividad observe.choice.quit=Cerrar observe.choice.save=Grabar observe.choice.useRemoteStorage=Usar la base de datos remota +observe.codeMesureEnum.ld1=LD1 +observe.codeMesureEnum.lf=LF +observe.codeMesureEnum.unknown=Desconocido observe.common.acquisitionMode=Modo de entrada de datos -observe.common.acquisitionMode.count=Entrada por grupo de tallas -observe.common.acquisitionMode.individu=Entrada por individuo observe.common.activities=Actividades observe.common.activities.list= observe.common.activity=Actividad @@ -880,9 +881,6 @@ observe.common.meanWeight=Peso medio (en Kg) observe.common.meanWeightComputed.computed.tip=El peso medio se calculó observe.common.meanWeightComputed.observed.tip=El peso medio se observó observe.common.measureType=Tipo de medida -observe.common.measureType.ld1=LD1 -observe.common.measureType.lf=LF -observe.common.measureType.unknown=Desconocido observe.common.minLengthMax=Talla min-max (en cm) observe.common.minWeightMax=Peso min-max (en Kg) observe.common.mitigationType= @@ -927,16 +925,6 @@ observe.common.picturesReferences=Referencia de foto observe.common.power=Potencia del motor principal observe.common.previousFpaZone= observe.common.program= -observe.common.program.observation.value.0=no observado -observe.common.program.observation.value.1=observado -observe.common.program.observation.value.2=valor 2 no definido -observe.common.program.observation.value.3=valor 3 no definido -observe.common.program.observation.value.4=valor 4 no definido -observe.common.program.observation.value.5=valor 5 no definido -observe.common.program.observation.value.6=valor 6 no definido -observe.common.program.observation.value.7=valor 7 no definido -observe.common.program.observation.value.8=valor 8 no definido -observe.common.program.observation.value.9=valor 9 no definido observe.common.reasonForDiscard=Razon de descarte observe.common.reasonForNoFishing= observe.common.reasonForNullSet= @@ -1571,6 +1559,8 @@ observe.message.validation.start.maree=Validación de la marea '%1$s' (%2$s) observe.message.validation.start.referentiel=Validación del referencial de tipo '%1$s' (%2$s entidades) observe.message.validation.use.storage=Se realizará la validación de %1$s observe.message.warning.will.be.delete=%1$s\n\nAtención, la exportación reemplazará la marea existente. +observe.modeSaisieEchantillonEnum.byEffectif=Entrada por grupo de tallas +observe.modeSaisieEchantillonEnum.byIndividu=Entrada por individuo observe.model.version= observe.navigationMenu.closeRouteAction= observe.navigationMenu.closeTripAction= @@ -1636,6 +1626,16 @@ observe.ownership.unknown=Desconocido observe.person.country=Nacionalidad observe.program.tab.general= observe.program.tab.observations= +observe.programObservationEnum.value0=no observado +observe.programObservationEnum.value1=observado +observe.programObservationEnum.value2=valor 2 no definido +observe.programObservationEnum.value3=valor 3 no definido +observe.programObservationEnum.value4=valor 4 no definido +observe.programObservationEnum.value5=valor 5 no definido +observe.programObservationEnum.value6=valor 6 no definido +observe.programObservationEnum.value7=valor 7 no definido +observe.programObservationEnum.value8=valor 8 no definido +observe.programObservationEnum.value9=valor 9 no definido observe.route.message.active.found=Ruta abierta. observe.route.message.active.found.for.other.trip=Existe una ruta abierta en otra marea. observe.route.message.creating=Ruta en proceso de creación. diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 061c95f..225acae 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -648,9 +648,9 @@ observe.branchlinesComposition.title=Composition des avançons observe.branchlinesComposition.topType=Type partie supérieure observe.branchlinesComposition.tracelineType=Type bas de ligne observe.broughtOnDeck.comment=Seules les espèces montées sur le pont pourront être échantillonnées +observe.catchAcquisitionModeEnum.GROUPED=Groupé +observe.catchAcquisitionModeEnum.INDIVIDUAL=Par individu observe.catchLongline.acquisitionMode=Mode de saisie -observe.catchLongline.acquisitionMode.grouped=Groupé -observe.catchLongline.acquisitionMode.individual=Par individu observe.catchLongline.action.create=Insérer cette capture observe.catchLongline.action.create.tip=Insérer cette capture observe.catchLongline.action.new=Nouvelle capture @@ -732,9 +732,10 @@ observe.choice.not.create.fin.veille.activity.and.continue=Ne pas créer l'activ observe.choice.quit=Fermer observe.choice.save=Enregistrer observe.choice.useRemoteStorage=Utiliser une base distante +observe.codeMesureEnum.ld1=LD1 +observe.codeMesureEnum.lf=LF +observe.codeMesureEnum.unknown=Inconnu observe.common.acquisitionMode=Mode de saisie -observe.common.acquisitionMode.count=Saisie par nombre -observe.common.acquisitionMode.individu=Saisie par individu observe.common.activities=Activités observe.common.activities.list=Liste des activités observe.common.activity=Activité @@ -874,9 +875,6 @@ observe.common.meanWeight=Poids moyen (en Kg) observe.common.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s) observe.common.meanWeightComputed.observed.tip=Le poids moyen a été observé observe.common.measureType=Type de mensuration -observe.common.measureType.ld1=LD1 -observe.common.measureType.lf=LF -observe.common.measureType.unknown=Inconnu observe.common.minLengthMax=Taille min-max (en cm) observe.common.minWeightMax=Poids min-max (en Kg) observe.common.mitigationType=Type de mesure d'atténuation @@ -921,16 +919,6 @@ observe.common.picturesReferences=Référence Photo observe.common.power=Puissance moteur principal observe.common.previousFpaZone=Zone FPA quitée observe.common.program=Programme -observe.common.program.observation.value.0=non observé -observe.common.program.observation.value.1=observé -observe.common.program.observation.value.2=valeur 2 non définie -observe.common.program.observation.value.3=valeur 3 non définie -observe.common.program.observation.value.4=valeur 4 non définie -observe.common.program.observation.value.5=valeur 5 non définie -observe.common.program.observation.value.6=valeur 6 non définie -observe.common.program.observation.value.7=valeur 7 non définie -observe.common.program.observation.value.8=valeur 8 non définie -observe.common.program.observation.value.9=valeur 9 non définie observe.common.reasonForDiscard=Raison rejet observe.common.reasonForNoFishing=Raison de non coup de Senne observe.common.reasonForNullSet=Cause coup nul @@ -1558,6 +1546,8 @@ observe.message.validation.start.maree=Validation de la marée '%1$s' (%2$s) observe.message.validation.start.referentiel=Validation du référentiel de type '%1$s' (%2$s entités) observe.message.validation.use.storage=La validation sera effectuée sur %1$s observe.message.warning.will.be.delete=%1$s\n\nAttention, l'export remplacera la marée existante. +observe.modeSaisieEchantillonEnum.byEffectif=Saisie par nombre +observe.modeSaisieEchantillonEnum.byIndividu=Saisie par individu observe.model.version=Version du modèle de données observe.navigationMenu.closeRouteAction=Clôturer la route observe.navigationMenu.closeTripAction=Clôturer la marée @@ -1621,6 +1611,16 @@ observe.ownership.unknown=Inconnue observe.person.country=Nationalité observe.program.tab.general=Caractértistiques générales observe.program.tab.observations=Observations +observe.programObservationEnum.value0=non observé +observe.programObservationEnum.value1=observé +observe.programObservationEnum.value2=valeur 2 non définie +observe.programObservationEnum.value3=valeur 3 non définie +observe.programObservationEnum.value4=valeur 4 non définie +observe.programObservationEnum.value5=valeur 5 non définie +observe.programObservationEnum.value6=valeur 6 non définie +observe.programObservationEnum.value7=valeur 7 non définie +observe.programObservationEnum.value8=valeur 8 non définie +observe.programObservationEnum.value9=valeur 9 non définie observe.route.message.active.found=Une route est ouverte. observe.route.message.active.found.for.other.trip=Une route ouverte existe dans une autre marée. observe.route.message.creating=La route est en cours de création. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm