From 77fe80af865827f0ddcbe48cbe8e7bcb9192ae0e Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Tue, 27 Feb 2024 09:06:48 +0100
Subject: [PATCH 01/14] =?UTF-8?q?:fix=20params:=20mise=20=C3=A0=20niveau?=
 =?UTF-8?q?=20des=20param=C3=A8tres=20en=20anglais?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 documentation/sturwild23.dbm          | 146 +++++++++++++-------------
 install/translatedb/parameters_en.ods | Bin 21320 -> 20316 bytes
 install/translatedb/updateparam.php   |   2 +-
 3 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/documentation/sturwild23.dbm b/documentation/sturwild23.dbm
index 030c5156..aa391718 100644
--- a/documentation/sturwild23.dbm
+++ b/documentation/sturwild23.dbm
@@ -3,8 +3,8 @@
 CAUTION: Do not modify this file unless you know what you are doing.
  Unexpected results may occur if the code is changed deliberately.
 -->
-<dbmodel pgmodeler-ver="1.0.6" use-changelog="false" author="Éric Quinton" last-position="0,383" last-zoom="0.65" max-obj-count="60"
-	 default-schema="sturwild" default-owner="sturwild_owner"
+<dbmodel pgmodeler-ver="1.0.6" use-changelog="false" author="Éric Quinton" last-position="0,0" last-zoom="0.65" max-obj-count="60"
+	 default-schema="sturwild" default-owner="sturwild"
 	 layers="Default layer"
 	 active-layers="0"
 	 layer-name-colors="#000000"
@@ -16,14 +16,14 @@ CAUTION: Do not modify this file unless you know what you are doing.
  sql-disabled="true">
 </role>
 
-<role name="sturwild_owner"
+<role name="sturwild"
  inherit="true"
  login="true"
  password="sturwildPassword">
 </role>
 
 <database name="sturwild" encoding="UTF8" lc-collate="C.UTF-8" lc-ctype="C.UTF-8" is-template="false" allow-conns="true">
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<tablespace name="pg_default"/>
 </database>
 
@@ -31,11 +31,11 @@ CAUTION: Do not modify this file unless you know what you are doing.
 </schema>
 
 <schema name="sturwild" layers="0" fill-color="#a0418f">
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </schema>
 
 <schema name="sturwildgacl" layers="0" rect-visible="true" fill-color="#e01b24">
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </schema>
 
 <tag name="location">
@@ -81,12 +81,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="capture_state_capture_state_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="capture_state" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des états à la capture]]> </comment>
 	<tag name="fish"/>
 	<position x="900" y="1460"/>
@@ -110,12 +110,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="capture_method_capture_method_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="capture_method" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Mode de capture des poissons]]> </comment>
 	<tag name="declaration"/>
 	<position x="460" y="40"/>
@@ -139,12 +139,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="origin_origin_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="origin" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Type de capture (professionnelle, amateur, scientifique...)]]> </comment>
 	<tag name="declaration"/>
 	<position x="900" y="40"/>
@@ -168,12 +168,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="ices_ices_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="ices" layers="0" collapse-mode="2" max-obj-count="2" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des zones de peche CIEM]]> </comment>
 	<tag name="location"/>
 	<position x="1280" y="40"/>
@@ -190,12 +190,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="dbparam_dbparam_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="dbparam" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table of parameters intrinsically associated to the instance]]> </comment>
 	<position x="2180" y="1280"/>
 	<column name="dbparam_id" not-null="true" sequence="sturwild.dbparam_dbparam_id_seq">
@@ -226,12 +226,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="dbversion_dbversion_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="dbversion" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des versions de la base de donnees]]> </comment>
 	<position x="2180" y="1460"/>
 	<column name="dbversion_id" not-null="true" sequence="sturwild.dbversion_dbversion_id_seq">
@@ -257,12 +257,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="declaration_declaration_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="declaration" layers="0" collapse-mode="2" max-obj-count="39" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Informations liées à la déclaration.]]> </comment>
 	<tag name="declaration"/>
 	<position x="460" y="240"/>
@@ -391,12 +391,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="fate_fate_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="fate" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Devenir des esturgeons capturés]]> </comment>
 	<tag name="fish"/>
 	<position x="20" y="760"/>
@@ -420,12 +420,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="document_document_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="document" layers="0" collapse-mode="2" max-obj-count="12" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Documents numériques rattachés à un poisson ou à un événement]]> </comment>
 	<tag name="fish"/>
 	<position x="20" y="1280"/>
@@ -469,12 +469,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="gear_type_gear_type_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="gear_type" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des engins utilisés]]> </comment>
 	<tag name="declaration"/>
 	<position x="20" y="540"/>
@@ -498,12 +498,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="species_species_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="species" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<tag name="fish"/>
 	<position x="20" y="1040"/>
 	<column name="species_id" not-null="true" sequence="sturwild.species_species_id_seq">
@@ -528,17 +528,17 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="estuaire_area_id_0_seq" cycle="false" start="1" increment="1" min-value="1" max-value="2147483647" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <sequence name="event_event_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="event" layers="0" collapse-mode="2" max-obj-count="7" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<tag name="declaration"/>
 	<position x="20" y="260"/>
 	<column name="event_id" not-null="true" sequence="sturwild.event_event_id_seq">
@@ -568,12 +568,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="event_type_event_type_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="event_type" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Types d'événements possibles sur une déclaration]]> </comment>
 	<tag name="declaration"/>
 	<position x="20" y="40"/>
@@ -597,12 +597,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="fish_fish_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="fish" layers="0" collapse-mode="2" max-obj-count="19" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<tag name="fish"/>
 	<position x="460" y="1280"/>
 	<column name="fish_id" not-null="true" sequence="sturwild.fish_fish_id_seq">
@@ -670,7 +670,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <table name="location" layers="0" collapse-mode="2" max-obj-count="20" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<tag name="location"/>
 	<position x="1280" y="260"/>
 	<column name="declaration_id" not-null="true">
@@ -740,17 +740,17 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="environment_environment_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <sequence name="environment_detail_environment_detail_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="environment_detail" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Milieu détaillé]]> </comment>
 	<tag name="location"/>
 	<position x="1740" y="460"/>
@@ -774,7 +774,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <table name="environment" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des milieux]]> </comment>
 	<tag name="location"/>
 	<position x="1740" y="260"/>
@@ -800,12 +800,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="mime_type_mime_type_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="mime_type" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des types mime, pour les documents associés]]> </comment>
 	<tag name="fish"/>
 	<position x="20" y="1660"/>
@@ -827,12 +827,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="country_country_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="country" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Pays de pêche]]> </comment>
 	<tag name="location"/>
 	<position x="1740" y="40"/>
@@ -856,12 +856,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="accuracy_accuracy_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="2147483647" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="accuracy" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Précision de la localisation du point GPS]]> </comment>
 	<tag name="location"/>
 	<position x="1740" y="760"/>
@@ -885,12 +885,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="tag_presence_tag_presence_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="tag_presence" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des types de présence de marque (présent, non signalé, absent)]]> </comment>
 	<tag name="fish"/>
 	<position x="900" y="1660"/>
@@ -914,12 +914,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="request_request_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="2147483647" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="request" layers="0" collapse-mode="2" max-obj-count="8" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Request table in database]]> </comment>
 	<position x="2180" y="1040"/>
 	<column name="request_id" not-null="true" sequence="sturwild.request_request_id_seq">
@@ -956,12 +956,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="status_status_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="status" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des statuts de la déclaration]]> </comment>
 	<tag name="declaration"/>
 	<position x="900" y="240"/>
@@ -985,7 +985,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <table name="aclacl" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des droits attribués]]> </comment>
 	<tag name="gacl"/>
 	<position x="3000" y="40"/>
@@ -1010,12 +1010,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="aclaco_aclaco_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="aclaco" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des droits gérés]]> </comment>
 	<tag name="gacl"/>
 	<position x="2580" y="40"/>
@@ -1043,12 +1043,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="aclappli_aclappli_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="aclappli" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des applications gérées]]> </comment>
 	<tag name="gacl"/>
 	<position x="2180" y="40"/>
@@ -1075,12 +1075,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="aclgroup_aclgroup_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="aclgroup" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Groupes des logins]]> </comment>
 	<tag name="gacl"/>
 	<position x="3000" y="260"/>
@@ -1108,12 +1108,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="acllogin_acllogin_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="acllogin" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des logins des utilisateurs autorisés]]> </comment>
 	<tag name="gacl"/>
 	<position x="2180" y="260"/>
@@ -1143,7 +1143,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <table name="acllogingroup" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table des relations entre les logins et les groupes]]> </comment>
 	<tag name="gacl"/>
 	<position x="2580" y="260"/>
@@ -1166,12 +1166,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="log_log_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="log" layers="0" collapse-mode="2" max-obj-count="7" z-value="0">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Liste des connexions ou des actions enregistrées]]> </comment>
 	<tag name="gacl"/>
 	<position x="3000" y="460"/>
@@ -1203,12 +1203,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="seq_logingestion_id" cycle="false" start="1" increment="1" min-value="1" max-value="999999" cache="1">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="logingestion" layers="0" collapse-mode="2" max-obj-count="15" z-value="0">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<tag name="gacl"/>
 	<position x="2180" y="460"/>
 	<column name="id" not-null="true" sequence="sturwildgacl.seq_logingestion_id">
@@ -1264,12 +1264,12 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <sequence name="passwordlost_passwordlost_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 </sequence>
 
 <table name="passwordlost" layers="0" collapse-mode="2" max-obj-count="6" z-value="0">
 	<schema name="sturwildgacl"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Table de suivi des pertes de mots de passe]]> </comment>
 	<tag name="gacl"/>
 	<position x="2580" y="460"/>
@@ -1564,7 +1564,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <table name="handling" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[Types of handling used after catch]]> </comment>
 	<tag name="declaration"/>
 	<position x="900" y="1040"/>
@@ -1588,7 +1588,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <table name="declaration_handling" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[List of all handling for a declaration]]> </comment>
 	<tag name="declaration"/>
 	<position x="900" y="860"/>
@@ -1629,7 +1629,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 
 <table name="target_species" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[List of species targeted]]> </comment>
 	<tag name="declaration"/>
 	<position x="900" y="420"/>
@@ -1700,7 +1700,7 @@ group by declaration_id]]> </expression>
 
 <table name="fish_handling" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<tag name="fish"/>
 	<position x="900" y="1280"/>
 </table>
@@ -1921,7 +1921,7 @@ left outer join sturwild.v_fish_handlings using (fish_id)]]> </expression>
 
 <table name="institute" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
+	<role name="sturwild"/>
 	<comment> <![CDATA[List of institute partners]]> </comment>
 	<tag name="declaration"/>
 	<position x="900" y="660"/>
diff --git a/install/translatedb/parameters_en.ods b/install/translatedb/parameters_en.ods
index ea7231f9d9aba58631e9e7b9689894f8faa82f83..862a441b19320b656c050ee98eb1b0b991d601e0 100644
GIT binary patch
literal 20316
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
KVNKd|T7LpxuKAq+

