diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index f35a3dc4221a6ba7881ca5bd20078dd76db0f548..d44729f7467b6d723fd75a5d214bff52f875ee1a 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">
+<!DOCTYPE TS><TS version="2.0" language="fr_FR" sourcelanguage="en">
 <context>
     <name>Dialog</name>
     <message>
@@ -131,7 +130,7 @@
     <message>
         <location filename="../view/ui/ConfigureDialog.ui" line="335"/>
         <source>Please restart application after language modification</source>
-        <translation></translation>
+        <translation type="unfinished">Please restart application after language modification</translation>
     </message>
     <message>
         <location filename="../view/ui/NewStudy.ui" line="40"/>
@@ -157,7 +156,7 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
+<context encoding="UTF-8">
     <name>MainWindow</name>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="37"/>
@@ -409,11 +408,6 @@
         <source>Edit spills</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="546"/>
-        <source>Édition des Tronçons</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow.ui" line="562"/>
         <source>Edit cross building</source>
@@ -479,26 +473,11 @@
         <source>ouvrir</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="693"/>
-        <source>Ouvrir une étude</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow.ui" line="656"/>
         <source>Save current study</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="705"/>
-        <source>Enrégistrer étude en cours (Ctrl+S)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="720"/>
-        <source>Fermer étude en cours (Ctrl+F)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="723"/>
         <source>Ctrl+F</source>
@@ -669,26 +648,6 @@
         <source>&amp;Fichier</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="102"/>
-        <source>&amp;Réseau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="108"/>
-        <source>&amp;Géométrie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="140"/>
-        <source>&amp;Exécuter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="144"/>
-        <source>Sous-étude Rubar3</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="159"/>
         <source>&amp;Hydraulique</source>
@@ -709,31 +668,11 @@
         <source>&amp;Aide</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="314"/>
-        <source>Nouvelle étude MAGE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="337"/>
-        <source>Nouvelle étude RubarBE</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="340"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="358"/>
-        <source>Importer un jeu de données MAGE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="366"/>
-        <source>Importer un jeu de données RubarBE</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="581"/>
         <source>Fermer</source>
@@ -769,26 +708,6 @@
         <source>Quitter</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="437"/>
-        <source> Éditer le réseau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="442"/>
-        <source>Éditer la géométrie </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="447"/>
-        <source>Importer une géométrie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="452"/>
-        <source>Exporter la géométrie</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="457"/>
         <source>Lancer le mailleur externe</source>
@@ -799,11 +718,6 @@
         <source>Choix du mailleur par bief</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="467"/>
-        <source>Visualiser la géométrie maillée</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="472"/>
         <source>Exporter le maillage </source>
@@ -819,11 +733,6 @@
         <source>Supprimer l&apos;ensemble des maillages</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="497"/>
-        <source>Paramètres numériques du solveur MAGE</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="502"/>
         <source>Conditions aux Limites &amp; Apports Ponctuels</source>
@@ -834,36 +743,6 @@
         <source>Conditions initiales</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="521"/>
-        <source>Activer/Désactiver l&apos;export des conditions initiales</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="526"/>
-        <source>Importer l&apos;état final comme état initial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="531"/>
-        <source>Édition des Frottements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="536"/>
-        <source>Édition des Apports Latéraux</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="541"/>
-        <source>Édition des déversements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="551"/>
-        <source>Édition des ouvrages en travers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="556"/>
         <source>Solveur MAGE</source>
@@ -879,11 +758,6 @@
         <source>Afficher les listings</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="571"/>
-        <source>Gestion des répertoires de simulation</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="576"/>
         <source>Ouvrir</source>
@@ -914,36 +788,11 @@
         <source>Ligne d&apos;eau enveloppe</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="624"/>
-        <source>Vitesse(Pk) à t fixé</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="629"/>
-        <source>Vitesse(t) à Pk fixé</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="634"/>
-        <source>Charge hydraulique(Pk) à t fixé</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="639"/>
-        <source>Charge hydraulique(t) à Pk fixé</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="650"/>
         <source>Voir l&apos;animation (MAGE)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="655"/>
-        <source>Autres résulats MAGE</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="666"/>
         <source>Cartographier le bief courant</source>
@@ -959,11 +808,6 @@
         <source>Aide de MAGE</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="681"/>
-        <source>À propos</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="702"/>
         <source>enregistrer_etude_en_cours</source>
