Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr

This commit is contained in:
Pierre-Antoine Rouby committed 2024-01-24 10:44:58 +01:00
commit 416a807e5d
2 files changed
+43 -43

No files matched your search

+41 -41
View File
@@ -19,12 +19,12 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="30"/>
<source>Change hydraulic structure type</source>
<translation type="unfinished">Changement du type d&apos;ouvrage hydraulique</translation>
<translation>Changement du type d&apos;ouvrage 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 type="unfinished">Voulez-vous changer le type de cet ouvrage hydraulique et reinitialiser ces valeurs ?</translation>
<translation>Voulez-vous changer le type de cet ouvrage hydraulique et réinitialiser les valeurs ?</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="43"/>
@@ -39,12 +39,12 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="49"/>
<source>Elevation</source>
<translation type="unfinished">Côte</translation>
<translation>Côte</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="52"/>
<source>Diameter</source>
<translation type="unfinished">Diamètre</translation>
<translation>Diamètre</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="55"/>
@@ -54,7 +54,7 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="58"/>
<source>Loading elevation</source>
<translation type="unfinished">Côte de mise en charge</translation>
<translation>Côte de mise en charge</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="61"/>
@@ -64,22 +64,22 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="64"/>
<source>Maximal loading elevation</source>
<translation type="unfinished">Côte de mise en charge maximale</translation>
<translation>Côte de mise en charge maximale</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="67"/>
<source>Siltation height</source>
<translation type="unfinished">Hauteur d&apos;envasement</translation>
<translation>Hauteur d&apos;envasement</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="70"/>
<source>Top of the vault</source>
<translation type="unfinished">Haut de la voûte</translation>
<translation>Haut de la voûte</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="73"/>
<source>Bottom of the vault</source>
<translation type="unfinished">Bas de la voûte</translation>
<translation>Bas de la voûte</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="76"/>
@@ -94,7 +94,7 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="82"/>
<source>Step space</source>
<translation type="unfinished">Pas d&apos;espace</translation>
<translation>Pas d&apos;espace</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="85"/>
@@ -104,32 +104,32 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="94"/>
<source>Parameter 1</source>
<translation type="unfinished">Paramètre 1</translation>
<translation>Paramètre 1</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="97"/>
<source>Parameter 2</source>
<translation type="unfinished">Paramètre 2</translation>
<translation>Paramètre 2</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="100"/>
<source>Parameter 3</source>
<translation type="unfinished">Paramètre 3</translation>
<translation>Paramètre 3</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="103"/>
<source>Parameter 4</source>
<translation type="unfinished">Paramètre 4</translation>
<translation>Paramètre 4</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="106"/>
<source>Parameter 5</source>
<translation type="unfinished">Paramètre 5</translation>
<translation>Paramètre 5</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="113"/>
<source>Not defined</source>
<translation type="unfinished">Non défini</translation>
<translation>Non défini</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="116"/>
@@ -139,7 +139,7 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="119"/>
<source>Trapezoidal weir</source>
<translation type="unfinished">Seuil trapézoidal</translation>
<translation>Seuil trapézoidal</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="122"/>
@@ -159,7 +159,7 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="131"/>
<source>Vaulted orifice</source>
<translation type="unfinished">Orifice voûte</translation>
<translation>Orifice voûte</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="134"/>
@@ -184,7 +184,7 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="146"/>
<source>User defined</source>
<translation type="unfinished">Défini par l&apos;utilisateur</translation>
<translation>Défini par l&apos;utilisateur</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="159"/>
@@ -212,7 +212,7 @@
<message>
<location filename="../View/BoundaryCondition/Table.py" line="148"/>
<source>Not associate</source>
<translation type="unfinished">Non associé</translation>
<translation>Non associé</translation>
</message>
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="33"/>
@@ -252,12 +252,12 @@
<message>
<location filename="../View/BoundaryCondition/translate.py" line="46"/>
<source>Not defined</source>
<translation type="unfinished">Non défini</translation>
<translation>Non défini</translation>
</message>
<message>
<location filename="../View/BoundaryCondition/translate.py" line="47"/>
<source>Ponctual contribution</source>
<translation type="unfinished">Apports ponctuelles</translation>
<translation type="unfinished">Apports ponctuels</translation>
</message>
<message>
<location filename="../View/BoundaryCondition/translate.py" line="55"/>
@@ -1042,7 +1042,7 @@
<message>
<location filename="../View/LateralContribution/Table.py" line="136"/>
<source>Not associate</source>
<translation>Non associer</translation>
<translation type="unfinished">Pas associé</translation>
</message>
<message>
<location filename="../View/LateralContribution/Edit/translate.py" line="32"/>
@@ -1645,7 +1645,7 @@
<message>
<location filename="../View/ui/BoundaryConditions.ui" line="64"/>
<source>Suspenssion</source>
<translation>Suspenssion</translation>
<translation type="unfinished">Suspension</translation>
</message>
<message>
<location filename="../View/ui/EditLateralContribution.ui" line="79"/>
@@ -2706,12 +2706,12 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="57"/>
<source>Timestep (second)</source>
<translation>Pas de temps (en second)</translation>
<translation type="unfinished">Pas de temps (en secondes)</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="64"/>
<source>Minimum timestep (second)</source>
<translation>Pas de temps minimal (en second)</translation>
<translation type="unfinished">Pas de temps minimal (en secondes)</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="67"/>
@@ -2741,17 +2741,17 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="82"/>
<source>Stop criterion iterations (G/A/R)</source>
<translation>Critère d&apos;arrêt d&apos;itération (G/A/R)</translation>
<translation type="unfinished">Critère d&apos;arrêt d&apos;itérations (G/A/R)</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="85"/>
<source>Iteration type</source>
<translation>Type d&apos;itération</translation>
<translation type="unfinished">Type d&apos;itérations</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="88"/>
<source>Smoothing coefficient</source>
<translation>Coefficient de lisage</translation>
<translation type="unfinished">Coefficient de lissage</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="91"/>
@@ -2761,12 +2761,12 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="94"/>
<source>Minimum water height (meter)</source>
<translation>Hauteur d&apos;eau minimal (metre)</translation>
<translation type="unfinished">Hauteur d&apos;eau minimal (mètre)</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="97"/>
<source>Maximun number of iterations (&lt; 100)</source>
<translation>Nombre maximum d&apos;itération (&lt; 100)</translation>
<translation type="unfinished">Nombre maximum d&apos;itérations (&lt; 100)</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="100"/>
@@ -2791,12 +2791,12 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="112"/>
<source>Number of iteration at maximum precision</source>
<translation>Nombre d&apos;itération a précition maximum</translation>
<translation type="unfinished">Nombre d&apos;itération à la précision maximum</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="115"/>
<source>Number of iteration before switch</source>
<translation>Nombre d&apos;itération avant changement</translation>
<translation type="unfinished">Nombre d&apos;itérations avant changement</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="118"/>
@@ -2811,7 +2811,7 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="124"/>
<source>Compute reach volume balance (Y/N)</source>
<translation>Calcule de l&apos;équilibre du volume de bief (Y/N)</translation>
<translation type="unfinished">Calcul de l&apos;équilibre du volume de bief (Y/N)</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="127"/>
@@ -2821,12 +2821,12 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="130"/>
<source>Minimum reach volume to check</source>
<translation>Volume de bief minimum à vérifié</translation>
<translation type="unfinished">Volume de bief minimum à vérifier</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="60"/>
<source>Command line arguments</source>
<translation>Arguments en ligne de command</translation>
<translation type="unfinished">Arguments en ligne de commande</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="133"/>
@@ -2836,17 +2836,17 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="137"/>
<source>Sediment density</source>
<translation>Masse volumique des sediments</translation>
<translation>Masse volumique des sédiments</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="139"/>
<source>Sediment rest angle</source>
<translation>Angle de repos des sediments</translation>
<translation>Angle de repos des sédiments</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="141"/>
<source>Sediment porosity</source>
<translation>Porosité des sediments</translation>
<translation>Porosité des sédiments</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="143"/>
@@ -2856,7 +2856,7 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="145"/>
<source>D50 changing distance</source>
<translation>Distance de changement du D50</translation>
<translation>Distance de changement pour le D50</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="147"/>
@@ -2866,7 +2866,7 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="149"/>
<source>Geometry modification method</source>
<translation>Méthode de modification de la geometrie</translation>
<translation>Méthode de modification de la géometrie</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="151"/>