literal 21320
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
OiJp<Q(mP=RfWHCvHj07(

diff --git a/install/translatedb/updateparam.php b/install/translatedb/updateparam.php
index d56d1e54..5ea712d5 100644
--- a/install/translatedb/updateparam.php
+++ b/install/translatedb/updateparam.php
@@ -2,7 +2,7 @@
 //require_once "../../vendor/autoload.php";
 require_once "modules/classes/param.class.php";
 //use PhpOffice\PhpSpreadsheet\Spreadsheet;
-$inputFileName = "install/translatedb/parameters.ods";
+$inputFileName = "install/translatedb/parameters_en.ods";
 
 $classeur = \PhpOffice\PhpSpreadsheet\IOFactory::load($inputFileName);
 $sheetnames = $classeur->getSheetNames();

From 16f0acaf640fbe565bb85d7a868e1b37afb8688b Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Wed, 28 Feb 2024 09:35:20 +0100
Subject: [PATCH 02/14] :fix framework: correction du message de modification
 du mot de passe

---
 display/templates/about.tpl        | 2 +-
 display/templates/apropos_en.tpl   | 2 +-
 display/templates/enpied.tpl       | 2 +-
 framework/identification/login.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/display/templates/about.tpl b/display/templates/about.tpl
index 548b449d..477c5006 100644
--- a/display/templates/about.tpl
+++ b/display/templates/about.tpl
@@ -4,7 +4,7 @@
 </p>
 
 
-    <h3>Copyright © 2014-2023 - Eric Quinton - EABX - INRAE</h3>
+    <h3>Copyright © 2014-2024 - Eric Quinton - EABX - INRAE</h3>
 <p>
 
 <br>
diff --git a/display/templates/apropos_en.tpl b/display/templates/apropos_en.tpl
index fac0481b..bb4c9e9d 100755
--- a/display/templates/apropos_en.tpl
+++ b/display/templates/apropos_en.tpl
@@ -2,7 +2,7 @@
 <p>
     Version {$version} of {$versiondate}.
 </p>
-<h3>Copyright © 2015-2023 - INRAE</h3>
+<h3>Copyright © 2015-2024 - INRAE</h3>
 <p>
     STURWILD is an application to record and consult the incidental catches of sturgeon.
 </p>
diff --git a/display/templates/enpied.tpl b/display/templates/enpied.tpl
index 62222395..2f807a23 100755
--- a/display/templates/enpied.tpl
+++ b/display/templates/enpied.tpl
@@ -1,6 +1,6 @@
 <div class="container">
   <p class="text-muted">
-    {t}Copyright © 2015- 2023 - Tous droits réservés. Auteur : Éric Quinton, pour EABX - INRAE - Logiciel diffusé sous licence AGPL{/t}
+    {t}Copyright © 2015- 2024 - Tous droits réservés. Auteur : Éric Quinton, pour EABX - INRAE - Logiciel diffusé sous licence AGPL{/t}
     <br>
     {t}En cas de problème :{/t}&nbsp;
     <a href="{$appliAssist}">{$appliAssist}</a>
diff --git a/framework/identification/login.php b/framework/identification/login.php
index bcdf967c..c017f831 100644
--- a/framework/identification/login.php
+++ b/framework/identification/login.php
@@ -90,7 +90,7 @@
              */
             $data = $dataClass->lireByLogin($_SESSION["login"]);
             if (!empty($data["mail"]) && $MAIL_enabled == 1) {
-
+                $subject = $_SESSION["APPLI_title"] ." - ". _("Changement de mot de passe");
                 require_once "framework/utils/mail.class.php";
                 $mail = new Mail($MAIL_param);
                 $data["APPLI_address"] = $APPLI_address;

From 45f46b755cfee1c65fe89d056cb7b9694eb59add Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Wed, 28 Feb 2024 10:40:37 +0100
Subject: [PATCH 03/14] :fix upgrade: correction dans le script de maj de la
 bdd

---
 install/pgsql/alter_23.0-24.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/pgsql/alter_23.0-24.0.sql b/install/pgsql/alter_23.0-24.0.sql
index 0e3c0f85..f3931fff 100644
--- a/install/pgsql/alter_23.0-24.0.sql
+++ b/install/pgsql/alter_23.0-24.0.sql
@@ -187,4 +187,4 @@ ON DELETE SET NULL ON UPDATE CASCADE;
 
 insert into sturwild.dbversion (dbversion_number, dbversion_date)
 values
-('24.0', '2024-00-05');
\ No newline at end of file
+('24.0', '2024-02-05');
\ No newline at end of file

From 872b66f6619a42b8ffc75a0eb068572a15cfd48b Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Wed, 28 Feb 2024 10:55:14 +0100
Subject: [PATCH 04/14] =?UTF-8?q?:fix=20version:=20correction=20du=20num?=
 =?UTF-8?q?=C3=A9ro=20de=20la=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 param/param.default.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/param/param.default.inc.php b/param/param.default.inc.php
index 311f5bd3..b93e667a 100755
--- a/param/param.default.inc.php
+++ b/param/param.default.inc.php
@@ -5,7 +5,7 @@
 *
 * Parametres par defaut de l'application
 */
-$APPLI_version = "24.0.0";
+$APPLI_version = "v24.0.0";
 $APPLI_dbversion = "24.0";
 $APPLI_versiondate = _("05/02/2024");
 $language = "fr";

From 9f625259ef5afa5a8a55ba10fdfe842feb01c5d6 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Wed, 28 Feb 2024 12:15:45 +0100
Subject: [PATCH 05/14] =?UTF-8?q?:fix=20db:=20correction=20des=20scripts?=
 =?UTF-8?q?=20de=20cr=C3=A9ation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 documentation/sturwild23.dbm   | 484 ++-------------------------------
 install/init_by_psql.sql       |   4 +-
 install/pgsql/createtables.sql |   2 +-
 3 files changed, 19 insertions(+), 471 deletions(-)

diff --git a/documentation/sturwild23.dbm b/documentation/sturwild23.dbm
index aa391718..acc15706 100644
--- a/documentation/sturwild23.dbm
+++ b/documentation/sturwild23.dbm
@@ -3,8 +3,8 @@
 CAUTION: Do not modify this file unless you know what you are doing.
  Unexpected results may occur if the code is changed deliberately.
 -->
-<dbmodel pgmodeler-ver="1.0.6" use-changelog="false" author="Éric Quinton" last-position="0,0" last-zoom="0.65" max-obj-count="60"
-	 default-schema="sturwild" default-owner="sturwild"
+<dbmodel pgmodeler-ver="1.0.6" use-changelog="false" last-position="0,0" last-zoom="1" max-obj-count="44"
+	 default-owner="postgres"
 	 layers="Default layer"
 	 active-layers="0"
 	 layer-name-colors="#000000"
@@ -273,7 +273,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 	<column name="status_id" not-null="true">
 		<type name="integer" length="0"/>
 	</column>
-	<column name="capture_method_id" default-value="1">
+	<column name="capture_method_id">
 		<type name="integer" length="0"/>
 	</column>
 	<column name="origin_id" not-null="true">
@@ -387,6 +387,16 @@ CAUTION: Do not modify this file unless you know what you are doing.
 	<constraint name="capture_id" type="pk-constr" table="sturwild.declaration">
 		<columns names="declaration_id" ref-type="src-columns"/>
 	</constraint>
+
+	<customidxs object-type="column">
+		<object name="institute_id" index="32"/>
+		<object name="target_species_id" index="31"/>
+	</customidxs>
+
+	<customidxs object-type="constraint">
+		<object name="institute_fk" index="9"/>
+		<object name="target_species_fk" index="8"/>
+	</customidxs>
 </table>
 
 <sequence name="fate_fate_id_seq" cycle="false" start="1" increment="1" min-value="1" max-value="9223372036854775807" cache="1">
@@ -1335,233 +1345,6 @@ CAUTION: Do not modify this file unless you know what you are doing.
 		</idxelement>
 </index>
 
-<view name="v_location" layers="0" collapse-mode="2" max-obj-count="1" z-value="0">
-	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
-	<tag name="location"/>
-	<position x="1740" y="1040"/>
-	<reference>
-		<expression> <![CDATA[SELECT location.declaration_id,
-    location.geom,
-    location.longitude_dd,
-    location.latitude_dd,
-    country.country_name,
-    ices.ices_name,
-    environment.environment_name,
-    status.status_name,
-    capture_method.capture_method_name,
-    origin.origin_name,
-    gear_type.gear_type_name,
-    capture_state.capture_state_name,
-    fate.fate_name,
-    species.species_name,
-    declaration.capture_date,
-    declaration.year,
-    declaration.caught_number,
-    declaration.estimated_capture_date,
-    declaration.gear_mesh,
-    declaration.target_species,
-    declaration.depth,
-    declaration.depth_min,
-    declaration.depth_max,
-    declaration.length_min,
-    declaration.length_max,
-    declaration.weight_min,
-    declaration.weight_max,
-    declaration.fisher_code,
-    declaration.contact,
-    declaration.harbour_vessel,
-    declaration.declaration_mode,
-    declaration.handling,
-    declaration.identification_quality
-   FROM sturwild.location
-     JOIN sturwild.declaration USING (declaration_id)
-     LEFT JOIN sturwild.status USING (status_id)
-     LEFT JOIN sturwild.species USING (species_id)
-     LEFT JOIN sturwild.capture_method USING (capture_method_id)
-     LEFT JOIN sturwild.origin USING (origin_id)
-     LEFT JOIN sturwild.gear_type USING (gear_type_id)
-     LEFT JOIN sturwild.capture_state USING (capture_state_id)
-     LEFT JOIN sturwild.country USING (country_id)
-     LEFT JOIN sturwild.ices USING (ices_id)
-     LEFT JOIN sturwild.environment USING (environment_id)
-     LEFT JOIN sturwild.fate USING (fate_id)]]> </expression>
-	<column name="geom">
-		<type name="geometry" length="0"/>
-	</column>
-	<column name="longitude_dd">
-		<type name="double precision" length="0"/>
-	</column>
-	<column name="latitude_dd">
-		<type name="double precision" length="0"/>
-	</column>
-	<column name="country_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="ices_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="environment_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="status_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="capture_method_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="origin_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="gear_type_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="capture_state_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="fate_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="species_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="capture_date">
-		<type name="timestamp" length="0"/>
-	</column>
-	<column name="year">
-		<type name="smallint" length="0"/>
-	</column>
-	<column name="caught_numer">
-		<type name="smallint" length="0"/>
-	</column>
-	<column name="estimated_capture_date">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="gear_mesh">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="target_species">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="depth">
-		<type name="real" length="0"/>
-	</column>
-	<column name="depth_min">
-		<type name="real" length="0"/>
-	</column>
-	<column name="depth_max">
-		<type name="real" length="0"/>
-	</column>
-	<column name="length_min">
-		<type name="real" length="0"/>
-	</column>
-	<column name="length_max">
-		<type name="real" length="0"/>
-	</column>
-	<column name="weight_min">
-		<type name="real" length="0"/>
-	</column>
-	<column name="weight_max">
-		<type name="real" length="0"/>
-	</column>
-	<column name="fisher_code">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="contact">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="harbour_vessel">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="declaration_mode">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="handling">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="identification_quality">
-		<type name="varchar" length="0"/>
-	</column>
-		<reftable name="sturwild.location"/>
-		<reftable name="sturwild.country"/>
-		<reftable name="sturwild.ices"/>
-		<reftable name="sturwild.environment"/>
-		<reftable name="sturwild.status"/>
-		<reftable name="sturwild.species"/>
-		<reftable name="sturwild.capture_method"/>
-		<reftable name="sturwild.origin"/>
-		<reftable name="sturwild.gear_type"/>
-		<reftable name="sturwild.capture_state"/>
-		<reftable name="sturwild.fate"/>
-	</reference>
-</view>
-
-<relationship name="rel_v_location_location" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.location"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_country" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.country"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_ices" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.ices"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_environment" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.environment"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_status" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.status"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_species" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.species"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_capture_method" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.capture_method"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_origin" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.origin"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_gear_type" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.gear_type"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_capture_state" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.capture_state"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_location_fate" type="reltv" layers="0"
-	 custom-color="#33d17a"
-	 src-table="sturwild.v_location"
-	 dst-table="sturwild.fate"
-	 src-required="false" dst-required="false"/>
-
 <table name="handling" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
 	<schema name="sturwild"/>
 	<role name="sturwild"/>
@@ -1660,44 +1443,6 @@ CAUTION: Do not modify this file unless you know what you are doing.
 	 dst-table="sturwild.declaration"
 	 src-required="false" dst-required="false"/>
 
-<view name="v_declaration_handlings" layers="0" collapse-mode="2" max-obj-count="1" z-value="0">
-	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
-	<tag name="declaration"/>
-	<position x="1320" y="1040"/>
-	<reference>
-		<expression> <![CDATA[select declaration_id, 
-array_to_string(array_agg(handling_name order by handling_name),',') as handlings_name,
-array_to_string(array_agg(handling_exchange order by handling_exchange), ',') as handlings_exchange
-from sturwild.declaration_handling
-join sturwild.handling using (handling_id)
-group by declaration_id]]> </expression>
-	<column name="declaration_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="handlings_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="handlings_exchange">
-		<type name="varchar" length="0"/>
-	</column>
-		<reftable name="sturwild.declaration_handling"/>
-		<reftable name="sturwild.handling"/>
-	</reference>
-</view>
-
-<relationship name="rel_v_handlings_declaration_handling" type="reltv" layers="0"
-	 custom-color="#1c71d8"
-	 src-table="sturwild.v_declaration_handlings"
-	 dst-table="sturwild.declaration_handling"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_handlings_handling" type="reltv" layers="0"
-	 custom-color="#1c71d8"
-	 src-table="sturwild.v_declaration_handlings"
-	 dst-table="sturwild.handling"
-	 src-required="false" dst-required="false"/>
-
 <table name="fish_handling" layers="0" collapse-mode="2" max-obj-count="3" z-value="0">
 	<schema name="sturwild"/>
 	<role name="sturwild"/>
@@ -1705,166 +1450,6 @@ group by declaration_id]]> </expression>
 	<position x="900" y="1280"/>
 </table>
 
-<view name="v_fish_handlings" layers="0" collapse-mode="2" max-obj-count="1" z-value="0">
-	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
-	<tag name="fish"/>
-	<position x="1320" y="1160"/>
-	<reference>
-		<expression> <![CDATA[select fish_id, 
-array_to_string(array_agg(handling_name order by handling_name),',') as handlings_name,
-array_to_string(array_agg(handling_exchange order by handling_exchange), ',') as handlings_exchange
-from sturwild.fish_handling
-join sturwild.handling using (handling_id)
-group by fish_id]]> </expression>
-	<column name="fish_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="handlings_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="handlings_exchange">
-		<type name="varchar" length="0"/>
-	</column>
-		<reftable name="sturwild.fish"/>
-		<reftable name="sturwild.handling"/>
-	</reference>
-</view>
-
-<relationship name="rel_v_fish_handlings_fish" type="reltv" layers="0"
-	 custom-color="#ff7800"
-	 src-table="sturwild.v_fish_handlings"
-	 dst-table="sturwild.fish"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_fish_handlings_handling" type="reltv" layers="0"
-	 custom-color="#ff7800"
-	 src-table="sturwild.v_fish_handlings"
-	 dst-table="sturwild.handling"
-	 src-required="false" dst-required="false"/>
-
-<view name="v_fish" layers="0" collapse-mode="2" max-obj-count="1" z-value="0">
-	<schema name="sturwild"/>
-	<role name="sturwild_owner"/>
-	<comment> <![CDATA[Detail of a fish]]> </comment>
-	<tag name="fish"/>
-	<position x="1320" y="1280"/>
-	<reference>
-		<expression> <![CDATA[select fish_id, declaration_id
-,f.fate_id, fate_name
-,f.species_id, species_name
-,f.capture_state_id, capture_state_name
-,tag_presence_id, tag_presence_name
-,handlings
-,tag_number, fish_length, estimated_cohort, validated_cohort
-,background, f.remarks
-identification_quality_id
-from sturwild.fish f
-join sturwild.declaration d using(declaration_id)
-left outer join sturwild.species s on  (s.species_id = f.species_id)
-left outer join sturwild.capture_state cs on (cs.capture_state_id = f.capture_state_id)
-left outer join sturwild.tag_presence using (tag_presence_id)
-left outer join sturwild.fate fa on (fa.fate_id = f.fate_id)
-left outer join sturwild.v_fish_handlings using (fish_id)]]> </expression>
-	<column name="fish_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="declaration_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="fate_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="species_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="capture_state_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="tag_presence_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="fate_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="species_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="capture_state_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="tag_presence_name">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="tag_number">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="estimated_cohort">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="handlings">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="background">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="remarks">
-		<type name="varchar" length="0"/>
-	</column>
-	<column name="identification_quality">
-		<type name="int2" length="0"/>
-	</column>
-	<column name="validated_cohort">
-		<type name="int2" length="0"/>
-	</column>
-	<column name="weight">
-		<type name="float4" length="0"/>
-	</column>
-		<reftable name="sturwild.fish"/>
-		<reftable name="sturwild.declaration"/>
-		<reftable name="sturwild.capture_state"/>
-		<reftable name="sturwild.tag_presence"/>
-		<reftable name="sturwild.species"/>
-		<reftable name="sturwild.fish_handling"/>
-	</reference>
-</view>
-
-<relationship name="rel_v_fish_fish" type="reltv" layers="0"
-	 custom-color="#ff7800"
-	 src-table="sturwild.v_fish"
-	 dst-table="sturwild.fish"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_fish_declaration" type="reltv" layers="0"
-	 custom-color="#ff7800"
-	 src-table="sturwild.v_fish"
-	 dst-table="sturwild.declaration"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_fish_capture_state" type="reltv" layers="0"
-	 custom-color="#ff7800"
-	 src-table="sturwild.v_fish"
-	 dst-table="sturwild.capture_state"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_fish_tag_presence" type="reltv" layers="0"
-	 custom-color="#ff7800"
-	 src-table="sturwild.v_fish"
-	 dst-table="sturwild.tag_presence"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_fish_species" type="reltv" layers="0"
-	 custom-color="#ff7800"
-	 src-table="sturwild.v_fish"
-	 dst-table="sturwild.species"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_v_fish_fish_handling" type="reltv" layers="0"
-	 custom-color="#ff7800"
-	 src-table="sturwild.v_fish"
-	 dst-table="sturwild.fish_handling"
-	 src-required="false" dst-required="false"/>
-
 <relationship name="fish_has_many_fish_handling" type="rel1n" layers="0"
 	 src-col-pattern="{sc}"
 	 pk-pattern="{dt}_pk" uq-pattern="{dt}_uq"
@@ -2127,189 +1712,152 @@ left outer join sturwild.v_fish_handlings using (fish_id)]]> </expression>
 </constraint>
 
 <relationship name="rel_declaration_capture_state" type="relfk" layers="0"
-	 custom-color="#ff7800"
 	 src-table="sturwild.declaration"
 	 dst-table="sturwild.capture_state" reference-fk="capture_etat_declaration_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_declaration_capture_method" type="relfk" layers="0"
-	 custom-color="#3584e4"
 	 src-table="sturwild.declaration"
 	 dst-table="sturwild.capture_method" reference-fk="capture_mode_capture_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_declaration_origin" type="relfk" layers="0"
-	 custom-color="#3584e4"
 	 src-table="sturwild.declaration"
 	 dst-table="sturwild.origin" reference-fk="capture_type_capture_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_declaration_fate" type="relfk" layers="0"
-	 custom-color="#3584e4"
 	 src-table="sturwild.declaration"
 	 dst-table="sturwild.fate" reference-fk="devenir_declaration_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_declaration_gear_type" type="relfk" layers="0"
-	 custom-color="#3584e4"
 	 src-table="sturwild.declaration"
 	 dst-table="sturwild.gear_type" reference-fk="engin_type_declaration_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_declaration_species" type="relfk" layers="0"
-	 custom-color="#3584e4"
 	 src-table="sturwild.declaration"
 	 dst-table="sturwild.species" reference-fk="espece_declaration_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_declaration_status" type="relfk" layers="0"
-	 custom-color="#3584e4"
 	 src-table="sturwild.declaration"
 	 dst-table="sturwild.status" reference-fk="statut_declaration_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_document_fish" type="relfk" layers="0"
-	 custom-color="#ff7800"
 	 src-table="sturwild.document"
 	 dst-table="sturwild.fish" reference-fk="individu_document_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_document_mime_type" type="relfk" layers="0"
-	 custom-color="#ff7800"
 	 src-table="sturwild.document"
 	 dst-table="sturwild.mime_type" reference-fk="mime_type_document_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_event_declaration" type="relfk" layers="0"
-	 custom-color="#3584e4"
 	 src-table="sturwild.event"
 	 dst-table="sturwild.declaration" reference-fk="evenement_capture_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_event_event_type" type="relfk" layers="0"
-	 custom-color="#3584e4"
 	 src-table="sturwild.event"
 	 dst-table="sturwild.event_type" reference-fk="evenement_type_evenement_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_fish_capture_state" type="relfk" layers="0"
-	 custom-color="#ff7800"
 	 src-table="sturwild.fish"
 	 dst-table="sturwild.capture_state" reference-fk="capture_etat_individu_fk"
-	 src-required="false" dst-required="false">
-	<label ref-type="name-label">
-		<position x="0" y="0"/>
-	</label>
-</relationship>
+	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_fish_declaration" type="relfk" layers="0"
-	 custom-color="#ff7800"
 	 src-table="sturwild.fish"
 	 dst-table="sturwild.declaration" reference-fk="capture_individu_fk1"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_fish_fate" type="relfk" layers="0"
-	 custom-color="#ff7800"
 	 src-table="sturwild.fish"
 	 dst-table="sturwild.fate" reference-fk="devenir_individu_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_fish_species" type="relfk" layers="0"
-	 custom-color="#ff7800"
 	 src-table="sturwild.fish"
 	 dst-table="sturwild.species" reference-fk="espece_individu_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_fish_tag_presence" type="relfk" layers="0"
-	 custom-color="#ff7800"
 	 src-table="sturwild.fish"
 	 dst-table="sturwild.tag_presence" reference-fk="presence_marque_individu_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_location_ices" type="relfk" layers="0"
-	 custom-color="#33d17a"
 	 src-table="sturwild.location"
 	 dst-table="sturwild.ices" reference-fk="ciem_localisation_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_location_declaration" type="relfk" layers="0"
-	 custom-color="#3584e4"
 	 src-table="sturwild.location"
 	 dst-table="sturwild.declaration" reference-fk="declaration_localisation_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_location_environment_detail" type="relfk" layers="0"
-	 custom-color="#33d17a"
 	 src-table="sturwild.location"
 	 dst-table="sturwild.environment_detail" reference-fk="milieu_detail_localisation_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_location_environment" type="relfk" layers="0"
-	 custom-color="#33d17a"
 	 src-table="sturwild.location"
 	 dst-table="sturwild.environment" reference-fk="milieu_localisation_fk"
-	 src-required="false" dst-required="false">
-	<label ref-type="name-label">
-		<position x="0" y="0"/>
-	</label>
-</relationship>
+	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_location_country" type="relfk" layers="0"
-	 custom-color="#33d17a"
 	 src-table="sturwild.location"
 	 dst-table="sturwild.country" reference-fk="pays_localisation_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_location_accuracy" type="relfk" layers="0"
-	 custom-color="#33d17a"
 	 src-table="sturwild.location"
 	 dst-table="sturwild.accuracy" reference-fk="precision_fk"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_aclacl_aclaco" type="relfk" layers="0"
-	 custom-color="#c01c28"
 	 src-table="sturwildgacl.aclacl"
 	 dst-table="sturwildgacl.aclaco" reference-fk="aclaco_aclacl_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_aclacl_aclgroup" type="relfk" layers="0"
-	 custom-color="#c01c28"
 	 src-table="sturwildgacl.aclacl"
 	 dst-table="sturwildgacl.aclgroup" reference-fk="aclgroup_aclacl_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_aclaco_aclappli" type="relfk" layers="0"
