diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index 2efedd5c472c0f813b56711eacf6eff2dbb4e830..be6177cb308241f724d326f926adf353f2012b3b 100644
--- a/src/lang/fr.ts
+++ b/src/lang/fr.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="fr_FR" sourcelanguage="en_150">
+<!DOCTYPE TS><TS version="2.0" language="fr_FR" sourcelanguage="en_150">
 <context>
     <name>About</name>
     <message>
@@ -14,10 +13,203 @@
         <translation>A propos</translation>
     </message>
 </context>
+<context>
+    <name>BasicHydraulicStructures</name>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="30"/>
+        <source>Change hydraulic structure type</source>
+        <translation>Changement du type de structure hydraulique</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="35"/>
+        <source>Do you want to change the hydraulic structure type and reset hydraulic structure values?</source>
+        <translation>Voulez-vous changer le type de cette structure hydraulique et reinitialiser ces valeurs ?</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="43"/>
+        <source>Width</source>
+        <translation>Largeur</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="46"/>
+        <source>Height</source>
+        <translation>Hauteur</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="49"/>
+        <source>Elevation</source>
+        <translation>Cote</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="52"/>
+        <source>Diameter</source>
+        <translation>Diametre</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="55"/>
+        <source>Discharge coefficient</source>
+        <translation>Coefficient de débit</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="58"/>
+        <source>Loading elevation</source>
+        <translation>Cote de mise en charge</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="61"/>
+        <source>Half-angle tangent</source>
+        <translation>Tangeante du demi angle</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="64"/>
+        <source>Maximal loading elevation</source>
+        <translation>Cote de mise en charge maximale</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="67"/>
+        <source>Siltation height</source>
+        <translation>Hauteur envasement</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="70"/>
+        <source>Top of the vault</source>
+        <translation>Haut de la voute</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="73"/>
+        <source>Bottom of the vault</source>
+        <translation>Bas de la voute</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="76"/>
+        <source>Opening</source>
+        <translation>Ouverture</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="79"/>
+        <source>Maximal opening</source>
+        <translation>Ouverture maximale</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="82"/>
+        <source>Step space</source>
+        <translation>Pas espace</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="85"/>
+        <source>Weir</source>
+        <translation>Seuil</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="94"/>
+        <source>Parameter 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="97"/>
+        <source>Parameter 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="100"/>
+        <source>Parameter 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="103"/>
+        <source>Parameter 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="106"/>
+        <source>Parameter 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="113"/>
+        <source>Not defined</source>
+        <translation>Non définie</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="116"/>
+        <source>Discharge weir</source>
+        <translation>Seuil déversoir</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="119"/>
+        <source>Trapezoidal weir</source>
+        <translation>Seuil trapezoidal</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="122"/>
+        <source>Triangular weir</source>
+        <translation>Seuil triangulaire</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="125"/>
+        <source>Rectangular orifice</source>
+        <translation>Orifice rectangulaire</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="128"/>
+        <source>Circular orifice</source>
+        <translation>Orifice circulaire</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="131"/>
+        <source>Vaulted orifice</source>
+        <translation>Orifice voute</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="134"/>
+        <source>Rectangular gate</source>
+        <translation>Vanne rectangulaire</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="137"/>
+        <source>Simplified rectangular gate</source>
+        <translation>Vanne rectangulaire simplifiée</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="140"/>
+        <source>Borda-type head loss</source>
+        <translation>Perte de charge à la Borda</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="143"/>
+        <source>Check valve</source>
+        <translation>Clapet</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="146"/>
+        <source>User defined</source>
+        <translation>Définie par l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="159"/>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="155"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="160"/>
+        <source>Value</source>
+        <translation>Valeur</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="88"/>
+        <source>Coefficient</source>
+        <translation>Coefficient</translation>
+    </message>
+</context>
 <context>
     <name>BoundaryCondition</name>
     <message>
-        <location filename="../View/BoundaryCondition/Edit/Window.py" line="110"/>
+        <location filename="../View/BoundaryCondition/Table.py" line="148"/>
         <source>Not associate</source>
         <translation>Non associer</translation>
     </message>
@@ -83,7 +275,7 @@
     </message>
     <message>
         <location filename="../View/BoundaryCondition/Edit/translate.py" line="12"/>
