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

Commits:

12 changed files:

Changes:

  • client-core/src/main/i18n/templates/about_es_ES.ftl
    ... ... @@ -8,12 +8,10 @@
    8 8 
      it under the terms of the GNU General Public License as
    9 9 
      published by the Free Software Foundation, either version 3 of the
    10 10 
      License, or (at your option) any later version.
    11 
    -
    12 11 
      This program is distributed in the hope that it will be useful,
    13 12 
      but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 13 
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 14 
      GNU General Public License for more details.
    16 
    -
    17 15 
      You should have received a copy of the GNU General Public
    18 16 
      License along with this program.  If not, see
    19 17 
      <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -53,4 +51,4 @@
    53 51 
     </dl>
    54 52
    55 53 
     </body>
    56 
    -</html>
    \ No newline at end of file
    54 
    +</html>

  • client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl
    ... ... @@ -377,4 +377,4 @@
    377 377 
       </ul>
    378 378 
       </#if>
    379 379 
     </body>
    380 
    -</html>
    \ No newline at end of file
    380 
    +</html>

  • client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl
    ... ... @@ -75,4 +75,4 @@ v ${connection.version}
    75 75 
     </#if>
    76 76
    77 77 
     </body>
    78 
    -</html>
    \ No newline at end of file
    78 
    +</html>

  • client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl
    ... ... @@ -50,4 +50,4 @@ Permisos:
    50 50 
     v ${version}
    51 51
    52 52 
     </body>
    53 
    -</html>
    \ No newline at end of file
    53 
    +</html>

  • client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl
    ... ... @@ -58,4 +58,4 @@
    58 58 
         No es necesario.
    59 59 
       </#if>
    60 60 
     </body>
    61 
    -</html>
    \ No newline at end of file
    61 
    +</html>

  • client-core/src/main/i18n/templates/initStorage_es_ES.ftl
    ... ... @@ -8,12 +8,10 @@
    8 8 
      it under the terms of the GNU General Public License as
    9 9 
      published by the Free Software Foundation, either version 3 of the
    10 10 
      License, or (at your option) any later version.
    11 
    -
    12 11 
      This program is distributed in the hope that it will be useful,
    13 12 
      but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 13 
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 14 
      GNU General Public License for more details.
    16 
    -
    17 15 
      You should have received a copy of the GNU General Public
    18 16 
      License along with this program.  If not, see
    19 17 
      <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -39,4 +37,4 @@ Ahora puede:
    39 37 
     </ul>
    40 38
    41 39 
     </body>
    42 
    -</html>
    \ No newline at end of file
    40 
    +</html>

  • client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl
    ... ... @@ -73,4 +73,4 @@
    73 73 
       <#else>
    74 74 
       NINGÚN MODELO DE ALMACENAMIENTO
    75 75 
       </#if>
    76 
    -</#macro>
    \ No newline at end of file
    76 
    +</#macro>

  • client-core/src/main/i18n/templates/validationReport_es_ES.ftl
    1 1 
     <#--
    2 2 
      #%L
    3 
    - ObServe :: Información al cliente
    3 
    + ObServe :: Client core
    4 4 
      %%
    5 5 
      Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    6 6 
      %%
    ... ... @@ -58,4 +58,4 @@
    58 58 
     </table>
    59 59 
     </#list>
    60 60 
     </body>
    61 
    -</html>
    \ No newline at end of file
    61 
    +</html>

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java
    ... ... @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.actions.main.menu.config;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java
    ... ... @@ -8,12 +8,12 @@
    8 8 
      * it under the terms of the GNU General Public License as
    9 9 
      * published by the Free Software Foundation, either version 3 of the
    10 10 
      * License, or (at your option) any later version.
    11 
    - *
    11 
    + *
    12 12 
      * This program is distributed in the hope that it will be useful,
    13 13 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 14 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 15 
      * GNU General Public License for more details.
    16 
    - *
    16 
    + *
    17 17 
      * You should have received a copy of the GNU General Public
    18 18 
      * License along with this program.  If not, see
    19 19 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.

  • client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIModel.java
    ... ... @@ -8,12 +8,12 @@
    8 8 
      * it under the terms of the GNU General Public License as
    9 9 
      * published by the Free Software Foundation, either version 3 of the
    10 10 
      * License, or (at your option) any later version.
    11 
    - *
    11 
    + *
    12 12 
      * This program is distributed in the hope that it will be useful,
    13 13 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 14 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 15 
      * GNU General Public License for more details.
    16 
    - *
    16 
    + *
    17 17 
      * You should have received a copy of the GNU General Public
    18 18 
      * License along with this program.  If not, see
    19 19 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.

  • persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql
    ... ... @@ -98,4 +98,4 @@ INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate
    98 98 
     INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.80',0, '2018-11-12','2018-11-12 17:27:06.06232','6-3','8',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',					null, true, 'Tuna seiner (or skiff)','Thonier (ou skiff)','Atunero (oó panga)',null, null, null, null, null, false, false, null);
    99 99 
     INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.81',0, '2018-11-12','2018-11-12 17:27:06.06232','6-4','9',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',					null, true, 'Supply','Bateau d’appui','Macicero',null, null, null, null, null, false, false, null);
    100 100 
     INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.82',0, '2018-11-12','2018-11-12 17:27:06.06232','6-5','5*, 6*, 21*',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',		null, null, 'Tagged','Balisé','Marcado',null, null, null, null, null, false, false, null);
    101 
    -INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.100',0, '2018-11-12','2018-11-12 17:27:06.06232','6-6','16',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, true, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',				null, null, ' Raft or buoy drifting','Radeau ou bouée en dérive','Parilla o buoy a la deriva',null, null, null, null, null, false, false, null);
    \ No newline at end of file
    101 
    +INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.100',0, '2018-11-12','2018-11-12 17:27:06.06232','6-6','16',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, true, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',				null, null, ' Raft or buoy drifting','Radeau ou bouée en dérive','Parilla o buoy a la deriva',null, null, null, null, null, false, false, null);

    • —
    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.