-	 custom-color="#c01c28"
 	 src-table="sturwildgacl.aclaco"
 	 dst-table="sturwildgacl.aclappli" reference-fk="aclappli_aclaco_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_aclgroup_aclgroup" type="relfk" layers="0"
-	 custom-color="#c01c28"
 	 src-table="sturwildgacl.aclgroup"
 	 dst-table="sturwildgacl.aclgroup" reference-fk="aclgroup_aclgroup_fk"
 	 src-required="false" dst-required="false">
 	<line>
-		<position x="3372.75" y="299.575"/>
+		<position x="3372.75" y="315.975"/>
 	<position x="3372.75" y="227"/>
 	<position x="3226.5" y="227"/>
 	</line>
 </relationship>
 
 <relationship name="rel_acllogingroup_aclgroup" type="relfk" layers="0"
-	 custom-color="#c01c28"
 	 src-table="sturwildgacl.acllogingroup"
 	 dst-table="sturwildgacl.aclgroup" reference-fk="aclgroup_acllogingroup_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_acllogingroup_acllogin" type="relfk" layers="0"
-	 custom-color="#c01c28"
 	 src-table="sturwildgacl.acllogingroup"
 	 dst-table="sturwildgacl.acllogin" reference-fk="acllogin_acllogingroup_fk"
 	 src-required="false" dst-required="true"/>
 
 <relationship name="rel_passwordlost_logingestion" type="relfk" layers="0"
-	 custom-color="#c01c28"
 	 src-table="sturwildgacl.passwordlost"
 	 dst-table="sturwildgacl.logingestion" reference-fk="logingestion_passwordlost_fk"
 	 src-required="false" dst-required="true"/>
diff --git a/install/init_by_psql.sql b/install/init_by_psql.sql
index bf4271fe..55358fe6 100644
--- a/install/init_by_psql.sql
+++ b/install/init_by_psql.sql
@@ -12,13 +12,13 @@ CREATE USER sturwild WITH
 /*
  * Database creation
  */
-create database sturwild owner sturwild_owner;
+create database sturwild owner sturwild;
 \c "dbname=sturwild"
  create extension if not exists postgis schema public;
  create extension if not exists pgcrypto schema public;
 
 
-\c "dbname=sturwild user=sturwild_owner password=sturwildPassword host=localhost"
+\c "dbname=sturwild user=sturwild password=sturwildPassword host=localhost"
 
 /**
  * create structure
diff --git a/install/pgsql/createtables.sql b/install/pgsql/createtables.sql
index 644165e1..755d6ca3 100644
--- a/install/pgsql/createtables.sql
+++ b/install/pgsql/createtables.sql
@@ -248,7 +248,7 @@ ALTER SEQUENCE sturwild.declaration_declaration_id_seq OWNER TO sturwild;
 CREATE TABLE sturwild.declaration (
 	declaration_id integer NOT NULL DEFAULT nextval('sturwild.declaration_declaration_id_seq'::regclass),
 	status_id integer NOT NULL,
-	capture_method_id integer DEFAULT 1,
+	capture_method_id integer,
 	origin_id integer NOT NULL,
 	gear_type_id integer,
 	species_id integer,

From 001cf4f8e46da475118a25c11980ef37d1c21a89 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Wed, 28 Feb 2024 15:11:16 +0100
Subject: [PATCH 06/14] =?UTF-8?q?:feat=20parameters:=20ajout=20de=20l'impo?=
 =?UTF-8?q?rt=20des=20param=C3=A8tres?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Depuis un fichier ODS
---
 display/templates/param/translateDb.tpl  |  38 +++++++++++++++++
 framework/identification/login.class.php |   2 +-
 install/translatedb/parameters_en.ods    | Bin 20316 -> 19083 bytes
 install/translatedb/updateparam.php      |  37 ----------------
 modules/param/updateparam.php            |  52 +++++++++++++++++++++++
 param/actions.xml                        |   4 ++
 param/menu.xml                           |   2 +
 7 files changed, 97 insertions(+), 38 deletions(-)
 create mode 100644 display/templates/param/translateDb.tpl
 delete mode 100644 install/translatedb/updateparam.php
 create mode 100644 modules/param/updateparam.php

diff --git a/display/templates/param/translateDb.tpl b/display/templates/param/translateDb.tpl
new file mode 100644
index 00000000..1eff7ef8
--- /dev/null
+++ b/display/templates/param/translateDb.tpl
@@ -0,0 +1,38 @@
+<div class="row">
+    <h2>{t}Import ou mise à jour des tables de paramètres{/t}</h2>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        <form class="form-horizontal" id="updateparamExec" method="post" action="index.php" enctype="multipart/form-data">
+            <input type="hidden" name="module" value="updateparamExec">
+            <div class="form-group">
+                <label for="upfile" class="control-label col-md-4"><span class="red">*</span>
+                    {t}Nom du fichier à importer (ODS) :{/t}
+                </label>
+                <div class="col-md-8">
+                    <input type="file" name="upfile" class="form-control" accept=".ods" required>
+                </div>
+            </div>
+            <div class="center">
+                <button type="submit" class="btn btn-danger">{t}Déclencher l'import{/t}</button>
+            </div>
+        </form>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-6 bg-info">
+        {t}Ce module permet d'importer ou de mettre à jour l'ensemble des tables de paramètres à partir d'un fichier ODS{/t}
+        <br>
+        {t}Le fichier doit contenir une feuille par table (le nom de la feuille doit être strictement équivalent au nom de la table){/t}
+        <br>
+        {t}Chaque feuille doit contenir impérativement les colonnes suivantes (conservez l'ordre des colonnes) :{/t}
+        <br>
+        <ul>
+            <li>id : {t}laissée à vide{/t}</li>
+            <li>name : {t}nom dans la langue courante{/t}</li>
+            <li>exchange : {t}nom en anglais, utilisé pour les échanges{/t}</li>
+            <li>order : {t}ordre d'affichage des enregistrements{/t}</li>
+        </ul>
+    </div>
+</div>
+
diff --git a/framework/identification/login.class.php b/framework/identification/login.class.php
index 1c54f5e3..d7b85338 100644
--- a/framework/identification/login.class.php
+++ b/framework/identification/login.class.php
@@ -27,7 +27,7 @@ function __construct($bdd, $param = array())
 
   function getLogin(string $type_authentification, $modeAdmin = false): ?string
   {
-    global  $privateKey, $pubKey, $CONNEXION_blocking_duration, $CONNEXION_max_attempts;
+    global  $privateKey, $pubKey, $CONNEXION_blocking_duration, $CONNEXION_max_attempts,$message;
     $tauth = "";
     $this->loginGestion->attemptdelay = $CONNEXION_blocking_duration;
     $this->loginGestion->nbattempts = $CONNEXION_max_attempts;
diff --git a/install/translatedb/parameters_en.ods b/install/translatedb/parameters_en.ods
index 862a441b19320b656c050ee98eb1b0b991d601e0..c649f362e27899e95f5c3791f35ebec5840efbbf 100644
GIT binary patch
delta 17117
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
DVwjxp

delta 18408
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

diff --git a/install/translatedb/updateparam.php b/install/translatedb/updateparam.php
deleted file mode 100644
index 5ea712d5..00000000
--- a/install/translatedb/updateparam.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-//require_once "../../vendor/autoload.php";
-require_once "modules/classes/param.class.php";
-//use PhpOffice\PhpSpreadsheet\Spreadsheet;
-$inputFileName = "install/translatedb/parameters_en.ods";
-
-$classeur = \PhpOffice\PhpSpreadsheet\IOFactory::load($inputFileName);
-$sheetnames = $classeur->getSheetNames();
-
-try {
-    foreach ($sheetnames as $sheetname) {
-        $sheet = $classeur->getSheetByName($sheetname);
-        $message->set("Traitement de la feuille/table $sheetname");
-        $param = new Param($bdd, $sheetname);
-        $ok = true;
-        $row = 2;
-
-        while ($ok) {
-            $id = $sheet->getCellByColumnAndRow(1, $row)->getValue();
-            if (!empty($id)) {
-                $data = array(
-                    $sheetname . "_id" => $id,
-                    $sheetname . "_name" => $sheet->getCellByColumnAndRow(2, $row)->getValue(),
-                    $sheetname . "_exchange" => $sheet->getCellByColumnAndRow(3, $row)->getValue(),
-                    $sheetname . "_order" => $sheet->getCellByColumnAndRow(4, $row)->getValue()
-                );
-                $param->ecrire($data);
-                $row ++;
-            } else {
-                $ok = false;
-            }
-        }
-    }
-} catch (Exception $e) {
-    $message->set($e->getMessage(), true);
-}
-$module_coderetour = 1;
diff --git a/modules/param/updateparam.php b/modules/param/updateparam.php
new file mode 100644
index 00000000..fcf2de64
--- /dev/null
+++ b/modules/param/updateparam.php
@@ -0,0 +1,52 @@
+<?php
+
+switch ($t_module["param"]) {
+    case "display":
+        $vue->set("param/translateDb.tpl", "corps");
+        break;
+    case "exec":
+        //require_once "../../vendor/autoload.php";
+        require_once "modules/classes/param.class.php";
+        //use PhpOffice\PhpSpreadsheet\Spreadsheet;
+        try {
+            if (!file_exists($_FILES['upfile']['tmp_name'])) {
+                throw new Exception(_("Le fichier n'a pas pu être téléchargé"));
+            }
+            //$inputFileName = "install/translatedb/parameters_en.ods";
+
+            $classeur = \PhpOffice\PhpSpreadsheet\IOFactory::load($_FILES['upfile']['tmp_name']);
+            $sheetnames = $classeur->getSheetNames();
+            foreach ($sheetnames as $sheetname) {
+                $sheet = $classeur->getSheetByName($sheetname);
+                $message->set(sprintf(_("Traitement de la feuille/table %s"), $sheetname));
+                $param = new Param($bdd, $sheetname);
+                $ok = true;
+                $row = 2;
+
+                while ($ok) {
+                    $exchangeName = $sheet->getCellByColumnAndRow(3, $row)->getValue();
+                    if (!empty($exchangeName)) {
+                        /**
+                         * Search from existent exchange name
+                         */
+                        $id = $param->getIdFromName($exchangeName);
+                        $data = array(
+                            $sheetname . "_id" => $id,
+                            $sheetname . "_name" => $sheet->getCellByColumnAndRow(2, $row)->getValue(),
+                            $sheetname . "_exchange" => $exchangeName,
+                            $sheetname . "_order" => $sheet->getCellByColumnAndRow(4, $row)->getValue()
+                        );
+                        $param->ecrire($data);
+                        $row++;
+                    } else {
+                        $ok = false;
+                    }
+                }
+            }
+        } catch (Exception $e) {
+            $message->set($e->getMessage(), true);
+            $module_coderetour = -1;
+        }
+        $module_coderetour = 1;
+        break;
+}
diff --git a/param/actions.xml b/param/actions.xml
index 6ee9ab5d..382ea406 100755
--- a/param/actions.xml
+++ b/param/actions.xml
@@ -134,6 +134,10 @@
 	<importJSONExec action="modules/declaration/import.php" param="jsonExec" droits="param" modulebefore="importJSONControl,importJSONDisplay" retourok="importJSONDisplay" retourko="importJSONDisplay"/>
 
 	<!-- migration en-->
+	<!--
 	<updateparam action="install/translatedb/updateparam.php" droits="admin" retourok="default" retourko="default"/>
 	<generateParamEn  action="install/translatedb/generate_param_en.php" droits="admin" retourok="default" retourko="default"/>
+	-->
+	<updateparamDisplay action="modules/param/updateparam.php" param="display" droits="admin,param" type="smarty"/>
+	<updateparamExec action="modules/param/updateparam.php" param="exec" droits="admin,param" modulebefore="updateparamDisplay,updateparamExec" retourok="updateparamDisplay" retourko="updateparamDisplay"/>
 </navigation>
diff --git a/param/menu.xml b/param/menu.xml
index 2762b9e1..04f7d415 100644
--- a/param/menu.xml
+++ b/param/menu.xml
@@ -54,6 +54,8 @@
 			tooltip="Liste des types d'événements" droits="gestion" />
 		<item module="statusList" label="Statuts" tooltip="Liste des statuts des déclarations"
 			droits="gestion" />
+		<item divider="1" droits="param,admin"/>
+		<item module="updateparamDisplay" label="Importer les paramètres" tooltip="Importer ou mettre à jour les paramètres depuis une feuille de calcul ODS" droits="param,admin"/> 
 	</item>
 	<item module="administration" label="Administration" tooltip="Administration de l'application"
 		droits="admin">

From 5b02972a8b9d869eb13eeb42dab6eff4bf4c6409 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Wed, 28 Feb 2024 16:42:40 +0100
Subject: [PATCH 07/14] :fix translation: ajout de balises manquantes dans les
 templates

---
 display/templates/declaration/declarationChange.tpl  | 7 ++++---
 display/templates/declaration/declarationGeneral.tpl | 2 +-
 modules/declaration/declaration.php                  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/display/templates/declaration/declarationChange.tpl b/display/templates/declaration/declarationChange.tpl
index 13a7658b..e80f36e1 100644
--- a/display/templates/declaration/declarationChange.tpl
+++ b/display/templates/declaration/declarationChange.tpl
@@ -90,7 +90,8 @@ Retour au détail</a>
 					</label>
 					<div class="col-sm-8" id="capture_date_zone">
 						<input class="datepicker form-control" id="capture_date" name="capture_date" value="{$data.capture_date}">
-						(<input id="estimated_capture_date" name="estimated_capture_date" value="{$data.estimated_capture_date}" placeholder="période ou heure de la capture" title="Période ou heur de la capture">)
+						(<input id="estimated_capture_date" name="estimated_capture_date" value="{$data.estimated_capture_date}" 
+						placeholder="{t}période ou heure de la capture{/t}" title="{t}Période ou heure de la capture{/t}">)
 					</div>
 				</div>
 				<div class="form-group">
@@ -99,8 +100,8 @@ Retour au détail</a>
 					</label>
 					<div class="col-sm-8" id="depth_zone">
 						<input class="nombre form-control" id="depth" name="depth" value="{$data.depth}">
-						({t}de :{/t} <input name="depth_min" id="depth_min" value="{$data.depth_min}" placeholder="min" class="nombre num5"> m.
-						{t}à :{/t} <input name="depth_max" id="depth_max" value="{$data.depth_max}" placeholder="max" class="nombre num5"> m.)
+						({t}de :{/t} <input name="depth_min" id="depth_min" value="{$data.depth_min}" placeholder="{t}min{/t}" class="nombre num5"> m.
+						{t}à :{/t} <input name="depth_max" id="depth_max" value="{$data.depth_max}" placeholder="{t}max{/t}" class="nombre num5"> m.)
 					</div>
 				</div>
 				<div class="form-group">
diff --git a/display/templates/declaration/declarationGeneral.tpl b/display/templates/declaration/declarationGeneral.tpl
index 535f72eb..edbe4994 100644
--- a/display/templates/declaration/declarationGeneral.tpl
+++ b/display/templates/declaration/declarationGeneral.tpl
@@ -23,7 +23,7 @@
   <dd>{$data.year}</dd>
   </dl>
   <dl class="dl-horizontal">
-    <dt>{t}Date de capture :{/t}{if !empty($data.estimated_capture_date)}(période/heure){/if}</dt>
+    <dt>{t}Date de capture :{/t}{if !empty($data.estimated_capture_date)}({t}période/heure{/t}){/if}</dt>
     <dd>{$data.capture_date}{if !empty($data.estimated_capture_date)}&nbsp;({$data.estimated_capture_date}){/if}</dd>
   </dl>
   <dl class="dl-horizontal">
diff --git a/modules/declaration/declaration.php b/modules/declaration/declaration.php
index 8cc5b5e5..d4f66776 100644
--- a/modules/declaration/declaration.php
+++ b/modules/declaration/declaration.php
@@ -140,7 +140,7 @@
             $statusOld = $dataStatus["status_id"];
         }
         $id = dataWrite($dataClass, $_REQUEST);
