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

Commits:

23 changed files:

Changes:

  • client/configuration/src/main/dcp-presets/ps/common/01-standard-fad-deployment-preset.yml
    1 1
     buoy1:
    
    2 2
       transmittingBuoyOperationId: fr.ird.referential.ps.common.TransmittingBuoyOperation#1239832686238#0.4755624782839416
    
    3 3
       transmittingBuoyOwnershipId: fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3
    
    4
    -label1: Draft deployment (DFAD)
    
    5
    -label2: Mise à l'eau de radeau dérivant (DFAD)
    
    6
    -label3: Draft deployment (DFAD) #TODO
    
    4
    +label1: Draft deployment (DFAD/Raft)
    
    5
    +label2: Mise à l'eau de radeau dérivant (DFAD/Raft)
    
    6
    +label3: Draft deployment (DFAD/Raft) #TODO
    
    7 7
     objectOperationId: fr.ird.referential.ps.common.ObjectOperation#0#1
    
    8 8
     whenLeavingMaterials: !java.util.TreeMap
    
    9 9
       fr.ird.referential.ps.common.ObjectMaterial#0#0.3: true

  • client/configuration/src/main/dcp-presets/ps/common/02-standard-fad-removal-preset.yml
    1 1
     buoy1:
    
    2 2
       transmittingBuoyOperationId: fr.ird.referential.ps.common.TransmittingBuoyOperation#1239832686238#0.38090479793636556
    
    3
    -label1: Draft removal (DFAD)
    
    4
    -label2: Retrait de radeau dérivant (DFAD)
    
    5
    -label3: Draft removal (DFAD) #TODO
    
    3
    +label1: Draft removal (DFAD/Raft)
    
    4
    +label2: Retrait de radeau dérivant (DFAD/Raft)
    
    5
    +label3: Draft removal (DFAD/Raft) #TODO
    
    6 6
     objectOperationId: fr.ird.referential.ps.common.ObjectOperation#0#4
    
    7 7
     whenArrivingMaterials: !java.util.TreeMap
    
    8 8
       fr.ird.referential.ps.common.ObjectMaterial#0#0.3: true

  • client/configuration/src/main/dcp-presets/ps/common/03-standard-fad-update-preset.yml
    1
    -label1: Draft visit/modify/reinforce (DFAD)
    
    2
    -label2: Visite/modification/renforcement de radeau dérivant (DFAD)
    
    3
    -label3: Draft visit/modify/reinforce (DFAD) #TODO
    
    1
    +label1: Draft visit/modify/reinforce (DFAD/Raft)
    
    2
    +label2: Visite/modification/renforcement de radeau dérivant (DFAD/Raft)
    
    3
    +label3: Draft visit/modify/reinforce (DFAD/Raft) #TODO
    
    4 4
     objectOperationId: fr.ird.referential.ps.common.ObjectOperation#0#2
    
    5 5
     whenArrivingMaterials: !java.util.TreeMap
    
    6 6
       fr.ird.referential.ps.common.ObjectMaterial#0#0.3: true

  • core/persistence/report/src/main/resources/META-INF/report/default/ll/llCommonTripGearUseFeatures.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=LL
    
    23 23
     name=Liste des équipements
    
    24
    -name.en=Gears uses features
    
    24
    +name.en=Common - Vessel equipments
    
    25 25
     name.es=
    
    26 26
     description=Afficher les équipements
    
    27 27
     description.en=Display gear uses features
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ll/llLanding.report
    ... ... @@ -20,8 +20,8 @@
    20 20
     # #L%
    
    21 21
     ###
    
    22 22
     modelType=LL
    
    23
    -name=Liste des débarquements
    
    24
    -name.en=List of landings
    
    23
    +name=Livre de bord - Débarquements
    
    24
    +name.en=Logbook - Landings
    
    25 25
     name.es=
    
    26 26
     description=Afficher le détails des débarquements
    
    27 27
     description.en=Display details on landing
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatch.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Liste des captures selon le type de banc, filtrées par groupe
    
    24
    -name.en=Observation - List of catches per school type, filtered per group
    
    24
    +name.en=Observations - List of catches per school type, filtered per group
    
    25 25
     name.es=
    
    26 26
     description=Afficher les captures par groupe d'espèce\nLes poids sont exprimés en tonnes.
    
    27 27
     description.en=Display catches per school type, filtered per group\nWeights are in tons.
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Dénombrement des captures selon le type d'association, filtrées par groupe et mode (rejeté/conservé)
    
    24
    -name.en=Observation - Catches counting per association type, filtered per group and discarded mode
    
    24
    +name.en=Observations - Catches counting per association type, filtered per group and discarded mode
    
    25 25
     name.es=
    
    26 26
     description=Afficher le dénombrement de rejets par groupe d'espèces et mode (rejeté/conservé) selon le type d'association
    
    27 27
     description.en=Display catches counting per association type, filtered per group and discarded mode
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchTotalCountByGroupPerReasonForDiscard.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Dénombrement des rejets par type de banc et raison de rejet, filtrés par groupe (en t)
    
    24
    -name.en=Observation - Discard counting per school type and reason for discard, filtered per group (in t)
    
    24
    +name.en=Observations - Discard counting per school type and reason for discard, filtered per group (in t)
    
    25 25
     name.es=
    
    26 26
     description=Afficher le nombre de captures rejetées par espèce selon le type de banc et le type de rejet, filtrés par groupe (en t)
    
    27 27
     description.en=Display discard counting per school type and reason for discard, filtered per group (in t)
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchTotalCountByGroupPerSpeciesFate.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Dénombrement des captures par type de banc et devenir, filtrés par groupe
    
    24
    -name.en=Observation - Catches counting per school type and species fate, filtered per group
    
    24
    +name.en=Observations - Catches counting per school type and species fate, filtered per group
    
    25 25
     name.es=
    
    26 26
     description=Afficher les nombres de captures selon le type de banc et le devenir, filtré par groupe
    
    27 27
     description.en=Display catches counting per school type and species fate, filtered per group
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchWeightByFPAZonePerSpeciesFate.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Devenir des captures par zone FPA filtré par groupe d'espèce (en t)
    
    24
    -name.en=Observation - Catch fates by species group and FPA zone, filtered per group (in t)
    
    24
    +name.en=Observations - Catch fates by species group and FPA zone, filtered per group (in t)
    
    25 25
     name.es=
    
    26 26
     description=Après sélection d'un groupe d'espèces, ce rapport retourne les poids capturés (en tonnes) par zone FPA et par devenir
    
    27 27
     description.en=Once a species group is selected, this report returns catch weights (in tons) by FPA zone and fate
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Poids des captures selon le type d'association, filtrées par groupe et mode (rejeté/conservé) (en t)
    
    24
    -name.en=Observation - Catches weight per association type, filtered per group and discarded mode (in t)
    
    24
    +name.en=Observations - Catches weight per association type, filtered per group and discarded mode (in t)
    
    25 25
     name.es=
    
    26 26
     description=Afficher le poids de rejets par groupe d'espèces et mode (rejeté/conservé) selon le type d'association
    
    27 27
     description.en=
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchWeightByGroupPerReasonForDiscard.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Poids des rejets par type de banc et raison de rejet, filtrés par groupe (en t)
    
    24
    -name.en=Observation - Discarded weight per school type and species fate, filtered per group (in t)
    
    24
    +name.en=Observations - Discarded weight per school type and species fate, filtered per group (in t)
    
    25 25
     name.es=
    
    26 26
     description=Afficher le poids de captures rejetées par espèce selon le type de banc et type de rejet, filtrés par groupe
    
    27 27
     description.en=Display discarded weight per school type and species fate, filtered per group (in t)
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchWeightByGroupPerSpeciesFate.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Poids des captures par type de banc et devenir, filtrés par groupe (en t)
    
    24
    -name.en=Observation - Catches weight per school type, species fate, filtered per group (in t)
    
    24
    +name.en=Observations - Catches weight per school type, species fate, filtered per group (in t)
    
    25 25
     name.es=
    
    26 26
     description=Afficher le poids de captures selon le type de banc et le devenir, filtrés par groupe (en t)
    
    27 27
     description.en=Display catches weight per school type, species fate, filtered per group (in t)
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationDailySetAndCatch.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Nombre de calées et captures journalières d'une marée
    
    24
    -name.en=Observation - Set counting and daily catches
    
    24
    +name.en=Observations - Set counting and daily catches
    
    25 25
     name.es=
    
    26 26
     description=Afficher le nombre de calées et les captures journalières d’une calée
    
    27 27
     description.en=Display set counting and daily catches
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationFobUsageExtended.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Utilisation des FOB, tableau détaillé
    
    24
    -name.en=Observation - FOB usage - detailled version
    
    24
    +name.en=Observations - FOB usage - detailled version
    
    25 25
     name.es=
    
    26 26
     description=Tableau récapitulatif des FOB rencontrés, par types CECOFAD et types d’actions (déploiements, simples visites, modifications, diverses modalités de retraits), avec et sans pêche, et nombres de tortues observées
    
    27 27
     description.en=Summary of FOB encountered, by CECOFAD types, types of object operation (deployment, visit, update, kinds of retrievals), presence or absence of associated fishing set, and number of observed turtles.
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationFobUsageMinimal.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Utilisation des FOB, tableau simplifiée
    
    24
    -name.en=Observation - FOB usage, simplified version
    
    24
    +name.en=Observations - FOB usage, simplified version
    
    25 25
     name.es=
    
    26 26
     description=Tableau récapitulatif des FOB rencontrés, par types CECOFAD et types d’actions regroupés (rencontrés et pêchés, rencontrés non pêchés, déployés), et nombres de tortues observées
    
    27 27
     description.en=Total number of found FOB,per CECOFAD types and action type (Visited fishing,Visited not fishing, deployed), and count of observed turtles
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationLengthsDistribution.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Distribution des tailles par espèces et type de mesure
    
    24
    -name.en=Observation - Length distribution per species and length measure type
    
    24
    +name.en=Observations - Length distribution per species and length measure type
    
    25 25
     name.es=
    
    26 26
     description=Afficher la nombre d'individus mesurés par classe de taille pour les espèces et le type de mesure
    
    27 27
     description.en=Display length distribution per species and length measure type
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Répartition des calées par cuves
    
    24
    -name.en=Observation - Set counting per well
    
    24
    +name.en=Observations - Set counting per well
    
    25 25
     name.es=
    
    26 26
     description=Répartition des calées par cuves, type de banc et espèce
    
    27 27
     description.en=Display set counting per well
    

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationSetByAssociation.report
    ... ... @@ -21,7 +21,7 @@
    21 21
     ###
    
    22 22
     modelType=PS
    
    23 23
     name=Observations - Nombre de calées selon le type d’association
    
    24
    -name.en=Observation -  Set counting per association type
    
    24
    +name.en=Observations -  Set counting per association type
    
    25 25
     name.es=
    
    26 26
     description=Afficher la répartitions des calées selon le type d’association l’issue du coup. Les coups sur BL baleine et BO requin-baleine sont spécifiés.
    
    27 27
     description.en=Display set counting per association type
    

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -620,7 +620,7 @@ observe.data.ll.landing.LandingPart.weight=Weight (Kg)
    620 620
     observe.data.ll.landing.LandingPart.weight.short=Weight
    
    621 621
     observe.data.ll.landing.LandingPart.weight.validation.required=Count or weight must be filled.
    
    622 622
     observe.data.ll.landing.LandingPart.weightCategoryMinMax=Weight category min - max
    
    623
    -observe.data.ll.logbook.Activity.action.create=Next activity
    
    623
    +observe.data.ll.logbook.Activity.action.create=Create activity
    
    624 624
     observe.data.ll.logbook.Activity.action.move=Change trip
    
    625 625
     observe.data.ll.logbook.Activity.action.move.choose.parent.message=Select target trip
    
    626 626
     observe.data.ll.logbook.Activity.action.move.choose.parent.title=Move activities to another trip
    
    ... ... @@ -683,12 +683,12 @@ observe.data.ll.logbook.HooksComposition.action.save=Insert this hook
    683 683
     observe.data.ll.logbook.HooksComposition.action.save.tip=Insert this hook
    
    684 684
     observe.data.ll.logbook.HooksComposition.type=Hook composition
    
    685 685
     observe.data.ll.logbook.Sample.action.create=Next sample
    
    686
    -observe.data.ll.logbook.Sample.action.move=Change trip
    
    686
    +observe.data.ll.logbook.Sample.action.move=Move to activity or other trip
    
    687 687
     observe.data.ll.logbook.Sample.action.move.choose.parent.activity.message=Select target activity
    
    688 688
     observe.data.ll.logbook.Sample.action.move.choose.parent.activity.title=Move samples to another activity
    
    689 689
     observe.data.ll.logbook.Sample.action.move.choose.parent.message=Select target trip
    
    690 690
     observe.data.ll.logbook.Sample.action.move.choose.parent.target.activity=Move to activity
    
    691
    -observe.data.ll.logbook.Sample.action.move.choose.parent.target.message=You can move sample to a trip or a sample
    
    691
    +observe.data.ll.logbook.Sample.action.move.choose.parent.target.message=You can move this sample to an activity or to another trip
    
    692 692
     observe.data.ll.logbook.Sample.action.move.choose.parent.target.multiple.message=You can move samples only to a trip
    
    693 693
     observe.data.ll.logbook.Sample.action.move.choose.parent.target.title=Target of sample move
    
    694 694
     observe.data.ll.logbook.Sample.action.move.choose.parent.target.trip=Move to trip
    
    ... ... @@ -744,7 +744,7 @@ observe.data.ll.logbook.SetGlobalComposition.floatlinesCompositionTab=Floatlines
    744 744
     observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Hooks
    
    745 745
     observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Mitigation
    
    746 746
     observe.data.ll.logbook.SetGlobalComposition.type=Global composition
    
    747
    -observe.data.ll.observation.Activity.action.create=Next activity
    
    747
    +observe.data.ll.observation.Activity.action.create=Create activity
    
    748 748
     observe.data.ll.observation.Activity.action.move=Change trip
    
    749 749
     observe.data.ll.observation.Activity.action.move.choose.parent.message=Select target trip
    
    750 750
     observe.data.ll.observation.Activity.action.move.choose.parent.title=Move activities to another trip
    
    ... ... @@ -1091,7 +1091,7 @@ observe.data.ps.localmarket.SurveyPart.type=Survey part
    1091 1091
     observe.data.ps.localmarket.TripBatch.availablePackagings=Available packaging
    
    1092 1092
     observe.data.ps.localmarket.TripBatch.type=Trip batch
    
    1093 1093
     observe.data.ps.localmarket.WellId.type=Well id
    
    1094
    -observe.data.ps.logbook.Activity.action.create=Next activity
    
    1094
    +observe.data.ps.logbook.Activity.action.create=Create activity
    
    1095 1095
     observe.data.ps.logbook.Activity.action.move=Change route
    
    1096 1096
     observe.data.ps.logbook.Activity.action.move.choose.parent.message=Select target route
    
    1097 1097
     observe.data.ps.logbook.Activity.action.move.choose.parent.title=Move activities to another route
    
    ... ... @@ -1130,7 +1130,7 @@ observe.data.ps.logbook.ActivityStub.date=Date
    1130 1130
     observe.data.ps.logbook.ActivityStub.number=Number
    
    1131 1131
     observe.data.ps.logbook.ActivityStub.time=Observation time
    
    1132 1132
     observe.data.ps.logbook.ActivityStub.type=Activity
    
    1133
    -observe.data.ps.logbook.Catch.action.create=Create a new catch
    
    1133
    +observe.data.ps.logbook.Catch.action.create=Create catch
    
    1134 1134
     observe.data.ps.logbook.Catch.action.save=Insert this catch
    
    1135 1135
     observe.data.ps.logbook.Catch.action.save.tip=Insert this catch
    
    1136 1136
     observe.data.ps.logbook.Catch.count=Count
    
    ... ... @@ -1142,7 +1142,7 @@ observe.data.ps.logbook.Catch.weight=Weight (t)
    1142 1142
     observe.data.ps.logbook.Catch.weight.short=Weight
    
    1143 1143
     observe.data.ps.logbook.Catch.weight.validation.required=Mandatory if count not filled
    
    1144 1144
     observe.data.ps.logbook.Catch.weightMeasureMethod.validation.required=Mandatory if weight is filled
    
    1145
    -observe.data.ps.logbook.FloatingObject.action.add=Add FAD
    
    1145
    +observe.data.ps.logbook.FloatingObject.action.add=Create FOB
    
    1146 1146
     observe.data.ps.logbook.FloatingObject.action.add.tip=Add a FAD to the activity
    
    1147 1147
     observe.data.ps.logbook.FloatingObject.buoysTab=Beacon
    
    1148 1148
     observe.data.ps.logbook.FloatingObject.materialsTab=Materials
    
    ... ... @@ -1152,7 +1152,7 @@ observe.data.ps.logbook.FloatingObject.title=DCP
    1152 1152
     observe.data.ps.logbook.FloatingObject.type=Floating object
    
    1153 1153
     observe.data.ps.logbook.FloatingObjectPart.objectMaterial=Object material
    
    1154 1154
     observe.data.ps.logbook.FloatingObjectPart.type=Floating object part
    
    1155
    -observe.data.ps.logbook.Route.action.create=Next road
    
    1155
    +observe.data.ps.logbook.Route.action.create=Create route day
    
    1156 1156
     observe.data.ps.logbook.Route.action.move=Change trip
    
    1157 1157
     observe.data.ps.logbook.Route.action.move.choose.parent.message=Select target trip
    
    1158 1158
     observe.data.ps.logbook.Route.action.move.choose.parent.title=Move routes to another trip
    
    ... ... @@ -1273,7 +1273,7 @@ observe.data.ps.logbook.WellActivitySpecies.setSpeciesNumber=Set species number
    1273 1273
     observe.data.ps.logbook.WellActivitySpecies.type=Well activity species
    
    1274 1274
     observe.data.ps.logbook.WellActivitySpecies.weight=Weight (t)
    
    1275 1275
     observe.data.ps.logbook.WellActivitySpecies.weight.short=Weight
    
    1276
    -observe.data.ps.observation.Activity.action.create=Next activity
    
    1276
    +observe.data.ps.observation.Activity.action.create=Create activity
    
    1277 1277
     observe.data.ps.observation.Activity.action.move=Change route
    
    1278 1278
     observe.data.ps.observation.Activity.action.move.choose.parent.message=Select target route
    
    1279 1279
     observe.data.ps.observation.Activity.action.move.choose.parent.title=Move activities to another route
    
    ... ... @@ -1299,7 +1299,7 @@ observe.data.ps.observation.Activity.validation.null.dcp=No floating object sele
    1299 1299
     observe.data.ps.observation.Activity.validation.required.observedSystem.for.catches=Some of the following observed systems are required for the non target catches \: %s
    
    1300 1300
     observe.data.ps.observation.Activity.validation.speed.bound=Activity speed is %s nd, which is more than the maximum authorized which is %s nd.
    
    1301 1301
     observe.data.ps.observation.Activity.validation.speed.bound.inter=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s).
    
    1302
    -observe.data.ps.observation.Catch.action.create=Create a new catch
    
    1302
    +observe.data.ps.observation.Catch.action.create=Create catch
    
    1303 1303
     observe.data.ps.observation.Catch.action.save=Insert this catch
    
    1304 1304
     observe.data.ps.observation.Catch.action.save.tip=Insert this catch
    
    1305 1305
     observe.data.ps.observation.Catch.catchWeight=Total weight estimated (in t)
    
    ... ... @@ -1341,7 +1341,7 @@ observe.data.ps.observation.Catch.type=Catch
    1341 1341
     observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species.
    
    1342 1342
     observe.data.ps.observation.Catch.weightMeasureMethod=Total weight measure method
    
    1343 1343
     observe.data.ps.observation.Catch.weightMeasureMethod.short=Total weight measure method
    
    1344
    -observe.data.ps.observation.FloatingObject.action.add=Add FAD
    
    1344
    +observe.data.ps.observation.FloatingObject.action.add=Create FOB
    
    1345 1345
     observe.data.ps.observation.FloatingObject.action.add.tip=Add a FAD to the activity
    
    1346 1346
     observe.data.ps.observation.FloatingObject.buoysTab=Beacon
    
    1347 1347
     observe.data.ps.observation.FloatingObject.materialsTab=Materials
    
    ... ... @@ -1356,8 +1356,8 @@ observe.data.ps.observation.FloatingObjectObjectObservedSpecies.type=Floating ob
    1356 1356
     observe.data.ps.observation.FloatingObjectObjectSchoolEstimate.type=Floating object school estimate
    
    1357 1357
     observe.data.ps.observation.FloatingObjectPart.objectMaterial=Object material
    
    1358 1358
     observe.data.ps.observation.FloatingObjectPart.type=Floating object part
    
    1359
    -observe.data.ps.observation.NonTargetCatchRelease.action.create=Create a new catch release
    
    1360
    -observe.data.ps.observation.NonTargetCatchRelease.action.save=Create a new catch released
    
    1359
    +observe.data.ps.observation.NonTargetCatchRelease.action.create=Create catch release
    
    1360
    +observe.data.ps.observation.NonTargetCatchRelease.action.save=Create catch released
    
    1361 1361
     observe.data.ps.observation.NonTargetCatchRelease.action.save.tip=Insert this catch released
    
    1362 1362
     observe.data.ps.observation.NonTargetCatchRelease.brailNumber=Brail number
    
    1363 1363
     observe.data.ps.observation.NonTargetCatchRelease.conformity=Conformity
    
    ... ... @@ -1389,7 +1389,7 @@ observe.data.ps.observation.ObjectSchoolEstimate.title=Object School estimate
    1389 1389
     observe.data.ps.observation.ObjectSchoolEstimate.totalWeight=Weight (in t)
    
    1390 1390
     observe.data.ps.observation.ObjectSchoolEstimate.totalWeight.short=Total weight
    
    1391 1391
     observe.data.ps.observation.ObjectSchoolEstimate.type=Object school estimate
    
    1392
    -observe.data.ps.observation.Route.action.create=Next road
    
    1392
    +observe.data.ps.observation.Route.action.create=Create route day
    
    1393 1393
     observe.data.ps.observation.Route.action.move=Change trip
    
    1394 1394
     observe.data.ps.observation.Route.action.move.all=Move all
    
    1395 1395
     observe.data.ps.observation.Route.action.move.all.choose.parent.message=Select target trip
    

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -1142,7 +1142,7 @@ observe.data.ps.logbook.Catch.weight=Peso (en t)
    1142 1142
     observe.data.ps.logbook.Catch.weight.short=Peso
    
    1143 1143
     observe.data.ps.logbook.Catch.weight.validation.required=Mandatory if count not filled \#TODO
    
    1144 1144
     observe.data.ps.logbook.Catch.weightMeasureMethod.validation.required=Mandatory if weight is filled \#TODO
    
    1145
    -observe.data.ps.logbook.FloatingObject.action.add=Add FAD
    
    1145
    +observe.data.ps.logbook.FloatingObject.action.add=Create FOB
    
    1146 1146
     observe.data.ps.logbook.FloatingObject.action.add.tip=Add a FAD to the activity
    
    1147 1147
     observe.data.ps.logbook.FloatingObject.buoysTab=Baliza
    
    1148 1148
     observe.data.ps.logbook.FloatingObject.materialsTab=Materials \#TODO
    
    ... ... @@ -1152,7 +1152,7 @@ observe.data.ps.logbook.FloatingObject.title=Objeto flotante
    1152 1152
     observe.data.ps.logbook.FloatingObject.type=Objeto flotante
    
    1153 1153
     observe.data.ps.logbook.FloatingObjectPart.objectMaterial=objectMaterial \#TODO
    
    1154 1154
     observe.data.ps.logbook.FloatingObjectPart.type=FloatingObjectPart
    
    1155
    -observe.data.ps.logbook.Route.action.create=Next road
    
    1155
    +observe.data.ps.logbook.Route.action.create=Create route day
    
    1156 1156
     observe.data.ps.logbook.Route.action.move=Change trip
    
    1157 1157
     observe.data.ps.logbook.Route.action.move.choose.parent.message=Select target trip
    
    1158 1158
     observe.data.ps.logbook.Route.action.move.choose.parent.title=Move routes to another trip
    

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-llLanding.properties
    ... ... @@ -19,7 +19,7 @@
    19 19
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20 20
     # #L%
    
    21 21
     ###
    
    22
    -syntax.name=Liste des débarquements
    
    22
    +syntax.name=Livre de bord - Débarquements
    
    23 23
     syntax.description=Afficher le détails des débarquements
    
    24 24
     syntax.rows=-1
    
    25 25
     syntax.columns=39
    

  • src/site/markdown/report/embedded-reports.md
    ... ... @@ -10,7 +10,7 @@ Liste des équipements
    10 10
     
    
    11 11
     ### llLanding
    
    12 12
     
    
    13
    -Liste des débarquements
    
    13
    +Livre de bord - Débarquements
    
    14 14
     
    
    15 15
     ### llLogbookActivities
    
    16 16