diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index 839a50190f59e64526dece19d08e9b467abb6537..fb23ef40b71230cd7399f82370f770f2fd2533f1 100644
--- a/src/lang/fr.ts
+++ b/src/lang/fr.ts
@@ -31,7 +31,7 @@
     <message>
         <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="30"/>
         <source>Basic Hydraulic Structures</source>
-        <translation>Structure hydraulique élémentaire</translation>
+        <translation>Ouvrage hydraulique élémentaire</translation>
     </message>
     <message>
         <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="34"/>
@@ -51,7 +51,7 @@
     <message>
         <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="54"/>
         <source>Upper elevation (m)</source>
-        <translation>Côte de mise en charge (m)</translation>
+        <translation>Cote de mise en charge (m)</translation>
     </message>
     <message>
         <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="57"/>
@@ -61,7 +61,7 @@
     <message>
         <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="60"/>
         <source>Maximal loading elevation</source>
-        <translation>Côte de mise en charge maximale</translation>
+        <translation>Cote de mise en charge maximale</translation>
     </message>
     <message>
         <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="63"/>
@@ -420,7 +420,7 @@
     <message>
         <location filename="../View/Results/CustomPlot/Translate.py" line="46"/>
         <source>Bed load elevation (m)</source>
-        <translation>Côte du fond (m)</translation>
+        <translation>Cote du fond (m)</translation>
     </message>
 </context>
 <context>
@@ -434,7 +434,7 @@
 <context>
     <name>Dialog</name>
     <message>
-        <location filename="../View/ui/MeshingOptions.ui" line="14"/>
+        <location filename="../View/ui/SelectSolver.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
@@ -449,7 +449,7 @@
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../View/ui/NewStudy.ui" line="92"/>
+        <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="48"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
@@ -829,7 +829,7 @@
 <context>
     <name>Form</name>
     <message>
-        <location filename="../View/ui/Widgets/MainWindowTabCheckers.ui" line="14"/>
+        <location filename="../View/ui/dummy.ui" line="14"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
@@ -1055,17 +1055,17 @@
 <context>
     <name>Geometry</name>
     <message>
-        <location filename="../View/Geometry/Translate.py" line="56"/>
+        <location filename="../View/LateralContribution/translate.py" line="52"/>
         <source>X (m)</source>
         <translation>X (m)</translation>
     </message>
     <message>
-        <location filename="../View/Geometry/Translate.py" line="57"/>
+        <location filename="../View/LateralContribution/translate.py" line="53"/>
         <source>Y (m)</source>
         <translation>Y (m)</translation>
     </message>
     <message>
-        <location filename="../View/Geometry/Translate.py" line="58"/>
+        <location filename="../View/LateralContribution/translate.py" line="54"/>
         <source>Z (m)</source>
         <translation>Z (m)</translation>
     </message>
@@ -1175,7 +1175,7 @@
     <message>
         <location filename="../View/HydraulicStructures/Translate.py" line="30"/>
         <source>Hydraulic Structures</source>
-        <translation>Structures hydraulique</translation>
+        <translation>Structures hydrauliques</translation>
     </message>
     <message>
         <location filename="../View/HydraulicStructures/Translate.py" line="34"/>
@@ -1262,17 +1262,17 @@
         <translation>Activer cette fenêtre</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="14"/>
+        <location filename="../View/ui/Stricklers.ui" line="14"/>
         <source>MainWindow</source>
         <translation>Fenêtre principale</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="112"/>
+        <location filename="../View/ui/Stricklers.ui" line="52"/>
         <source>toolBar</source>
         <translation>Barre d&apos;outils</translation>
     </message>
     <message>
-        <location filename="../View/ui/EditLateralContribution.ui" line="79"/>
+        <location filename="../View/ui/Stricklers.ui" line="70"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
@@ -1282,7 +1282,7 @@
         <translation>Ajouter un casier</translation>
     </message>
     <message>