-        if ($id >= 0) {
+        if ($id > 0) {
             $_REQUEST[$keyName] = $id;
             /*
              * Traitement du changement de status : envoi d'un message si le status vaut 3 ou 4

From a96057d4ade9b2b5530ca3e4fcbe19455a360914 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Wed, 28 Feb 2024 16:52:43 +0100
Subject: [PATCH 08/14] =?UTF-8?q?:feat=20locale:=20mise=20=C3=A0=20niveau?=
 =?UTF-8?q?=20des=20traductions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../declaration/declarationGeneral.tpl        |   3 +-
 locales/C/LC_MESSAGES/_old.po                 |  45 +-
 locales/C/LC_MESSAGES/en.mo                   | Bin 64633 -> 66949 bytes
 locales/C/LC_MESSAGES/en.po                   | 430 +++++++++++-------
 4 files changed, 314 insertions(+), 164 deletions(-)

diff --git a/display/templates/declaration/declarationGeneral.tpl b/display/templates/declaration/declarationGeneral.tpl
index edbe4994..acc1ac53 100644
--- a/display/templates/declaration/declarationGeneral.tpl
+++ b/display/templates/declaration/declarationGeneral.tpl
@@ -1,7 +1,8 @@
 <div class="row">
 {if $droits.gestion ==1}
 <a href="index.php?module=declarationChange&declaration_id={$data.declaration_id}">
-<img src="display/images/edit.gif" height="20">Modifier...
+<img src="display/images/edit.gif" height="20">
+{t}Modifier...{/t}
 </a>
 {/if}
 </div>
diff --git a/locales/C/LC_MESSAGES/_old.po b/locales/C/LC_MESSAGES/_old.po
index 23abb4e5..c1c3ad0b 100644
--- a/locales/C/LC_MESSAGES/_old.po
+++ b/locales/C/LC_MESSAGES/_old.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-05 15:26+0100\n"
+"POT-Creation-Date: 2024-02-05 15:33+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -472,32 +472,42 @@ msgid "Quoi de neuf dans l'application ?"
 msgstr "What's new in the app?"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:112
+#: ../../../param/menu.xml:111
+msgid "Nouvelle version ?"
+msgstr "New version?"
+
+#. (itstool) path: item/item@tooltip
+#: ../../../param/menu.xml:111
+msgid "Rechercher s'il existe une nouvelle version disponible de l'application"
+msgstr "Find out if there is a new version of the application available"
+
+#. (itstool) path: item/item@label
+#: ../../../param/menu.xml:113
 msgid "Lexique"
 msgstr "Glossary"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:112
+#: ../../../param/menu.xml:113
 msgid "Lexique des termes utilisés dans le logiciel"
 msgstr "Glossary of terms used in the software"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:113
+#: ../../../param/menu.xml:114
 msgid "Français"
 msgstr "Français"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:113
+#: ../../../param/menu.xml:114
 msgid "Libellés en français"
 msgstr "Libellés en français"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:114
+#: ../../../param/menu.xml:115
 msgid "English"
 msgstr "English"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:114
+#: ../../../param/menu.xml:115
 msgid "Labels in English"
 msgstr "Labels in English"
 
@@ -3428,6 +3438,24 @@ msgstr "Process to the backup"
 msgid "Liste des nouveautés"
 msgstr "List of news"
 
+#: ../../../display/templates/framework/utils/lastRelease.tpl:18
+msgid "Dernière version publiée"
+msgstr "Last published version"
+
+#: ../../../display/templates/framework/utils/lastRelease.tpl:20
+msgid "Version actuelle : "
+msgstr "Current version:"
+
+#: ../../../display/templates/framework/utils/lastRelease.tpl:21
+msgid "Dernière version publiée : "
+msgstr "Last published release:"
+
+#: ../../../display/templates/framework/utils/lastRelease.tpl:23
+msgid ""
+"Vous pouvez demander la mise à jour de votre plate-forme à vos "
+"administrateurs !"
+msgstr "You can ask your administrators to update your platform!"
+
 #: ../../../display/templates/framework/utils/system.tpl:8
 msgid "Nom de la variable"
 msgstr "Name of the variable"
@@ -5738,9 +5766,6 @@ msgstr "Version %1 of %2."
 #~ msgid "Modification d'un modèle d'export"
 #~ msgstr "Create / Edit an export model"
 
-#~ msgid "Version :"
-#~ msgstr "Version:"
-
 #~ msgid "Fichier compressé (si un seul fichier généré) ?"
 #~ msgstr "Zipped file (if only one file is generated)?"
 
diff --git a/locales/C/LC_MESSAGES/en.mo b/locales/C/LC_MESSAGES/en.mo
index c54c4616edc569dd77c0198a7b7ba2fe6fe33037..6e5f018e45d05993904789ad61a242ec8cbe0508 100644
GIT binary patch
delta 17142
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
DdWiMP

delta 15198
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
G82x{Po3P0M

diff --git a/locales/C/LC_MESSAGES/en.po b/locales/C/LC_MESSAGES/en.po
index c1c3ad0b..16afb1a6 100644
--- a/locales/C/LC_MESSAGES/en.po
+++ b/locales/C/LC_MESSAGES/en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-05 15:33+0100\n"
+"POT-Creation-Date: 2024-02-28 16:46+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -10,7 +10,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.4.1\n"
+"X-Generator: Poedit 3.4.2\n"
 "X-Poedit-Basepath: ../../../param\n"
 "X-Poedit-SearchPath-0: menu.xml\n"
 
@@ -104,8 +104,11 @@ msgid "Pays"
 msgstr "Country"
 
 #. (itstool) path: item/item@tooltip
+#. (itstool) path: navigation/countryList@tabledescription
+#. (itstool) path: navigation/countryChange@tabledescription
 #: ../../../param/menu.xml:27
 #: ../../../display/templates/param/countryList.tpl:1
+#: ../../../param/actions.xml:69 ../../../param/actions.xml:70
 msgid "Liste des pays"
 msgstr "List of contries"
 
@@ -115,7 +118,10 @@ msgid "Milieux"
 msgstr "Environments"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:28
+#. (itstool) path: navigation/environmentList@tabledescription
+#. (itstool) path: navigation/environmentChange@tabledescription
+#: ../../../param/menu.xml:28 ../../../param/actions.xml:109
+#: ../../../param/actions.xml:110
 msgid "Liste des milieux"
 msgstr "List of environments"
 
@@ -125,7 +131,10 @@ msgid "Milieux détaillés"
 msgstr "Detailed environments"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:30
+#. (itstool) path: navigation/environment_detailList@tabledescription
+#. (itstool) path: navigation/environment_detailChange@tabledescription
+#: ../../../param/menu.xml:30 ../../../param/actions.xml:104
+#: ../../../param/actions.xml:105
 msgid "Liste des milieux détaillés"
 msgstr "List of detailed environments"
 
@@ -165,7 +174,10 @@ msgid "Méthodes de capture"
 msgstr "Methods of capture"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:39
+#. (itstool) path: navigation/capture_methodList@tabledescription
+#. (itstool) path: navigation/capture_methodChange@tabledescription
+#: ../../../param/menu.xml:39 ../../../param/actions.xml:89
+#: ../../../param/actions.xml:90
 msgid "Liste des méthodes de capture"
 msgstr "List of capture methods"
 
@@ -175,7 +187,10 @@ msgid "Origine des captures"
 msgstr "Origin of captures"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:41
+#. (itstool) path: navigation/originList@tabledescription
+#. (itstool) path: navigation/originChange@tabledescription
+#: ../../../param/menu.xml:41 ../../../param/actions.xml:84
+#: ../../../param/actions.xml:85
 msgid "Liste des origines des captures"
 msgstr "List of origins of captures"
 
@@ -185,7 +200,10 @@ msgid "États à la capture"
 msgstr "States at the catch"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:43
+#. (itstool) path: navigation/capture_stateList@tabledescription
+#. (itstool) path: navigation/capture_stateChange@tabledescription
+#: ../../../param/menu.xml:43 ../../../param/actions.xml:79
+#: ../../../param/actions.xml:80
 msgid "Liste des états à la capture"
 msgstr "List of states at catch"
 
@@ -216,7 +234,10 @@ msgid "Espèces ciblées"
 msgstr "Target species"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:49
+#. (itstool) path: navigation/target_speciesList@tabledescription
+#. (itstool) path: navigation/target_speciesChange@tabledescription
+#: ../../../param/menu.xml:49 ../../../param/actions.xml:114
+#: ../../../param/actions.xml:115
 msgid "Liste des espèces ciblées"
 msgstr "List of targeted species"
 
@@ -236,7 +257,10 @@ msgid "Types d'événements"
 msgstr "Event types"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:54
+#. (itstool) path: navigation/event_typeList@tabledescription
+#. (itstool) path: navigation/event_typeChange@tabledescription
+#: ../../../param/menu.xml:54 ../../../param/actions.xml:74
+#: ../../../param/actions.xml:75
 msgid "Liste des types d'événements"
 msgstr "List of event types"
 
@@ -250,264 +274,275 @@ msgstr "Status"
 msgid "Liste des statuts des déclarations"
 msgstr "List of declaration status"
 
+#. (itstool) path: item/item@label
+#: ../../../param/menu.xml:58
+msgid "Importer les paramètres"
+msgstr "Import parameters"
+
+#. (itstool) path: item/item@tooltip
+#: ../../../param/menu.xml:58
+msgid ""
+"Importer ou mettre à jour les paramètres depuis une feuille de calcul ODS"
+msgstr "Import or update parameters from an ODS spreadsheet"
+
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:59
+#: ../../../param/menu.xml:61
 msgid "Administration"
 msgstr "Administration"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:59
+#: ../../../param/menu.xml:61
 msgid "Administration de l'application"
 msgstr "Application Administration"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:61
+#: ../../../param/menu.xml:63
 msgid "Liste des comptes locaux"
 msgstr "List of local accounts"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:61
+#: ../../../param/menu.xml:63
 msgid "Liste des logins - identification via la base de données"
 msgstr "List of logins - identification via the database"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:63
+#: ../../../param/menu.xml:65
 msgid "ACL - droits"
 msgstr "ACL - rights"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:63
+#: ../../../param/menu.xml:65
 msgid "applications et droits gérés"
 msgstr "applications and rights managed"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:65
+#: ../../../param/menu.xml:67
 msgid "ACL - logins"
 msgstr "ACL - logins"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:65
+#: ../../../param/menu.xml:67
 msgid "Logins déclarés dans le module de gestion des droits"
 msgstr "Logins declared in the rights management module"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:67
+#: ../../../param/menu.xml:69
 msgid "ACL - groupes de logins"
 msgstr "ACL - login groups"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:67
+#: ../../../param/menu.xml:69
 msgid "Groupes de logins et logins rattachés aux groupes"
 msgstr "Groups of logins and logins attached to groups"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:70
+#: ../../../param/menu.xml:72
 msgid "Paramètres de l'application"
 msgstr "Application Settings"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:70
+#: ../../../param/menu.xml:72
 msgid "Liste des paramètres pérennes de l'application"
 msgstr "List of long-term parameters of the application"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:73
+#: ../../../param/menu.xml:75
 msgid "Logs"
 msgstr "Logs"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:73
+#: ../../../param/menu.xml:75
 msgid "Consultation des logs enregistrées"
 msgstr "Consultation of recorded logs"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:76
+#: ../../../param/menu.xml:78
 msgid "Structure de la base de données des droits (HTML)"
 msgstr "Rights management database structure (HTML)"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:76
+#: ../../../param/menu.xml:78
 msgid ""
 "Liste des tables et des colonnes de la base de données de gestion des droits"
 msgstr "List of the tables and the columns of the rights management database"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:78
+#: ../../../param/menu.xml:80
 msgid "PHP info"
 msgstr "PHP info"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:78
+#: ../../../param/menu.xml:80
 msgid "configuration générale du serveur PHP"
 msgstr "general configuration of the PHP server"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:81
+#: ../../../param/menu.xml:83
 msgid "Variables SERVER"
 msgstr "SERVER variables"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:81
+#: ../../../param/menu.xml:83
 msgid "Affichage des variables fournies par le serveur"
 msgstr "Display the variables provided by the server"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:83
+#: ../../../param/menu.xml:85
 msgid "Variables SESSION"
 msgstr "SESSION variables"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:83
+#: ../../../param/menu.xml:85
 msgid "Affichage des variables de session"
 msgstr "Display the data of the session"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:86
+#: ../../../param/menu.xml:88
 msgid "Backup"
 msgstr "Backup"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:86 ../../../display/templates/framework/backup.tpl:1
+#: ../../../param/menu.xml:88 ../../../display/templates/framework/backup.tpl:1
 msgid "Sauvegarde de la base de données"
 msgstr "Backup of the database"
 
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:90 ../../../param/menu.xml:95
+#: ../../../param/menu.xml:92 ../../../param/menu.xml:97
 msgid "documentation"
 msgstr "documentation"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:90
+#: ../../../param/menu.xml:92
 msgid "Documentations en ligne en français"
 msgstr "Online documentation in french"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:92 ../../../param/menu.xml:97
+#: ../../../param/menu.xml:94 ../../../param/menu.xml:99
 msgid "Comprendre la double authentification"
 msgstr "Understand the double authentication"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:92 ../../../param/menu.xml:97
+#: ../../../param/menu.xml:94 ../../../param/menu.xml:99
 msgid "Comprendre le mécanisme de double authentification"
 msgstr "Understand the mechanism of the double authentication"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:95
+#: ../../../param/menu.xml:97
 msgid "Documentations en ligne en anglais"
 msgstr "Online documentation in English"
 
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:100 ../../../display/templates/entete.tpl:21
+#: ../../../param/menu.xml:102 ../../../display/templates/entete.tpl:21
 #: ../../../display/templates/entete.tpl:41
 #: ../../../display/templates/entete.tpl:42
 msgid "Connexion"
 msgstr "Sign in"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:100
+#: ../../../param/menu.xml:102
 msgid "S'identifier dans l'application"
 msgstr "Sign in to the app"
 
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:102 ../../../display/templates/entete.tpl:37
+#: ../../../param/menu.xml:104 ../../../display/templates/entete.tpl:37
 #: ../../../display/templates/entete.tpl:38
 msgid "Déconnexion"
 msgstr "Sign out"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:102
+#: ../../../param/menu.xml:104
 msgid "Déconnexion de l'application"
 msgstr "Sign out of the app"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:104
+#: ../../../param/menu.xml:106
 msgid "Dernières connexions"
 msgstr "Last connections"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:104
+#: ../../../param/menu.xml:106
 msgid "Liste des dernières connexions réalisées"
 msgstr "List of last connections"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:106 ../../../display/templates/entete.tpl:33
+#: ../../../param/menu.xml:108 ../../../display/templates/entete.tpl:33
 #: ../../../display/templates/entete.tpl:34
 #: ../../../display/templates/framework/ident/loginChangePassword.tpl:86
 msgid "Modifier le mot de passe"
 msgstr "Change your password"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:106
+#: ../../../param/menu.xml:108
 msgid "Modifiez votre mot de passe (identification locale uniquement)"
 msgstr "Change your password (local identification only)"
 
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:108
+#: ../../../param/menu.xml:110
 msgid "?"
 msgstr "?"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:108
+#: ../../../param/menu.xml:110
 msgid "Aide"
 msgstr "Help"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:109
+#: ../../../param/menu.xml:111
 msgid "A propos"
 msgstr "About"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:109
+#: ../../../param/menu.xml:111
 msgid "A propos de Sturwild"
 msgstr "About Sturwild"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:110
+#: ../../../param/menu.xml:112
 msgid "Nouveautés"
 msgstr "News"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:110
+#: ../../../param/menu.xml:112
 msgid "Quoi de neuf dans l'application ?"
 msgstr "What's new in the app?"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:111
+#: ../../../param/menu.xml:113
 msgid "Nouvelle version ?"
 msgstr "New version?"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:111
+#: ../../../param/menu.xml:113
 msgid "Rechercher s'il existe une nouvelle version disponible de l'application"
 msgstr "Find out if there is a new version of the application available"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:113
+#: ../../../param/menu.xml:115
 msgid "Lexique"
 msgstr "Glossary"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:113
+#: ../../../param/menu.xml:115
 msgid "Lexique des termes utilisés dans le logiciel"
 msgstr "Glossary of terms used in the software"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:114
+#: ../../../param/menu.xml:116
 msgid "Français"
 msgstr "Français"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:114
+#: ../../../param/menu.xml:116
 msgid "Libellés en français"
 msgstr "Libellés en français"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:115
+#: ../../../param/menu.xml:117
 msgid "English"
 msgstr "English"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:115
+#: ../../../param/menu.xml:117
 msgid "Labels in English"
 msgstr "Labels in English"
 
@@ -712,6 +747,10 @@ msgid ""
 "Problème rencontré lors de l'écriture du login pour la gestion des droits"
 msgstr "Problem encountered while writing the login for the rights management"
 
+#: ../../../framework/identification/login.php:93
+msgid "Changement de mot de passe"
+msgstr "Password change"
+
 #: ../../../framework/identification/passwordlost.class.php:79
 msgid "Le compte n'est pas actif"
 msgstr "The account is inactive"
@@ -1101,6 +1140,15 @@ msgstr "The file %s don't exist"
 msgid "Le fichier %s est vide ou ne peut être lu"
 msgstr "The %s file is empty or cannot be read"
 
+#: ../../../modules/param/updateparam.php:13
+msgid "Le fichier n'a pas pu être téléchargé"
+msgstr "The file can't be uploaded"
+
+#: ../../../modules/param/updateparam.php:21
+#, php-format
+msgid "Traitement de la feuille/table %s"
+msgstr "Processing the %s sheet/table"
+
 #: ../../../modules/declaration/import.php:28
 #: ../../../modules/declaration/import.php:140
 #: ../../../modules/declaration/importFish.php:28
@@ -1448,7 +1496,7 @@ msgstr "Display order in the lists:"
 #: ../../../display/templates/param/countryChange.tpl:29
 #: ../../../display/templates/declaration/locationChange.tpl:318
 #: ../../../display/templates/declaration/fishChange.tpl:203
-#: ../../../display/templates/declaration/declarationChange.tpl:311
+#: ../../../display/templates/declaration/declarationChange.tpl:312
 #: ../../../display/templates/declaration/eventChange.tpl:49
 #: ../../../display/templates/framework/ident/loginChangePassword.tpl:135
 #: ../../../display/templates/framework/ident/totp.tpl:21
@@ -1468,7 +1516,7 @@ msgstr "Save and return"
 #: ../../../display/templates/param/countryChange.tpl:31
 #: ../../../display/templates/declaration/fishChange.tpl:205
 #: ../../../display/templates/declaration/documentList.tpl:30
-#: ../../../display/templates/declaration/declarationChange.tpl:313
+#: ../../../display/templates/declaration/declarationChange.tpl:314
 #: ../../../display/templates/declaration/eventChange.tpl:51
 #: ../../../display/templates/document/documentList.tpl:47
 #: ../../../display/templates/framework/ident/loginsaisie.tpl:222
@@ -1503,7 +1551,7 @@ msgstr "Name of the ICES zone:"
 #: ../../../display/templates/param/countryChange.tpl:36
 #: ../../../display/templates/declaration/locationChange.tpl:325
 #: ../../../display/templates/declaration/fishChange.tpl:211
-#: ../../../display/templates/declaration/declarationChange.tpl:322
+#: ../../../display/templates/declaration/declarationChange.tpl:323
 #: ../../../display/templates/declaration/eventChange.tpl:59
 msgid "Champ obligatoire"
 msgstr "Mandatory"
@@ -1535,6 +1583,61 @@ msgstr "Code:"
 msgid "Description :"
 msgstr "Description:"
 
+#: ../../../display/templates/param/translateDb.tpl:2
+msgid "Import ou mise à jour des tables de paramètres"
+msgstr "Importing or updating parameter tables"
+
+#: ../../../display/templates/param/translateDb.tpl:10
+msgid "Nom du fichier à importer (ODS) :"
+msgstr "Name of the file to import (ODS):"
+
+#: ../../../display/templates/param/translateDb.tpl:17
+#: ../../../display/templates/declaration/importJson.tpl:78
+#: ../../../display/templates/declaration/importCsv.tpl:80
+#: ../../../display/templates/declaration/importFishCsv.tpl:80
+msgid "Déclencher l'import"
+msgstr "Import"
+
+#: ../../../display/templates/param/translateDb.tpl:24
+msgid ""
+"Ce module permet d'importer ou de mettre à jour l'ensemble des tables de "
+"paramètres à partir d'un fichier ODS"
+msgstr ""
+"This module can be used to import or update all parameter tables from an ODS "
+"file."
+
+#: ../../../display/templates/param/translateDb.tpl:26
+msgid ""
+"Le fichier doit contenir une feuille par table (le nom de la feuille doit "
+"être strictement équivalent au nom de la table)"
+msgstr ""
+"The file must contain one sheet per table (the name of the sheet must be "
+"strictly equivalent to the table name)."
+
+#: ../../../display/templates/param/translateDb.tpl:28
+msgid ""
+"Chaque feuille doit contenir impérativement les colonnes suivantes "
+"(conservez l'ordre des colonnes) :"
+msgstr ""
+"Each sheet must contain the following columns (keep the order of the "
+"columns):"
+
+#: ../../../display/templates/param/translateDb.tpl:31
+msgid "laissée à vide"
+msgstr "left empty"
+
+#: ../../../display/templates/param/translateDb.tpl:32
+msgid "nom dans la langue courante"
+msgstr "Name in common language"
+
+#: ../../../display/templates/param/translateDb.tpl:33
+msgid "nom en anglais, utilisé pour les échanges"
+msgstr "Name in english, used for exchanges"
+
+#: ../../../display/templates/param/translateDb.tpl:34
+msgid "ordre d'affichage des enregistrements"
+msgstr "Display order of the records"
+
 #: ../../../display/templates/param/statusChange.tpl:1
 msgid "Modification d'un statut :"
 msgstr "Edit a status:"
@@ -1735,12 +1838,6 @@ msgstr "Checks OK."
 msgid "Vous pouvez réaliser l'import du fichier (%1) :"
 msgstr "You can import the file (%1):"
 
-#: ../../../display/templates/declaration/importJson.tpl:78
-#: ../../../display/templates/declaration/importCsv.tpl:80
-#: ../../../display/templates/declaration/importFishCsv.tpl:80
-msgid "Déclencher l'import"
-msgstr "Import"
-
 #: ../../../display/templates/declaration/importJson.tpl:90
 msgid "Nom du fichier à importer (JSON) :"
 msgstr "Name of the file to import (JSON):"
@@ -1791,133 +1888,143 @@ msgstr ""
 "The expected columns (variables) are the same as those described for CSV "
 "imports"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:11
+#: ../../../display/templates/declaration/declarationGeneral.tpl:5
+#: ../../../display/templates/declaration/locationDisplay.tpl:4
+#: ../../../display/templates/framework/droits/appliDisplay.tpl:10
+msgid "Modifier..."
+msgstr "Edit..."
+
+#: ../../../display/templates/declaration/declarationGeneral.tpl:12
 #: ../../../display/templates/declaration/declarationChange.tpl:26
 msgid "Statut  :"
 msgstr "Status:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:15
+#: ../../../display/templates/declaration/declarationGeneral.tpl:16
 #: ../../../display/templates/declaration/fishChange.tpl:23
 #: ../../../display/templates/declaration/declarationSearch.tpl:41
 #: ../../../display/templates/declaration/declarationChange.tpl:40
 msgid "Espèce :"
 msgstr "Species:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:19
+#: ../../../display/templates/declaration/declarationGeneral.tpl:20
 #: ../../../display/templates/declaration/declarationChange.tpl:68
 msgid "Nombre total d'esturgeons capturés :"
 msgstr "Total number of captured sturgeons:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:22
+#: ../../../display/templates/declaration/declarationGeneral.tpl:23
 #: ../../../display/templates/declaration/declarationChange.tpl:74
 msgid "Année de capture :"
 msgstr "Year of capture:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:26
+#: ../../../display/templates/declaration/declarationGeneral.tpl:27
 msgid "Date de capture :"
 msgstr "Capture date:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:30
-#: ../../../display/templates/declaration/declarationChange.tpl:98
+#: ../../../display/templates/declaration/declarationGeneral.tpl:27
+msgid "période/heure"
+msgstr "period/hour"
+
+#: ../../../display/templates/declaration/declarationGeneral.tpl:31
+#: ../../../display/templates/declaration/declarationChange.tpl:99
 msgid "Profondeur (ou gamme de profondeur) :"
 msgstr "Depth (or depth range):"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:35
-#: ../../../display/templates/declaration/declarationChange.tpl:108
+#: ../../../display/templates/declaration/declarationGeneral.tpl:36
+#: ../../../display/templates/declaration/declarationChange.tpl:109
 msgid "Statut du déclarant  :"
 msgstr "Declarant status:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:39
-#: ../../../display/templates/declaration/declarationChange.tpl:122
+#: ../../../display/templates/declaration/declarationGeneral.tpl:40
+#: ../../../display/templates/declaration/declarationChange.tpl:123
 msgid "Code du pécheur :"
 msgstr "Fisherman code:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:43
-#: ../../../display/templates/declaration/declarationChange.tpl:130
+#: ../../../display/templates/declaration/declarationGeneral.tpl:44
+#: ../../../display/templates/declaration/declarationChange.tpl:131
 msgid "Port d'attache du navire de pêche :"
 msgstr "Home port of fishing vessel:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:47
-#: ../../../display/templates/declaration/declarationChange.tpl:138
+#: ../../../display/templates/declaration/declarationGeneral.tpl:48
+#: ../../../display/templates/declaration/declarationChange.tpl:139
 msgid "Autre correspondant et coordonnées :"
 msgstr "Other contact and coordinates:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:51
+#: ../../../display/templates/declaration/declarationGeneral.tpl:52
 msgid "Mode de capture  :"
 msgstr "Capture method:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:55
-#: ../../../display/templates/declaration/declarationChange.tpl:164
+#: ../../../display/templates/declaration/declarationGeneral.tpl:56
+#: ../../../display/templates/declaration/declarationChange.tpl:165
 msgid "Type d'engin utilisé et maille :"
 msgstr "Type of engine used and mesh size:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:59
-#: ../../../display/templates/declaration/declarationChange.tpl:180
+#: ../../../display/templates/declaration/declarationGeneral.tpl:60
+#: ../../../display/templates/declaration/declarationChange.tpl:181
 msgid "Espèce ciblée :"
 msgstr "Target species:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:69
-#: ../../../display/templates/declaration/declarationChange.tpl:205
+#: ../../../display/templates/declaration/declarationGeneral.tpl:70
+#: ../../../display/templates/declaration/declarationChange.tpl:206
 msgid "Mode de déclaration :"
 msgstr "Declaration mode:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:73
+#: ../../../display/templates/declaration/declarationGeneral.tpl:74
 msgid "Institut ayant enregistré la déclaration :"
 msgstr "Institute registering the declaration :"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:78
+#: ../../../display/templates/declaration/declarationGeneral.tpl:79
 msgid "identifiant technique (UUID) :"
 msgstr "Technical identifier (UUID):"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:83
-#: ../../../display/templates/declaration/declarationChange.tpl:228
+#: ../../../display/templates/declaration/declarationGeneral.tpl:84
+#: ../../../display/templates/declaration/declarationChange.tpl:229
 msgid "Observations :"
 msgstr "Remarks:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:87
-#: ../../../display/templates/declaration/declarationChange.tpl:235
+#: ../../../display/templates/declaration/declarationGeneral.tpl:88
+#: ../../../display/templates/declaration/declarationChange.tpl:236
 msgid "Informations sur le lot d'esturgeons"
 msgstr "Sturgeon lot informations"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:90
+#: ../../../display/templates/declaration/declarationGeneral.tpl:91
 msgid "Longueur totale :"
 msgstr "Total length:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:91
-#: ../../../display/templates/declaration/declarationGeneral.tpl:97
-#: ../../../display/templates/declaration/declarationChange.tpl:102
-#: ../../../display/templates/declaration/declarationChange.tpl:238
-#: ../../../display/templates/declaration/declarationChange.tpl:244
-msgid "de :"
-msgstr "from:"
-
-#: ../../../display/templates/declaration/declarationGeneral.tpl:91
-#: ../../../display/templates/declaration/declarationGeneral.tpl:97
+#: ../../../display/templates/declaration/declarationGeneral.tpl:92
+#: ../../../display/templates/declaration/declarationGeneral.tpl:98
 #: ../../../display/templates/declaration/declarationChange.tpl:103
 #: ../../../display/templates/declaration/declarationChange.tpl:239
 #: ../../../display/templates/declaration/declarationChange.tpl:245
+msgid "de :"
+msgstr "from:"
+
+#: ../../../display/templates/declaration/declarationGeneral.tpl:92
+#: ../../../display/templates/declaration/declarationGeneral.tpl:98
+#: ../../../display/templates/declaration/declarationChange.tpl:104
+#: ../../../display/templates/declaration/declarationChange.tpl:240
+#: ../../../display/templates/declaration/declarationChange.tpl:246
 msgid "à :"
 msgstr "to:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:96
+#: ../../../display/templates/declaration/declarationGeneral.tpl:97
 msgid "Masse :"
 msgstr "Weight:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:101
+#: ../../../display/templates/declaration/declarationGeneral.tpl:102
 #: ../../../display/templates/declaration/fishChange.tpl:90
 #: ../../../display/templates/declaration/declarationSearch.tpl:53
-#: ../../../display/templates/declaration/declarationChange.tpl:249
+#: ../../../display/templates/declaration/declarationChange.tpl:250
 msgid "État à la capture :"
 msgstr "State at the capture:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:105
+#: ../../../display/templates/declaration/declarationGeneral.tpl:106
 #: ../../../display/templates/declaration/fishChange.tpl:106
-#: ../../../display/templates/declaration/declarationChange.tpl:264
+#: ../../../display/templates/declaration/declarationChange.tpl:265
 msgid "Manipulations effectuées :"
 msgstr "Handling performed:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:113
-#: ../../../display/templates/declaration/declarationChange.tpl:297
+#: ../../../display/templates/declaration/declarationGeneral.tpl:114
+#: ../../../display/templates/declaration/declarationChange.tpl:298
 msgid "Devenir du lot :"
 msgstr "Fate of lot:"
 
@@ -2050,11 +2157,6 @@ msgstr "Validated coordinates:"
 msgid "Précision estimée du point GPS :"
 msgstr "Estimated accuracy of GPS point:"
 
-#: ../../../display/templates/declaration/locationDisplay.tpl:4
-#: ../../../display/templates/framework/droits/appliDisplay.tpl:10
-msgid "Modifier..."
-msgstr "Edit..."
-
 #: ../../../display/templates/declaration/locationDisplay.tpl:8
 #: ../../../display/templates/declaration/declarationSearch.tpl:69
 msgid "Pays :"
@@ -2108,12 +2210,12 @@ msgid "Longueur (mm) :"
 msgstr "Length (mm):"
 
 #: ../../../display/templates/declaration/fishChange.tpl:82
-#: ../../../display/templates/declaration/declarationChange.tpl:243
+#: ../../../display/templates/declaration/declarationChange.tpl:244
 msgid "Masse (kg) :"
 msgstr "Weight (kg):"
 
 #: ../../../display/templates/declaration/fishChange.tpl:133
-#: ../../../display/templates/declaration/declarationChange.tpl:291
+#: ../../../display/templates/declaration/declarationChange.tpl:292
 msgid "Compléments sur les manipulations effectuées :"
 msgstr ""
 "AdditiAdditional information on the manipulations carried out:onal "
@@ -2298,27 +2400,43 @@ msgstr "General information"
 msgid "Date de capture (période/heure) :"
 msgstr "Capture date (period/time):"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:143
+#: ../../../display/templates/declaration/declarationChange.tpl:94
+msgid "période ou heure de la capture"
+msgstr "period or hour of the capture"
+
+#: ../../../display/templates/declaration/declarationChange.tpl:94
+msgid "Période ou heure de la capture"
+msgstr "Period or hour of the capture"
+
+#: ../../../display/templates/declaration/declarationChange.tpl:103
+msgid "min"
+msgstr "min"
+
+#: ../../../display/templates/declaration/declarationChange.tpl:104
+msgid "max"
+msgstr "max"
+
+#: ../../../display/templates/declaration/declarationChange.tpl:144
 msgid "coordonnées"
 msgstr "coordinates"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:148
+#: ../../../display/templates/declaration/declarationChange.tpl:149
 msgid "Méthode de capture :"
 msgstr "Methods of capture:"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:175
+#: ../../../display/templates/declaration/declarationChange.tpl:176
 msgid "maille - précisez le mode de mesure"
 msgstr "mesh size - specify measurement method"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:196
+#: ../../../display/templates/declaration/declarationChange.tpl:197
 msgid "Commentaire sur l'espèce ciblée :"
 msgstr "Remark on targeted species:"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:213
+#: ../../../display/templates/declaration/declarationChange.tpl:214
 msgid "Institut ayant recueilli la déclaration :"
 msgstr "Institute that received the declaration :"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:237
+#: ../../../display/templates/declaration/declarationChange.tpl:238
 msgid "Longueur totale (mm) :"
 msgstr "Total length (mm):"
 
@@ -2688,10 +2806,10 @@ msgstr "About STURWILD"
 
 #: ../../../display/templates/enpied.tpl:3
 msgid ""
-"Copyright © 2015- 2023 - Tous droits réservés. Auteur : Éric Quinton, pour "
+"Copyright © 2015- 2024 - Tous droits réservés. Auteur : Éric Quinton, pour "
 "EABX - INRAE - Logiciel diffusé sous licence AGPL"
 msgstr ""
-"Copyright © 2015-2023 - All rights reserved. Author: Eric Quinton, for EABX "
+"Copyright © 2015-2024 - All rights reserved. Author: Eric Quinton, for EABX "
 "- INRAE - Software released under AGPL license"
 
 #: ../../../display/templates/enpied.tpl:5
@@ -3444,11 +3562,11 @@ msgstr "Last published version"
 
 #: ../../../display/templates/framework/utils/lastRelease.tpl:20
 msgid "Version actuelle : "
-msgstr "Current version:"
+msgstr "Current version: "
 
 #: ../../../display/templates/framework/utils/lastRelease.tpl:21
 msgid "Dernière version publiée : "
-msgstr "Last published release:"
+msgstr "Last published release: "
 
 #: ../../../display/templates/framework/utils/lastRelease.tpl:23
 msgid ""
@@ -3476,17 +3594,35 @@ msgstr "About STURWILD"
 msgid "Version %1 du %2."
 msgstr "Version %1 of %2."
 
-#~ msgid "Liste des types d'engins"
-#~ msgstr "List of engine types"
-
-#~ msgid "Précision des locations"
-#~ msgstr "Localization accuracy"
+#. (itstool) path: navigation/handlingList@tabledescription
+#. (itstool) path: navigation/handlingChange@tabledescription
+#: ../../../param/actions.xml:54 ../../../param/actions.xml:55
+msgid "Manipulations effectuées sur les poissons"
+msgstr "Fish handling"
+
+#. (itstool) path: navigation/gear_typeList@tabledescription
+#. (itstool) path: navigation/gear_typeChange@tabledescription
+#: ../../../param/actions.xml:59 ../../../param/actions.xml:60
+msgid "Liste des types d'engins"
+msgstr "List of engine types"
+
+#. (itstool) path: navigation/accuracyList@tabledescription
+#. (itstool) path: navigation/accuracyChange@tabledescription
+#: ../../../param/actions.xml:64 ../../../param/actions.xml:65
+msgid "Précision des locations"
+msgstr "Localization accuracy"
 
-#~ msgid "Liste des devenirs des poissons"
-#~ msgstr "List of fates of fish"
+#. (itstool) path: navigation/fateList@tabledescription
+#. (itstool) path: navigation/fateChange@tabledescription
+#: ../../../param/actions.xml:94 ../../../param/actions.xml:95
+msgid "Liste des devenirs des poissons"
+msgstr "List of fates of fish"
 
-#~ msgid "Liste des espèces d'esturgeons"
-#~ msgstr "List of species of sturgeons"
+#. (itstool) path: navigation/speciesList@tabledescription
+#. (itstool) path: navigation/speciesChange@tabledescription
+#: ../../../param/actions.xml:99 ../../../param/actions.xml:100
+msgid "Liste des espèces d'esturgeons"
+msgstr "List of species of sturgeons"
 
 #~ msgid ""
 #~ "Vous venez de modifier votre mot de passe. Si vous n'êtes pas à l'origine "
@@ -4159,9 +4295,6 @@ msgstr "Version %1 of %2."
 #~ msgstr ""
 #~ "Technical error: the downloaded file is not accessible by the application"
 
-#~ msgid "Seuls les fichiers PDF peuvent être téléchargés"
-#~ msgstr "Only PDF files can be downloaded"
-
 #~ msgid "L'UID n'est pas numérique (%s). "
 #~ msgstr "The UID is not numeric (%s). "
 
@@ -4444,12 +4577,6 @@ msgstr "Version %1 of %2."
 #~ msgstr ""
 #~ "Strict relation (the child records depends totally of the current record)?"
 
-#~ msgid "Liste des tables de paramètres associées"
-#~ msgstr "List of linked parameter tables"
-
-#~ msgid "Nom de la colonne dans la table courante"
-#~ msgstr "Name of the column in the current table"
-
 #~ msgid "Table de type n-n"
 #~ msgstr "Table of type n-n"
 
@@ -5117,9 +5244,6 @@ msgstr "Version %1 of %2."
 #~ msgid "Choisissez le référent..."
 #~ msgstr "Select the referent ..."
 
-#~ msgid "Traitement de la corbeille"
-#~ msgstr "Bin treatment"
-
 #~ msgid "Mettre à la corbeille"
 #~ msgstr "Put in the trash"
 

From 7de77ab6f1308a746e1b8d7feaf245e31d9dab25 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Wed, 28 Feb 2024 17:14:52 +0100
Subject: [PATCH 09/14] :fix bootstrap: correctio de l'affichage de la carte

---
 display/CSS/bootstrap-prototypephp.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/display/CSS/bootstrap-prototypephp.css b/display/CSS/bootstrap-prototypephp.css
index ec1b0776..069f516b 100644
--- a/display/CSS/bootstrap-prototypephp.css
+++ b/display/CSS/bootstrap-prototypephp.css
@@ -348,8 +348,8 @@ tr {
 	cursor: pointer;
 }
 /* bootstrap hack: fix content width inside hidden tabs */
-.tab-content > .tab-pane:not(.active),
-.pill-content > .pill-pane:not(.active) {
+.tab-content > .tab-pane:not(.active)/*,
+.pill-content > .pill-pane:not(.active)*/ {
     display: block;
     height: 0;
     overflow-y: hidden;

From ca65ee751d4013d7ebbb0fa7e2469998b573fa86 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Wed, 28 Feb 2024 18:06:25 +0100
Subject: [PATCH 10/14] :fix declaration: correction de l'affichage de la carte

---
 display/templates/declaration/declarationList.tpl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/display/templates/declaration/declarationList.tpl b/display/templates/declaration/declarationList.tpl
index 7b2fddd5..bb5a9509 100644
--- a/display/templates/declaration/declarationList.tpl
+++ b/display/templates/declaration/declarationList.tpl
@@ -14,6 +14,13 @@
 		 $('.tabResult').on('shown.bs.tab', function () {
 			myStorage.setItem("declarationResultTab", $(this).attr("id"));
 		});
+        $('.nav-tabs > li > a').hover(function() {
+			//$(this).tab('show');
+ 		});
+         $("#tabmap").on("shown.bs.tab", function () {
+            setTimeout(function () { map.invalidateSize(); }, 400);
+        });
+
     });
 </script>
 {include file="declaration/declarationSearch.tpl"}
@@ -54,7 +61,7 @@
             </div>
         </div>
         <div class="tab-pane fade" id="navmap" role="tabpanel" aria-labelledby="tabmap">
-            <div id="mapList" class="map"style="height:600px;"></div>
+            <div id="mapList" class="map" style="height:600px;width: 1024px;"></div>
             {include file="declaration/declarationListMap.tpl"}
         </div>
     </div>

From 1eb57a93fdf428e9660856f28808be96ed18cc10 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Thu, 29 Feb 2024 09:43:28 +0100
Subject: [PATCH 11/14] :fix declaration: correction de l'affichage de la carte
 depuis la liste

---
 display/templates/declaration/declarationList.tpl    | 6 +-----
 display/templates/declaration/declarationListMap.tpl | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/display/templates/declaration/declarationList.tpl b/display/templates/declaration/declarationList.tpl
index bb5a9509..33270f42 100644
--- a/display/templates/declaration/declarationList.tpl
+++ b/display/templates/declaration/declarationList.tpl
@@ -17,10 +17,6 @@
         $('.nav-tabs > li > a').hover(function() {
 			//$(this).tab('show');
  		});
-         $("#tabmap").on("shown.bs.tab", function () {
-            setTimeout(function () { map.invalidateSize(); }, 400);
-        });
-
     });
 </script>
 {include file="declaration/declarationSearch.tpl"}
