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

Commits:

24 changed files:

Changes:

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java
    ... ... @@ -88,7 +88,8 @@ public class ObserveKeyStrokesEditorApi extends ObserveKeyStrokesSupport {
    88 88 
         public static final KeyStroke KEY_STROKE_SAVE_DATA = KeyStroke.getKeyStroke("pressed F5");
    89 89 
         public static final KeyStroke KEY_STROKE_DELETE_DATA_GLOBAL = KeyStroke.getKeyStroke("pressed F6");
    90 90 
         public static final KeyStroke KEY_STROKE_MOVE = KeyStroke.getKeyStroke("pressed F7");
    91 
    -    public static final KeyStroke KEY_STROKE_DUPLICATE = KeyStroke.getKeyStroke("pressed F7");
    91 
    +
    92 
    +    public static final KeyStroke KEY_STROKE_MOVE_LAYOUT = KeyStroke.getKeyStroke("pressed F8");
    92 93 
         public static final KeyStroke KEY_STROKE_ADD_PRESET = KeyStroke.getKeyStroke("pressed F9");
    93 94 
         public static final KeyStroke KEY_STROKE_FIX = KeyStroke.getKeyStroke("pressed F9");
    94 95 
         public static final KeyStroke KEY_STROKE_GENERATE = KeyStroke.getKeyStroke("pressed F9");

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutAction.java
    ... ... @@ -116,10 +116,10 @@ public class MoveLayoutAction<D extends DataDto, U extends ContentUI> extends Co
    116 116 
         }
    117 117
    118 118 
         protected MoveLayoutAction(Class<D> dataType, MoveLayoutExecutor executor) {
    119 
    -        super(null, null, "move", ObserveKeyStrokesEditorApi.KEY_STROKE_MOVE);
    119 
    +        super(null, null, "move", ObserveKeyStrokesEditorApi.KEY_STROKE_MOVE_LAYOUT);
    120 120 
             this.executor = Objects.requireNonNull(executor);
    121 
    -        setText(I18n.t(I18nDecoratorHelper.getPropertyI18nKey(dataType, "action.move")));
    122 
    -        setTooltipText(I18n.t(I18nDecoratorHelper.getPropertyI18nKey(dataType, "action.move")));
    121 
    +        setText(I18n.t(I18nDecoratorHelper.getPropertyI18nKey(dataType, "action.move.all")));
    122 
    +        setTooltipText(I18n.t(I18nDecoratorHelper.getPropertyI18nKey(dataType, "action.move.all")));
    123 123 
         }
    124 124
    125 125 
         @Override

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java
    ... ... @@ -248,10 +248,10 @@ public class MoveLayoutRequestBuilder {
    248 248 
                 parentTargetDtoType = oldParentId.getType();
    249 249 
             }
    250 250 
             if (askNewParentTitle == null) {
    251 
    -            askNewParentTitle = I18nDecoratorHelper.getPropertyI18nKey(dtoType, "action.move.choose.parent.title");
    251 
    +            askNewParentTitle = I18nDecoratorHelper.getPropertyI18nKey(dtoType, "action.move.all.choose.parent.title");
    252 252 
             }
    253 253 
             if (askNewParentMessage == null) {
    254 
    -            askNewParentMessage = I18nDecoratorHelper.getPropertyI18nKey(dtoType, "action.move.choose.parent.message");
    254 
    +            askNewParentMessage = I18nDecoratorHelper.getPropertyI18nKey(dtoType, "action.move.all.choose.parent.message");
    255 255 
             }
    256 256 
             Objects.requireNonNull(availableLayoutTypes, "No availableLayoutTypes declared in builder");
    257 257 
             DataGroupByParameter groupBy = Objects.requireNonNull(this.groupByValueSupplier, "No groupByValue supplier set.").get();

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUI.jaxx
    ... ... @@ -60,6 +60,6 @@ public void resetEdit() {
    60 60 
         <JPanel id='showForm' decorator="boxed"/>
    61 61 
       </JPanel>
    62 62 
       <JMenuItem id='delete' styleClass='showData'/>
    63 
    -  <JMenuItem id='move' styleClass='showData'/>
    63 
    +  <JMenuItem id='moveAll' styleClass='showData'/>
    64 64 
       <JMenuItem id='showTechnicalInformations'/>
    65 65 
     </fr.ird.observe.client.datasource.editor.api.content.ContentUI>

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUI.jaxx
    ... ... @@ -63,7 +63,7 @@ public void resetEdit() {
    63 63 
         </row>
    64 64 
       </Table>
    65 65 
       <JMenuItem id='delete' styleClass='editableAndNotModified'/>
    66 
    -  <JMenuItem id='move' styleClass='editableAndNotModified'/>
    66 
    +  <JMenuItem id='moveAll' styleClass='editableAndNotModified'/>
    67 67 
       <JMenuItem id='showTechnicalInformations'/>
    68 68
    69 69 
     </fr.ird.observe.client.datasource.editor.api.content.ContentUI>

  • client/datasource/editor/ps/src/main/i18n/getters/navigation.getter
    ... ... @@ -41,7 +41,16 @@ observe.data.Trip.message.not.open
    41 41 
     observe.data.Trip.navigation.unsaved
    42 42 
     observe.data.Trip.title
    43 43 
     observe.data.Trip.type
    44 
    +observe.data.ps.common.Trip.action.move.all
    45 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.message
    46 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.title
    47 
    +observe.data.ps.common.TripLocalmarket.action.move.all
    48 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message
    49 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title
    44 50 
     observe.data.ps.common.TripLocalmarket.type
    51 
    +observe.data.ps.common.TripLogbook.action.move.all
    52 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message
    53 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title
    45 54 
     observe.data.ps.common.TripLogbook.type
    46 55 
     observe.data.ps.landing.Landing.action.create
    47 56 
     observe.data.ps.landing.Landing.action.save

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx
    ... ... @@ -110,5 +110,5 @@
    110 110 
           </cell>
    111 111 
         </row>
    112 112 
       </Table>
    113 
    -  <JMenuItem id='move' styleClass='editableAndNotModifiedAndTableNotEmpty'/>
    113 
    +  <JMenuItem id='moveAll' styleClass='editableAndNotModifiedAndTableNotEmpty'/>
    114 114 
     </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI>

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx
    ... ... @@ -121,5 +121,5 @@
    121 121 
           </cell>
    122 122 
         </row>
    123 123 
       </Table>
    124 
    -  <JMenuItem id='move' styleClass='editableAndNotModifiedAndTableNotEmpty'/>
    124 
    +  <JMenuItem id='moveAll' styleClass='editableAndNotModifiedAndTableNotEmpty'/>
    125 125 
     </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI>

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUI.jaxx
    ... ... @@ -28,4 +28,5 @@
    28 28 
         <RouteListUIModel id='model' constructorParams='@override:getNavigationSource(this)'/>
    29 29 
         <RouteListUIModelStates id='states'/>
    30 30 
         <TripDto id='bean'/>
    31 
    +    <JMenuItem id='moveAll' styleClass='editableAndNotModified'/>
    31 32 
     </fr.ird.observe.client.datasource.editor.api.content.data.list.ContentListUI>

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUIHandler.java
    1 
    +package fr.ird.observe.client.datasource.editor.ps.data.observation;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe Client :: DataSource :: Editor :: PS
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +
    26 
    +import fr.ird.observe.client.datasource.editor.api.content.actions.move.layout.MoveLayoutAction;
    27 
    +import fr.ird.observe.dto.data.ps.common.TripDto;
    28 
    +import fr.ird.observe.dto.data.ps.observation.RouteDto;
    29 
    +
    30 
    +/**
    31 
    + * Created on 19/04/2022.
    32 
    + *
    33 
    + * @author Tony Chemit - dev@tchemit.fr
    34 
    + * @since 9.0.0
    35 
    + */
    36 
    +public class RouteListUIHandler extends GeneratedRouteListUIHandler {
    37 
    +
    38 
    +    @Override
    39 
    +    protected void installMoveAction() {
    40 
    +        super.installMoveAction();
    41 
    +        MoveLayoutAction
    42 
    +                .create(ui, RouteDto.class)
    43 
    +                .on(() -> ui.getModel().toMoveAllRequest().setParentCandidates((groupBy, parentId) -> getRootOpenableService().getBrothers(groupBy, parentId)))
    44 
    +                .call(r -> getRootOpenableService().moveLayout(TripDto.class, r))
    45 
    +                .then(RouteUIMoveAllTreeAdapter::create)
    46 
    +                .install(ui::getMoveAll);
    47 
    +    }
    48 
    +}

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUIModel.java
    1 
    +package fr.ird.observe.client.datasource.editor.ps.data.observation;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe Client :: DataSource :: Editor :: PS
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +
    26 
    +import fr.ird.observe.client.datasource.editor.api.content.actions.move.layout.MoveLayoutRequestBuilder;
    27 
    +import fr.ird.observe.dto.data.ps.observation.RouteDto;
    28 
    +
    29 
    +/**
    30 
    + * Created on 19/04/2022.
    31 
    + *
    32 
    + * @author Tony Chemit - dev@tchemit.fr
    33 
    + * @since 9.0.0
    34 
    + */
    35 
    +public class RouteListUIModel extends GeneratedRouteListUIModel {
    36 
    +
    37 
    +    public RouteListUIModel(RouteListUINavigationNode source) {
    38 
    +        super(source);
    39 
    +    }
    40 
    +
    41 
    +    public MoveLayoutRequestBuilder.StepSetParentCandidates toMoveAllRequest() {
    42 
    +        return MoveLayoutRequestBuilder
    43 
    +                .create(RouteDto.class, getStates().selectedParent())
    44 
    +                .setAvailableLayoutType(RouteDto.class)
    45 
    +                .setEditNode(getSource().getInitializer().getEditNode())
    46 
    +                .setGroupByValue(this::getGroupByValue);
    47 
    +    }
    48 
    +
    49 
    +}

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteUIMoveAllTreeAdapter.java
    1 
    +package fr.ird.observe.client.datasource.editor.ps.data.observation;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe Client :: DataSource :: Editor :: PS
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import fr.ird.observe.client.datasource.editor.api.content.actions.move.layout.MoveLayoutTreeAdapter;
    26 
    +import fr.ird.observe.client.datasource.editor.ps.data.common.TripUINavigationNode;
    27 
    +import fr.ird.observe.services.service.data.MoveLayoutRequest;
    28 
    +
    29 
    +import java.util.function.Function;
    30 
    +
    31 
    +/**
    32 
    + * Created on 19/04/2022.
    33 
    + *
    34 
    + * @author Tony Chemit - dev@tchemit.fr
    35 
    + * @since 9.0.0
    36 
    + */
    37 
    +public class RouteUIMoveAllTreeAdapter extends MoveLayoutTreeAdapter<TripUINavigationNode, RouteListUINavigationNode> {
    38 
    +
    39 
    +    public static Function<MoveLayoutRequest, RouteUIMoveAllTreeAdapter> create(RouteListUI ui) {
    40 
    +        return r -> new RouteUIMoveAllTreeAdapter(ui.getModel().getSource());
    41 
    +    }
    42 
    +
    43 
    +    public RouteUIMoveAllTreeAdapter(RouteListUINavigationNode incomingNode) {
    44 
    +        super(incomingNode::getParent);
    45 
    +    }
    46 
    +
    47 
    +    @Override
    48 
    +    public final TripUINavigationNode getNewParentNode(TripUINavigationNode oldParentNode, String newParentId) {
    49 
    +        return oldParentNode.findSibling(newParentId);
    50 
    +    }
    51 
    +
    52 
    +    @Override
    53 
    +    public final RouteListUINavigationNode getNodeToSelect(TripUINavigationNode parentNode) {
    54 
    +        return parentNode.getRouteObsListUINavigationNode();
    55 
    +    }
    56 
    +
    57 
    +}

  • client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripLocalmarketUINavigationNode.scope
    ... ... @@ -5,6 +5,9 @@
    5 5 
         "ui.iconPath": "navigation.ps.data.common.TripLocalmarket"
    6 6 
       },
    7 7 
       "i18nMapping": {
    8 
    +    "action.move.all": "observe.data.ps.common.TripLocalmarket.action.move.all",
    9 
    +    "action.move.all.choose.parent.message": "observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message",
    10 
    +    "action.move.all.choose.parent.title": "observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title",
    8 11 
         "type": "observe.data.ps.common.TripLocalmarket.type"
    9 12 
       },
    10 13 
       "types": {

  • client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripLogbookUINavigationNode.scope
    ... ... @@ -5,6 +5,9 @@
    5 5 
         "ui.iconPath": "navigation.ps.data.common.TripLogbook"
    6 6 
       },
    7 7 
       "i18nMapping": {
    8 
    +    "action.move.all": "observe.data.ps.common.TripLogbook.action.move.all",
    9 
    +    "action.move.all.choose.parent.message": "observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message",
    10 
    +    "action.move.all.choose.parent.title": "observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title",
    8 11 
         "type": "observe.data.ps.common.TripLogbook.type"
    9 12 
       },
    10 13 
       "types": {

  • client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripUINavigationNode.scope
    ... ... @@ -7,6 +7,9 @@
    7 7 
       },
    8 8 
       "i18nMapping": {
    9 9 
         "action.create": "observe.data.Trip.action.create",
    10 
    +    "action.move.all": "observe.data.ps.common.Trip.action.move.all",
    11 
    +    "action.move.all.choose.parent.message": "observe.data.ps.common.Trip.action.move.all.choose.parent.message",
    12 
    +    "action.move.all.choose.parent.title": "observe.data.ps.common.Trip.action.move.all.choose.parent.title",
    10 13 
         "message.not.open": "observe.data.Trip.message.not.open",
    11 14 
         "navigation.unsaved": "observe.data.Trip.navigation.unsaved",
    12 15 
         "title": "observe.data.Trip.title",

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/GenerateContentUISupport.java
    ... ... @@ -159,6 +159,7 @@ public abstract class GenerateContentUISupport extends GenerateJavaFileSupport {
    159 159 
                     && !getClass().getSimpleName().endsWith("OpenableUIHandler")
    160 160 
                     && !getClass().getSimpleName().endsWith("OpenableUIMoveTreeAdapter")
    161 161 
                     && !getClass().getSimpleName().endsWith("OpenableUIModelStates")
    162 
    +                && !getClass().getSimpleName().endsWith("ListUIModel")
    162 163 
                     && !getClass().getSimpleName().endsWith("ListUIHandler")
    163 164 
                     && !getClass().getSimpleName().endsWith("ListUINavigationCapability")
    164 165 
                     && !getClass().getSimpleName().endsWith("SimpleUIHandler")

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/layout/GenerateContentLayoutUINavigationScope.java
    ... ... @@ -88,6 +88,9 @@ public class GenerateContentLayoutUINavigationScope extends GenerateContentLayou
    88 88 
         @Override
    89 89 
         protected String generateConcreteContent(Path path, String packageName, String namePrefix) {
    90 90 
             addI118nProperty(dtoType, "type");
    91 
    +        addI118nProperty(dtoType, "action.move.all");
    92 
    +        addI118nProperty(dtoType, "action.move.all.choose.parent.message");
    93 
    +        addI118nProperty(dtoType, "action.move.all.choose.parent.title");
    91 94 
             NavigationScopeDescriptor descriptor = scopeBuilder.build(i18nMapping, iconPath);
    92 95 
             return serializeDescriptor(descriptor);
    93 96 
         }

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/ropen/GenerateContentRootOpenableUINavigationScope.java
    ... ... @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpen
    26 26 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope;
    27 27 
     import fr.ird.observe.client.datasource.editor.spi.content.NavigationScopeBuilder;
    28 28 
     import fr.ird.observe.client.datasource.editor.spi.content.NavigationScopeDescriptor;
    29 
    +import fr.ird.observe.dto.data.UsingLayout;
    29 30
    30 31 
     import java.nio.file.Path;
    31 32
    ... ... @@ -78,6 +79,11 @@ public class GenerateContentRootOpenableUINavigationScope extends GenerateConten
    78 79 
             addI118nProperty(dtoType, "message.not.open");
    79 80 
             addI118nProperty(dtoType, "navigation.unsaved");
    80 81 
             addI118nProperty(dtoType, "action.create");
    82 
    +        if (UsingLayout.class.isAssignableFrom(dtoType)) {
    83 
    +            addI118nProperty(dtoType, "action.move.all");
    84 
    +            addI118nProperty(dtoType, "action.move.all.choose.parent.message");
    85 
    +            addI118nProperty(dtoType, "action.move.all.choose.parent.title");
    86 
    +        }
    81 87 
             NavigationScopeDescriptor descriptor = scopeBuilder.build(i18nMapping, iconPath);
    82 88 
             return serializeDescriptor(descriptor);
    83 89 
         }

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIHandlerHelper.java
    ... ... @@ -93,7 +93,7 @@ public class ContentUIHandlerHelper extends ContentUIHelperSupport {
    93 93 
                 "                .on(() -> ui.getModel().toMoveRequest().setParentCandidates((groupBy, parentId) -> getRootOpenableService().getBrothers(groupBy, parentId)))\n" +
    94 94 
                 "                .call(r -> getRootOpenableService().moveLayout(%1$s.class, r))\n" +
    95 95 
                 "                .then(%3$sMoveTreeAdapter::create)\n" +
    96 
    -            "                .install(ui::getMove);\n" +
    96 
    +            "                .install(ui::getMoveAll);\n" +
    97 97 
                 "    }\n\n";
    98 98 
         public static final String INSTALL_DELETE_SIMPLE_ACTION = "" +
    99 99 
                 "    @Override\n" +
    ... ... @@ -203,7 +203,7 @@ public class ContentUIHandlerHelper extends ContentUIHelperSupport {
    203 203 
                 "                .on(() -> ui.getModel().toMoveRequest().setParentCandidates((groupBy, parentId) -> getRootOpenableService().getBrothers(groupBy, parentId)))\n" +
    204 204 
                 "                .call(r -> getRootOpenableService().moveLayout(%1$s.class, r))\n" +
    205 205 
                 "                .then(%2$sMoveTreeAdapter::create)\n" +
    206 
    -            "                .install(ui::getMove);\n" +
    206 
    +            "                .install(ui::getMoveAll);\n" +
    207 207 
                 "    }\n\n";
    208 208
    209 209 
         public static String generateCreateNewAction(List<String> imports, GenerateJavaFileSupport generator) {

  • core/api/services/src/main/i18n/getters/labels.getter
    ... ... @@ -754,9 +754,9 @@ observe.data.ll.observation.Tdr.type
    754 754 
     observe.data.ll.observation.WeightMeasure.type
    755 755 
     observe.data.ll.observation.WeightMeasure.weight
    756 756 
     observe.data.ll.observation.WeightMeasure.weight.short
    757 
    -observe.data.ps.common.Trip.action.move
    758 
    -observe.data.ps.common.Trip.action.move.choose.parent.message
    759 
    -observe.data.ps.common.Trip.action.move.choose.parent.title
    757 
    +observe.data.ps.common.Trip.action.move.all
    758 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.message
    759 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.title
    760 760 
     observe.data.ps.common.Trip.action.openLinkFormsUrl.tip
    761 761 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip
    762 762 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus
    ... ... @@ -779,13 +779,13 @@ observe.data.ps.common.Trip.routeObs
    779 779 
     observe.data.ps.common.Trip.routeObsSize
    780 780 
     observe.data.ps.common.Trip.targetWellsSamplingAcquisitionStatusLabel.tip
    781 781 
     observe.data.ps.common.Trip.timeAtSea
    782 
    -observe.data.ps.common.TripGearUseFeatures.action.move
    783 
    -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.message
    784 
    -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.title
    782 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all
    783 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.message
    784 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.title
    785 785 
     observe.data.ps.common.TripGearUseFeatures.type
    786 
    -observe.data.ps.common.TripLocalmarket.action.move
    787 
    -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.message
    788 
    -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.title
    786 
    +observe.data.ps.common.TripLocalmarket.action.move.all
    787 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message
    788 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title
    789 789 
     observe.data.ps.common.TripLocalmarket.type
    790 790 
     observe.data.ps.common.TripLocalmarketCommon.localMarketAcquisitionStatus
    791 791 
     observe.data.ps.common.TripLocalmarketCommon.localMarketSurveySamplingAcquisitionStatus
    ... ... @@ -793,9 +793,9 @@ observe.data.ps.common.TripLocalmarketCommon.localMarketWellsSamplingAcquisition
    793 793 
     observe.data.ps.common.TripLocalmarketCommon.localmarketBatchSize
    794 794 
     observe.data.ps.common.TripLocalmarketCommon.localmarketSampleSize
    795 795 
     observe.data.ps.common.TripLocalmarketCommon.localmarketSurveySize
    796 
    -observe.data.ps.common.TripLogbook.action.move
    797 
    -observe.data.ps.common.TripLogbook.action.move.choose.parent.message
    798 
    -observe.data.ps.common.TripLogbook.action.move.choose.parent.title
    796 
    +observe.data.ps.common.TripLogbook.action.move.all
    797 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message
    798 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title
    799 799 
     observe.data.ps.common.TripLogbook.type
    800 800 
     observe.data.ps.common.TripLogbookCommon.logbookAcquisitionStatus
    801 801 
     observe.data.ps.common.TripLogbookCommon.routeLogbookSize
    ... ... @@ -815,9 +815,9 @@ observe.data.ps.landing.Landing.title
    815 815 
     observe.data.ps.landing.Landing.type
    816 816 
     observe.data.ps.landing.Landing.weight
    817 817 
     observe.data.ps.landing.Landing.weight.short
    818 
    -observe.data.ps.landing.TripLanding.action.move
    819 
    -observe.data.ps.landing.TripLanding.action.move.choose.parent.message
    820 
    -observe.data.ps.landing.TripLanding.action.move.choose.parent.title
    818 
    +observe.data.ps.landing.TripLanding.action.move.all
    819 
    +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.message
    820 
    +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.title
    821 821 
     observe.data.ps.landing.TripLanding.type
    822 822 
     observe.data.ps.localmarket.Batch.action.create
    823 823 
     observe.data.ps.localmarket.Batch.action.save
    ... ... @@ -1079,6 +1079,9 @@ observe.data.ps.observation.ObjectSchoolEstimate.totalWeight.short
    1079 1079 
     observe.data.ps.observation.ObjectSchoolEstimate.type
    1080 1080 
     observe.data.ps.observation.Route.action.create
    1081 1081 
     observe.data.ps.observation.Route.action.move
    1082 
    +observe.data.ps.observation.Route.action.move.all
    1083 
    +observe.data.ps.observation.Route.action.move.all.choose.parent.message
    1084 
    +observe.data.ps.observation.Route.action.move.all.choose.parent.title
    1082 1085 
     observe.data.ps.observation.Route.action.move.choose.parent.message
    1083 1086 
     observe.data.ps.observation.Route.action.move.choose.parent.title
    1084 1087 
     observe.data.ps.observation.Route.action.move.tip

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -879,9 +879,9 @@ observe.data.ps.Route.validation.duplicated.date=There is already another route
    879 879 
     observe.data.ps.Route.validation.invalid.quadrant=Activity quadrant at position %1$s is not consistent with trip ocean (%2$s) of trip (indian\: 1 or 2, atlantic\: 1,2,3 or 4).
    880 880 
     observe.data.ps.Route.validation.invalid.time=Observation time cant' be after the one of the previous activity (activity at position %1$s is not correct).
    881 881 
     observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Measure count (%s) must be the sum of frequencies count (%s)
    882 
    -observe.data.ps.common.Trip.action.move=Change trip
    883 
    -observe.data.ps.common.Trip.action.move.choose.parent.message=Select target trip
    884 
    -observe.data.ps.common.Trip.action.move.choose.parent.title=Move data to another trip
    882 
    +observe.data.ps.common.Trip.action.move.all=Change trip
    883 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.message=Select target trip
    884 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.title=Move data to another trip
    885 885 
     observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=View forms in a web browser
    886 886 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=View reports in a web browser
    887 887 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling
    ... ... @@ -906,13 +906,13 @@ observe.data.ps.common.Trip.routeObs=Observations
    906 906 
     observe.data.ps.common.Trip.routeObsSize=Count of observation routes
    907 907 
     observe.data.ps.common.Trip.targetWellsSamplingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for well sampling on target catches
    908 908 
     observe.data.ps.common.Trip.timeAtSea=Time at sea (h)
    909 
    -observe.data.ps.common.TripGearUseFeatures.action.move=Change trip
    910 
    -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.message=Select target trip
    911 
    -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.title=Move data to another trip
    909 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all=Change trip
    910 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.message=Select target trip
    911 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.title=Move data to another trip
    912 912 
     observe.data.ps.common.TripGearUseFeatures.type=Trip Gear uses features
    913 
    -observe.data.ps.common.TripLocalmarket.action.move=Change trip
    914 
    -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.message=Select target trip
    915 
    -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.title=Move data to another trip
    913 
    +observe.data.ps.common.TripLocalmarket.action.move.all=Change trip
    914 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message=Select target trip
    915 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title=Move data to another trip
    916 916 
     observe.data.ps.common.TripLocalmarket.type=Local market
    917 917 
     observe.data.ps.common.TripLocalmarketCommon.localMarketAcquisitionStatus=Local market collection
    918 918 
     observe.data.ps.common.TripLocalmarketCommon.localMarketSurveySamplingAcquisitionStatus=Local market dock survey
    ... ... @@ -920,9 +920,9 @@ observe.data.ps.common.TripLocalmarketCommon.localMarketWellsSamplingAcquisition
    920 920 
     observe.data.ps.common.TripLocalmarketCommon.localmarketBatchSize=Count of batches
    921 921 
     observe.data.ps.common.TripLocalmarketCommon.localmarketSampleSize=Count of samples
    922 922 
     observe.data.ps.common.TripLocalmarketCommon.localmarketSurveySize=Count of survey
    923 
    -observe.data.ps.common.TripLogbook.action.move=Change trip
    924 
    -observe.data.ps.common.TripLogbook.action.move.choose.parent.message=Select target trip
    925 
    -observe.data.ps.common.TripLogbook.action.move.choose.parent.title=Move data to another trip
    923 
    +observe.data.ps.common.TripLogbook.action.move.all=Change trip
    924 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message=Select target trip
    925 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title=Move data to another trip
    926 926 
     observe.data.ps.common.TripLogbook.type=Logbook and associate data
    927 927 
     observe.data.ps.common.TripLogbookCommon.logbookAcquisitionStatus=Logbook collection
    928 928 
     observe.data.ps.common.TripLogbookCommon.routeLogbookSize=Count of logbook routes
    ... ... @@ -945,9 +945,9 @@ observe.data.ps.landing.Landing.validation.date.after.currentPsCommonTrip.startD
    945 945 
     observe.data.ps.landing.Landing.validation.date.delay.too.long=Delay in days with trip end date is %d and can not be more than %s days.
    946 946 
     observe.data.ps.landing.Landing.weight=Weight (t)
    947 947 
     observe.data.ps.landing.Landing.weight.short=Weight
    948 
    -observe.data.ps.landing.TripLanding.action.move=Change trip
    949 
    -observe.data.ps.landing.TripLanding.action.move.choose.parent.message=Select target trip
    950 
    -observe.data.ps.landing.TripLanding.action.move.choose.parent.title=Move data to another trip
    948 
    +observe.data.ps.landing.TripLanding.action.move.all=Change trip
    949 
    +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.message=Select target trip
    950 
    +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.title=Move data to another trip
    951 951 
     observe.data.ps.landing.TripLanding.type=Trip landing
    952 952 
     observe.data.ps.localmarket.Batch.action.create=Add a new batch
    953 953 
     observe.data.ps.localmarket.Batch.action.save=Insert this batch
    ... ... @@ -1251,6 +1251,9 @@ observe.data.ps.observation.ObjectSchoolEstimate.totalWeight.short=Total weight
    1251 1251 
     observe.data.ps.observation.ObjectSchoolEstimate.type=Object school estimate
    1252 1252 
     observe.data.ps.observation.Route.action.create=Next road
    1253 1253 
     observe.data.ps.observation.Route.action.move=Change trip
    1254 
    +observe.data.ps.observation.Route.action.move.all=Change trip
    1255 
    +observe.data.ps.observation.Route.action.move.all.choose.parent.message=Select target trip
    1256 
    +observe.data.ps.observation.Route.action.move.all.choose.parent.title=Move routes to another trip
    1254 1257 
     observe.data.ps.observation.Route.action.move.choose.parent.message=Select target trip
    1255 1258 
     observe.data.ps.observation.Route.action.move.choose.parent.title=Move routes to another trip
    1256 1259 
     observe.data.ps.observation.Route.action.move.tip=Change trip of route(s)

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -879,9 +879,9 @@ observe.data.ps.Route.validation.duplicated.date=Ya existe otra ruta en esa fech
    879 879 
     observe.data.ps.Route.validation.invalid.quadrant=El cuadrante de la actividad %1$s no es coherente con el océano (%2$s) de la marea (indico \: 1,2, atlántico \: 1, 2, 3, 4)
    880 880 
     observe.data.ps.Route.validation.invalid.time=La hora de la observación de la actividad debe ser superior a la de la actividad anterior (actividad %1$s incorrecta).
    881 881 
     observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Measure count (%s) must be the sum of frequencies count (%s)
    882 
    -observe.data.ps.common.Trip.action.move=Change trip
    883 
    -observe.data.ps.common.Trip.action.move.choose.parent.message=Select target trip
    884 
    -observe.data.ps.common.Trip.action.move.choose.parent.title=Move data to another trip
    882 
    +observe.data.ps.common.Trip.action.move.all=Change trip
    883 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.message=Select target trip
    884 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.title=Move data to another trip
    885 885 
     observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=Acceder a los formularios en un navegador web
    886 886 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web
    887 887 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling TODO
    ... ... @@ -906,13 +906,13 @@ observe.data.ps.common.Trip.routeObs=Observations \#TODO
    906 906 
     observe.data.ps.common.Trip.routeObsSize=Count of observation routes
    907 907 
     observe.data.ps.common.Trip.targetWellsSamplingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for well sampling on target catches
    908 908 
     observe.data.ps.common.Trip.timeAtSea=Time at sea (h)
    909 
    -observe.data.ps.common.TripGearUseFeatures.action.move=Change trip
    910 
    -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.message=Select target trip
    911 
    -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.title=Move data to another trip
    909 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all=Change trip
    910 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.message=Select target trip
    911 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.title=Move data to another trip
    912 912 
     observe.data.ps.common.TripGearUseFeatures.type=Trip Gear uses features
    913 
    -observe.data.ps.common.TripLocalmarket.action.move=Cambiar de marea
    914 
    -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.message=Select target trip
    915 
    -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.title=Move data to another trip
    913 
    +observe.data.ps.common.TripLocalmarket.action.move.all=Cambiar de marea
    914 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message=Select target trip
    915 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title=Move data to another trip
    916 916 
     observe.data.ps.common.TripLocalmarket.type=Local market
    917 917 
     observe.data.ps.common.TripLocalmarketCommon.localMarketAcquisitionStatus=Local market collection
    918 918 
     observe.data.ps.common.TripLocalmarketCommon.localMarketSurveySamplingAcquisitionStatus=Local market dock survey TODO
    ... ... @@ -920,9 +920,9 @@ observe.data.ps.common.TripLocalmarketCommon.localMarketWellsSamplingAcquisition
    920 920 
     observe.data.ps.common.TripLocalmarketCommon.localmarketBatchSize=Count of batches
    921 921 
     observe.data.ps.common.TripLocalmarketCommon.localmarketSampleSize=Count of samples
    922 922 
     observe.data.ps.common.TripLocalmarketCommon.localmarketSurveySize=Count of survey
    923 
    -observe.data.ps.common.TripLogbook.action.move=Cambiar de marea
    924 
    -observe.data.ps.common.TripLogbook.action.move.choose.parent.message=Select target trip
    925 
    -observe.data.ps.common.TripLogbook.action.move.choose.parent.title=Move data to another trip
    923 
    +observe.data.ps.common.TripLogbook.action.move.all=Cambiar de marea
    924 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message=Select target trip
    925 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title=Move data to another trip
    926 926 
     observe.data.ps.common.TripLogbook.type=Logbook and associate data
    927 927 
     observe.data.ps.common.TripLogbookCommon.logbookAcquisitionStatus=Logbook collection TODO
    928 928 
     observe.data.ps.common.TripLogbookCommon.routeLogbookSize=Count of logbook routes
    ... ... @@ -945,9 +945,9 @@ observe.data.ps.landing.Landing.validation.date.after.currentPsCommonTrip.startD
    945 945 
     observe.data.ps.landing.Landing.validation.date.delay.too.long=Delay in days with trip end date is %d and can not be more than %s days.
    946 946 
     observe.data.ps.landing.Landing.weight=Weight (t) \#TODO
    947 947 
     observe.data.ps.landing.Landing.weight.short=Weight \#TODO
    948 
    -observe.data.ps.landing.TripLanding.action.move=Change trip
    949 
    -observe.data.ps.landing.TripLanding.action.move.choose.parent.message=Select target trip
    950 
    -observe.data.ps.landing.TripLanding.action.move.choose.parent.title=Move data to another trip
    948 
    +observe.data.ps.landing.TripLanding.action.move.all=Change trip
    949 
    +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.message=Select target trip
    950 
    +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.title=Move data to another trip
    951 951 
     observe.data.ps.landing.TripLanding.type=TripLanding
    952 952 
     observe.data.ps.localmarket.Batch.action.create=Add a new batch
    953 953 
     observe.data.ps.localmarket.Batch.action.save=Insert this batch
    ... ... @@ -1251,6 +1251,9 @@ observe.data.ps.observation.ObjectSchoolEstimate.totalWeight.short=total weight
    1251 1251 
     observe.data.ps.observation.ObjectSchoolEstimate.type=Estimación banco de objetos
    1252 1252 
     observe.data.ps.observation.Route.action.create=Ruta siguiente
    1253 1253 
     observe.data.ps.observation.Route.action.move=Cambiar de marea
    1254 
    +observe.data.ps.observation.Route.action.move.all=Cambiar de marea
    1255 
    +observe.data.ps.observation.Route.action.move.all.choose.parent.message=A qué marea quierer asociar las rutas seleccionadas ?
    1256 
    +observe.data.ps.observation.Route.action.move.all.choose.parent.title=Cambiar la marea de las rutas
    1254 1257 
     observe.data.ps.observation.Route.action.move.choose.parent.message=A qué marea quierer asociar las rutas seleccionadas ?
    1255 1258 
     observe.data.ps.observation.Route.action.move.choose.parent.title=Cambiar la marea de las rutas
    1256 1259 
     observe.data.ps.observation.Route.action.move.tip=Cambiar la marea de las rutas seleccionadas

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -879,9 +879,9 @@ observe.data.ps.Route.validation.duplicated.date=Il existe déjà une autre rout
    879 879 
     observe.data.ps.Route.validation.invalid.quadrant=Le quadrant de l’activité à la position %1$s n'est pas cohérent par rapport à l'océan (%2$s) de la marée (indien \: 1
    880 880 
     observe.data.ps.Route.validation.invalid.time=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente (activité de position %1$s incorrecte).
    881 881 
     observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Le nombre mesuré (%s) doit valoir la somme des effectifs de fréquences (%s)
    882 
    -observe.data.ps.common.Trip.action.move=Changer de marée
    883 
    -observe.data.ps.common.Trip.action.move.choose.parent.message=À quelle marée voulez-vous associer les données sélectionnées ?
    884 
    -observe.data.ps.common.Trip.action.move.choose.parent.title=Changer la marée des données sélectionnées
    882 
    +observe.data.ps.common.Trip.action.move.all=Déplacer des données
    883 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les données sélectionnées ?
    884 
    +observe.data.ps.common.Trip.action.move.all.choose.parent.title=Changer la marée des données sélectionnées
    885 885 
     observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=Accéder aux formulaires dans un navigateur web
    886 886 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web
    887 887 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Échantillonnage avancé
    ... ... @@ -906,13 +906,13 @@ observe.data.ps.common.Trip.routeObs=Route « Observations »
    906 906 
     observe.data.ps.common.Trip.routeObsSize=Nombre de routes « Observation »
    907 907 
     observe.data.ps.common.Trip.targetWellsSamplingAcquisitionStatusLabel.tip=Seuls les choix reflétant l'existence des données permettront la saisie de l'échantillonnage des cuves d'espèces cibles
    908 908 
     observe.data.ps.common.Trip.timeAtSea=Heures en mer
    909 
    -observe.data.ps.common.TripGearUseFeatures.action.move=Changer de marée
    910 
    -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.message=À quelle marée voulez-vous associer les équipements ?
    911 
    -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.title=Changer la marée des équipements
    909 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all=Tout déplacer
    910 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les équipements ?
    911 
    +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.title=Changer la marée des équipements
    912 912 
     observe.data.ps.common.TripGearUseFeatures.type=Équipement
    913 
    -observe.data.ps.common.TripLocalmarket.action.move=Changer de marée
    914 
    -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.message=À quelle marée voulez-vous associer les données du marché local .
    915 
    -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.title=Changer la marée des données du marché local
    913 
    +observe.data.ps.common.TripLocalmarket.action.move.all=Tout déplacer
    914 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les données du marché local ?
    915 
    +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title=Changer la marée des données du marché local
    916 916 
     observe.data.ps.common.TripLocalmarket.type=Marché local
    917 917 
     observe.data.ps.common.TripLocalmarketCommon.localMarketAcquisitionStatus=Collecte du marché local
    918 918 
     observe.data.ps.common.TripLocalmarketCommon.localMarketSurveySamplingAcquisitionStatus=Échantillonnage du marché local à quai (sondages)
    ... ... @@ -920,9 +920,9 @@ observe.data.ps.common.TripLocalmarketCommon.localMarketWellsSamplingAcquisition
    920 920 
     observe.data.ps.common.TripLocalmarketCommon.localmarketBatchSize=Nombre de lots
    921 921 
     observe.data.ps.common.TripLocalmarketCommon.localmarketSampleSize=Nombre d'échantillonnages
    922 922 
     observe.data.ps.common.TripLocalmarketCommon.localmarketSurveySize=Nombre d'enquètes
    923 
    -observe.data.ps.common.TripLogbook.action.move=Changer de marée
    924 
    -observe.data.ps.common.TripLogbook.action.move.choose.parent.message=A quelle marée voulez-vous associer les données du livre de bord ?
    925 
    -observe.data.ps.common.TripLogbook.action.move.choose.parent.title=Changer la marée des données du livre de bord
    923 
    +observe.data.ps.common.TripLogbook.action.move.all=Tout déplacer
    924 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message=A quelle marée voulez-vous associer les données du livre de bord ?
    925 
    +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title=Changer la marée des données du livre de bord
    926 926 
     observe.data.ps.common.TripLogbook.type=Livre de bord et données associées
    927 927 
     observe.data.ps.common.TripLogbookCommon.logbookAcquisitionStatus=Collecte du logbook
    928 928 
     observe.data.ps.common.TripLogbookCommon.routeLogbookSize=Nombre de routes « Livre de Bord »
    ... ... @@ -945,9 +945,9 @@ observe.data.ps.landing.Landing.validation.date.after.currentPsCommonTrip.startD
    945 945 
     observe.data.ps.landing.Landing.validation.date.delay.too.long=Le délai avec la date de fin de marée est de %s jour(s) et ne doit pas dépasser %s jour(s).
    946 946 
     observe.data.ps.landing.Landing.weight=Poids (en t)
    947 947 
     observe.data.ps.landing.Landing.weight.short=Poids (en t)
    948 
    -observe.data.ps.landing.TripLanding.action.move=Changer de marée
    949 
    -observe.data.ps.landing.TripLanding.action.move.choose.parent.message=À quelle marée voulez-vous associer les débarquements ?
    950 
    -observe.data.ps.landing.TripLanding.action.move.choose.parent.title=Changer la marée des débarquements
    948 
    +observe.data.ps.landing.TripLanding.action.move.all=Tout déplacer
    949 
    +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les débarquements ?
    950 
    +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.title=Changer la marée des débarquements
    951 951 
     observe.data.ps.landing.TripLanding.type=Débarquement
    952 952 
     observe.data.ps.localmarket.Batch.action.create=Nouveau lot
    953 953 
     observe.data.ps.localmarket.Batch.action.save=Insérer ce lot
    ... ... @@ -967,7 +967,7 @@ observe.data.ps.localmarket.Batch.weight.observed.tip=Le poids estimé a été o
    967 967 
     observe.data.ps.localmarket.Batch.weight.short=Poids
    968 968 
     observe.data.ps.localmarket.Batch.weight.validation.required=Le nombre ou le poids doit être renseigné (mais pas les deux).
    969 969 
     observe.data.ps.localmarket.Sample.action.create=Échantillonnage au port suivant
    970 
    -observe.data.ps.localmarket.Sample.action.move=Changer de marée
    970 
    +observe.data.ps.localmarket.Sample.action.move=Changer de marée
    971 971 
     observe.data.ps.localmarket.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillonnages sélectionnés ?
    972 972 
     observe.data.ps.localmarket.Sample.action.move.choose.parent.title=Changer la marée des échantillonnages
    973 973 
     observe.data.ps.localmarket.Sample.action.move.tip=Changer la marée des échantillonnages sélectionnés
    ... ... @@ -1251,6 +1251,9 @@ observe.data.ps.observation.ObjectSchoolEstimate.totalWeight.short=Poids total
    1251 1251 
     observe.data.ps.observation.ObjectSchoolEstimate.type=Estimation banc objet
    1252 1252 
     observe.data.ps.observation.Route.action.create=Route suivante
    1253 1253 
     observe.data.ps.observation.Route.action.move=Changer de marée
    1254 
    +observe.data.ps.observation.Route.action.move.all=Tout déplacer
    1255 
    +observe.data.ps.observation.Route.action.move.all.choose.parent.message=A quelle marée voulez-vous associer toutes les routes ?
    1256 
    +observe.data.ps.observation.Route.action.move.all.choose.parent.title=Changer la marée des routes
    1254 1257 
     observe.data.ps.observation.Route.action.move.choose.parent.message=A quelle marée voulez-vous associer les routes sélectionnées ?
    1255 1258 
     observe.data.ps.observation.Route.action.move.choose.parent.title=Changer la marée des routes
    1256 1259 
     observe.data.ps.observation.Route.action.move.tip=Changer la marée des routes sélectionnées

  • model/src/main/models/Observe/dto/class/i18nLabels.properties
    ... ... @@ -86,7 +86,7 @@ data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselN
    86 86 
     data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,lengthMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd
    87 87 
     data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus
    88 88 
     data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod
    89 
    -data.ps.observation.Route=activity,comment,date,endLogValue,startLogValue,choice.create.fin.veille.activity,choice.not.create.fin.veille.activity.and.continue,message.need.fin.veille.activity
    89 
    +data.ps.observation.Route=activity,comment,date,endLogValue,startLogValue,choice.create.fin.veille.activity,choice.not.create.fin.veille.activity.and.continue,message.need.fin.veille.activity,action.move.all,action.move.all.choose.parent.message,action.move.all.choose.parent.title
    90 90 
     data.ps.observation.Sample=species,sampleMeasure,speciesFate,length.computed.tip,length.observed.tip,message.cantAdd,weight.computed.tip,weight.observed.tip
    91 91 
     data.ps.observation.SampleMeasure=comment,count,length,lengthMeasureMethod,picturesReferences,sex,sizeMeasureType,species,speciesFate,tagNumber,weight,weightMeasureMethod,weightMeasureType,type
    92 92 
     data.ps.observation.SchoolEstimate=meanWeight,species,totalWeight,weightMeasureMethod

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.