-        <location filename="../View/ui/EditLateralContribution.ui" line="94"/>
+        <location filename="../View/ui/Stricklers.ui" line="82"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
@@ -1292,7 +1292,7 @@
         <translation>Supprimer casier(s)</translation>
     </message>
     <message>
-        <location filename="../View/ui/AdditionalFileList.ui" line="67"/>
+        <location filename="../View/ui/ReservoirList.ui" line="105"/>
         <source>Edit</source>
         <translation>Éditer</translation>
     </message>
@@ -1327,7 +1327,7 @@
         <translation>Éditer la couche sedimentaire</translation>
     </message>
     <message>
-        <location filename="../View/ui/REPLineList.ui" line="79"/>
+        <location filename="../View/ui/Results.ui" line="270"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -1397,7 +1397,7 @@
         <translation>Nouvelle étude</translation>
     </message>
     <message>
-        <location filename="../View/ui/EditLateralContribution.ui" line="85"/>
+        <location filename="../View/ui/BoundaryConditions.ui" line="120"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1682,7 +1682,7 @@
         <translation>Éditer les casiers</translation>
     </message>
     <message>
-        <location filename="../View/ui/HydraulicStructures.ui" line="14"/>
+        <location filename="../View/ui/MainWindow.ui" line="625"/>
         <source>Hydraulic structures</source>
         <translation>Structures hydraulique</translation>
     </message>
@@ -1727,7 +1727,7 @@
         <translation>Supprimer la(les) couche(s) sédimentaire(s) sélectionnée(s)</translation>
     </message>
     <message>
-        <location filename="../View/ui/EditLateralContribution.ui" line="100"/>
+        <location filename="../View/ui/BoundaryConditions.ui" line="135"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
@@ -1762,7 +1762,7 @@
         <translation>Ajouter une condition aux limites ou un apport ponctuel</translation>
     </message>
     <message>
-        <location filename="../View/ui/EditLateralContribution.ui" line="97"/>
+        <location filename="../View/ui/BoundaryConditions.ui" line="132"/>
         <source>Delete current selected rows</source>
         <translation>Supprimer les lignes selectionnées</translation>
     </message>
@@ -1772,7 +1772,7 @@
         <translation>Éditer une condition aux limites ou un apport ponctuel</translation>
     </message>
     <message>
-        <location filename="../View/ui/EditLateralContribution.ui" line="109"/>
+        <location filename="../View/ui/Stricklers.ui" line="94"/>
         <source>Sort</source>
         <translation>Trier</translation>
     </message>
@@ -1824,7 +1824,7 @@
     <message>
         <location filename="../View/ui/Results.ui" line="169"/>
         <source>Water elevation</source>
-        <translation>Côte de l&apos;eau</translation>
+        <translation>Cote de l&apos;eau</translation>
     </message>
     <message>
         <location filename="../View/ui/Results.ui" line="201"/>
@@ -1842,7 +1842,7 @@
         <translation>Recharger</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="141"/>
+        <location filename="../View/ui/Results.ui" line="264"/>
         <source>Export</source>
         <translation>Exporter</translation>
     </message>
@@ -1852,7 +1852,7 @@
         <translation>Exporter les données brutes</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="165"/>
+        <location filename="../View/ui/GeometryCrossSection.ui" line="80"/>
         <source>delete</source>
         <translation>supprimer</translation>
     </message>
@@ -1917,37 +1917,37 @@
         <translation>Supprimer points</translation>
     </message>
     <message>
-        <location filename="../View/ui/HydraulicStructures.ui" line="133"/>
+        <location filename="../View/ui/BasicHydraulicStructures.ui" line="136"/>
         <source>Edit selected hydraulic structure</source>
         <translation>Éditer l&apos;ouvrage hydraulique sélectionné</translation>
     </message>
     <message>
-        <location filename="../View/ui/SolverLog.ui" line="77"/>
+        <location filename="../View/ui/SolverLog.ui" line="78"/>
         <source>Stop</source>
         <translation>Stoper</translation>
     </message>
     <message>