@@ -61,7 +57,7 @@
             </div>
         </div>
         <div class="tab-pane fade" id="navmap" role="tabpanel" aria-labelledby="tabmap">
-            <div id="mapList" class="map" style="height:600px;width: 1024px;"></div>
+            <div id="mapList" class="map" ></div>
             {include file="declaration/declarationListMap.tpl"}
         </div>
     </div>
diff --git a/display/templates/declaration/declarationListMap.tpl b/display/templates/declaration/declarationListMap.tpl
index 2c29d557..b1e90eb3 100644
--- a/display/templates/declaration/declarationListMap.tpl
+++ b/display/templates/declaration/declarationListMap.tpl
@@ -19,5 +19,8 @@
         markerGroup.addLayer(mark);
     });
      mapList.addLayer(markerGroup);
+     $("#mapList").width(window.innerWidth - 40);
+        $("#mapList").height(window.innerHeight * 0.5);
     mapDisplay(mapList);
+    
 </script>
\ No newline at end of file

From 84fc6ebba978fce9c2a24b243d1b76c8a7d6084e Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Thu, 29 Feb 2024 09:44:02 +0100
Subject: [PATCH 12/14] =?UTF-8?q?:feat=20param:=20ajout=20du=20chargement?=
 =?UTF-8?q?=20du=20mod=C3=A8le=20d'import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 display/templates/param/translateDb.tpl |  4 ++++
 modules/param/updateparam.php           | 10 ++++++++++
 param/actions.xml                       |  1 +
 3 files changed, 15 insertions(+)