-        <source>Discharge (m³/s)</source>
+        <source>Discharge (m&#xb3;/s)</source>
         <translation type="obsolete">Débit (m³/s)</translation>
     </message>
     <message>
@@ -126,6 +318,11 @@
         <source>Q(Z)</source>
         <translation>Q(Z)</translation>
     </message>
+    <message encoding="UTF-8">
+        <location filename="../View/BoundaryCondition/Edit/translate.py" line="37"/>
+        <source>Discharge (m³/s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CheckList</name>
@@ -229,55 +426,60 @@
         <translation>Cote (m)</translation>
     </message>
     <message>
+        <location filename="../View/Results/CustomPlot/Translate.py" line="53"/>
+        <source>Discharge (m&#xb3;/s)</source>
+        <translation type="obsolete">Débit (m³/s)</translation>
+    </message>
+    <message encoding="UTF-8">
         <location filename="../View/Results/CustomPlot/Translate.py" line="53"/>
         <source>Discharge (m³/s)</source>
-        <translation>Débit (m³/s)</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Dialog</name>
     <message>
-        <location filename="../View/ui/SelectSolver.ui" line="14"/>
+        <location filename="../View/ui/InitialConditions_Dialog_Generator_Discharge.ui" line="14"/>
         <source>Dialog</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="24"/>
+        <location filename="../View/ui/NewStudy.ui" line="22"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="31"/>
+        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="34"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="45"/>
+        <location filename="../View/ui/NewStudy.ui" line="95"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="62"/>
+        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="65"/>
         <source>Solver</source>
         <translation>Solver</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="256"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="204"/>
         <source>Path</source>
         <translation>Chemin</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="97"/>
+        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="100"/>
         <source>Output formater</source>
         <translation>Formateur de sortie</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="107"/>
+        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="116"/>
         <source>Command line</source>
         <translation>Ligne de commande</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="120"/>
+        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="129"/>
         <source>Input formater</source>
         <translation>Formateur d&apos;entrée</translation>
     </message>
@@ -294,7 +496,7 @@
     <message>
         <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="25"/>
         <source>Draft</source>
-        <translation>Débit (m³/s)</translation>
+        <translation type="obsolete">Débit (m³/s)</translation>
     </message>
     <message>
         <location filename="../View/ui/ConfigureDialog.ui" line="47"/>
@@ -304,100 +506,100 @@
     <message>
         <location filename="../View/ui/ConfigureDialog.ui" line="121"/>
         <source>Meshing tool</source>
-        <translation>Mailleur</translation>
+        <translation type="obsolete">Mailleur</translation>
     </message>
     <message>
         <location filename="../View/ui/ConfigureDialog.ui" line="131"/>
         <source>Meshing tool path</source>
-        <translation>Chemin du mailleur</translation>
+        <translation type="obsolete">Chemin du mailleur</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="170"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="118"/>
         <source>Constants</source>
         <translation>Constantes</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="182"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="130"/>
         <source>Segment number</source>
         <translation>Nombre se segments</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="189"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="137"/>
         <source>Listing maximum size</source>
         <translation>Taille maximal du listing</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="200"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="148"/>
         <source>1000</source>
         <translation>1000</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="207"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="155"/>
         <source>500000</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="237"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="185"/>
         <source>Backup</source>
         <translation>Archive</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="249"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="197"/>
         <source>Auto save</source>
         <translation>Sauvegarde auto</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="263"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="211"/>
         <source>Frequence</source>
         <translation>Fréquence</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="270"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="218"/>
         <source>Max. archives</source>
         <translation>Nombre max d&apos;archive</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="281"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="229"/>
         <source>Enable</source>
         <translation>Activé</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="316"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="264"/>
         <source>HH:mm:ss</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="363"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="311"/>
         <source>Stricklers</source>
         <translation>Stricklers</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="423"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="371"/>
         <source>Editor</source>
         <translation>Éditeur</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="447"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="395"/>
         <source>This value must be used for reading or editing files in speficic case.</source>
         <translation>Cette valeur peut être utiliser dans des cas spécifique pour lire ou écrire dans un fichier.</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="456"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="404"/>
         <source>Editor command</source>
         <translation>Commande de l&apos;éditeur</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="472"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="420"/>
         <source>  - The &quot;@file&quot; keyworkd is replace by the path of file to open.</source>
         <translation>  - Le mot clef &quot;@file&quot; sera remplacer par le chemin du fichier à ouvrir.</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="502"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="450"/>
         <source>Language</source>
         <translation>Langage</translation>
     </message>
     <message>
-        <location filename="../View/ui/ConfigureDialog.ui" line="493"/>
+        <location filename="../View/ui/ConfigureDialog.ui" line="441"/>
         <source>Please restart application after language modification</source>
         <translation>Please restart application after language modification</translation>
     </message>
@@ -456,6 +658,16 @@
         <source>Y axis:</source>
         <translation>Axe Y:</translation>
     </message>
+    <message>
+        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="110"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Command line format, for input formater (optional), solver execution and output formater (optional). This format can use some replacement values like:&lt;/p&gt;&lt;p&gt;- &lt;span style=&quot; font-style:italic;&quot;&gt;@install_dir&lt;/span&gt;: The Pamhyr2 install path&lt;/p&gt;&lt;p&gt;- &lt;span style=&quot; font-style:italic;&quot;&gt;@path&lt;/span&gt;: The associate path&lt;/p&gt;&lt;p&gt;- &lt;span style=&quot; font-style:italic;&quot;&gt;@input&lt;/span&gt;: Solver input data (depend of solver type)&lt;/p&gt;&lt;p&gt;-&lt;span style=&quot; font-style:italic;&quot;&gt; @output&lt;/span&gt;: Solver output data (depend of solver type)&lt;/p&gt;&lt;p&gt;- &lt;span style=&quot; font-style:italic;&quot;&gt;@dir&lt;/span&gt;: The working dir at solver execution&lt;/p&gt;&lt;p&gt;- &lt;span style=&quot; font-style:italic;&quot;&gt;@args&lt;/span&gt;: Solver arguments and additional arguments defined on solver parameters&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="25"/>
+        <source>Heigth</source>
+        <translation>Hauteur</translation>
+    </message>
 </context>
 <context>
     <name>Exception</name>
@@ -553,7 +765,7 @@
 <context>
     <name>Form</name>
     <message>
-        <location filename="../View/ui/dummy.ui" line="14"/>
+        <location filename="../View/ui/Widgets/extendedTimeEdit.ui" line="20"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
@@ -649,7 +861,7 @@
 <context>
     <name>Geometry</name>
     <message>
-        <location filename="../View/Geometry/Translate.py" line="46"/>
+        <location filename="../View/Geometry/Profile/Translate.py" line="35"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -674,12 +886,12 @@
         <translation>aval</translation>
     </message>
     <message>
-        <location filename="../View/Geometry/Profile/Translate.py" line="32"/>
+        <location filename="../View/Geometry/PlotXY.py" line="66"/>
         <source>X (m)</source>
         <translation>X (m)</translation>
     </message>
     <message>
-        <location filename="../View/Geometry/Profile/Translate.py" line="33"/>
+        <location filename="../View/Geometry/PlotXY.py" line="70"/>
         <source>Y (m)</source>
         <translation>Y (m)</translation>
     </message>
@@ -738,6 +950,37 @@
         <source>KP</source>
         <translation>PK</translation>
     </message>
+    <message>
+        <location filename="../View/Geometry/Translate.py" line="48"/>
+        <source>Points</source>
+        <translation>Points</translation>
+    </message>
+</context>
+<context>
+    <name>Hydraulic structure</name>
+    <message>
+        <location filename="../View/HydraulicStructures/Table.py" line="143"/>
+        <source>Not associated</source>
+        <translation>Non associé</translation>
+    </message>
+</context>
+<context>
+    <name>HydraulicStructures</name>
+    <message>
+        <location filename="../View/HydraulicStructures/Translate.py" line="31"/>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/Translate.py" line="32"/>
+        <source>Reach</source>
+        <translation>Bief</translation>
+    </message>
+    <message>
+        <location filename="../View/HydraulicStructures/Translate.py" line="33"/>
+        <source>Kp</source>
+        <translation>PK</translation>
+    </message>
 </context>
 <context>
     <name>InitialCondition</name>
@@ -748,8 +991,8 @@
     </message>
     <message>
         <location filename="../View/InitialConditions/translate.py" line="40"/>
-        <source>Discharge (m³/s)</source>
-        <translation>Débit (m³/s)</translation>
+        <source>Discharge (m&#xb3;/s)</source>
+        <translation type="obsolete">Débit (m³/s)</translation>
     </message>
     <message>
         <location filename="../View/InitialConditions/translate.py" line="38"/>
@@ -761,6 +1004,11 @@
         <source>Height (m)</source>
         <translation>Hauteur (m)</translation>
     </message>
+    <message encoding="UTF-8">
+        <location filename="../View/InitialConditions/translate.py" line="40"/>
+        <source>Discharge (m³/s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LateralContribution</name>
@@ -785,7 +1033,7 @@
         <translation>Commentaire</translation>
     </message>
     <message>
-        <location filename="../View/LateralContribution/Edit/Window.py" line="61"/>
+        <location filename="../View/LateralContribution/Table.py" line="136"/>
         <source>Not associate</source>
         <translation>Non associer</translation>
     </message>
@@ -881,19 +1129,24 @@
     </message>
     <message>
         <location filename="../View/InitialConditions/translate.py" line="11"/>
-        <source>Discharge (m³/s)</source>
+        <source>Discharge (m&#xb3;/s)</source>
         <translation type="obsolete">Débit (m³/s)</translation>
     </message>
+    <message encoding="UTF-8">
+        <location filename="../View/LateralContribution/Edit/translate.py" line="36"/>
+        <source>Discharge (m³/s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../View/ui/Stricklers.ui" line="14"/>
+        <location filename="../View/ui/GeometryReach.ui" line="14"/>
         <source>MainWindow</source>
         <translation>Fenêtre principale</translation>
     </message>
     <message>
-        <location filename="../View/ui/Stricklers.ui" line="52"/>
+        <location filename="../View/ui/GeometryReach.ui" line="112"/>
         <source>toolBar</source>
         <translation>Bar d&apos;outils</translation>
     </message>
@@ -948,162 +1201,162 @@
         <translation type="obsolete">Gra&amp;phique</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="147"/>
+        <location filename="../View/ui/MainWindow.ui" line="148"/>
         <source>&amp;Cartography</source>
         <translation>&amp;Cartographie</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="153"/>
+        <location filename="../View/ui/MainWindow.ui" line="154"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="262"/>
+        <location filename="../View/ui/MainWindow.ui" line="263"/>
         <source>New study</source>
         <translation>Nouvelle étude</translation>
     </message>
     <message>
-        <location filename="../View/ui/BoundaryConditions.ui" line="120"/>
+        <location filename="../View/ui/EditLateralContribution.ui" line="85"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="293"/>
+        <location filename="../View/ui/MainWindow.ui" line="294"/>
         <source>Open a study</source>
         <translation>Ouvrir une étude</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="296"/>
+        <location filename="../View/ui/MainWindow.ui" line="297"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="304"/>
+        <location filename="../View/ui/MainWindow.ui" line="305"/>
         <source>Import data from MAGE</source>
         <translation>Importer des données d&apos;une étude MAGE</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="315"/>
+        <location filename="../View/ui/MainWindow.ui" line="316"/>
         <source>Import data from RubarBE</source>
         <translation>Importer des données d&apos;une étude RubarBE</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="587"/>
+        <location filename="../View/ui/MainWindow.ui" line="588"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="680"/>
+        <location filename="../View/ui/MainWindow.ui" line="681"/>
         <source>Close current study</source>
         <translation>Fermer l&apos;étude en cours</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="338"/>
+        <location filename="../View/ui/MainWindow.ui" line="339"/>
         <source>Save mesh</source>
         <translation>Sauvegarder le maillage</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="347"/>
+        <location filename="../View/ui/MainWindow.ui" line="348"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="353"/>
+        <location filename="../View/ui/MainWindow.ui" line="354"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="362"/>
+        <location filename="../View/ui/MainWindow.ui" line="363"/>
         <source>Save as ...</source>
         <translation>Sauvegarder sous...</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="368"/>
+        <location filename="../View/ui/MainWindow.ui" line="369"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="373"/>
+        <location filename="../View/ui/MainWindow.ui" line="374"/>
         <source>Archive</source>
         <translation>Archive</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="378"/>
+        <location filename="../View/ui/MainWindow.ui" line="379"/>
         <source>Pamhyr configuration</source>
         <translation>Configuration de PAMHYR</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="695"/>
+        <location filename="../View/ui/MainWindow.ui" line="696"/>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="393"/>
+        <location filename="../View/ui/MainWindow.ui" line="394"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="770"/>
+        <location filename="../View/ui/MainWindow.ui" line="771"/>
         <source>Edit river network</source>
         <translation>Éditer le réseau</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="403"/>
+        <location filename="../View/ui/MainWindow.ui" line="404"/>
         <source>Edit geometry</source>
         <translation>Éditer la géométrie</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="133"/>
+        <location filename="../View/ui/GeometryReach.ui" line="136"/>
         <source>Import geometry</source>
         <translation>Importer une géométrie</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="141"/>
+        <location filename="../View/ui/GeometryReach.ui" line="144"/>
         <source>Export geometry</source>
         <translation>Exporter la géométrie</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="427"/>
+        <location filename="../View/ui/MainWindow.ui" line="428"/>
         <source>Run extrenal meshing tool</source>
         <translation>Lancer le mailler externe</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="432"/>
+        <location filename="../View/ui/MainWindow.ui" line="433"/>
         <source>choose meshing tool by reach</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="440"/>
+        <location filename="../View/ui/MainWindow.ui" line="441"/>
         <source>View meshed geometry</source>
         <translation>Voir la géométrie mailler</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="448"/>
+        <location filename="../View/ui/MainWindow.ui" line="449"/>
         <source>Export mesh</source>
         <translation>Exporter le maillage</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="456"/>
+        <location filename="../View/ui/MainWindow.ui" line="457"/>
         <source>Delete mesh of current reach</source>
         <translation>Supprimer le maillage</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="464"/>
+        <location filename="../View/ui/MainWindow.ui" line="465"/>
         <source>Delete all mesh</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="472"/>
+        <location filename="../View/ui/MainWindow.ui" line="473"/>
         <source>Abscisse - Cote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="480"/>
+        <location filename="../View/ui/MainWindow.ui" line="481"/>
         <source>XYZ</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="488"/>
+        <location filename="../View/ui/MainWindow.ui" line="489"/>
         <source>Numerical parameter for solvers</source>
         <translation>Paramètre numerique des solvers</translation>
     </message>
@@ -1113,62 +1366,62 @@
         <translation type="obsolete">Condition aux limites et apports ponctuels</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="872"/>
+        <location filename="../View/ui/MainWindow.ui" line="873"/>
         <source>Initial conditions</source>
         <translation>Conditions initiales</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="512"/>
+        <location filename="../View/ui/MainWindow.ui" line="513"/>
         <source>Export initial conditions</source>
         <translation>Exporter les conditions initiales</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="520"/>
+        <location filename="../View/ui/MainWindow.ui" line="521"/>
         <source>Import final state as initial condition</source>
         <translation>Importer un état final comme conditions initiales</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="525"/>
+        <location filename="../View/ui/MainWindow.ui" line="526"/>
         <source>Edit friction</source>
         <translation>Éditer les frottements</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="530"/>
+        <location filename="../View/ui/MainWindow.ui" line="531"/>
         <source>Edit lateral contributions</source>
         <translation>Éditer les apports latéraux</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="538"/>
+        <location filename="../View/ui/MainWindow.ui" line="539"/>
         <source>Edit spills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="551"/>
+        <location filename="../View/ui/MainWindow.ui" line="552"/>
         <source>Edit cross building</source>
         <translation>Éditer les ouvrages</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="710"/>
+        <location filename="../View/ui/MainWindow.ui" line="711"/>
         <source>Run solver</source>
         <translation>Lancer un solver</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="559"/>
+        <location filename="../View/ui/MainWindow.ui" line="560"/>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="564"/>
+        <location filename="../View/ui/MainWindow.ui" line="565"/>
         <source>Stop solver</source>
         <translation>Stopper le solver</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="569"/>
+        <location filename="../View/ui/MainWindow.ui" line="570"/>
         <source>Display listings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="577"/>
+        <location filename="../View/ui/MainWindow.ui" line="578"/>
         <source>Simulation directory management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1178,182 +1431,182 @@
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../View/ui/Results.ui" line="70"/>
+        <location filename="../View/ui/Results.ui" line="99"/>
         <source>Hydrograph</source>
         <translation>Hydrogramme</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="609"/>
+        <location filename="../View/ui/MainWindow.ui" line="610"/>
         <source>Limnigram</source>
         <translation>Limnigramme</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="623"/>
+        <location filename="../View/ui/MainWindow.ui" line="624"/>
         <source>Map current reach</source>
         <translation>Cartographier le bief sélectionné</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="631"/>
+        <location filename="../View/ui/MainWindow.ui" line="632"/>
         <source>Help PAMHYR</source>
         <translation>Aide de PAMHYR</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="639"/>
+        <location filename="../View/ui/MainWindow.ui" line="640"/>
         <source>Help MAGE</source>
         <translation>Aide de MAGE</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="644"/>
+        <location filename="../View/ui/MainWindow.ui" line="645"/>
         <source>About</source>
         <translation>A propos</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="653"/>
+        <location filename="../View/ui/MainWindow.ui" line="654"/>
         <source>ouvrir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="665"/>
+        <location filename="../View/ui/MainWindow.ui" line="666"/>
         <source>Save current study</source>
         <translation>Sauvegarder l&apos;étude</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="686"/>
+        <location filename="../View/ui/MainWindow.ui" line="687"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="390"/>
+        <location filename="../View/ui/MainWindow.ui" line="391"/>
         <source>Quit application</source>
         <translation type="unfinished">Quitter l&apos;application</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="701"/>
+        <location filename="../View/ui/MainWindow.ui" line="702"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="725"/>
+        <location filename="../View/ui/MainWindow.ui" line="726"/>
         <source>stop solver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="728"/>
+        <location filename="../View/ui/MainWindow.ui" line="729"/>
         <source>Interrompt la simulation en cours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="731"/>
+        <location filename="../View/ui/MainWindow.ui" line="732"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="740"/>
+        <location filename="../View/ui/MainWindow.ui" line="741"/>
         <source>Run external meshing tool</source>
         <translation>Lancer le mailler externe</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="743"/>
+        <location filename="../View/ui/MainWindow.ui" line="744"/>
         <source>Run meshing tool on current reach geometry</source>
         <translation>Lancer le mailler externe sur le bief selectionné</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="755"/>
+        <location filename="../View/ui/MainWindow.ui" line="756"/>
         <source>Display simulation listing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="758"/>
+        <location filename="../View/ui/MainWindow.ui" line="759"/>
         <source>Display current simulation listing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="767"/>
+        <location filename="../View/ui/MainWindow.ui" line="768"/>
         <source>River network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../View/ui/Results.ui" line="42"/>
+        <location filename="../View/ui/Results.ui" line="67"/>
         <source>Geometry</source>
         <translation>Géométrie</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="782"/>
+        <location filename="../View/ui/MainWindow.ui" line="783"/>
         <source>Edit reach geometry</source>
         <translation>Éditer la géométrie</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="791"/>
+        <location filename="../View/ui/MainWindow.ui" line="792"/>
         <source>Mesh</source>
         <translation>Maillage</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="799"/>
+        <location filename="../View/ui/MainWindow.ui" line="800"/>
         <source>Boundary conditions</source>
         <translation>Conditions aux limites</translation>
     </message>
     <message>
         <location filename="../View/ui/MainWindow.ui" line="802"/>
         <source>Edit boundary conditions and one-time contributions</source>
-        <translation>Éditer les conditions aux limites et les apports ponctuels</translation>
+        <translation type="obsolete">Éditer les conditions aux limites et les apports ponctuels</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="810"/>
+        <location filename="../View/ui/MainWindow.ui" line="811"/>
         <source>Lateral contribution</source>
         <translation>Contributions latérales</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="813"/>
+        <location filename="../View/ui/MainWindow.ui" line="814"/>
         <source>Edit lateral contribution</source>
         <translation>Éditer les contributions latérales</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="818"/>
+        <location filename="../View/ui/MainWindow.ui" line="819"/>
         <source>Spills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="821"/>
+        <location filename="../View/ui/MainWindow.ui" line="822"/>
         <source>Edit lateral spills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="826"/>
+        <location filename="../View/ui/MainWindow.ui" line="827"/>
         <source>Friction</source>
         <translation>Frottements</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="834"/>
+        <location filename="../View/ui/MainWindow.ui" line="835"/>
         <source>Stricklers</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="837"/>
+        <location filename="../View/ui/MainWindow.ui" line="838"/>
         <source>Edit the study stricklers</source>
         <translation>Éditer les Stricklers de l&apos;étude</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="842"/>
+        <location filename="../View/ui/MainWindow.ui" line="843"/>
         <source>Building</source>
         <translation>Ouvrages</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="845"/>
+        <location filename="../View/ui/MainWindow.ui" line="846"/>
         <source>Edit building (valve, ...), singularity and pump</source>
         <translation>Éditer les ouvrages</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="854"/>
+        <location filename="../View/ui/MainWindow.ui" line="855"/>
         <source>Edit study</source>
         <translation>Éditer l&apos;étude</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="862"/>
+        <location filename="../View/ui/MainWindow.ui" line="863"/>
         <source>English</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="867"/>
+        <location filename="../View/ui/MainWindow.ui" line="868"/>
         <source>French</source>
         <translation></translation>
     </message>
@@ -1393,47 +1646,47 @@
         <translation>Suspenssion</translation>
     </message>
     <message>
-        <location filename="../View/ui/Stricklers.ui" line="70"/>
+        <location filename="../View/ui/EditLateralContribution.ui" line="79"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../View/ui/BoundaryConditions.ui" line="117"/>
+        <location filename="../View/ui/LateralContributions.ui" line="117"/>
         <source>Add a new boundary condition or lateral contribution</source>
         <translation>Ajouter une condition aux limites ou un apport ponctuel</translation>
     </message>
     <message>
-        <location filename="../View/ui/Stricklers.ui" line="82"/>
+        <location filename="../View/ui/EditLateralContribution.ui" line="94"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../View/ui/BoundaryConditions.ui" line="132"/>
+        <location filename="../View/ui/EditLateralContribution.ui" line="97"/>
         <source>Delete current selected rows</source>
         <translation>Supprimer les lignes selectionnées</translation>
     </message>
     <message>
-        <location filename="../View/ui/BoundaryConditions.ui" line="135"/>
+        <location filename="../View/ui/EditLateralContribution.ui" line="100"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../View/ui/ReservoirList.ui" line="105"/>
+        <location filename="../View/ui/Reservoir.ui" line="99"/>
         <source>Edit</source>
         <translation>Éditer</translation>
     </message>
     <message>
-        <location filename="../View/ui/BoundaryConditions.ui" line="147"/>
+        <location filename="../View/ui/LateralContributions.ui" line="147"/>
         <source>Edit boundary condition or lateral contribution</source>
         <translation>Éditer une condition aux limites ou un apport ponctuel</translation>
     </message>
     <message>
-        <location filename="../View/ui/BoundaryConditions.ui" line="150"/>
+        <location filename="../View/ui/Frictions.ui" line="104"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../View/ui/Stricklers.ui" line="94"/>
+        <location filename="../View/ui/EditLateralContribution.ui" line="109"/>
         <source>Sort</source>
         <translation>Trier</translation>
     </message>
@@ -1468,7 +1721,7 @@
         <translation>Trier les stricklers</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryCrossSection.ui" line="80"/>
+        <location filename="../View/ui/GeometryReach.ui" line="165"/>
         <source>delete</source>
         <translation>Supprimer</translation>
     </message>
@@ -1520,12 +1773,12 @@
     <message>
         <location filename="../View/ui/InitialConditions.ui" line="30"/>
         <source>Generate minimal height</source>
-        <translation>Généré une hauteur minimale</translation>
+        <translation type="obsolete">Généré une hauteur minimale</translation>
     </message>
     <message>
         <location filename="../View/ui/InitialConditions.ui" line="37"/>
         <source>Generate constant discharge</source>
-        <translation>Généré un debit constant</translation>
+        <translation type="obsolete">Généré un debit constant</translation>
     </message>
     <message>
         <location filename="../View/ui/InitialConditions.ui" line="97"/>
@@ -1558,27 +1811,27 @@
         <translation>Trier les points des conditions aux limites</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="698"/>
+        <location filename="../View/ui/MainWindow.ui" line="699"/>
         <source>Quit the application (Ctrl+Q)</source>
         <translation>Quitter l&apos;application (Ctrl+Q)</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="713"/>
+        <location filename="../View/ui/MainWindow.ui" line="714"/>
         <source>Run a solver</source>
         <translation>Lancer un solver</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="794"/>
+        <location filename="../View/ui/MainWindow.ui" line="795"/>
         <source>Display meshed reach</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="829"/>
+        <location filename="../View/ui/MainWindow.ui" line="830"/>
         <source>Edit friction frictions</source>
         <translation>Éditer les frottements</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="875"/>
+        <location filename="../View/ui/MainWindow.ui" line="876"/>
         <source>Define initial conditions</source>
         <translation>Définire les conditions initiales</translation>
     </message>
@@ -1603,17 +1856,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="176"/>
+        <location filename="../View/ui/MainWindow.ui" line="177"/>
         <source>&amp;Sediment</source>
         <translation>&amp;Sédiments</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="880"/>
+        <location filename="../View/ui/MainWindow.ui" line="881"/>
         <source>Sediment layers</source>
         <translation>Couche sédimentaires</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="888"/>
+        <location filename="../View/ui/MainWindow.ui" line="889"/>
         <source>Edit reach sediment layers</source>
         <translation>Éditer les couches sédimentaires</translation>
     </message>
@@ -1638,12 +1891,12 @@
         <translation>Descendre</translation>
     </message>
     <message>
-        <location filename="../View/ui/Results.ui" line="83"/>
+        <location filename="../View/ui/Results.ui" line="112"/>
         <source>Sediment</source>
         <translation>Sédiment</translation>
     </message>
     <message>
-        <location filename="../View/ui/ReachSedimentLayers.ui" line="31"/>
+        <location filename="../View/ui/ProfileSedimentLayers.ui" line="75"/>
         <source>Edit sediment layers list</source>
         <translation>Éditer la liste des couches sédimentaires</translation>
     </message>
@@ -1688,197 +1941,187 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="543"/>
-        <source>Édition des Tronçons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/ui/MainWindow.ui" line="656"/>
-        <source>Ouvrir une étude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/ui/MainWindow.ui" line="138"/>
+        <location filename="../View/ui/MainWindow.ui" line="139"/>
         <source>&amp;Results</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Résultats</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="157"/>
+        <location filename="../View/ui/MainWindow.ui" line="158"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="161"/>
+        <location filename="../View/ui/MainWindow.ui" line="162"/>
         <source>Pamhyr2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="350"/>
+        <location filename="../View/ui/MainWindow.ui" line="351"/>
         <source>Save study</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="365"/>
+        <location filename="../View/ui/MainWindow.ui" line="366"/>
         <source>Save study as ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="493"/>
+        <location filename="../View/ui/MainWindow.ui" line="494"/>
         <source>Boundary conditions and punctual contributions</source>
         <translation>Conditions limites et apports ponctuels</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="595"/>
+        <location filename="../View/ui/MainWindow.ui" line="596"/>
         <source>Visualize last results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="598"/>
+        <location filename="../View/ui/MainWindow.ui" line="599"/>
         <source>Visualize the last results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="668"/>
+        <location filename="../View/ui/MainWindow.ui" line="669"/>
         <source>Save the study (Ctrl+S)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="683"/>
+        <location filename="../View/ui/MainWindow.ui" line="684"/>
         <source>Close the study (Ctrl+F)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="857"/>
+        <location filename="../View/ui/MainWindow.ui" line="858"/>
         <source>Edit the study metadata</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="883"/>
+        <location filename="../View/ui/MainWindow.ui" line="884"/>
         <source>Define sediment layers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="893"/>
+        <location filename="../View/ui/MainWindow.ui" line="894"/>
         <source>Doc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="898"/>
+        <location filename="../View/ui/MainWindow.ui" line="899"/>
         <source>Pamhyr2 developer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="903"/>
+        <location filename="../View/ui/MainWindow.ui" line="904"/>
         <source>Mage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="906"/>
+        <location filename="../View/ui/MainWindow.ui" line="907"/>
         <source>Open mage documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="911"/>
+        <location filename="../View/ui/MainWindow.ui" line="912"/>
         <source>Users (pdf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="916"/>
+        <location filename="../View/ui/MainWindow.ui" line="917"/>
         <source>Users (html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="921"/>
+        <location filename="../View/ui/MainWindow.ui" line="922"/>
         <source>Developers (pdf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="926"/>
+        <location filename="../View/ui/MainWindow.ui" line="927"/>
         <source>Developers (html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="931"/>
+        <location filename="../View/ui/MainWindow.ui" line="932"/>
         <source>Reservoirs</source>
         <translation>Casiers</translation>
     </message>
     <message>
-        <location filename="../View/ui/MainWindow.ui" line="934"/>
+        <location filename="../View/ui/MainWindow.ui" line="935"/>
         <source>Edit reservoirs</source>
         <translation>Éditer les casiers</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="130"/>
+        <location filename="../View/ui/GeometryReach.ui" line="133"/>
         <source>import</source>
         <translation>importer</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="138"/>
+        <location filename="../View/ui/GeometryReach.ui" line="141"/>
         <source>export</source>
         <translation>exporter</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryCrossSection.ui" line="68"/>
+        <location filename="../View/ui/GeometryReach.ui" line="153"/>
         <source>add</source>
         <translation>ajouter</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="153"/>
+        <location filename="../View/ui/GeometryReach.ui" line="156"/>
         <source>Add a cross-section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="165"/>
+        <location filename="../View/ui/GeometryReach.ui" line="168"/>
         <source>Delete selected cross-section(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="174"/>
+        <location filename="../View/ui/GeometryReach.ui" line="177"/>
         <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="177"/>
+        <location filename="../View/ui/GeometryReach.ui" line="180"/>
         <source>Edit selected cross section(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryCrossSection.ui" line="116"/>
+        <location filename="../View/ui/GeometryReach.ui" line="189"/>
         <source>sort_asc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="189"/>
+        <location filename="../View/ui/GeometryReach.ui" line="192"/>
         <source>Sort cross-sections by ascending KP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryCrossSection.ui" line="128"/>
+        <location filename="../View/ui/GeometryReach.ui" line="201"/>
         <source>sort_des</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="201"/>
+        <location filename="../View/ui/GeometryReach.ui" line="204"/>
         <source>Sort cross-sections by descending KP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryCrossSection.ui" line="92"/>
+        <location filename="../View/ui/GeometryReach.ui" line="213"/>
         <source>up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="213"/>
+        <location filename="../View/ui/GeometryReach.ui" line="216"/>
         <source>Move up selected cross-section(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryCrossSection.ui" line="104"/>
+        <location filename="../View/ui/GeometryReach.ui" line="225"/>
         <source>down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="225"/>
+        <location filename="../View/ui/GeometryReach.ui" line="228"/>
         <source>Move down selected cross-section(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1963,15 +2206,95 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/Results.ui" line="165"/>
+        <location filename="../View/ui/Results.ui" line="259"/>
         <source>Add custom visualization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../View/ui/Results.ui" line="170"/>
+        <location filename="../View/ui/Results.ui" line="264"/>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../View/ui/MainWindow.ui" line="803"/>
+        <source>Edit boundary conditions and punctual contributions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/HydraulicStructures.ui" line="14"/>
+        <source>Hydraulic structures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/MainWindow.ui" line="943"/>
+        <source>Edit hydraulic structures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/BoundaryConditions.ui" line="117"/>
+        <source>Add a new boundary condition or punctual contribution</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/BoundaryConditions.ui" line="147"/>
+        <source>Edit boundary condition or punctual contribution</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/BasicHydraulicStructures.ui" line="14"/>
+        <source>Basic hydraulic structures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/BasicHydraulicStructures.ui" line="49"/>
+        <source>Enable / Disable basic hydraulic structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/HydraulicStructures.ui" line="133"/>
+        <source>Edit selected hydraulic structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/HydraulicStructures.ui" line="49"/>
+        <source>Enable / Disable hydraulic structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/InitialConditions.ui" line="30"/>
+        <source>Generate from height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/InitialConditions.ui" line="37"/>
+        <source>Generate from discharge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/EditBoundaryConditions.ui" line="89"/>
+        <source>Add a new point in boundary condition or punctual contribution</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/EditBoundaryConditions.ui" line="119"/>
+        <source>Sort boundary condition points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../View/ui/GeometryReach.ui" line="233"/>
+        <source>meshing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../View/ui/MainWindow.ui" line="544"/>
+        <source>Édition des Tronçons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../View/ui/MainWindow.ui" line="657"/>
+        <source>Ouvrir une étude</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindowProfile</name>
@@ -2021,7 +2344,7 @@
         <translation>Stricklers</translation>
     </message>
     <message>
-        <location filename="../View/Results/PlotSedReach.py" line="214"/>
+        <location filename="../View/Geometry/PlotKPZ.py" line="65"/>
         <source>Kp (m)</source>
         <translation>Pk (m)</translation>
     </message>
@@ -2046,7 +2369,7 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../View/Results/PlotKPC.py" line="68"/>
+        <location filename="../View/HydraulicStructures/PlotKPC.py" line="77"/>
         <source>KP (m)</source>
         <translation></translation>
     </message>
@@ -2056,12 +2379,12 @@
         <translation type="obsolete">Débit (m³/s)</translation>
     </message>
     <message>
-        <location filename="../View/Results/PlotKPC.py" line="64"/>
+        <location filename="../View/HydraulicStructures/PlotKPC.py" line="73"/>
         <source>Elevation (m)</source>
         <translation type="unfinished">Altitude (m)</translation>
     </message>
     <message>
-        <location filename="../View/SedimentLayers/Reach/Profile/Plot.py" line="51"/>
+        <location filename="../View/Geometry/PlotAC.py" line="181"/>
         <source>Height (m)</source>
         <translation type="unfinished">Hauteur (m)</translation>
     </message>
@@ -2090,12 +2413,12 @@
         <source>Next cross-section</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../View/Geometry/PlotAC.py" line="187"/>
         <source>Profil précédent</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../View/Geometry/PlotAC.py" line="189"/>
         <source>Profil sélectionné</source>
         <translation type="unfinished"></translation>
@@ -2104,37 +2427,37 @@
 <context>
     <name>Network</name>
     <message>
-        <location filename="../View/Network/GraphWidget.py" line="813"/>
+        <location filename="../View/Network/GraphWidget.py" line="816"/>
         <source>Add node</source>
         <translation>Ajouter un nœud</translation>
     </message>
     <message>
-        <location filename="../View/Network/GraphWidget.py" line="821"/>
+        <location filename="../View/Network/GraphWidget.py" line="824"/>
         <source>Delete the node</source>
         <translation>Supprimer un nœud</translation>
     </message>
     <message>
-        <location filename="../View/Network/GraphWidget.py" line="822"/>
+        <location filename="../View/Network/GraphWidget.py" line="825"/>
         <source>Disable the node</source>
         <translation>Déactiver un nœud</translation>
     </message>
     <message>
-        <location filename="../View/Network/GraphWidget.py" line="830"/>
+        <location filename="../View/Network/GraphWidget.py" line="833"/>
         <source>Delete the reach</source>
         <translation>Supprimer un bief</translation>
     </message>
     <message>
-        <location filename="../View/Network/GraphWidget.py" line="833"/>
+        <location filename="../View/Network/GraphWidget.py" line="836"/>
         <source>Disable the reach</source>
         <translation>Déactiver un bief</translation>
     </message>
     <message>
-        <location filename="../View/Network/GraphWidget.py" line="836"/>
+        <location filename="../View/Network/GraphWidget.py" line="839"/>
         <source>Enable the reach</source>
         <translation>Activer un bief</translation>
     </message>
     <message>
-        <location filename="../View/Network/GraphWidget.py" line="839"/>
+        <location filename="../View/Network/GraphWidget.py" line="842"/>
         <source>Reverse the reach orientation</source>
         <translation>Inverser l&apos;orientation du bief</translation>
     </message>
@@ -2170,7 +2493,7 @@
 <context>
     <name>Reservoir</name>
     <message>
-        <location filename="../View/Reservoir/Edit/Window.py" line="65"/>
+        <location filename="../View/Reservoir/Table.py" line="121"/>
         <source>Not associated</source>
         <translation>Non associé</translation>
     </message>
@@ -2239,9 +2562,14 @@
     </message>
     <message>
         <location filename="../View/Results/PlotH.py" line="79"/>
-        <source>Discharge (m³/s)</source>
+        <source>Discharge (m&#xb3;/s)</source>
         <translation type="obsolete">Débit (m³/s)</translation>
     </message>
+    <message encoding="UTF-8">
+        <location filename="../View/Results/PlotH.py" line="87"/>
+        <source>Discharge (m³/s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SedimentLayers</name>
@@ -2251,7 +2579,7 @@
         <translation>(sans nom)</translation>
     </message>
     <message>
-        <location filename="../View/SedimentLayers/Reach/translate.py" line="19"/>
+        <location filename="../View/SedimentLayers/translate.py" line="15"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -2266,7 +2594,7 @@
         <translation>(sans nom - @kp)</translation>
     </message>
     <message>
-        <location filename="../View/SedimentLayers/Reach/SLDialog.py" line="53"/>
+        <location filename="../View/SedimentLayers/Reach/translate.py" line="14"/>
         <source>Not defined</source>
         <translation>Non définie</translation>
     </message>
@@ -2498,6 +2826,11 @@
         <source>Command line arguments</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../View/SolverParameters/translate.py" line="133"/>
+        <source>Use Mage internal initialization (Y/N)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Solvers</name>