@@ -984,11 +828,6 @@
         <source>lancer_solveur</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="750"/>
-        <source>Lancer le solveur pour réaliser une simulation</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="765"/>
         <source>interrompt_simulation_en_cours</source>
@@ -999,11 +838,6 @@
         <source>lancer_mailleur_externe</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="783"/>
-        <source>Lancer le mailleur externe sur la géométrie du bief courant</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../view/ui/MainWindow_old.ui" line="795"/>
         <source>afficher_listings_simulation</source>
@@ -1015,86 +849,251 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../view/ui/MainWindow_old.ui" line="831"/>
+        <source>Maillage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../view/ui/MainWindow_old.ui" line="839"/>
+        <source>Cond. Limites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../view/ui/MainWindow_old.ui" line="874"/>
+        <source>Frottements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../view/ui/MainWindow_old.ui" line="882"/>
+        <source>Ouvrages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="546"/>
+        <source>Édition des Tronçons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="693"/>
+        <source>Ouvrir une étude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="705"/>
+        <source>Enrégistrer étude en cours (Ctrl+S)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="720"/>
+        <source>Fermer étude en cours (Ctrl+F)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="102"/>
+        <source>&amp;Réseau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="108"/>
+        <source>&amp;Géométrie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="140"/>
+        <source>&amp;Exécuter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="144"/>
+        <source>Sous-étude Rubar3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="314"/>
+        <source>Nouvelle étude MAGE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="337"/>
+        <source>Nouvelle étude RubarBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="358"/>
+        <source>Importer un jeu de données MAGE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="366"/>
+        <source>Importer un jeu de données RubarBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="437"/>
+        <source> Éditer le réseau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="442"/>
+        <source>Éditer la géométrie </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="447"/>
+        <source>Importer une géométrie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="452"/>
+        <source>Exporter la géométrie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="467"/>
+        <source>Visualiser la géométrie maillée</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="497"/>
+        <source>Paramètres numériques du solveur MAGE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="521"/>
+        <source>Activer/Désactiver l&apos;export des conditions initiales</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="526"/>
+        <source>Importer l&apos;état final comme état initial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="531"/>
+        <source>Édition des Frottements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="536"/>
+        <source>Édition des Apports Latéraux</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="541"/>
+        <source>Édition des déversements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="551"/>
+        <source>Édition des ouvrages en travers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="571"/>
+        <source>Gestion des répertoires de simulation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="624"/>
+        <source>Vitesse(Pk) à t fixé</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="629"/>
+        <source>Vitesse(t) à Pk fixé</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="634"/>
+        <source>Charge hydraulique(Pk) à t fixé</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="639"/>
+        <source>Charge hydraulique(t) à Pk fixé</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="655"/>
+        <source>Autres résulats MAGE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="681"/>
+        <source>À propos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="750"/>
+        <source>Lancer le solveur pour réaliser une simulation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="../view/ui/MainWindow_old.ui" line="783"/>
+        <source>Lancer le mailleur externe sur la géométrie du bief courant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="807"/>
         <source>Réseau</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="810"/>
         <source>Ouvrir l&apos;éditeur de la topologie du réseau</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="819"/>
         <source>Géométrie</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="822"/>
         <source>Ouvrir l&apos;éditeur de géométrie</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="831"/>
-        <source>Maillage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="839"/>
-        <source>Cond. Limites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="842"/>
         <source>Ouvir l&apos;éditeur des Conditions aux Limites &amp; Apports Ponctuels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="850"/>
         <source>App. Latéraux</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="853"/>
         <source>Ouvrir l&apos;éditeur des Apports Latéraux Distribués</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="858"/>
         <source>Déversements</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="861"/>
         <source>Ouvrir l&apos;éditeur des Déversements Latéraux</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="866"/>
         <source>Tronçons</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="869"/>
         <source>Ouvrir l&apos;éditeur des tronçons pour les frottements et Apports Latéraux</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="874"/>
-        <source>Frottements</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="877"/>
         <source>Ouvrir l&apos;éditeur des frottements au fond</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../view/ui/MainWindow_old.ui" line="882"/>
-        <source>Ouvrages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../view/ui/MainWindow_old.ui" line="885"/>
         <source>Ouvrir l&apos;éditeur des ouvrages (seuils, vannes, etc.), singularités et pompes</source>
         <translation type="unfinished"></translation>