diff --git a/display/templates/param/translateDb.tpl b/display/templates/param/translateDb.tpl
index 1eff7ef8..b398e5bd 100644
--- a/display/templates/param/translateDb.tpl
+++ b/display/templates/param/translateDb.tpl
@@ -33,6 +33,10 @@
             <li>exchange : {t}nom en anglais, utilisé pour les échanges{/t}</li>
             <li>order : {t}ordre d'affichage des enregistrements{/t}</li>
         </ul>
+        <br>
+        <a href="index.php?module=updateparamGettemplate">
+            {t}Téléchargez le modèle de fichier{/t}
+        </a>
     </div>
 </div>
 
diff --git a/modules/param/updateparam.php b/modules/param/updateparam.php
index fcf2de64..f09e59fe 100644
--- a/modules/param/updateparam.php
+++ b/modules/param/updateparam.php
@@ -49,4 +49,14 @@
         }
         $module_coderetour = 1;
         break;
+    case "gettemplate":
+        $vue->setParam(
+            [
+                "filename" => "parameters_en.ods", /* nom du fichier tel qu'il apparaitra dans le navigateur */
+                "disposition" => "attachment", /* attachment : le fichier est telecharge, inline : le fichier est affiche */
+                "content_type" => "application/vnd.oasis.opendocument.spreadsheet", /* type mime */
+                "tmp_name" => "install/translatedb/parameters_en.ods"
+            ]
+        );
+        break;
 }
diff --git a/param/actions.xml b/param/actions.xml
index 382ea406..d1024cae 100755
--- a/param/actions.xml
+++ b/param/actions.xml
@@ -140,4 +140,5 @@
 	-->
 	<updateparamDisplay action="modules/param/updateparam.php" param="display" droits="admin,param" type="smarty"/>
 	<updateparamExec action="modules/param/updateparam.php" param="exec" droits="admin,param" modulebefore="updateparamDisplay,updateparamExec" retourok="updateparamDisplay" retourko="updateparamDisplay"/>
+	<updateparamGettemplate action="modules/param/updateparam.php" param="gettemplate" droits="admin,param" type="file"/>
 </navigation>

From 434cc557f11a277eec0f0ca82f58c06bc2377656 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Thu, 29 Feb 2024 09:52:39 +0100
Subject: [PATCH 13/14] :rele v24.0.1: ajout des news

---
 locales/C/LC_MESSAGES/_old.po | 446 ++++++++++++++++++++++------------
 locales/C/LC_MESSAGES/en.mo   | Bin 66949 -> 67022 bytes
 locales/C/LC_MESSAGES/en.po   |  30 ++-
 param/newsen.txt              |   9 +
 param/newsfr.txt              |   9 +
 param/param.default.inc.php   |   4 +-
 6 files changed, 324 insertions(+), 174 deletions(-)

diff --git a/locales/C/LC_MESSAGES/_old.po b/locales/C/LC_MESSAGES/_old.po
index c1c3ad0b..01e51fc4 100644
--- a/locales/C/LC_MESSAGES/_old.po
+++ b/locales/C/LC_MESSAGES/_old.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-05 15:33+0100\n"
+"POT-Creation-Date: 2024-02-29 09:44+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -10,7 +10,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.4.1\n"
+"X-Generator: Poedit 3.4.2\n"
 "X-Poedit-Basepath: ../../../param\n"
 "X-Poedit-SearchPath-0: menu.xml\n"
 
@@ -104,8 +104,11 @@ msgid "Pays"
 msgstr "Country"
 
 #. (itstool) path: item/item@tooltip
+#. (itstool) path: navigation/countryList@tabledescription
+#. (itstool) path: navigation/countryChange@tabledescription
 #: ../../../param/menu.xml:27
 #: ../../../display/templates/param/countryList.tpl:1
+#: ../../../param/actions.xml:69 ../../../param/actions.xml:70
 msgid "Liste des pays"
 msgstr "List of contries"
 
@@ -115,7 +118,10 @@ msgid "Milieux"
 msgstr "Environments"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:28
+#. (itstool) path: navigation/environmentList@tabledescription
+#. (itstool) path: navigation/environmentChange@tabledescription
+#: ../../../param/menu.xml:28 ../../../param/actions.xml:109
+#: ../../../param/actions.xml:110
 msgid "Liste des milieux"
 msgstr "List of environments"
 
@@ -125,7 +131,10 @@ msgid "Milieux détaillés"
 msgstr "Detailed environments"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:30
+#. (itstool) path: navigation/environment_detailList@tabledescription
+#. (itstool) path: navigation/environment_detailChange@tabledescription
+#: ../../../param/menu.xml:30 ../../../param/actions.xml:104
+#: ../../../param/actions.xml:105
 msgid "Liste des milieux détaillés"
 msgstr "List of detailed environments"
 
@@ -165,7 +174,10 @@ msgid "Méthodes de capture"
 msgstr "Methods of capture"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:39
+#. (itstool) path: navigation/capture_methodList@tabledescription
+#. (itstool) path: navigation/capture_methodChange@tabledescription
+#: ../../../param/menu.xml:39 ../../../param/actions.xml:89
+#: ../../../param/actions.xml:90
 msgid "Liste des méthodes de capture"
 msgstr "List of capture methods"
 
@@ -175,7 +187,10 @@ msgid "Origine des captures"
 msgstr "Origin of captures"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:41
+#. (itstool) path: navigation/originList@tabledescription
+#. (itstool) path: navigation/originChange@tabledescription
+#: ../../../param/menu.xml:41 ../../../param/actions.xml:84
+#: ../../../param/actions.xml:85
 msgid "Liste des origines des captures"
 msgstr "List of origins of captures"
 
@@ -185,7 +200,10 @@ msgid "États à la capture"
 msgstr "States at the catch"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:43
+#. (itstool) path: navigation/capture_stateList@tabledescription
+#. (itstool) path: navigation/capture_stateChange@tabledescription
+#: ../../../param/menu.xml:43 ../../../param/actions.xml:79
+#: ../../../param/actions.xml:80
 msgid "Liste des états à la capture"
 msgstr "List of states at catch"
 
@@ -216,7 +234,10 @@ msgid "Espèces ciblées"
 msgstr "Target species"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:49
+#. (itstool) path: navigation/target_speciesList@tabledescription
+#. (itstool) path: navigation/target_speciesChange@tabledescription
+#: ../../../param/menu.xml:49 ../../../param/actions.xml:114
+#: ../../../param/actions.xml:115
 msgid "Liste des espèces ciblées"
 msgstr "List of targeted species"
 
@@ -236,7 +257,10 @@ msgid "Types d'événements"
 msgstr "Event types"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:54
+#. (itstool) path: navigation/event_typeList@tabledescription
+#. (itstool) path: navigation/event_typeChange@tabledescription
+#: ../../../param/menu.xml:54 ../../../param/actions.xml:74
+#: ../../../param/actions.xml:75
 msgid "Liste des types d'événements"
 msgstr "List of event types"
 
@@ -250,264 +274,275 @@ msgstr "Status"
 msgid "Liste des statuts des déclarations"
 msgstr "List of declaration status"
 
+#. (itstool) path: item/item@label
+#: ../../../param/menu.xml:58
+msgid "Importer les paramètres"
+msgstr "Import parameters"
+
+#. (itstool) path: item/item@tooltip
+#: ../../../param/menu.xml:58
+msgid ""
+"Importer ou mettre à jour les paramètres depuis une feuille de calcul ODS"
+msgstr "Import or update parameters from an ODS spreadsheet"
+
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:59
+#: ../../../param/menu.xml:61
 msgid "Administration"
 msgstr "Administration"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:59
+#: ../../../param/menu.xml:61
 msgid "Administration de l'application"
 msgstr "Application Administration"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:61
+#: ../../../param/menu.xml:63
 msgid "Liste des comptes locaux"
 msgstr "List of local accounts"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:61
+#: ../../../param/menu.xml:63
 msgid "Liste des logins - identification via la base de données"
 msgstr "List of logins - identification via the database"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:63
+#: ../../../param/menu.xml:65
 msgid "ACL - droits"
 msgstr "ACL - rights"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:63
+#: ../../../param/menu.xml:65
 msgid "applications et droits gérés"
 msgstr "applications and rights managed"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:65
+#: ../../../param/menu.xml:67
 msgid "ACL - logins"
 msgstr "ACL - logins"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:65
+#: ../../../param/menu.xml:67
 msgid "Logins déclarés dans le module de gestion des droits"
 msgstr "Logins declared in the rights management module"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:67
+#: ../../../param/menu.xml:69
 msgid "ACL - groupes de logins"
 msgstr "ACL - login groups"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:67
+#: ../../../param/menu.xml:69
 msgid "Groupes de logins et logins rattachés aux groupes"
 msgstr "Groups of logins and logins attached to groups"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:70
+#: ../../../param/menu.xml:72
 msgid "Paramètres de l'application"
 msgstr "Application Settings"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:70
+#: ../../../param/menu.xml:72
 msgid "Liste des paramètres pérennes de l'application"
 msgstr "List of long-term parameters of the application"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:73
+#: ../../../param/menu.xml:75
 msgid "Logs"
 msgstr "Logs"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:73
+#: ../../../param/menu.xml:75
 msgid "Consultation des logs enregistrées"
 msgstr "Consultation of recorded logs"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:76
+#: ../../../param/menu.xml:78
 msgid "Structure de la base de données des droits (HTML)"
 msgstr "Rights management database structure (HTML)"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:76
+#: ../../../param/menu.xml:78
 msgid ""
 "Liste des tables et des colonnes de la base de données de gestion des droits"
 msgstr "List of the tables and the columns of the rights management database"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:78
+#: ../../../param/menu.xml:80
 msgid "PHP info"
 msgstr "PHP info"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:78
+#: ../../../param/menu.xml:80
 msgid "configuration générale du serveur PHP"
 msgstr "general configuration of the PHP server"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:81
+#: ../../../param/menu.xml:83
 msgid "Variables SERVER"
 msgstr "SERVER variables"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:81
+#: ../../../param/menu.xml:83
 msgid "Affichage des variables fournies par le serveur"
 msgstr "Display the variables provided by the server"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:83
+#: ../../../param/menu.xml:85
 msgid "Variables SESSION"
 msgstr "SESSION variables"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:83
+#: ../../../param/menu.xml:85
 msgid "Affichage des variables de session"
 msgstr "Display the data of the session"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:86
+#: ../../../param/menu.xml:88
 msgid "Backup"
 msgstr "Backup"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:86 ../../../display/templates/framework/backup.tpl:1
+#: ../../../param/menu.xml:88 ../../../display/templates/framework/backup.tpl:1
 msgid "Sauvegarde de la base de données"
 msgstr "Backup of the database"
 
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:90 ../../../param/menu.xml:95
+#: ../../../param/menu.xml:92 ../../../param/menu.xml:97
 msgid "documentation"
 msgstr "documentation"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:90
+#: ../../../param/menu.xml:92
 msgid "Documentations en ligne en français"
 msgstr "Online documentation in french"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:92 ../../../param/menu.xml:97
+#: ../../../param/menu.xml:94 ../../../param/menu.xml:99
 msgid "Comprendre la double authentification"
 msgstr "Understand the double authentication"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:92 ../../../param/menu.xml:97
