diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index bb552375e60072f9892aca958c5c2ef42ea446b7..74f87241f8a495424e2f7c792d56a184fcf7a746 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -90,7 +90,7 @@ class Mage(CommandLineSolver):
("mage_compute_reach_volume_balance", "y"),
("mage_max_reach_volume_balance", "0.001"),
("mage_min_reach_volume_to_check", "1000.0"),
- ("mage_init_internal", " "),
+ ("mage_init_internal", "n"),
]
return lst
@@ -792,6 +792,10 @@ class Mage8(Mage):
value = ("p" if value.lower() in ["y", "yes", "true"]
else "")
+ logger.debug(
+ f"export: PAR: {name}: {value} ({p.value})"
+ )
+
f.write(f"{name} {value}\n")
return files
diff --git a/src/View/SolverParameters/Table.py b/src/View/SolverParameters/Table.py
index bbf12adadebfd8d70054016dd84e197e307a1095..043238f64818d9dc34f1577b794f7eec199abf8a 100644
--- a/src/View/SolverParameters/Table.py
+++ b/src/View/SolverParameters/Table.py
@@ -96,76 +96,6 @@ class TableModel(PamhyrTableModel):
self.dataChanged.emit(index, index)
return True
- # def add(self, row, parent=QModelIndex()):
- # self.beginInsertRows(parent, row, row - 1)
-
- # self._undo.push(
- # AddCommand(
- # self._lst, row
- # )
- # )
-
- # self.endInsertRows()
- # self.layoutChanged.emit()
-
- # def delete(self, rows, parent=QModelIndex()):
- # self.beginRemoveRows(parent, rows[0], rows[-1])
-
- # self._undo.push(
- # DelCommand(
- # self._lst, rows
- # )
- # )
-
- # self.endRemoveRows()
- # self.layoutChanged.emit()
-
- # def sort(self, _reverse, parent=QModelIndex()):
- # self.layoutAboutToBeChanged.emit()
-
- # self._undo.push(
- # SortCommand(
- # self._lst, False
- # )
- # )
-
- # self.layoutAboutToBeChanged.emit()
- # self.layoutChanged.emit()
-
- # def move_up(self, row, parent=QModelIndex()):
- # if row <= 0:
- # return
-
- # target = row + 2
-
- # self.beginMoveRows(parent, row - 1, row - 1, parent, target)
-
- # self._undo_stack.push(
- # MoveCommand(
- # self._lst, "up", row
- # )
- # )
-
- # self.endMoveRows()
- # self.layoutChanged.emit()
-
- # def move_down(self, index, parent=QModelIndex()):
- # if row > len(self._lst):
- # return
-
- # target = row
-
- # self.beginMoveRows(parent, row + 1, row + 1, parent, target)
-
- # self._undo_stack.push(
- # MoveCommand(
- # self._lst, "down", row
- # )
- # )
-
- # self.endMoveRows()
- # self.layoutChanged.emit()
-
def undo(self):
self._undo.undo()
self.layoutChanged.emit()
diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index 5a32733163331015e3b13498165c7e012d8a59ba..c0cc1afc06fc92482b0ba2f8df6f5f6ab7d0c5e4 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>
@@ -276,7 +275,7 @@
</message>
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="12"/>
- <source>Discharge (m³/s)</source>
+ <source>Discharge (m³/s)</source>
<translation type="obsolete">Débit (m³/s)</translation>
</message>
<message>
@@ -319,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>
@@ -433,9 +437,14 @@
</message>
<message>
<location filename="../View/Results/CustomPlot/Translate.py" line="53"/>
- <source>Discharge (m³/s)</source>
+ <source>Discharge (m³/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 type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Dialog</name>
@@ -925,12 +934,12 @@
<message>
<location filename="../View/Geometry/Translate.py" line="31"/>
<source>File mage geometry (*.ST)</source>
- <translation>Fichier géométrie Mage (*.ST)</translation>
+ <translation type="obsolete">Fichier géométrie Mage (*.ST)</translation>
</message>
<message>
<location filename="../View/Geometry/Translate.py" line="33"/>
<source>File mage meshed geometry (*.M)</source>
- <translation>Fichier géométrie maillée (*.M)</translation>
+ <translation type="obsolete">Fichier géométrie maillée (*.M)</translation>
</message>
<message>
<location filename="../View/Geometry/Translate.py" line="35"/>
@@ -967,6 +976,16 @@
<source>Points</source>
<translation>Points</translation>
</message>
+ <message>
+ <location filename="../View/Geometry/Translate.py" line="31"/>
+ <source>File mage geometry (*.ST *.st)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Translate.py" line="33"/>
+ <source>File mage meshed geometry (*.M *.m)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Hydraulic structure</name>
@@ -1003,7 +1022,7 @@
</message>
<message>
<location filename="../View/InitialConditions/translate.py" line="40"/>
- <source>Discharge (m³/s)</source>
+ <source>Discharge (m³/s)</source>
<translation type="obsolete">Débit (m³/s)</translation>
</message>
<message>
@@ -1016,6 +1035,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>
@@ -1136,9 +1160,14 @@
</message>
<message>
<location filename="../View/InitialConditions/translate.py" line="11"/>
- <source>Discharge (m³/s)</source>
+ <source>Discharge (m³/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>
@@ -1213,7 +1242,7 @@
<translation>&Aide</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="264"/>
+ <location filename="../View/ui/MainWindow.ui" line="263"/>
<source>New study</source>
<translation>Nouvelle étude</translation>
</message>
@@ -1223,87 +1252,87 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="295"/>
+ <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="298"/>
+ <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="306"/>
+ <location filename="../View/ui/MainWindow.ui" line="305"/>
<source>Import data from MAGE</source>
<translation>Importer des données d'une étude MAGE</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="317"/>
+ <location filename="../View/ui/MainWindow.ui" line="316"/>
<source>Import data from RubarBE</source>
<translation>Importer des données d'une étude RubarBE</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="589"/>
+ <location filename="../View/ui/MainWindow.ui" line="588"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="682"/>
+ <location filename="../View/ui/MainWindow.ui" line="681"/>
<source>Close current study</source>
<translation>Fermer l'étude en cours</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="340"/>
+ <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="349"/>
+ <location filename="../View/ui/MainWindow.ui" line="348"/>
<source>Save</source>
<translation>Sauvegarder</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="355"/>
+ <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="364"/>
+ <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="370"/>
+ <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="375"/>
+ <location filename="../View/ui/MainWindow.ui" line="374"/>
<source>Archive</source>
<translation>Archive</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="380"/>
+ <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="697"/>
+ <location filename="../View/ui/MainWindow.ui" line="696"/>
<source>Quit</source>
<translation>Quitter</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="395"/>
+ <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="772"/>
+ <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="405"/>
+ <location filename="../View/ui/MainWindow.ui" line="404"/>
<source>Edit geometry</source>
<translation>Éditer la géométrie</translation>
</message>
@@ -1318,47 +1347,47 @@
<translation>Exporter la géométrie</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="429"/>
+ <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="434"/>
+ <location filename="../View/ui/MainWindow.ui" line="433"/>
<source>choose meshing tool by reach</source>
<translation>Choisir l'outil de maillage par bief</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="442"/>
+ <location filename="../View/ui/MainWindow.ui" line="441"/>
<source>View meshed geometry</source>
<translation>Voir la géométrie maillée</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="450"/>
+ <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="458"/>
+ <location filename="../View/ui/MainWindow.ui" line="457"/>
<source>Delete mesh of current reach</source>
<translation>Supprimer le maillage du bief courant</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="466"/>
+ <location filename="../View/ui/MainWindow.ui" line="465"/>
<source>Delete all mesh</source>
<translation>Supprimer tout le maillage</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="474"/>
+ <location filename="../View/ui/MainWindow.ui" line="473"/>
<source>Abscisse - Cote</source>
<translation>Abscisse - Cote</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="482"/>
+ <location filename="../View/ui/MainWindow.ui" line="481"/>
<source>XYZ</source>
<translation></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="490"/>
+ <location filename="../View/ui/MainWindow.ui" line="489"/>
<source>Numerical parameter for solvers</source>
<translation>Paramètres numeriques des solvers</translation>
</message>
@@ -1368,62 +1397,62 @@
<translation type="obsolete">Condition aux limites et apports ponctuels</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="874"/>
+ <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="514"/>
+ <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="522"/>
+ <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="527"/>
+ <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="532"/>
+ <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="540"/>
+ <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="553"/>
+ <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="712"/>
+ <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="561"/>
+ <location filename="../View/ui/MainWindow.ui" line="560"/>
<source>F5</source>
<translation>F5</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="566"/>
+ <location filename="../View/ui/MainWindow.ui" line="565"/>
<source>Stop solver</source>
<translation>Stopper le solveur</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="571"/>
+ <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="579"/>
+ <location filename="../View/ui/MainWindow.ui" line="578"/>
<source>Simulation directory management</source>
<translation type="unfinished"></translation>
</message>
@@ -1438,92 +1467,92 @@
<translation>Hydrogramme</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="611"/>
+ <location filename="../View/ui/MainWindow.ui" line="610"/>
<source>Limnigram</source>
<translation>Limnigramme</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="625"/>
+ <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="633"/>
+ <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="641"/>
+ <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="646"/>
+ <location filename="../View/ui/MainWindow.ui" line="645"/>
<source>About</source>
<translation>À propos</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="655"/>
+ <location filename="../View/ui/MainWindow.ui" line="654"/>
<source>ouvrir</source>
<translation>open</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="667"/>
+ <location filename="../View/ui/MainWindow.ui" line="666"/>
<source>Save current study</source>
<translation>Sauvegarder l'étude</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="688"/>
+ <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="392"/>
+ <location filename="../View/ui/MainWindow.ui" line="391"/>
<source>Quit application</source>
<translation>Quitter l'application</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="703"/>
+ <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="727"/>
+ <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="730"/>
+ <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="733"/>
+ <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="742"/>
+ <location filename="../View/ui/MainWindow.ui" line="741"/>
<source>Run external meshing tool</source>
<translation>Lancer le mailleur externe</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="745"/>
+ <location filename="../View/ui/MainWindow.ui" line="744"/>
<source>Run meshing tool on current reach geometry</source>
<translation>Lancer le mailleur externe sur le bief selectionné</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="757"/>
+ <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="760"/>
+ <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="769"/>
+ <location filename="../View/ui/MainWindow.ui" line="768"/>
<source>River network</source>
<translation>Réseau</translation>
</message>
@@ -1533,17 +1562,17 @@
<translation>Géométrie</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="784"/>
+ <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="793"/>
+ <location filename="../View/ui/MainWindow.ui" line="792"/>
<source>Mesh</source>
<translation>Maillage</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="801"/>
+ <location filename="../View/ui/MainWindow.ui" line="800"/>
<source>Boundary conditions</source>
<translation>Conditions aux limites</translation>
</message>
@@ -1553,62 +1582,62 @@
<translation type="obsolete">Éditer les conditions aux limites et les apports ponctuels</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="812"/>
+ <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="815"/>
+ <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="820"/>
+ <location filename="../View/ui/MainWindow.ui" line="819"/>
<source>Spills</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="823"/>
+ <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="828"/>
+ <location filename="../View/ui/MainWindow.ui" line="827"/>
<source>Friction</source>
<translation>Frottements</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="836"/>
+ <location filename="../View/ui/MainWindow.ui" line="835"/>
<source>Stricklers</source>
<translation>Stricklers</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="839"/>
+ <location filename="../View/ui/MainWindow.ui" line="838"/>
<source>Edit the study stricklers</source>
<translation>Éditer les Stricklers de l'étude</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="844"/>
+ <location filename="../View/ui/MainWindow.ui" line="843"/>
<source>Building</source>
<translation>Ouvrages</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="847"/>
+ <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="856"/>
+ <location filename="../View/ui/MainWindow.ui" line="855"/>
<source>Edit study</source>
<translation>Éditer l'étude</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="864"/>
+ <location filename="../View/ui/MainWindow.ui" line="863"/>
<source>English</source>
<translation>Anglais</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="869"/>
+ <location filename="../View/ui/MainWindow.ui" line="868"/>
<source>French</source>
<translation>Français</translation>
</message>
@@ -1813,27 +1842,27 @@
<translation>Trier les points des conditions aux limites</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="700"/>
+ <location filename="../View/ui/MainWindow.ui" line="699"/>
<source>Quit the application (Ctrl+Q)</source>
<translation>Quitter l'application (Ctrl+Q)</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="715"/>
+ <location filename="../View/ui/MainWindow.ui" line="714"/>
<source>Run a solver</source>
<translation>Lancer un solveur</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="796"/>
+ <location filename="../View/ui/MainWindow.ui" line="795"/>
<source>Display meshed reach</source>
<translation>Afficher le maillage du bief</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="831"/>
+ <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="877"/>
+ <location filename="../View/ui/MainWindow.ui" line="876"/>
<source>Define initial conditions</source>
<translation>Définir les conditions initiales</translation>
</message>
@@ -1858,17 +1887,17 @@
<translation>Éditer la couche sedimentaire</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="178"/>
+ <location filename="../View/ui/MainWindow.ui" line="177"/>
<source>&Sediment</source>
<translation>&Sédiments</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="882"/>
+ <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="890"/>
+ <location filename="../View/ui/MainWindow.ui" line="889"/>
<source>Edit reach sediment layers</source>
<translation>Éditer les couches sédimentaires</translation>
</message>
@@ -1958,109 +1987,104 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="352"/>
+ <location filename="../View/ui/MainWindow.ui" line="351"/>
<source>Save study</source>
<translation>Sauvegarder l'étude</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="367"/>
+ <location filename="../View/ui/MainWindow.ui" line="366"/>
<source>Save study as ...</source>
<translation>Sauvegarder l'étude sous ...</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="495"/>
+ <location filename="../View/ui/MainWindow.ui" line="494"/>
<source>Boundary conditions and punctual contributions</source>
<translation>Conditions aux limites et apports ponctuels</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="597"/>
+ <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="600"/>
+ <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="670"/>
+ <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="685"/>
+ <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="859"/>
+ <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="885"/>
+ <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="895"/>
+ <location filename="../View/ui/MainWindow.ui" line="894"/>
<source>Doc</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="900"/>
+ <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="905"/>
+ <location filename="../View/ui/MainWindow.ui" line="904"/>
<source>Mage</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="908"/>
+ <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="913"/>
- <source>Users (pdf)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../View/ui/MainWindow.ui" line="918"/>
+ <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="923"/>
+ <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="928"/>
+ <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="933"/>
+ <location filename="../View/ui/MainWindow.ui" line="932"/>
<source>Reservoirs</source>
<translation>Casiers</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="936"/>
+ <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="133"/>
<source>import</source>
- <translation>Importer</translation>
+ <translation type="obsolete">Importer</translation>
</message>
<message>
<location filename="../View/ui/GeometryReach.ui" line="141"/>
<source>export</source>
- <translation>Exporter</translation>
+ <translation type="obsolete">Exporter</translation>
</message>
<message>
<location filename="../View/ui/GeometryReach.ui" line="153"/>
@@ -2218,7 +2242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="804"/>
+ <location filename="../View/ui/MainWindow.ui" line="803"/>
<source>Edit boundary conditions and punctual contributions</source>
<translation type="unfinished"></translation>
</message>
@@ -2228,7 +2252,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="944"/>
+ <location filename="../View/ui/MainWindow.ui" line="943"/>
<source>Edit hydraulic structures</source>
<translation type="unfinished"></translation>
</message>
@@ -2283,22 +2307,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="233"/>
- <source>meshing</source>
+ <location filename="../View/ui/MainWindow.ui" line="951"/>
+ <source>Open results from file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="952"/>
- <source>Open results from file</source>
+ <location filename="../View/ui/MainWindow.ui" line="912"/>
+ <source>Users (wiki)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="545"/>
- <source>Édition des Tronçons</source>
+ <location filename="../View/ui/GeometryReach.ui" line="133"/>
+ <source>Import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../View/ui/GeometryReach.ui" line="141"/>
+ <source>Export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="658"/>
+ <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>
@@ -2355,11 +2394,6 @@
<source>Kp (m)</source>
<translation>Pk (m)</translation>
</message>
- <message>
- <location filename="../View/Geometry/PlotAC.py" line="197"/>
- <source>Profil suivant</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../View/Geometry/mainwindow_ui_reach.py" line="334"/>
<source>Name</source>
@@ -2403,68 +2437,58 @@
<message>
<location filename="../View/Geometry/PlotAC.py" line="183"/>
<source>Transverse abscissa (m)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Abscisse en travers (m)</translation>
</message>
<message>
- <location filename="../View/Geometry/PlotAC.py" line="89"/>
+ <location filename="../View/Geometry/PlotAC.py" line="193"/>
<source>Previous cross-section</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/Geometry/PlotAC.py" line="91"/>
+ <location filename="../View/Geometry/PlotAC.py" line="195"/>
<source>Cross-section</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/Geometry/PlotAC.py" line="92"/>
+ <location filename="../View/Geometry/PlotAC.py" line="197"/>
<source>Next cross-section</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../View/Geometry/PlotAC.py" line="193"/>
- <source>Profil précédent</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../View/Geometry/PlotAC.py" line="195"/>
- <source>Profil sélectionné</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Network</name>
<message>
- <location filename="../View/Network/GraphWidget.py" line="816"/>
+ <location filename="../View/Network/GraphWidget.py" line="817"/>
<source>Add node</source>
<translation>Ajouter un nœud</translation>
</message>
<message>
- <location filename="../View/Network/GraphWidget.py" line="824"/>
+ <location filename="../View/Network/GraphWidget.py" line="825"/>
<source>Delete the node</source>
<translation>Supprimer un nœud</translation>
</message>
<message>
- <location filename="../View/Network/GraphWidget.py" line="825"/>
+ <location filename="../View/Network/GraphWidget.py" line="826"/>
<source>Disable the node</source>
<translation>Désactiver un nœud</translation>
</message>
<message>
- <location filename="../View/Network/GraphWidget.py" line="833"/>
+ <location filename="../View/Network/GraphWidget.py" line="834"/>
<source>Delete the reach</source>
<translation>Supprimer un bief</translation>
</message>
<message>
- <location filename="../View/Network/GraphWidget.py" line="836"/>
+ <location filename="../View/Network/GraphWidget.py" line="837"/>
<source>Disable the reach</source>
<translation>Désactiver un bief</translation>
</message>
<message>
- <location filename="../View/Network/GraphWidget.py" line="839"/>
+ <location filename="../View/Network/GraphWidget.py" line="840"/>
<source>Enable the reach</source>
<translation>Activer un bief</translation>
</message>
<message>
- <location filename="../View/Network/GraphWidget.py" line="842"/>
+ <location filename="../View/Network/GraphWidget.py" line="843"/>
<source>Reverse the reach orientation</source>
<translation>Inverser l'orientation du bief</translation>
</message>
@@ -2569,9 +2593,14 @@
</message>
<message>
<location filename="../View/Results/PlotH.py" line="79"/>
- <source>Discharge (m³/s)</source>
+ <source>Discharge (m³/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>
@@ -2831,7 +2860,7 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="133"/>
<source>Use Mage internal initialization (Y/N)</source>
- <translation>Utiliser l'initialisation interne de mage (Y/N)</translation>
+ <translation>Utiliser l'initialisation interne de mage (O/N)</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="137"/>