-        <location filename="../View/ui/SolverLog.ui" line="86"/>
+        <location filename="../View/ui/SolverLog.ui" line="87"/>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
     <message>
-        <location filename="../View/ui/SolverLog.ui" line="95"/>
+        <location filename="../View/ui/SolverLog.ui" line="96"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../View/ui/SolverLog.ui" line="104"/>
+        <location filename="../View/ui/SolverLog.ui" line="105"/>
         <source>LogFile</source>
         <translation>Fichier de log</translation>
     </message>
     <message>
-        <location filename="../View/ui/SolverLog.ui" line="109"/>
+        <location filename="../View/ui/SolverLog.ui" line="110"/>
         <source>results</source>
         <translation>resultats</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="153"/>
+        <location filename="../View/ui/GeometryCrossSection.ui" line="68"/>
         <source>add</source>
         <translation>Ajouter</translation>
     </message>
@@ -1962,7 +1962,7 @@
         <translation>Supprimer le(s) point(s) sélectionné(s)</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="213"/>
+        <location filename="../View/ui/GeometryCrossSection.ui" line="92"/>
         <source>up</source>
         <translation>Monter</translation>
     </message>
@@ -1972,7 +1972,7 @@
         <translation>Déplacer le point sélectionné vers le haut</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="225"/>
+        <location filename="../View/ui/GeometryCrossSection.ui" line="104"/>
         <source>down</source>
         <translation>Descendre</translation>
     </message>
@@ -1982,7 +1982,7 @@
         <translation>Déplacer le point sélectionné vers le bas</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="189"/>
+        <location filename="../View/ui/GeometryCrossSection.ui" line="116"/>
         <source>sort_asc</source>
         <translation>sort_asc</translation>
     </message>
@@ -1992,7 +1992,7 @@
         <translation>Trier les points par leurs plus proches voisins</translation>
     </message>
     <message>
-        <location filename="../View/ui/GeometryReach.ui" line="201"/>
+        <location filename="../View/ui/GeometryCrossSection.ui" line="128"/>
         <source>sort_des</source>
         <translation>sort_des</translation>
     </message>
@@ -2014,10 +2014,10 @@
     <message>
         <location filename="../View/ui/Reservoir.ui" line="114"/>
         <source>Sort points by elevation</source>
-        <translation>Trier les points par leur côte</translation>
+        <translation>Trier les points par leur cote</translation>
     </message>
     <message>
-        <location filename="../View/ui/ProfileSedimentLayers.ui" line="75"/>
+        <location filename="../View/ui/ReachSedimentLayers.ui" line="31"/>
         <source>Edit sediment layers list</source>
         <translation>Éditer la liste des couches sédimentaires</translation>
     </message>
@@ -2472,12 +2472,12 @@
     <message>
         <location filename="../View/Results/translate.py" line="41"/>
         <source>Water elevation</source>
-        <translation>Côte de l&apos;eau</translation>
+        <translation>Cote de l&apos;eau</translation>
     </message>
     <message>
         <location filename="../View/Results/translate.py" line="42"/>
         <source>Max water elevation</source>
-        <translation>Côte maximum de l&apos;eau</translation>
+        <translation>Cote maximum de l&apos;eau</translation>
     </message>
     <message>
         <location filename="../View/Results/translate.py" line="48"/>
@@ -2913,12 +2913,12 @@
     <message>
         <location filename="../View/Translate.py" line="60"/>
         <source>Elevation (m)</source>
-        <translation>Côte (m)</translation>
+        <translation>Cote (m)</translation>
     </message>
     <message>
         <location filename="../View/Translate.py" line="61"/>
         <source>Water elevation (m)</source>
-        <translation>Côte de l&apos;eau (m)</translation>
+        <translation>Cote de l&apos;eau (m)</translation>
     </message>
     <message>
         <location filename="../View/Translate.py" line="65"/>