+#: ../../../param/menu.xml:94 ../../../param/menu.xml:99
 msgid "Comprendre le mécanisme de double authentification"
 msgstr "Understand the mechanism of the double authentication"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:95
+#: ../../../param/menu.xml:97
 msgid "Documentations en ligne en anglais"
 msgstr "Online documentation in English"
 
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:100 ../../../display/templates/entete.tpl:21
+#: ../../../param/menu.xml:102 ../../../display/templates/entete.tpl:21
 #: ../../../display/templates/entete.tpl:41
 #: ../../../display/templates/entete.tpl:42
 msgid "Connexion"
 msgstr "Sign in"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:100
+#: ../../../param/menu.xml:102
 msgid "S'identifier dans l'application"
 msgstr "Sign in to the app"
 
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:102 ../../../display/templates/entete.tpl:37
+#: ../../../param/menu.xml:104 ../../../display/templates/entete.tpl:37
 #: ../../../display/templates/entete.tpl:38
 msgid "Déconnexion"
 msgstr "Sign out"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:102
+#: ../../../param/menu.xml:104
 msgid "Déconnexion de l'application"
 msgstr "Sign out of the app"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:104
+#: ../../../param/menu.xml:106
 msgid "Dernières connexions"
 msgstr "Last connections"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:104
+#: ../../../param/menu.xml:106
 msgid "Liste des dernières connexions réalisées"
 msgstr "List of last connections"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:106 ../../../display/templates/entete.tpl:33
+#: ../../../param/menu.xml:108 ../../../display/templates/entete.tpl:33
 #: ../../../display/templates/entete.tpl:34
 #: ../../../display/templates/framework/ident/loginChangePassword.tpl:86
 msgid "Modifier le mot de passe"
 msgstr "Change your password"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:106
+#: ../../../param/menu.xml:108
 msgid "Modifiez votre mot de passe (identification locale uniquement)"
 msgstr "Change your password (local identification only)"
 
 #. (itstool) path: menu/item@label
-#: ../../../param/menu.xml:108
+#: ../../../param/menu.xml:110
 msgid "?"
 msgstr "?"
 
 #. (itstool) path: menu/item@tooltip
-#: ../../../param/menu.xml:108
+#: ../../../param/menu.xml:110
 msgid "Aide"
 msgstr "Help"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:109
+#: ../../../param/menu.xml:111
 msgid "A propos"
 msgstr "About"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:109
+#: ../../../param/menu.xml:111
 msgid "A propos de Sturwild"
 msgstr "About Sturwild"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:110
+#: ../../../param/menu.xml:112
 msgid "Nouveautés"
 msgstr "News"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:110
+#: ../../../param/menu.xml:112
 msgid "Quoi de neuf dans l'application ?"
 msgstr "What's new in the app?"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:111
+#: ../../../param/menu.xml:113
 msgid "Nouvelle version ?"
 msgstr "New version?"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:111
+#: ../../../param/menu.xml:113
 msgid "Rechercher s'il existe une nouvelle version disponible de l'application"
 msgstr "Find out if there is a new version of the application available"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:113
+#: ../../../param/menu.xml:115
 msgid "Lexique"
 msgstr "Glossary"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:113
+#: ../../../param/menu.xml:115
 msgid "Lexique des termes utilisés dans le logiciel"
 msgstr "Glossary of terms used in the software"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:114
+#: ../../../param/menu.xml:116
 msgid "Français"
 msgstr "Français"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:114
+#: ../../../param/menu.xml:116
 msgid "Libellés en français"
 msgstr "Libellés en français"
 
 #. (itstool) path: item/item@label
-#: ../../../param/menu.xml:115
+#: ../../../param/menu.xml:117
 msgid "English"
 msgstr "English"
 
 #. (itstool) path: item/item@tooltip
-#: ../../../param/menu.xml:115
+#: ../../../param/menu.xml:117
 msgid "Labels in English"
 msgstr "Labels in English"
 
@@ -712,6 +747,10 @@ msgid ""
 "Problème rencontré lors de l'écriture du login pour la gestion des droits"
 msgstr "Problem encountered while writing the login for the rights management"
 
+#: ../../../framework/identification/login.php:93
+msgid "Changement de mot de passe"
+msgstr "Password change"
+
 #: ../../../framework/identification/passwordlost.class.php:79
 msgid "Le compte n'est pas actif"
 msgstr "The account is inactive"
@@ -1101,6 +1140,15 @@ msgstr "The file %s don't exist"
 msgid "Le fichier %s est vide ou ne peut être lu"
 msgstr "The %s file is empty or cannot be read"
 
+#: ../../../modules/param/updateparam.php:13
+msgid "Le fichier n'a pas pu être téléchargé"
+msgstr "The file can't be uploaded"
+
+#: ../../../modules/param/updateparam.php:21
+#, php-format
+msgid "Traitement de la feuille/table %s"
+msgstr "Processing the %s sheet/table"
+
 #: ../../../modules/declaration/import.php:28
 #: ../../../modules/declaration/import.php:140
 #: ../../../modules/declaration/importFish.php:28
@@ -1448,7 +1496,7 @@ msgstr "Display order in the lists:"
 #: ../../../display/templates/param/countryChange.tpl:29
 #: ../../../display/templates/declaration/locationChange.tpl:318
 #: ../../../display/templates/declaration/fishChange.tpl:203
-#: ../../../display/templates/declaration/declarationChange.tpl:311
+#: ../../../display/templates/declaration/declarationChange.tpl:312
 #: ../../../display/templates/declaration/eventChange.tpl:49
 #: ../../../display/templates/framework/ident/loginChangePassword.tpl:135
 #: ../../../display/templates/framework/ident/totp.tpl:21
@@ -1468,7 +1516,7 @@ msgstr "Save and return"
 #: ../../../display/templates/param/countryChange.tpl:31
 #: ../../../display/templates/declaration/fishChange.tpl:205
 #: ../../../display/templates/declaration/documentList.tpl:30
-#: ../../../display/templates/declaration/declarationChange.tpl:313
+#: ../../../display/templates/declaration/declarationChange.tpl:314
 #: ../../../display/templates/declaration/eventChange.tpl:51
 #: ../../../display/templates/document/documentList.tpl:47
 #: ../../../display/templates/framework/ident/loginsaisie.tpl:222
@@ -1503,7 +1551,7 @@ msgstr "Name of the ICES zone:"
 #: ../../../display/templates/param/countryChange.tpl:36
 #: ../../../display/templates/declaration/locationChange.tpl:325
 #: ../../../display/templates/declaration/fishChange.tpl:211
-#: ../../../display/templates/declaration/declarationChange.tpl:322
+#: ../../../display/templates/declaration/declarationChange.tpl:323
 #: ../../../display/templates/declaration/eventChange.tpl:59
 msgid "Champ obligatoire"
 msgstr "Mandatory"
@@ -1535,6 +1583,65 @@ msgstr "Code:"
 msgid "Description :"
 msgstr "Description:"
 
+#: ../../../display/templates/param/translateDb.tpl:2
+msgid "Import ou mise à jour des tables de paramètres"
+msgstr "Importing or updating parameter tables"
+
+#: ../../../display/templates/param/translateDb.tpl:10
+msgid "Nom du fichier à importer (ODS) :"
+msgstr "Name of the file to import (ODS):"
+
+#: ../../../display/templates/param/translateDb.tpl:17
+#: ../../../display/templates/declaration/importJson.tpl:78
+#: ../../../display/templates/declaration/importCsv.tpl:80
+#: ../../../display/templates/declaration/importFishCsv.tpl:80
+msgid "Déclencher l'import"
+msgstr "Import"
+
+#: ../../../display/templates/param/translateDb.tpl:24
+msgid ""
+"Ce module permet d'importer ou de mettre à jour l'ensemble des tables de "
+"paramètres à partir d'un fichier ODS"
+msgstr ""
+"This module can be used to import or update all parameter tables from an ODS "
+"file"
+
+#: ../../../display/templates/param/translateDb.tpl:26
+msgid ""
+"Le fichier doit contenir une feuille par table (le nom de la feuille doit "
+"être strictement équivalent au nom de la table)"
+msgstr ""
+"The file must contain one sheet per table (the name of the sheet must be "
+"strictly equivalent to the table name)."
+
+#: ../../../display/templates/param/translateDb.tpl:28
+msgid ""
+"Chaque feuille doit contenir impérativement les colonnes suivantes "
+"(conservez l'ordre des colonnes) :"
+msgstr ""
+"Each sheet must contain the following columns (keep the order of the "
+"columns):"
+
+#: ../../../display/templates/param/translateDb.tpl:31
+msgid "laissée à vide"
+msgstr "left empty"
+
+#: ../../../display/templates/param/translateDb.tpl:32
+msgid "nom dans la langue courante"
+msgstr "name in common language"
+
+#: ../../../display/templates/param/translateDb.tpl:33
+msgid "nom en anglais, utilisé pour les échanges"
+msgstr "name in english, used for exchanges"
+
+#: ../../../display/templates/param/translateDb.tpl:34
+msgid "ordre d'affichage des enregistrements"
+msgstr "display order of the records"
+
+#: ../../../display/templates/param/translateDb.tpl:38
+msgid "Téléchargez le modèle de fichier"
+msgstr "Download the template"
+
 #: ../../../display/templates/param/statusChange.tpl:1
 msgid "Modification d'un statut :"
 msgstr "Edit a status:"
@@ -1735,12 +1842,6 @@ msgstr "Checks OK."
 msgid "Vous pouvez réaliser l'import du fichier (%1) :"
 msgstr "You can import the file (%1):"
 
-#: ../../../display/templates/declaration/importJson.tpl:78
-#: ../../../display/templates/declaration/importCsv.tpl:80
-#: ../../../display/templates/declaration/importFishCsv.tpl:80
-msgid "Déclencher l'import"
-msgstr "Import"
-
 #: ../../../display/templates/declaration/importJson.tpl:90
 msgid "Nom du fichier à importer (JSON) :"
 msgstr "Name of the file to import (JSON):"
@@ -1791,133 +1892,143 @@ msgstr ""
 "The expected columns (variables) are the same as those described for CSV "
 "imports"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:11
+#: ../../../display/templates/declaration/declarationGeneral.tpl:5
+#: ../../../display/templates/declaration/locationDisplay.tpl:4
+#: ../../../display/templates/framework/droits/appliDisplay.tpl:10
+msgid "Modifier..."
+msgstr "Edit..."
+
+#: ../../../display/templates/declaration/declarationGeneral.tpl:12
 #: ../../../display/templates/declaration/declarationChange.tpl:26
 msgid "Statut  :"
 msgstr "Status:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:15
+#: ../../../display/templates/declaration/declarationGeneral.tpl:16
 #: ../../../display/templates/declaration/fishChange.tpl:23
 #: ../../../display/templates/declaration/declarationSearch.tpl:41
 #: ../../../display/templates/declaration/declarationChange.tpl:40
 msgid "Espèce :"
 msgstr "Species:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:19
+#: ../../../display/templates/declaration/declarationGeneral.tpl:20
 #: ../../../display/templates/declaration/declarationChange.tpl:68
 msgid "Nombre total d'esturgeons capturés :"
 msgstr "Total number of captured sturgeons:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:22
+#: ../../../display/templates/declaration/declarationGeneral.tpl:23
 #: ../../../display/templates/declaration/declarationChange.tpl:74
 msgid "Année de capture :"
 msgstr "Year of capture:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:26
+#: ../../../display/templates/declaration/declarationGeneral.tpl:27
 msgid "Date de capture :"
 msgstr "Capture date:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:30
-#: ../../../display/templates/declaration/declarationChange.tpl:98
+#: ../../../display/templates/declaration/declarationGeneral.tpl:27
+msgid "période/heure"
+msgstr "period/hour"
+
+#: ../../../display/templates/declaration/declarationGeneral.tpl:31
+#: ../../../display/templates/declaration/declarationChange.tpl:99
 msgid "Profondeur (ou gamme de profondeur) :"
 msgstr "Depth (or depth range):"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:35
-#: ../../../display/templates/declaration/declarationChange.tpl:108
+#: ../../../display/templates/declaration/declarationGeneral.tpl:36
+#: ../../../display/templates/declaration/declarationChange.tpl:109
 msgid "Statut du déclarant  :"
 msgstr "Declarant status:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:39
-#: ../../../display/templates/declaration/declarationChange.tpl:122
+#: ../../../display/templates/declaration/declarationGeneral.tpl:40
+#: ../../../display/templates/declaration/declarationChange.tpl:123
 msgid "Code du pécheur :"
 msgstr "Fisherman code:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:43
-#: ../../../display/templates/declaration/declarationChange.tpl:130
+#: ../../../display/templates/declaration/declarationGeneral.tpl:44
+#: ../../../display/templates/declaration/declarationChange.tpl:131
 msgid "Port d'attache du navire de pêche :"
 msgstr "Home port of fishing vessel:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:47
-#: ../../../display/templates/declaration/declarationChange.tpl:138
+#: ../../../display/templates/declaration/declarationGeneral.tpl:48
+#: ../../../display/templates/declaration/declarationChange.tpl:139
 msgid "Autre correspondant et coordonnées :"
 msgstr "Other contact and coordinates:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:51
+#: ../../../display/templates/declaration/declarationGeneral.tpl:52
 msgid "Mode de capture  :"
 msgstr "Capture method:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:55
-#: ../../../display/templates/declaration/declarationChange.tpl:164
+#: ../../../display/templates/declaration/declarationGeneral.tpl:56
+#: ../../../display/templates/declaration/declarationChange.tpl:165
 msgid "Type d'engin utilisé et maille :"
 msgstr "Type of engine used and mesh size:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:59
-#: ../../../display/templates/declaration/declarationChange.tpl:180
+#: ../../../display/templates/declaration/declarationGeneral.tpl:60
+#: ../../../display/templates/declaration/declarationChange.tpl:181
 msgid "Espèce ciblée :"
 msgstr "Target species:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:69
-#: ../../../display/templates/declaration/declarationChange.tpl:205
+#: ../../../display/templates/declaration/declarationGeneral.tpl:70
+#: ../../../display/templates/declaration/declarationChange.tpl:206
 msgid "Mode de déclaration :"
 msgstr "Declaration mode:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:73
+#: ../../../display/templates/declaration/declarationGeneral.tpl:74
 msgid "Institut ayant enregistré la déclaration :"
 msgstr "Institute registering the declaration :"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:78
+#: ../../../display/templates/declaration/declarationGeneral.tpl:79
 msgid "identifiant technique (UUID) :"
-msgstr "Technical identifier (UUID):"
+msgstr "technical identifier (UUID):"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:83
-#: ../../../display/templates/declaration/declarationChange.tpl:228
+#: ../../../display/templates/declaration/declarationGeneral.tpl:84
+#: ../../../display/templates/declaration/declarationChange.tpl:229
 msgid "Observations :"
 msgstr "Remarks:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:87
-#: ../../../display/templates/declaration/declarationChange.tpl:235
+#: ../../../display/templates/declaration/declarationGeneral.tpl:88
+#: ../../../display/templates/declaration/declarationChange.tpl:236
 msgid "Informations sur le lot d'esturgeons"
 msgstr "Sturgeon lot informations"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:90
+#: ../../../display/templates/declaration/declarationGeneral.tpl:91
 msgid "Longueur totale :"
 msgstr "Total length:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:91
-#: ../../../display/templates/declaration/declarationGeneral.tpl:97
-#: ../../../display/templates/declaration/declarationChange.tpl:102
-#: ../../../display/templates/declaration/declarationChange.tpl:238
-#: ../../../display/templates/declaration/declarationChange.tpl:244
-msgid "de :"
-msgstr "from:"
-
-#: ../../../display/templates/declaration/declarationGeneral.tpl:91
-#: ../../../display/templates/declaration/declarationGeneral.tpl:97
+#: ../../../display/templates/declaration/declarationGeneral.tpl:92
+#: ../../../display/templates/declaration/declarationGeneral.tpl:98
 #: ../../../display/templates/declaration/declarationChange.tpl:103
 #: ../../../display/templates/declaration/declarationChange.tpl:239
 #: ../../../display/templates/declaration/declarationChange.tpl:245
+msgid "de :"
+msgstr "from:"
+
+#: ../../../display/templates/declaration/declarationGeneral.tpl:92
+#: ../../../display/templates/declaration/declarationGeneral.tpl:98
+#: ../../../display/templates/declaration/declarationChange.tpl:104
+#: ../../../display/templates/declaration/declarationChange.tpl:240
+#: ../../../display/templates/declaration/declarationChange.tpl:246
 msgid "à :"
 msgstr "to:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:96
+#: ../../../display/templates/declaration/declarationGeneral.tpl:97
 msgid "Masse :"
 msgstr "Weight:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:101
+#: ../../../display/templates/declaration/declarationGeneral.tpl:102
 #: ../../../display/templates/declaration/fishChange.tpl:90
 #: ../../../display/templates/declaration/declarationSearch.tpl:53
-#: ../../../display/templates/declaration/declarationChange.tpl:249
+#: ../../../display/templates/declaration/declarationChange.tpl:250
 msgid "État à la capture :"
 msgstr "State at the capture:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:105
+#: ../../../display/templates/declaration/declarationGeneral.tpl:106
 #: ../../../display/templates/declaration/fishChange.tpl:106
-#: ../../../display/templates/declaration/declarationChange.tpl:264
+#: ../../../display/templates/declaration/declarationChange.tpl:265
 msgid "Manipulations effectuées :"
 msgstr "Handling performed:"
 
