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; 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 @@

-

Copyright © 2014-2023 - Eric Quinton - EABX - INRAE

+

Copyright © 2014-2024 - Eric Quinton - EABX - INRAE


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 @@

Version {$version} of {$versiondate}.

-

Copyright © 2015-2023 - INRAE

+

Copyright © 2015-2024 - INRAE

STURWILD is an application to record and consult the incidental catches of sturgeon.

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
- () + ()
@@ -99,8 +100,8 @@ Retour au détail
- ({t}de :{/t} m. - {t}à :{/t} m.) + ({t}de :{/t} m. + {t}à :{/t} m.)
diff --git a/display/templates/declaration/declarationGeneral.tpl b/display/templates/declaration/declarationGeneral.tpl index 535f72eb..acc1ac53 100644 --- a/display/templates/declaration/declarationGeneral.tpl +++ b/display/templates/declaration/declarationGeneral.tpl @@ -1,7 +1,8 @@
{if $droits.gestion ==1} -Modifier... + +{t}Modifier...{/t} {/if}
@@ -23,7 +24,7 @@
{$data.year}
-
{t}Date de capture :{/t}{if !empty($data.estimated_capture_date)}(période/heure){/if}
+
{t}Date de capture :{/t}{if !empty($data.estimated_capture_date)}({t}période/heure{/t}){/if}
{$data.capture_date}{if !empty($data.estimated_capture_date)} ({$data.estimated_capture_date}){/if}
diff --git a/display/templates/declaration/declarationList.tpl b/display/templates/declaration/declarationList.tpl index 7b2fddd5..33270f42 100644 --- a/display/templates/declaration/declarationList.tpl +++ b/display/templates/declaration/declarationList.tpl @@ -14,6 +14,9 @@ $('.tabResult').on('shown.bs.tab', function () { myStorage.setItem("declarationResultTab", $(this).attr("id")); }); + $('.nav-tabs > li > a').hover(function() { + //$(this).tab('show'); + }); }); {include file="declaration/declarationSearch.tpl"} @@ -54,7 +57,7 @@
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); + \ No newline at end of file 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 @@

- {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}
{t}En cas de problème :{/t}  {$appliAssist} diff --git a/display/templates/param/translateDb.tpl b/display/templates/param/translateDb.tpl new file mode 100644 index 00000000..b398e5bd --- /dev/null +++ b/display/templates/param/translateDb.tpl @@ -0,0 +1,42 @@ +

+

{t}Import ou mise à jour des tables de paramètres{/t}

+
+
+
+
+ +
+ +
+ +
+
+
+ +
+
+
+
+
+
+ {t}Ce module permet d'importer ou de mettre à jour l'ensemble des tables de paramètres à partir d'un fichier ODS{/t} +
+ {t}Le fichier doit contenir une feuille par table (le nom de la feuille doit être strictement équivalent au nom de la table){/t} +
+ {t}Chaque feuille doit contenir impérativement les colonnes suivantes (conservez l'ordre des colonnes) :{/t} +
+
    +
  • id : {t}laissée à vide{/t}
    • +
  • name : {t}nom dans la langue courante{/t}
    • +
  • exchange : {t}nom en anglais, utilisé pour les échanges{/t}
    • +
  • order : {t}ordre d'affichage des enregistrements{/t}
    • +
+
+ + {t}Téléchargez le modèle de fichier{/t} + +
+
+ diff --git a/documentation/sturwild23.dbm b/documentation/sturwild23.dbm index 030c5156..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. --> - - - + @@ -31,11 +31,11 @@ CAUTION: Do not modify this file unless you know what you are doing. - + - + @@ -81,12 +81,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - + - + @@ -110,12 +110,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -139,12 +139,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -168,12 +168,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -190,12 +190,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -226,12 +226,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -257,12 +257,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -273,7 +273,7 @@ CAUTION: Do not modify this file unless you know what you are doing. - + @@ -387,16 +387,26 @@ CAUTION: Do not modify this file unless you know what you are doing. + + + + + + + + + +
- + - + @@ -420,12 +430,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -469,12 +479,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -498,12 +508,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -528,17 +538,17 @@ CAUTION: Do not modify this file unless you know what you are doing. - + - +
- + @@ -568,12 +578,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -597,12 +607,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -670,7 +680,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
- + @@ -740,17 +750,17 @@ CAUTION: Do not modify this file unless you know what you are doing. - + - +
- + @@ -774,7 +784,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
- + @@ -800,12 +810,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -827,12 +837,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -856,12 +866,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -885,12 +895,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -914,12 +924,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -956,12 +966,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -985,7 +995,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
- + @@ -1010,12 +1020,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -1043,12 +1053,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -1075,12 +1085,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -1108,12 +1118,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -1143,7 +1153,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
- + @@ -1166,12 +1176,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -1203,12 +1213,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -1264,12 +1274,12 @@ CAUTION: Do not modify this file unless you know what you are doing. - +
- + @@ -1335,236 +1345,9 @@ CAUTION: Do not modify this file unless you know what you are doing. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- + @@ -1588,7 +1371,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
- + @@ -1629,7 +1412,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
- + @@ -1660,211 +1443,13 @@ CAUTION: Do not modify this file unless you know what you are doing. dst-table="sturwild.declaration" src-required="false" dst-required="false"/> - - - - - - - - - - - - - - - - - - - - - - - - -
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2127,189 +1712,152 @@ left outer join sturwild.v_fish_handlings using (fish_id)]]> - - + src-required="false" dst-required="false"/> - - + src-required="false" dst-required="false"/> - + 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/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; 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..776030d1 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, @@ -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/install/translatedb/parameters_en.ods b/install/translatedb/parameters_en.ods index ea7231f9..c649f362 100644 Binary files a/install/translatedb/parameters_en.ods and b/install/translatedb/parameters_en.ods differ diff --git a/install/translatedb/updateparam.php b/install/translatedb/updateparam.php deleted file mode 100644 index d56d1e54..00000000 --- a/install/translatedb/updateparam.php +++ /dev/null @@ -1,37 +0,0 @@ -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/locales/C/LC_MESSAGES/_old.po b/locales/C/LC_MESSAGES/_old.po index 23abb4e5..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:26+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,254 +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:112 +#: ../../../param/menu.xml:113 +msgid "Nouvelle version ?" +msgstr "New version?" + +#. (itstool) path: item/item@tooltip +#: ../../../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:115 msgid "Lexique" msgstr "Glossary" #. (itstool) path: item/item@tooltip -#: ../../../param/menu.xml:112 +#: ../../../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:113 +#: ../../../param/menu.xml:116 msgid "Français" msgstr "Français" #. (itstool) path: item/item@tooltip -#: ../../../param/menu.xml:113 +#: ../../../param/menu.xml:116 msgid "Libellés en français" msgstr "Libellés en français" #. (itstool) path: item/item@label -#: ../../../param/menu.xml:114 +#: ../../../param/menu.xml:117 msgid "English" msgstr "English" #. (itstool) path: item/item@tooltip -#: ../../../param/menu.xml:114 +#: ../../../param/menu.xml:117 msgid "Labels in English" msgstr "Labels in English" @@ -702,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" @@ -1091,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 @@ -1438,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 @@ -1458,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 @@ -1493,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" @@ -1525,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:" @@ -1725,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):" @@ -1781,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:" @@ -2040,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 :" @@ -2098,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 " @@ -2240,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" @@ -2288,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):" @@ -2678,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 @@ -3428,6 +3560,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" @@ -3448,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 " @@ -4131,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). " @@ -4416,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" @@ -5089,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" @@ -5738,9 +5894,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 c54c4616..32975481 100644 Binary files a/locales/C/LC_MESSAGES/en.mo and b/locales/C/LC_MESSAGES/en.mo differ diff --git a/locales/C/LC_MESSAGES/en.po b/locales/C/LC_MESSAGES/en.po index c1c3ad0b..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-05 15:33+0100\n" +"POT-Creation-Date: 2024-02-29 09:51+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" @@ -516,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 @@ -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/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 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"]); diff --git a/modules/param/updateparam.php b/modules/param/updateparam.php new file mode 100644 index 00000000..f09e59fe --- /dev/null +++ b/modules/param/updateparam.php @@ -0,0 +1,62 @@ +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; + 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 6ee9ab5d..d1024cae 100755 --- a/param/actions.xml +++ b/param/actions.xml @@ -134,6 +134,11 @@ + + + + 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" /> + + 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"; /*