Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e42f8ae6 by tchemit at 2018-11-26T12:20:21Z update license header - - - - - 12 changed files: - client-core/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/initStorage_es_ES.ftl - client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl - client-core/src/main/i18n/templates/validationReport_es_ES.ftl - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIModel.java - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql Changes: ===================================== client-core/src/main/i18n/templates/about_es_ES.ftl ===================================== @@ -8,12 +8,10 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -53,4 +51,4 @@ </dl> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl ===================================== @@ -377,4 +377,4 @@ </ul> </#if> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl ===================================== @@ -75,4 +75,4 @@ v ${connection.version} </#if> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl ===================================== @@ -50,4 +50,4 @@ Permisos: v ${version} </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl ===================================== @@ -58,4 +58,4 @@ No es necesario. </#if> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/initStorage_es_ES.ftl ===================================== @@ -8,12 +8,10 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -39,4 +37,4 @@ Ahora puede: </ul> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl ===================================== @@ -73,4 +73,4 @@ <#else> NINGÚN MODELO DE ALMACENAMIENTO </#if> -</#macro> \ No newline at end of file +</#macro> ===================================== client-core/src/main/i18n/templates/validationReport_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Información al cliente + ObServe :: Client core %% Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io %% @@ -58,4 +58,4 @@ </table> </#list> </body> -</html> \ No newline at end of file +</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; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <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 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <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 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <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 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); 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); 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); -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 +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: https://gitlab.com/ultreiaio/ird-observe/commit/e42f8ae6043ad755ea6be08e9f4f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e42f8ae6043ad755ea6be08e9f4f... You're receiving this email because of your account on gitlab.com.