-#: ../../../display/templates/declaration/declarationGeneral.tpl:113
-#: ../../../display/templates/declaration/declarationChange.tpl:297
+#: ../../../display/templates/declaration/declarationGeneral.tpl:114
+#: ../../../display/templates/declaration/declarationChange.tpl:298
 msgid "Devenir du lot :"
 msgstr "Fate of lot:"
 
@@ -2050,11 +2161,6 @@ msgstr "Validated coordinates:"
 msgid "Précision estimée du point GPS :"
 msgstr "Estimated accuracy of GPS point:"
 
-#: ../../../display/templates/declaration/locationDisplay.tpl:4
-#: ../../../display/templates/framework/droits/appliDisplay.tpl:10
-msgid "Modifier..."
-msgstr "Edit..."
-
 #: ../../../display/templates/declaration/locationDisplay.tpl:8
 #: ../../../display/templates/declaration/declarationSearch.tpl:69
 msgid "Pays :"
@@ -2108,12 +2214,12 @@ msgid "Longueur (mm) :"
 msgstr "Length (mm):"
 
 #: ../../../display/templates/declaration/fishChange.tpl:82
-#: ../../../display/templates/declaration/declarationChange.tpl:243
+#: ../../../display/templates/declaration/declarationChange.tpl:244
 msgid "Masse (kg) :"
 msgstr "Weight (kg):"
 
 #: ../../../display/templates/declaration/fishChange.tpl:133
-#: ../../../display/templates/declaration/declarationChange.tpl:291
+#: ../../../display/templates/declaration/declarationChange.tpl:292
 msgid "Compléments sur les manipulations effectuées :"
 msgstr ""
 "AdditiAdditional information on the manipulations carried out:onal "
@@ -2250,23 +2356,23 @@ msgstr "to"
 msgid "Rechercher"
 msgstr "Search"
 
-#: ../../../display/templates/declaration/declarationList.tpl:25
+#: ../../../display/templates/declaration/declarationList.tpl:28
 msgid "Nouvelle déclaration"
 msgstr "New declaration"
 
-#: ../../../display/templates/declaration/declarationList.tpl:31
+#: ../../../display/templates/declaration/declarationList.tpl:34
 msgid "Exporter la liste au format CSV (obsolète)"
 msgstr "Export list in CSV format (obsolete)"
 
-#: ../../../display/templates/declaration/declarationList.tpl:34
+#: ../../../display/templates/declaration/declarationList.tpl:37
 msgid "Exporter les poissons correspondants au format CSV (obsolète)"
 msgstr "Export the corresponding fish in CSV format (obsolete)"
 
-#: ../../../display/templates/declaration/declarationList.tpl:41
+#: ../../../display/templates/declaration/declarationList.tpl:44
 msgid "Liste"
 msgstr "List"
 
-#: ../../../display/templates/declaration/declarationList.tpl:46
+#: ../../../display/templates/declaration/declarationList.tpl:49
 msgid "Carte"
 msgstr "Map"
 
@@ -2298,27 +2404,43 @@ msgstr "General information"
 msgid "Date de capture (période/heure) :"
 msgstr "Capture date (period/time):"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:143
+#: ../../../display/templates/declaration/declarationChange.tpl:94
+msgid "période ou heure de la capture"
+msgstr "period or hour of the capture"
+
+#: ../../../display/templates/declaration/declarationChange.tpl:94
+msgid "Période ou heure de la capture"
+msgstr "Period or hour of the capture"
+
+#: ../../../display/templates/declaration/declarationChange.tpl:103
+msgid "min"
+msgstr "min"
+
+#: ../../../display/templates/declaration/declarationChange.tpl:104
+msgid "max"
+msgstr "max"
+
+#: ../../../display/templates/declaration/declarationChange.tpl:144
 msgid "coordonnées"
 msgstr "coordinates"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:148
+#: ../../../display/templates/declaration/declarationChange.tpl:149
 msgid "Méthode de capture :"
 msgstr "Methods of capture:"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:175
+#: ../../../display/templates/declaration/declarationChange.tpl:176
 msgid "maille - précisez le mode de mesure"
 msgstr "mesh size - specify measurement method"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:196
+#: ../../../display/templates/declaration/declarationChange.tpl:197
 msgid "Commentaire sur l'espèce ciblée :"
 msgstr "Remark on targeted species:"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:213
+#: ../../../display/templates/declaration/declarationChange.tpl:214
 msgid "Institut ayant recueilli la déclaration :"
 msgstr "Institute that received the declaration :"
 
-#: ../../../display/templates/declaration/declarationChange.tpl:237
+#: ../../../display/templates/declaration/declarationChange.tpl:238
 msgid "Longueur totale (mm) :"
 msgstr "Total length (mm):"
 
@@ -2688,10 +2810,10 @@ msgstr "About STURWILD"
 
 #: ../../../display/templates/enpied.tpl:3
 msgid ""
-"Copyright © 2015- 2023 - Tous droits réservés. Auteur : Éric Quinton, pour "
+"Copyright © 2015- 2024 - Tous droits réservés. Auteur : Éric Quinton, pour "
 "EABX - INRAE - Logiciel diffusé sous licence AGPL"
 msgstr ""
-"Copyright © 2015-2023 - All rights reserved. Author: Eric Quinton, for EABX "
+"Copyright © 2015-2024 - All rights reserved. Author: Eric Quinton, for EABX "
 "- INRAE - Software released under AGPL license"
 
 #: ../../../display/templates/enpied.tpl:5
@@ -3444,11 +3566,11 @@ msgstr "Last published version"
 
 #: ../../../display/templates/framework/utils/lastRelease.tpl:20
 msgid "Version actuelle : "
-msgstr "Current version:"
+msgstr "Current version: "
 
 #: ../../../display/templates/framework/utils/lastRelease.tpl:21
 msgid "Dernière version publiée : "
-msgstr "Last published release:"
+msgstr "Last published release: "
 
 #: ../../../display/templates/framework/utils/lastRelease.tpl:23
 msgid ""
@@ -3476,17 +3598,35 @@ msgstr "About STURWILD"
 msgid "Version %1 du %2."
 msgstr "Version %1 of %2."
 
-#~ msgid "Liste des types d'engins"
-#~ msgstr "List of engine types"
-
-#~ msgid "Précision des locations"
-#~ msgstr "Localization accuracy"
+#. (itstool) path: navigation/handlingList@tabledescription
+#. (itstool) path: navigation/handlingChange@tabledescription
+#: ../../../param/actions.xml:54 ../../../param/actions.xml:55
+msgid "Manipulations effectuées sur les poissons"
+msgstr "Fish handling"
+
+#. (itstool) path: navigation/gear_typeList@tabledescription
+#. (itstool) path: navigation/gear_typeChange@tabledescription
+#: ../../../param/actions.xml:59 ../../../param/actions.xml:60
+msgid "Liste des types d'engins"
+msgstr "List of engine types"
+
+#. (itstool) path: navigation/accuracyList@tabledescription
+#. (itstool) path: navigation/accuracyChange@tabledescription
+#: ../../../param/actions.xml:64 ../../../param/actions.xml:65
+msgid "Précision des locations"
+msgstr "Localization accuracy"
 
-#~ msgid "Liste des devenirs des poissons"
-#~ msgstr "List of fates of fish"
+#. (itstool) path: navigation/fateList@tabledescription
+#. (itstool) path: navigation/fateChange@tabledescription
+#: ../../../param/actions.xml:94 ../../../param/actions.xml:95
+msgid "Liste des devenirs des poissons"
+msgstr "List of fates of fish"
 
-#~ msgid "Liste des espèces d'esturgeons"
-#~ msgstr "List of species of sturgeons"
+#. (itstool) path: navigation/speciesList@tabledescription
+#. (itstool) path: navigation/speciesChange@tabledescription
+#: ../../../param/actions.xml:99 ../../../param/actions.xml:100
+msgid "Liste des espèces d'esturgeons"
+msgstr "List of species of sturgeons"
 
 #~ msgid ""
 #~ "Vous venez de modifier votre mot de passe. Si vous n'êtes pas à l'origine "
@@ -4159,9 +4299,6 @@ msgstr "Version %1 of %2."
 #~ msgstr ""
 #~ "Technical error: the downloaded file is not accessible by the application"
 
-#~ msgid "Seuls les fichiers PDF peuvent être téléchargés"
-#~ msgstr "Only PDF files can be downloaded"
-
 #~ msgid "L'UID n'est pas numérique (%s). "
 #~ msgstr "The UID is not numeric (%s). "
 
@@ -4444,12 +4581,6 @@ msgstr "Version %1 of %2."
 #~ msgstr ""
 #~ "Strict relation (the child records depends totally of the current record)?"
 
-#~ msgid "Liste des tables de paramètres associées"
-#~ msgstr "List of linked parameter tables"
-
-#~ msgid "Nom de la colonne dans la table courante"
-#~ msgstr "Name of the column in the current table"
-
 #~ msgid "Table de type n-n"
 #~ msgstr "Table of type n-n"
 
@@ -5117,9 +5248,6 @@ msgstr "Version %1 of %2."
 #~ msgid "Choisissez le référent..."
 #~ msgstr "Select the referent ..."
 
-#~ msgid "Traitement de la corbeille"
-#~ msgstr "Bin treatment"
-
 #~ msgid "Mettre à la corbeille"
 #~ msgstr "Put in the trash"
 
diff --git a/locales/C/LC_MESSAGES/en.mo b/locales/C/LC_MESSAGES/en.mo
index 6e5f018e45d05993904789ad61a242ec8cbe0508..329754811fc89ca7aa667f8466ea9659cbd0b3b2 100644
GIT binary patch
delta 12638
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

delta 12573
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

diff --git a/locales/C/LC_MESSAGES/en.po b/locales/C/LC_MESSAGES/en.po
index 16afb1a6..1eb6129d 100644
--- a/locales/C/LC_MESSAGES/en.po
+++ b/locales/C/LC_MESSAGES/en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-28 16:46+0100\n"
+"POT-Creation-Date: 2024-02-29 09:51+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -551,8 +551,8 @@ msgid "Impossible de lire le fichier contenant les news"
 msgstr "Unable to read the file containing the news"
 
 #: ../../../param/param.default.inc.php:10
-msgid "05/02/2024"
-msgstr "05/02/2024"
+msgid "29/02/2024"
+msgstr "29/02/2024"
 
 #: ../../../install/translatedb/import.class.php:75
 #: ../../../framework/import/import.class.php:77
@@ -1604,7 +1604,7 @@ msgid ""
 "paramètres à partir d'un fichier ODS"
 msgstr ""
 "This module can be used to import or update all parameter tables from an ODS "
-"file."
+"file"
 
 #: ../../../display/templates/param/translateDb.tpl:26
 msgid ""
@@ -1628,15 +1628,19 @@ msgstr "left empty"
 
 #: ../../../display/templates/param/translateDb.tpl:32
 msgid "nom dans la langue courante"
-msgstr "Name in common language"
+msgstr "name in common language"
 
 #: ../../../display/templates/param/translateDb.tpl:33
 msgid "nom en anglais, utilisé pour les échanges"
-msgstr "Name in english, used for exchanges"
+msgstr "name in english, used for exchanges"
 
 #: ../../../display/templates/param/translateDb.tpl:34
 msgid "ordre d'affichage des enregistrements"
-msgstr "Display order of the records"
+msgstr "display order of the records"
+
+#: ../../../display/templates/param/translateDb.tpl:38
+msgid "Téléchargez le modèle de fichier"
+msgstr "Download the template"
 
 #: ../../../display/templates/param/statusChange.tpl:1
 msgid "Modification d'un statut :"
@@ -1974,7 +1978,7 @@ msgstr "Institute registering the declaration :"
 
 #: ../../../display/templates/declaration/declarationGeneral.tpl:79
 msgid "identifiant technique (UUID) :"
-msgstr "Technical identifier (UUID):"
+msgstr "technical identifier (UUID):"
 
 #: ../../../display/templates/declaration/declarationGeneral.tpl:84
 #: ../../../display/templates/declaration/declarationChange.tpl:229
@@ -2352,23 +2356,23 @@ msgstr "to"
 msgid "Rechercher"
 msgstr "Search"
 
-#: ../../../display/templates/declaration/declarationList.tpl:25
+#: ../../../display/templates/declaration/declarationList.tpl:28
 msgid "Nouvelle déclaration"
 msgstr "New declaration"
 
-#: ../../../display/templates/declaration/declarationList.tpl:31
+#: ../../../display/templates/declaration/declarationList.tpl:34
 msgid "Exporter la liste au format CSV (obsolète)"
 msgstr "Export list in CSV format (obsolete)"
 
-#: ../../../display/templates/declaration/declarationList.tpl:34
+#: ../../../display/templates/declaration/declarationList.tpl:37
 msgid "Exporter les poissons correspondants au format CSV (obsolète)"
 msgstr "Export the corresponding fish in CSV format (obsolete)"
 
-#: ../../../display/templates/declaration/declarationList.tpl:41
+#: ../../../display/templates/declaration/declarationList.tpl:44
 msgid "Liste"
 msgstr "List"
 
-#: ../../../display/templates/declaration/declarationList.tpl:46
+#: ../../../display/templates/declaration/declarationList.tpl:49
 msgid "Carte"
 msgstr "Map"
 
diff --git a/param/newsen.txt b/param/newsen.txt
index b03baa15..151f0072 100644
--- a/param/newsen.txt
+++ b/param/newsen.txt
@@ -1,5 +1,14 @@
 News
 ===========
+Version 24.0.1 of 29 February 2024
+---------------------------------
+Bug corrections :
+- the map was not displayed correctly from the list of declarations
+- installation or upgrade procedures have been corrected
+
+New features:
+- addition of a module for importing or updating parameter tables from an ODS spreadsheet
+
 Version 24.0.0 of 5 February 2024
 --------------------------------
 Bug corrections :
diff --git a/param/newsfr.txt b/param/newsfr.txt
index 3238213b..c83d007d 100644
--- a/param/newsfr.txt
+++ b/param/newsfr.txt
@@ -1,5 +1,14 @@
 News
 ===========
+Version 24.0.1 du 29 février 2024
+---------------------------------
+Corrections de bugs :
+- l'affichage de la carte depuis la liste des déclarations n'était pas correcte
+- les procédures d'installation ou de mise à niveau ont été corrigées
+
+Nouveautés :
+- ajout d'un module permettant d'importer ou de mettre à jour les tables de paramètres à partir d'un classeur ODS
+
 Version 24.0.0 du 5 février 2024
 --------------------------------
 Corrections de bugs :
diff --git a/param/param.default.inc.php b/param/param.default.inc.php
index b93e667a..7b8e66b3 100755
--- a/param/param.default.inc.php
+++ b/param/param.default.inc.php
@@ -5,9 +5,9 @@
 *
 * Parametres par defaut de l'application
 */
-$APPLI_version = "v24.0.0";
+$APPLI_version = "v24.0.1";
 $APPLI_dbversion = "24.0";
-$APPLI_versiondate = _("05/02/2024");
+$APPLI_versiondate = _("29/02/2024");
 $language = "fr";
 $DEFAULT_formatdate = "fr";
 /*

From a030ba7e39ee3e641bc4a0b17e51acba268d48f8 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Thu, 29 Feb 2024 10:10:18 +0100
Subject: [PATCH 14/14] :fix db: populate the mime_type table

---
 install/pgsql/createtables.sql | 22 ++++++++++++++++++++++
 modules/declaration/fish.php   |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/install/pgsql/createtables.sql b/install/pgsql/createtables.sql
index 755d6ca3..776030d1 100644
--- a/install/pgsql/createtables.sql
+++ b/install/pgsql/createtables.sql
@@ -1747,3 +1747,25 @@ REFERENCES sturwildgacl.logingestion (id) MATCH SIMPLE
 ON DELETE NO ACTION ON UPDATE NO ACTION;
 -- ddl-end --
 
+INSERT INTO sturwild.mime_type (content_type,"extension") VALUES
+	 ('application/pdf','pdf'),
+	 ('application/zip','zip'),
+	 ('audio/mpeg','mp3'),
+	 ('image/jpeg','jpg'),
+	 ('image/jpeg','jpeg'),
+	 ('image/png','png'),
+	 ('image/tiff','tiff'),
+	 ('application/vnd.oasis.opendocument.text','odt'),
+	 ('application/vnd.oasis.opendocument.spreadsheet','ods'),
+	 ('application/vnd.ms-excel','xls');
+INSERT INTO sturwild.mime_type (content_type,"extension") VALUES
+	 ('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet','xlsx'),
+	 ('application/msword','doc'),
+	 ('application/vnd.openxmlformats-officedocument.wordprocessingml.document','docx'),
+	 ('text/csv','csv'),
+	 ('video/mp4','mp4'),
+	 ('video/x-msvideo','avi'),
+	 ('video/3gpp','3gp'),
+	 ('video/x-ms-wmv','wmv'),
+	 ('video/MP2T','ts'),
+	 ('video/quicktime','mov');
diff --git a/modules/declaration/fish.php b/modules/declaration/fish.php
index b6c316dd..39214286 100644
--- a/modules/declaration/fish.php
+++ b/modules/declaration/fish.php
@@ -80,8 +80,9 @@
 						'size' => $fdata['size'][$i]
 					);
 				}
-			} else
+			} else {
 				$files[] = $fdata;
+			}
 			foreach ($files as $file) {
 				if (strlen($file['name']) > 0)
 					$document->documentWrite($file, $id, $_REQUEST["document_description"]);