diff --git a/src/Checker/Mage.py b/src/Checker/Mage.py
index e7f8352b6d16ec8b2e003f4040b6ce8e6ca6fca6..acb2ddc8d41774fac45c6babfc8296ef8dfa2fbe 100644
--- a/src/Checker/Mage.py
+++ b/src/Checker/Mage.py
@@ -206,11 +206,11 @@ class MageGeometryGuideLineChecker(StudyGeometryChecker):
def __init__(self, version="mage8"):
super(MageGeometryGuideLineChecker, self).__init__()
- self._name = _translate("Checker", "Mage geometry guide line checker")
+ self._name = _translate("Checker", "Mage geometry guideline checker")
self._description = _translate(
"Checker",
- "Check if exists geometry guide line is correctly defined \
-for each reaches of the study"
+ "Check if exists geometry guidelines are correctly defined \
+for each reach"
)
self._solver = version
self._modules = Modules.GEOMETRY
@@ -241,7 +241,7 @@ for each reaches of the study"
for profile in profiles:
if not profile.has_standard_named_points():
self._status = STATUS.WARNING
- self._summary = "no_standard_guileline_defined"
+ self._summary = "no_standard_guideline_defined"
return False
for gl in gls[1:]:
diff --git a/src/Checker/Study.py b/src/Checker/Study.py
index f0d692629511f5297550e8b0d4b67cb7c2644946..b893a507e8378021d1712fa36db2e275a9a529fc 100644
--- a/src/Checker/Study.py
+++ b/src/Checker/Study.py
@@ -34,9 +34,9 @@ class StudyNetworkReachChecker(AbstractModelChecker):
def __init__(self):
super(StudyNetworkReachChecker, self).__init__()
- self._name = _translate("Checker", "Study network reach checker")
+ self._name = _translate("Checker", "Study reach network checker")
self._description = _translate(
- "Checker", "Check if exists at least one reach for study"
+ "Checker", "Check if exists at least one reach exists"
)
self._modules = Modules.NETWORK
@@ -63,7 +63,7 @@ class StudyGeometryChecker(AbstractModelChecker):
self._name = _translate("Checker", "Study geometry checker")
self._description = _translate(
- "Checker", "Check if exists geometry for each reach of study"
+ "Checker", "Check if the geometry of each reach exists"
)
self._modules = Modules.GEOMETRY
diff --git a/src/View/BoundaryCondition/translate.py b/src/View/BoundaryCondition/translate.py
index 19244076b8a30640d7c1dea61d61b83c79202e63..02903daebe4116c13425c43392ab44378fc7e8a2 100644
--- a/src/View/BoundaryCondition/translate.py
+++ b/src/View/BoundaryCondition/translate.py
@@ -48,7 +48,7 @@ class BCTranslate(MainTranslate):
self._sub_dict["long_types"] = {
"ND": self._dict["not_defined"],
- "PC": _translate("BoundaryCondition", "Ponctual contribution"),
+ "PC": _translate("BoundaryCondition", "Point sources"),
"TZ": _translate("BoundaryCondition", "Z(t)"),
"TD": _translate("BoundaryCondition", "Q(t)"),
"ZD": _translate("BoundaryCondition", "Q(Z)"),
diff --git a/src/View/Frictions/translate.py b/src/View/Frictions/translate.py
index 57b823a7db6e33e453ed5dc1be6c4b44c775d360..3286e2e2ecae72a39b84edb782b492df237179a4 100644
--- a/src/View/Frictions/translate.py
+++ b/src/View/Frictions/translate.py
@@ -39,8 +39,8 @@ class FrictionsTranslate(MainTranslate):
self._sub_dict["table_headers"] = {
# "name": self._dict["name"],
# "edge": self._dict["reach"],
- "begin_kp": _translate("Frictions", "Begin kp (m)"),
- "end_kp": _translate("Frictions", "End kp (m)"),
- "begin_strickler": _translate("Frictions", "Begin strickler"),
- "end_strickler": _translate("Frictions", "End strickler"),
+ "begin_kp": _translate("Frictions", "Start (m)"),
+ "end_kp": _translate("Frictions", "End (m)"),
+ "begin_strickler": _translate("Frictions", "Start coefficient"),
+ "end_strickler": _translate("Frictions", "End coefficient"),
}
diff --git a/src/View/Geometry/Profile/Table.py b/src/View/Geometry/Profile/Table.py
index 21e202f8ee9fafffe0d4bec3b275355592118f0c..5974eb7c054ca4d792eabed0d5238c05bb55819d 100644
--- a/src/View/Geometry/Profile/Table.py
+++ b/src/View/Geometry/Profile/Table.py
@@ -82,16 +82,6 @@ class GeometryProfileTableModel(PamhyrTableModel):
elif value == self._data.z_max():
return QColor("blue")
- if role == Qt.ToolTipRole:
- if value == self._data.z_min():
- return _translate("MainWindowProfile",
- "La cote du fond",
- "Z minimale")
- elif value == self._data.z_max():
- return _translate("MainWindowProfile",
- "La cote maximale",
- "Z maximale")
-
if index.column() == 3:
value = self._data.point(index.row()).name
@@ -104,16 +94,6 @@ class GeometryProfileTableModel(PamhyrTableModel):
if role == Qt.ForegroundRole:
return QColor("darkRed")
- if role == Qt.ToolTipRole:
- if value.strip().upper() == "RG":
- return _translate(
- "MainWindowProfile", "Rive gauche"
- )
- else:
- return _translate(
- "MainWindowProfile", "Rive droite"
- )
-
return QVariant()
def setData(self, index, value, role=Qt.EditRole):
diff --git a/src/View/Geometry/Translate.py b/src/View/Geometry/Translate.py
index ec8c451a6ce5d8983fd5bd27177880f580f8888e..85348ded07eec69b3239ee72ab3ec09e9a7f359f 100644
--- a/src/View/Geometry/Translate.py
+++ b/src/View/Geometry/Translate.py
@@ -33,12 +33,12 @@ class GeometryTranslate(MainTranslate):
self._dict["open_file"] = _translate("Geometry", "Open a file")
self._dict["file_st"] = _translate(
- "Geometry", "File mage geometry (*.ST *.st)")
+ "Geometry", "Mage geometry file (*.ST *.st)")
self._dict["file_m"] = _translate(
- "Geometry", "File mage meshed geometry (*.M *.m)")
+ "Geometry", "Mage meshed geometry file (*.M *.m)")
self._dict["file_shp"] = _translate(
"Geometry", "Shapefile (*.SHP *.shp)")
- self._dict["file_all"] = _translate("Geometry", "All file (*)")
+ self._dict["file_all"] = _translate("Geometry", "All files (*)")
self._dict["cross_section"] = _translate("Geometry", "cross-section")
self._dict["cross_sections"] = _translate("Geometry", "cross-sections")
@@ -70,7 +70,7 @@ class GeometryTranslate(MainTranslate):
"2": _translate("Geometry", "the second guide-line"),
"3": _translate(
"Geometry",
- "the means between the two guide-lines"
+ "the mean over the two guide-lines"
),
}
diff --git a/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py b/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
index f55fb2d778e212588520e94dafd133c101c38413..29a12f350feedfe000ae42954affc90e7d30ac9a 100644
--- a/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
+++ b/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
@@ -28,7 +28,7 @@ class BasicHydraulicStructuresTranslate(MainTranslate):
super(BasicHydraulicStructuresTranslate, self).__init__()
self._dict["Basic Hydraulic Structures"] = _translate(
- "BasicHydraulicStructures", "Basic Hydraulic Structures"
+ "BasicHydraulicStructures", "Basic Hydraulic Structure"
)
self._dict['msg_type_change_title'] = _translate(
@@ -138,7 +138,7 @@ hydraulic structure values?"
"BasicHydraulicStructures", "Check valve"
),
"UD": _translate(
- "BasicHydraulicStructures", "User defined"
+ "BasicHydraulicStructures", "User-defined"
),
}
diff --git a/src/View/LateralContribution/Edit/translate.py b/src/View/LateralContribution/Edit/translate.py
index eeb889304838a4b75339bfdcb481d6de96e55b4c..14b23772fe2c8df691e3c5ab559eb9e2d4b67813 100644
--- a/src/View/LateralContribution/Edit/translate.py
+++ b/src/View/LateralContribution/Edit/translate.py
@@ -28,7 +28,7 @@ class LCETranslate(LCTranslate):
def __init__(self):
super(LCETranslate, self).__init__()
self._dict["Edit lateral contribution"] = _translate(
- "LateralContribution", "Edit lateral contribution"
+ "LateralContribution", "Edit lateral sources"
)
self._sub_dict["table_headers"] = {
diff --git a/src/View/LateralContribution/translate.py b/src/View/LateralContribution/translate.py
index 145e137f826a345ef8ad6ac0fdf51b4726562958..e6d4225c1ca50de4945fa9a8ac8b0e0db6290969 100644
--- a/src/View/LateralContribution/translate.py
+++ b/src/View/LateralContribution/translate.py
@@ -39,12 +39,12 @@ class LCTranslate(MainTranslate):
super(LCTranslate, self).__init__()
self._dict["Lateral contribution"] = _translate(
- "LateralContribution", "Lateral contribution"
+ "LateralContribution", "Lateral sources"
)
self._sub_dict["long_types"] = {
"ND": self._dict["not_defined"],
- "LC": _translate("LateralContribution", "Lateral contribution"),
+ "LC": _translate("LateralContribution", "Lateral sources"),
"RA": _translate("LateralContribution", "Rain"),
"EV": _translate("LateralContribution", "Evaporation"),
}
@@ -57,6 +57,6 @@ class LCTranslate(MainTranslate):
"name": self._dict["name"],
"type": self._dict["type"],
"edge": self._dict["reach"],
- "begin_kp": _translate("LateralContribution", "Begin kp (m)"),
- "end_kp": _translate("LateralContribution", "End kp (m)")
+ "begin_kp": _translate("LateralContribution", "Start (m)"),
+ "end_kp": _translate("LateralContribution", "End (m)")
}
diff --git a/src/View/Results/CustomPlot/Translate.py b/src/View/Results/CustomPlot/Translate.py
index 6c4236b8603f5a555cebba9adb0c1ad9db757f83..4c4f38157af628a2627b404f4ea4fffc470fa5d9 100644
--- a/src/View/Results/CustomPlot/Translate.py
+++ b/src/View/Results/CustomPlot/Translate.py
@@ -28,7 +28,7 @@ class CustomPlotTranslate(ResultsTranslate):
super(CustomPlotTranslate, self).__init__()
self._dict["Custom Plot Selection"] = _translate(
- "CustomPlot", "Custom Plot Selection"
+ "CustomPlot", "Custom plot selection"
)
# Value type
@@ -38,13 +38,13 @@ class CustomPlotTranslate(ResultsTranslate):
self._dict['water_elevation'] = self._dict["unit_water_elevation"]
self._dict['discharge'] = self._dict["unit_discharge"]
self._dict['elevation'] = _translate(
- "CustomPlot", "Bed load elevation (m)"
+ "CustomPlot", "Bed elevation (m)"
)
# Unit corresponding long name (plot axes display)
self._dict['0-meter'] = _translate(
- "CustomPlot", "Bed load elevation (m)"
+ "CustomPlot", "Bed elevation (m)"
)
self._dict['1-m3s'] = self._dict["unit_discharge"]
diff --git a/src/View/Results/PlotSedReach.py b/src/View/Results/PlotSedReach.py
index d77339a1891895a1c07cde3b1ece880be60e713d..f62c51230d37ac0183a85d07473dd99d9131253d 100644
--- a/src/View/Results/PlotSedReach.py
+++ b/src/View/Results/PlotSedReach.py
@@ -231,7 +231,7 @@ class PlotSedReach(PamhyrPlot):
return
self.canvas.axes.set_xlabel(
- _translate("MainWindow_reach", "Kp (m)"),
+ _translate("MainWindow_reach", "Position (m)"),
color='black', fontsize=10
)
self.canvas.axes.set_ylabel(
diff --git a/src/View/SolverParameters/translate.py b/src/View/SolverParameters/translate.py
index c1a45d2bb9128232685d5cf3c3e1919e59b1e80c..46bae698196f67f4663f7319e8369d8bb5f49f57 100644
--- a/src/View/SolverParameters/translate.py
+++ b/src/View/SolverParameters/translate.py
@@ -99,7 +99,7 @@ class ParamTranslate(MainTranslate):
"Minimum water height (meter)"),
"mage_max_niter":
_translate("SolverParameters",
- "Maximun number of iterations (< 100)"),
+ "Maximum number of iterations (< 100)"),
"mage_timestep_reduction_factor":
_translate("SolverParameters",
"Timestep reduction factor"),
@@ -114,10 +114,10 @@ class ParamTranslate(MainTranslate):
"Reduction precision factor of residue"),
"mage_niter_max_precision":
_translate("SolverParameters",
- "Number of iteration at maximum precision"),
+ "Number of iterations at maximum precision"),
"mage_niter_before_switch":
_translate("SolverParameters",
- "Number of iteration before switch"),
+ "Number of iterations before switch"),
"mage_max_froude":
_translate("SolverParameters",
"Maximum accepted Froude number"),
@@ -152,7 +152,7 @@ class ParamTranslate(MainTranslate):
"mage_methode_modification_geometrie":
_translate("SolverParameters", "Geometry modification method"),
"mage_shields_critique":
- _translate("SolverParameters", "Critic shields"),
+ _translate("SolverParameters", "Critical Shields number"),
"mage_shields_correction":
_translate("SolverParameters", "Shields correction"),
"mage_capacite_solide":
diff --git a/src/View/Stricklers/translate.py b/src/View/Stricklers/translate.py
index 01275bb1f23bca223834b55356eea15001363482..eb8b53619a2025ac7737762e3b6bdcd9cdbb6f97 100644
--- a/src/View/Stricklers/translate.py
+++ b/src/View/Stricklers/translate.py
@@ -28,7 +28,7 @@ class StricklersTranslate(MainTranslate):
super(StricklersTranslate, self).__init__()
self._dict["Stricklers"] = _translate(
- "Stricklers", "Stricklers"
+ "Stricklers", "Strickler coefficients"
)
self._sub_dict["table_headers"] = {
diff --git a/src/View/Tools/Plot/PamhyrToolbar.py b/src/View/Tools/Plot/PamhyrToolbar.py
index 2a851c924f4f9653d3f6ab2ccf6cd63ec1abbaf1..5b4e292713e08356750d97ef142766ee16e25cc1 100644
--- a/src/View/Tools/Plot/PamhyrToolbar.py
+++ b/src/View/Tools/Plot/PamhyrToolbar.py
@@ -112,7 +112,7 @@ class PamhyrPlotToolbar(NavigationToolbar2QT):
self.toolitems.append(
(
'Forward',
- _translate("Toolbar", 'Return to next view'),
+ _translate("Toolbar", 'Back to next view'),
'forward', 'forward'
)
)
@@ -121,7 +121,7 @@ class PamhyrPlotToolbar(NavigationToolbar2QT):
self.toolitems.append(
(
'Pan',
- _translate("Toolbar", 'Axes panoramic'),
+ _translate("Toolbar", 'Panoramic axes'),
'move', 'pan'
)
)
@@ -184,7 +184,7 @@ class PamhyrPlotToolbar(NavigationToolbar2QT):
self.toolitems.append(
(
'Save',
- _translate("Toolbar", 'Save the figure'),
+ _translate("Toolbar", 'Save figure'),
'filesave', 'save_figure'
)
)
@@ -253,12 +253,12 @@ class PamhyrPlotToolbar(NavigationToolbar2QT):
self._actions['back'].setToolTip(
_translate("Toolbar", "Back to previous view"))
self._actions['forward'].setToolTip(
- _translate("Toolbar", "Return to next view"))
+ _translate("Toolbar", "Back to next view"))
self._actions['pan'].setToolTip(
- _translate("Toolbar", "Axes panoramic"))
+ _translate("Toolbar", "Panoramic axes"))
self._actions['zoom'].setToolTip(_translate("Toolbar", "Zoom"))
self._actions['save_figure'].setToolTip(
- _translate("Toolbar", "Save the figure"))
+ _translate("Toolbar", "Save figure"))
self.action_isometric_view.setToolTip(
_translate("Toolbar", "Isometric view (Shift+W)"))
self.action_auto_global_view.setToolTip(
diff --git a/src/View/Translate.py b/src/View/Translate.py
index fc91a5160dd89b3d32a5e8b021839910f4c97d00..2061d6911fb5c903ff4be6a3dc7dd92e4df44dda 100644
--- a/src/View/Translate.py
+++ b/src/View/Translate.py
@@ -52,7 +52,7 @@ class UnitTranslate(CommonWordTranslate):
def __init__(self):
super(UnitTranslate, self).__init__()
- self._dict["unit_kp"] = _translate("Unit", "KP (m)")
+ self._dict["unit_kp"] = _translate("Unit", "Position (m)")
self._dict["unit_width"] = _translate("Unit", "Width (m)")
self._dict["unit_height"] = _translate("Unit", "Height (m)")
self._dict["unit_diameter"] = _translate("Unit", "Diameter (m)")
@@ -90,5 +90,5 @@ class MainTranslate(UnitTranslate):
"MainWindow", "Open SQLite debuging tool ('sqlitebrowser')"
)
self._dict["active_window"] = _translate(
- "MainWindow", "Activate this window"
+ "MainWindow", "Enable this window"
)
diff --git a/src/View/ui/BoundaryConditions.ui b/src/View/ui/BoundaryConditions.ui
index 9f2f1b99419c50c6e2ca7e1a4587468e55a4f15e..e023eff03cc0ab9be9581df2089b7e1dd6940aba 100644
--- a/src/View/ui/BoundaryConditions.ui
+++ b/src/View/ui/BoundaryConditions.ui
@@ -37,7 +37,7 @@
</size>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tab_liquid">
<attribute name="title">
@@ -61,7 +61,7 @@
</widget>
<widget class="QWidget" name="tab_suspenssion">
<attribute name="title">
- <string>Suspenssion</string>
+ <string>Suspension</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@@ -114,7 +114,7 @@
<string>Add</string>
</property>
<property name="toolTip">
- <string>Add a new boundary condition or punctual contribution</string>
+ <string>Add a new boundary condition or point source</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -144,7 +144,7 @@
<string>Edit</string>
</property>
<property name="toolTip">
- <string>Edit boundary condition or punctual contribution</string>
+ <string>Edit boundary condition or point source</string>
</property>
<property name="shortcut">
<string>Ctrl+E</string>
@@ -159,7 +159,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
- <string>Sort boundary condition by name</string>
+ <string>Sort by names</string>
</property>
</action>
</widget>
diff --git a/src/View/ui/ConfigureDialog.ui b/src/View/ui/ConfigureDialog.ui
index 590d0ca2ce4ea50d0537a09cd1b5a67613205c6f..c6477f86776ae5a931e22ada4ee4066bc7f2f637 100644
--- a/src/View/ui/ConfigureDialog.ui
+++ b/src/View/ui/ConfigureDialog.ui
@@ -25,7 +25,7 @@
<bool>true</bool>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>4</number>
</property>
<property name="documentMode">
<bool>false</bool>
@@ -164,7 +164,7 @@
<item>
<widget class="QLabel" name="label_9">
<property name="text">
- <string>Frequence</string>
+ <string>Frequency</string>
</property>
</widget>
</item>
@@ -349,7 +349,7 @@
</font>
</property>
<property name="text">
- <string>This value must be used for reading or editing files in speficic case.</string>
+ <string>This value must be used for reading or editing files in speficic cases.</string>
</property>
</widget>
</item>
@@ -374,7 +374,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
- <string> - The "@file" keyworkd is replace by the path of file to open.</string>
+ <string> - The "@file" keyword is replaced by the path of file to open.</string>
</property>
</widget>
</item>
@@ -382,7 +382,7 @@
</widget>
<widget class="QWidget" name="tab_language">
<attribute name="title">
- <string>Language</string>
+ <string>Langue</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
diff --git a/src/View/ui/DebugRepl.ui b/src/View/ui/DebugRepl.ui
index db4d069e5c599c88346dbd20c801103becc79680..39f30ac383fc2fe5f29b4dbcf86f3a2782e18dc2 100644
--- a/src/View/ui/DebugRepl.ui
+++ b/src/View/ui/DebugRepl.ui
@@ -23,7 +23,7 @@
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
- <string>Eval</string>
+ <string>Evaluate</string>
</property>
<property name="icon">
<iconset>
diff --git a/src/View/ui/EditBoundaryConditions.ui b/src/View/ui/EditBoundaryConditions.ui
index bfcf95052c191fd5d66efd9a4fdd009614f4cfb5..b27232d2c2f3bde34c7d14af190c895608b7e767 100644
--- a/src/View/ui/EditBoundaryConditions.ui
+++ b/src/View/ui/EditBoundaryConditions.ui
@@ -86,7 +86,7 @@
<string>Add</string>
</property>
<property name="toolTip">
- <string>Add a new point in boundary condition or punctual contribution</string>
+ <string>Add a new point</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -116,7 +116,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
- <string>Sort boundary condition points</string>
+ <string>Sort points</string>
</property>
</action>
</widget>
diff --git a/src/View/ui/EditLateralContribution.ui b/src/View/ui/EditLateralContribution.ui
index 02e14bcba61effb9392b6108ba35f85941514708..21736a6b2bae8d01d593c1b325f9e4ae52229457 100644
--- a/src/View/ui/EditLateralContribution.ui
+++ b/src/View/ui/EditLateralContribution.ui
@@ -79,7 +79,7 @@
<string>Add</string>
</property>
<property name="toolTip">
- <string>Add a new point in boundary condition or lateral contribution</string>
+ <string>Add a new point in boundary condition or lateral source</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -109,7 +109,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
- <string>Sort boundary condition point</string>
+ <string>Sort points</string>
</property>
</action>
</widget>
diff --git a/src/View/ui/Frictions.ui b/src/View/ui/Frictions.ui
index e219bf7365efc584353af1f3bf6a8c23798ad6e8..77c3218161fb56ac141675f6eacced47d7015c5e 100644
--- a/src/View/ui/Frictions.ui
+++ b/src/View/ui/Frictions.ui
@@ -98,7 +98,10 @@
<normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
</property>
<property name="text">
- <string>Edit stricklers</string>
+ <string>Edit Strickler coefficients</string>
+ </property>
+ <property name="toolTip">
+ <string>Edit Strickler coefficients</string>
</property>
<property name="shortcut">
<string>Ctrl+E</string>
diff --git a/src/View/ui/GeometryCrossSection.ui b/src/View/ui/GeometryCrossSection.ui
index c9c29e61d14e3cfc4f5c37e72562d6a0ae91aaee..dfc47bb61690f98d540b7a9bde02eff1e1d8d68d 100644
--- a/src/View/ui/GeometryCrossSection.ui
+++ b/src/View/ui/GeometryCrossSection.ui
@@ -67,10 +67,10 @@
<normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property>
<property name="text">
- <string>add</string>
+ <string>Add</string>
</property>
<property name="toolTip">
- <string>Add a point on cross-section</string>
+ <string>Add a point to cross-section</string>
</property>
</action>
<action name="action_delete">
@@ -91,7 +91,7 @@
<normaloff>ressources/up.png</normaloff>ressources/up.png</iconset>
</property>
<property name="text">
- <string>up</string>
+ <string>Up</string>
</property>
<property name="toolTip">
<string>Move up selected point(s)</string>
@@ -103,10 +103,10 @@
<normaloff>ressources/down.png</normaloff>ressources/down.png</iconset>
</property>
<property name="text">
- <string>down</string>
+ <string>Down</string>
</property>
<property name="toolTip">
- <string>Mode down selected point(s)</string>
+ <string>Move down selected point(s)</string>
</property>
</action>
<action name="action_sort_asc">
diff --git a/src/View/ui/GeometryReach.ui b/src/View/ui/GeometryReach.ui
index 2ba386506c8275818b928d84ae167a84a4cc9942..4624b796db601c3af987e426a6ce198c34ba9588 100644
--- a/src/View/ui/GeometryReach.ui
+++ b/src/View/ui/GeometryReach.ui
@@ -166,7 +166,7 @@
<normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property>
<property name="text">
- <string>add</string>
+ <string>Add</string>
</property>
<property name="toolTip">
<string>Add a cross-section</string>
@@ -190,7 +190,7 @@
<normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
</property>
<property name="text">
- <string>edit</string>
+ <string>Edit</string>
</property>
<property name="toolTip">
<string>Edit selected cross section(s)</string>
@@ -205,7 +205,7 @@
<string>sort_asc</string>
</property>
<property name="toolTip">
- <string>Sort cross-sections by ascending KP</string>
+ <string>Sort cross-sections by ascending position</string>
</property>
</action>
<action name="action_sort_des">
@@ -217,7 +217,7 @@
<string>sort_des</string>
</property>
<property name="toolTip">
- <string>Sort cross-sections by descending KP</string>
+ <string>Sort cross-sections by descending position</string>
</property>
</action>
<action name="action_up">
@@ -226,7 +226,7 @@
<normaloff>ressources/up.png</normaloff>ressources/up.png</iconset>
</property>
<property name="text">
- <string>up</string>
+ <string>Up</string>
</property>
<property name="toolTip">
<string>Move up selected cross-section(s)</string>
@@ -238,7 +238,7 @@
<normaloff>ressources/down.png</normaloff>ressources/down.png</iconset>
</property>
<property name="text">
- <string>down</string>
+ <string>Down</string>
</property>
<property name="toolTip">
<string>Move down selected cross-section(s)</string>
diff --git a/src/View/ui/InitialConditions.ui b/src/View/ui/InitialConditions.ui
index 38f9673437b45964903f27dd16125fa44fb32dc2..403a5fe248acde4885b50cf008069e7e96fecf1a 100644
--- a/src/View/ui/InitialConditions.ui
+++ b/src/View/ui/InitialConditions.ui
@@ -119,7 +119,7 @@
<string>sort</string>
</property>
<property name="toolTip">
- <string>Sort inital condition</string>
+ <string>Sort inital conditions</string>
</property>
</action>
<action name="action_import">
diff --git a/src/View/ui/LateralContributions.ui b/src/View/ui/LateralContributions.ui
index d8d81b79cadb6bd83a69b1a1c559bdba4aaf66ff..f1ac570746d157e7f9635b087398751b5e12adf7 100644
--- a/src/View/ui/LateralContributions.ui
+++ b/src/View/ui/LateralContributions.ui
@@ -37,7 +37,7 @@
</size>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tab_liquid">
<attribute name="title">
@@ -61,7 +61,7 @@
</widget>
<widget class="QWidget" name="tab_suspenssion">
<attribute name="title">
- <string>Suspenssion</string>
+ <string>Suspension</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@@ -114,7 +114,7 @@
<string>Add</string>
</property>
<property name="toolTip">
- <string>Add a new boundary condition or lateral contribution</string>
+ <string>Add a new boundary condition or lateral source</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -144,7 +144,7 @@
<string>Edit</string>
</property>
<property name="toolTip">
- <string>Edit boundary condition or lateral contribution</string>
+ <string>Edit boundary condition or lateral source</string>
</property>
<property name="shortcut">
<string>Ctrl+E</string>
@@ -159,7 +159,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
- <string>Sort boundary condition by name</string>
+ <string>Sort by names</string>
</property>
</action>
</widget>
diff --git a/src/View/ui/MainWindow.ui b/src/View/ui/MainWindow.ui
index cb40e14277f9e0279420e02821adca31c058b496..1156fca9c6884130ee35902ca7e6a14b54edeed5 100644
--- a/src/View/ui/MainWindow.ui
+++ b/src/View/ui/MainWindow.ui
@@ -115,7 +115,7 @@
<locale language="English" country="Europe"/>
</property>
<property name="title">
- <string>&River Network</string>
+ <string>&River network</string>
</property>
<addaction name="action_menu_edit_network"/>
</widget>
@@ -408,7 +408,7 @@
</action>
<action name="action_menu_config">
<property name="text">
- <string>Pamhyr configuration</string>
+ <string>Pamhyr2 configuration</string>
</property>
</action>
<action name="action_menu_quit">
@@ -446,10 +446,10 @@
</action>
<action name="action_menu_numerical_parameter">
<property name="text">
- <string>Numerical parameter for solvers</string>
+ <string>Numerical parameters of solvers</string>
</property>
<property name="toolTip">
- <string>Numerical parameter for solvers</string>
+ <string>Numerical parameters of solvers</string>
</property>
</action>
<action name="action_menu_boundary_conditions">
@@ -458,7 +458,7 @@
<normaloff>ressources/boundary_condition.png</normaloff>ressources/boundary_condition.png</iconset>
</property>
<property name="text">
- <string>Boundary conditions and punctual contributions</string>
+ <string>Boundary conditions and point sources</string>
</property>
<property name="font">
<font/>
@@ -479,7 +479,7 @@
<normaloff>ressources/friction.png</normaloff>ressources/friction.png</iconset>
</property>
<property name="text">
- <string>Edit friction</string>
+ <string>Edit frictions</string>
</property>
</action>
<action name="action_menu_edit_lateral_contribution">
@@ -488,7 +488,7 @@
<normaloff>ressources/lateral_contribution.png</normaloff>ressources/lateral_contribution.png</iconset>
</property>
<property name="text">
- <string>Edit lateral contributions</string>
+ <string>Edit lateral sources</string>
</property>
</action>
<action name="action_menu_run_solver">
@@ -597,7 +597,7 @@
<string>Boundary conditions</string>
</property>
<property name="toolTip">
- <string>Edit boundary conditions and punctual contributions</string>
+ <string>Edit boundary conditions and point sources</string>
</property>
<property name="font">
<font/>
@@ -609,10 +609,10 @@
<normaloff>ressources/lateral_contribution.png</normaloff>ressources/lateral_contribution.png</iconset>
</property>
<property name="text">
- <string>Lateral contribution</string>
+ <string>Lateral sources</string>
</property>
<property name="toolTip">
- <string>Edit lateral contribution</string>
+ <string>Edit lateral sources</string>
</property>
</action>
<action name="action_toolBar_frictions">
@@ -624,7 +624,7 @@
<string>Friction</string>
</property>
<property name="toolTip">
- <string>Edit frictions</string>
+ <string>Edit friction</string>
</property>
</action>
<action name="action_menu_edit">
@@ -669,7 +669,7 @@
<string>Mage</string>
</property>
<property name="toolTip">
- <string>Open mage documentation</string>
+ <string>Open Mage documentation</string>
</property>
</action>
<action name="action_menu_pamhyr_users_wiki">
@@ -717,12 +717,12 @@
<normaloff>ressources/boundary_condition.png</normaloff>ressources/boundary_condition.png</iconset>
</property>
<property name="text">
- <string>Boundary conditions and punctual contributions</string>
+ <string>Boundary conditions and point sources</string>
</property>
</action>
<action name="action_menu_additional_file">
<property name="text">
- <string>&Additional file</string>
+ <string>&Additional files</string>
</property>
</action>
<action name="action_menu_rep_additional_lines">
diff --git a/src/View/ui/MeshingOptions.ui b/src/View/ui/MeshingOptions.ui
index 6ff87a52465ff2c9a79e8f65a77af32c6c816033..495965849058e1d0c1c03d55a1f7aca34f578424 100644
--- a/src/View/ui/MeshingOptions.ui
+++ b/src/View/ui/MeshingOptions.ui
@@ -33,7 +33,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Section space step (m)</string>
+ <string>Space step (m)</string>
</property>
</widget>
</item>
@@ -111,7 +111,7 @@
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
- <string>Distance computation</string>
+ <string>Guideline used for distance computation</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
@@ -120,7 +120,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>Second guide-line</string>
+ <string>Second guideline</string>
</property>
</widget>
</item>
@@ -130,7 +130,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>First guide-line</string>
+ <string>First guideline</string>
</property>
</widget>
</item>
@@ -165,7 +165,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>First cross section</string>
+ <string>First cross-section</string>
</property>
</widget>
</item>
@@ -186,7 +186,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>Last cross section</string>
+ <string>Last cross-section</string>
</property>
</widget>
</item>
diff --git a/src/View/ui/NewStudy.ui b/src/View/ui/NewStudy.ui
index 47b216c1d01f55a259fb74c6827983a0f0e05d5c..e087241c63dad058c72eae3b9238fa1f5f9b3cac 100644
--- a/src/View/ui/NewStudy.ui
+++ b/src/View/ui/NewStudy.ui
@@ -127,7 +127,7 @@
<bool>false</bool>
</property>
<property name="text">
- <string>Staring date</string>
+ <string>Starting date</string>
</property>
</widget>
</item>
diff --git a/src/View/ui/REPLineDialog.ui b/src/View/ui/REPLineDialog.ui
index 9d5722ae52ed71a9e1bbd84abad31beab815390b..25902f3f6ea53187d52f40eff243ae6cf4a3aac5 100644
--- a/src/View/ui/REPLineDialog.ui
+++ b/src/View/ui/REPLineDialog.ui
@@ -54,7 +54,7 @@
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_line">
<property name="toolTip">
- <string>Comment lines start with '*' char (let see the mage documentation for more details)</string>
+ <string><html><head/><body><p>Comment lines start with '*' char (let see Mage documentation for more details)</p></body></html></string>
</property>
</widget>
</item>
diff --git a/src/View/ui/REPLineList.ui b/src/View/ui/REPLineList.ui
index ea3fe793a471c9680229d8d66be671074eb572a5..b2c713365230c2f8feada04d43056e127ee4712f 100644
--- a/src/View/ui/REPLineList.ui
+++ b/src/View/ui/REPLineList.ui
@@ -37,13 +37,13 @@
<action name="action_add">
<property name="icon">
<iconset>
- <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+ <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property>
<property name="text">
<string>Add</string>
</property>
<property name="toolTip">
- <string>Add new additional line</string>
+ <string>Add new line</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -52,7 +52,7 @@
<action name="action_delete">
<property name="icon">
<iconset>
- <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
+ <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property>
<property name="text">
<string>Delete</string>
diff --git a/src/View/ui/ReachSedimentLayers.ui b/src/View/ui/ReachSedimentLayers.ui
index dfe39a823d819abf8351e0cf9cc490438fb209be..4aaf140d0bc93ed6f97914becb62a5b1eefa5540 100644
--- a/src/View/ui/ReachSedimentLayers.ui
+++ b/src/View/ui/ReachSedimentLayers.ui
@@ -35,7 +35,7 @@
<item>
<widget class="QPushButton" name="pushButton_apply">
<property name="text">
- <string>Apply sediment layers on all reach</string>
+ <string>Apply sediment layers to all reaches</string>
</property>
</widget>
</item>
@@ -80,7 +80,7 @@
<string>Edit profile</string>
</property>
<property name="toolTip">
- <string>Edit profile sediment layer</string>
+ <string>Edit sediment layers of the profile</string>
</property>
</action>
</widget>
diff --git a/src/View/ui/Reservoir.ui b/src/View/ui/Reservoir.ui
index 97e0d7a1972f79fcafd68dd2adeb7ee62fde570d..b5f89ff02070628227cac98db65163038fdf6d67 100644
--- a/src/View/ui/Reservoir.ui
+++ b/src/View/ui/Reservoir.ui
@@ -99,7 +99,7 @@
<string>Edit</string>
</property>
<property name="toolTip">
- <string>Edit elevation/surface law</string>
+ <string>Edit stage-area relation</string>
</property>
</action>
<action name="action_sort">
@@ -111,7 +111,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
- <string>Sort points by elevation</string>
+ <string>Sort points by elevations</string>
</property>
</action>
</widget>
diff --git a/src/View/ui/ReservoirList.ui b/src/View/ui/ReservoirList.ui
index c53a7cd6602bc975f6f3fe7352eceb2db5c1464c..aecfc26aae130b6eeb6d07f01a08e00c18ef6c1c 100644
--- a/src/View/ui/ReservoirList.ui
+++ b/src/View/ui/ReservoirList.ui
@@ -75,7 +75,7 @@
<action name="action_add">
<property name="icon">
<iconset>
- <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+ <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property>
<property name="text">
<string>Add</string>
@@ -87,7 +87,7 @@
<action name="action_delete">
<property name="icon">
<iconset>
- <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
+ <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property>
<property name="text">
<string>Delete</string>
@@ -105,7 +105,7 @@
<string>Edit</string>
</property>
<property name="toolTip">
- <string>Edit reservoir law</string>
+ <string>Edit reservoir equations</string>
</property>
</action>
</widget>
diff --git a/src/View/ui/Results.ui b/src/View/ui/Results.ui
index c7c319a0bd6fe066d6ba46bcf777cb628e277905..0ff198c629f9fe1ace366baca54521d2dc5aee4b 100644
--- a/src/View/ui/Results.ui
+++ b/src/View/ui/Results.ui
@@ -145,7 +145,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>1</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tab_4">
<attribute name="title">
@@ -198,7 +198,7 @@
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
- <string>Hydrograph</string>
+ <string>Discharge time series</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@@ -251,7 +251,7 @@
<string>Add</string>
</property>
<property name="toolTip">
- <string>Add custom visualization</string>
+ <string>Add customized visualization</string>
</property>
</action>
<action name="action_reload">
diff --git a/src/View/ui/Stricklers.ui b/src/View/ui/Stricklers.ui
index a7dbd8e9d7efdd562fbca1da0d9d912a147e1036..437ee7828a40ba15d8e58bdd3bc0952a8000dc86 100644
--- a/src/View/ui/Stricklers.ui
+++ b/src/View/ui/Stricklers.ui
@@ -25,7 +25,7 @@
</property>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
- <string>Study stricklers</string>
+ <string>Strickler coefficients of the study</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -35,7 +35,7 @@
</widget>
<widget class="QGroupBox" name="groupBox">
<property name="title">
- <string>Application stricklers</string>
+ <string>Strickler coefficients of the application</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
@@ -70,7 +70,7 @@
<string>Add</string>
</property>
<property name="toolTip">
- <string>Add new stricklers</string>
+ <string>Add new Strickler coefficients</string>
</property>
</action>
<action name="action_del">
@@ -82,7 +82,7 @@
<string>Delete</string>
</property>
<property name="toolTip">
- <string>Delete selected stricklers</string>
+ <string>Delete selected Strickler coefficients</string>
</property>
</action>
<action name="action_sort">
@@ -94,7 +94,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
- <string>Sort stricklers</string>
+ <string>Sort Strickler coefficients</string>
</property>
</action>
</widget>
diff --git a/src/View/ui/Widgets/MainWindowTabInfo.ui b/src/View/ui/Widgets/MainWindowTabInfo.ui
index 9c09579d0b14308eb7aea4ea63d0181bfd0f0326..8de4e3233b8f8fb78e4002e4423cf159738a968f 100644
--- a/src/View/ui/Widgets/MainWindowTabInfo.ui
+++ b/src/View/ui/Widgets/MainWindowTabInfo.ui
@@ -182,7 +182,7 @@
<item row="2" column="3">
<widget class="QLabel" name="label_11">
<property name="text">
- <string>Lateral contributions:</string>
+ <string>Lateral sources:</string>
</property>
</widget>
</item>
diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index 4b3a4a4d4ba613ce312a551c2dd776f42103ee11..5c194d357e2959924905f28b4e416b6520d5781a 100644
--- a/src/lang/fr.ts
+++ b/src/lang/fr.ts
@@ -23,14 +23,14 @@
<message>
<location filename="../View/AdditionalFiles/Translate.py" line="33"/>
<source>Edit additional file</source>
- <translation>Éditer le fichier supplémentaire</translation>
+ <translation>Modifier le fichier supplémentaire</translation>
</message>
</context>
<context>
<name>BasicHydraulicStructures</name>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="30"/>
- <source>Basic Hydraulic Structures</source>
+ <source>Basic Hydraulic Structure</source>
<translation>Ouvrage hydraulique élémentaire</translation>
</message>
<message>
@@ -56,7 +56,7 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="57"/>
<source>Half-angle tangent</source>
- <translation>Tangeante du demi angle</translation>
+ <translation>Tangeante du demi-angle</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="60"/>
@@ -96,7 +96,7 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="81"/>
<source>Weir</source>
- <translation>Seuil</translation>
+ <translation>Déversoir</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="84"/>
@@ -128,20 +128,15 @@
<source>Parameter 5</source>
<translation>Paramètre 5</translation>
</message>
- <message>
- <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="110"/>
- <source>Discharge weir</source>
- <translation>Seuil déversoir</translation>
- </message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="113"/>
<source>Trapezoidal weir</source>
- <translation>Seuil trapézoidal</translation>
+ <translation>Déversoir trapézoidal</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="116"/>
<source>Triangular weir</source>
- <translation>Seuil triangulaire</translation>
+ <translation>Déversoir triangulaire</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="119"/>
@@ -180,16 +175,21 @@
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="140"/>
- <source>User defined</source>
+ <source>User-defined</source>
<translation>Défini par l'utilisateur</translation>
</message>
+ <message>
+ <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="110"/>
+ <source>Discharge weir</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>BoundaryCondition</name>
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="32"/>
<source>Edit boundary conditions</source>
- <translation>Éditer les conditions aux limites</translation>
+ <translation>Modifier les conditions aux limites</translation>
</message>
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="37"/>
@@ -208,7 +208,7 @@
</message>
<message>
<location filename="../View/BoundaryCondition/translate.py" line="51"/>
- <source>Ponctual contribution</source>
+ <source>Point sources</source>
<translation>Apports ponctuels</translation>
</message>
<message>
@@ -267,49 +267,79 @@
</message>
<message>
<location filename="../Checker/Mage.py" line="209"/>
- <source>Mage geometry guide line checker</source>
+ <source>Mage geometry guideline checker</source>
<translation>Vérificateur des lignes directrices pour Mage</translation>
</message>
<message>
<location filename="../Checker/Mage.py" line="210"/>
- <source>Check if exists geometry guide line is correctly defined for each reaches of the study</source>
- <translation>Vérifie si les lignes directrices sont définies pour tous les biefs</translation>
+ <source>Check if geometry guidelines are correctly defined for each reach</source>
+ <translation type="obsolete">Vérifie si les lignes directrices sont définies pour tous les biefs</translation>
</message>
<message>
- <location filename="../Checker/Study.py" line="33"/>
- <source>Study network reach checker</source>
+ <location filename="../Checker/Study.py" line="37"/>
+ <source>Study reach network checker</source>
<translation>Vérificateur des biefs de l'étude</translation>
</message>
<message>
<location filename="../Checker/Study.py" line="34"/>
- <source>Check if exists at least one reach for study</source>
- <translation>Vérifie si il existe au moins un bief dans l'étude</translation>
+ <source>Check if at least one reach exists</source>
+ <translation type="obsolete">Vérifie s'il existe au moins un bief dans l'étude</translation>
</message>
<message>
- <location filename="../Checker/Study.py" line="66"/>
+ <location filename="../Checker/Study.py" line="64"/>
<source>Study geometry checker</source>
<translation>Vérificateur de géometrie de l'étude</translation>
</message>
<message>
- <location filename="../Checker/Study.py" line="67"/>
- <source>Check if exists geometry for each reach of study</source>
- <translation>Vérifie si la géométrie existe pour chaque bief de l'étude</translation>
+ <location filename="../Checker/Study.py" line="65"/>
+ <source>Check if the geometry of each reach exists</source>
+ <translation>Vérifie si la géométrie de chaque bief de l'étude existe</translation>
</message>
<message>
- <location filename="../Checker/Study.py" line="114"/>
+ <location filename="../Checker/Study.py" line="224"/>
<source>Dummy ok</source>
<translation>Dummy ok</translation>
</message>
<message>
- <location filename="../Checker/Study.py" line="130"/>
+ <location filename="../Checker/Study.py" line="240"/>
<source>Dummy warning</source>
<translation>Dummy warning</translation>
</message>
<message>
- <location filename="../Checker/Study.py" line="146"/>
+ <location filename="../Checker/Study.py" line="256"/>
<source>Dummy error</source>
<translation>Dummy error</translation>
</message>
+ <message>
+ <location filename="../Checker/Study.py" line="105"/>
+ <source>Study initial conditions checker</source>
+ <translation>Vérificateur des conditions initial de l'étude</translation>
+ </message>
+ <message>
+ <location filename="../Checker/Study.py" line="106"/>
+ <source>Check initial conditions for each node of study</source>
+ <translation>Vérifie les conditions initial de l'étude pour chaque nœud</translation>
+ </message>
+ <message>
+ <location filename="../Checker/Study.py" line="154"/>
+ <source>Study boundary conditions checker</source>
+ <translation>Vérificateur des conditions aux limites de l'étude</translation>
+ </message>
+ <message>
+ <location filename="../Checker/Study.py" line="155"/>
+ <source>Check boundary conditions for each node of study</source>
+ <translation>Vérifie les conditions aux limites de l'étude pour chaque nœud</translation>
+ </message>
+ <message>
+ <location filename="../Checker/Mage.py" line="210"/>
+ <source>Check if exists geometry guidelines are correctly defined for each reach</source>
+ <translation>Vérifie si il existe des lignes directrices correctement définie pour chaque bief</translation>
+ </message>
+ <message>
+ <location filename="../Checker/Study.py" line="38"/>
+ <source>Check if exists at least one reach exists</source>
+ <translation>Vérificateur si il exists au moins un bief</translation>
+ </message>
</context>
<context>
<name>Checklist</name>
@@ -414,12 +444,12 @@
<name>CustomPlot</name>
<message>
<location filename="../View/Results/CustomPlot/Translate.py" line="30"/>
- <source>Custom Plot Selection</source>
+ <source>Custom plot selection</source>
<translation>Sélection des graphiques personnalisés</translation>
</message>
<message>
<location filename="../View/Results/CustomPlot/Translate.py" line="46"/>
- <source>Bed load elevation (m)</source>
+ <source>Bed elevation (m)</source>
<translation>Cote du fond (m)</translation>
</message>
</context>
@@ -434,9 +464,9 @@
<context>
<name>Dialog</name>
<message>
- <location filename="../View/ui/SelectSolver.ui" line="14"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="14"/>
<source>Dialog</source>
- <translation>Dialog</translation>
+ <translation>Dialogue</translation>
</message>
<message>
<location filename="../View/ui/REPLineDialog.ui" line="50"/>
@@ -449,7 +479,7 @@
<translation>Type</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="48"/>
+ <location filename="../View/ui/NewStudy.ui" line="92"/>
<source>Description</source>
<translation>Description</translation>
</message>
@@ -471,7 +501,7 @@
<message>
<location filename="../View/ui/ConfigureAddSolverDialog.ui" line="110"/>
<source><html><head/><body><p>Command line format, for input formater (optional), solver execution and output formater (optional). This format can use some replacement values like:</p><p>- <span style=" font-style:italic;">@install_dir</span>: The Pamhyr2 install path</p><p>- <span style=" font-style:italic;">@path</span>: The associate path</p><p>- <span style=" font-style:italic;">@input</span>: Solver input data (depend of solver type)</p><p>-<span style=" font-style:italic;"> @output</span>: Solver output data (depend of solver type)</p><p>- <span style=" font-style:italic;">@dir</span>: The working dir at solver execution</p><p>- <span style=" font-style:italic;">@args</span>: Solver arguments and additional arguments defined on solver parameters</p></body></html></source>
- <translation><html><head/><body><p>Format des lignes de commandes. Ce format peut contenir des valeurs de remplacement, tel que :</p><p>- <span style=" font-style:italic;">@install_dir</span>: Le dossier d'installation de Pamhyr2</p><p>- <span style=" font-style:italic;">@path</span>: Le chemin associé à cette commande</p><p>- <span style=" font-style:italic;">@input</span>: Les données d'entrées du solveur générées par Pamhyr2 (dépend du solveur)</p><p>-<span style=" font-style:italic;"> @output</span>: Les données d'entrées du solveur générées par Pamhyr2 (dépend du solveur)</p><p>- <span style=" font-style:italic;">@dir</span>: Le chemin vers le dossier d'execution du solveur</p><p>- <span style=" font-style:italic;">@args</span>: Arguments du solveur et arguments complémentaires définis dans les paramètres du solveur</p></body></html></translation>
+ <translation><html><head/><body><p>Format des lignes de commandes. Ce format peut contenir des valeurs de remplacement, telles que :</p><p>- <span style=" font-style:italic;">@install_dir</span>: Le dossier d'installation de Pamhyr2</p><p>- <span style=" font-style:italic;">@path</span>: Le chemin associé à cette commande</p><p>- <span style=" font-style:italic;">@input</span>: Les données d'entrées du solveur générées par Pamhyr2 (dépend du solveur)</p><p>-<span style=" font-style:italic;"> @output</span>: Les données d'entrées du solveur générées par Pamhyr2 (dépend du solveur)</p><p>- <span style=" font-style:italic;">@dir</span>: Le chemin vers le dossier d'execution du solveur</p><p>- <span style=" font-style:italic;">@args</span>: Arguments du solveur et arguments complémentaires définis dans les paramètres du solveur</p></body></html></translation>
</message>
<message>
<location filename="../View/ui/ConfigureAddSolverDialog.ui" line="116"/>
@@ -506,7 +536,7 @@
<message>
<location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="25"/>
<source>Height</source>
- <translation>Hauteur</translation>
+ <translation type="obsolete">Hauteur</translation>
</message>
<message>
<location filename="../View/ui/ConfigureDialog.ui" line="47"/>
@@ -514,62 +544,62 @@
<translation>Solveurs</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="121"/>
+ <location filename="../View/ui/ConfigureDialog.ui" line="148"/>
<source>Backup</source>
<translation>Sauvegarde auto</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="133"/>
+ <location filename="../View/ui/ConfigureDialog.ui" line="160"/>
<source>Auto save</source>
<translation>Sauvegarde auto</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="140"/>
- <source>Frequence</source>
+ <location filename="../View/ui/ConfigureDialog.ui" line="167"/>
+ <source>Frequency</source>
<translation>Fréquence</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="151"/>
+ <location filename="../View/ui/ConfigureDialog.ui" line="178"/>
<source>Enable</source>
<translation>Activée</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="177"/>
+ <location filename="../View/ui/ConfigureDialog.ui" line="204"/>
<source>HH:mm:ss</source>
<translation>HH:mm:ss</translation>
</message>
<message>
<location filename="../View/ui/ConfigureDialog.ui" line="214"/>
- <source>Stricklers</source>
- <translation>Stricklers</translation>
+ <source>Strickler coefficients</source>
+ <translation type="obsolete">Coefficients de Strickler</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="274"/>
+ <location filename="../View/ui/ConfigureDialog.ui" line="328"/>
<source>Editor</source>
<translation>Editeur</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="298"/>
- <source>This value must be used for reading or editing files in speficic case.</source>
+ <location filename="../View/ui/ConfigureDialog.ui" line="352"/>
+ <source>This value must be used for reading or editing files in speficic cases.</source>
<translation>Cette valeur peut être utilisée dans des cas spécifiques pour lire ou écrire dans un fichier.</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="307"/>
+ <location filename="../View/ui/ConfigureDialog.ui" line="361"/>
<source>Editor command</source>
- <translation>Commande d'édition</translation>
+ <translation>Commande d'modification</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="323"/>
- <source> - The "@file" keyworkd is replace by the path of file to open.</source>
+ <location filename="../View/ui/ConfigureDialog.ui" line="377"/>
+ <source> - The "@file" keyword is replaced by the path of file to open.</source>
<translation> - Le mot clef "@file" sera remplacé par le chemin du fichier à ouvrir.</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="353"/>
+ <location filename="../View/ui/ConfigureDialog.ui" line="407"/>
<source>Language</source>
- <translation>Langage</translation>
+ <translation>Langue</translation>
</message>
<message>
- <location filename="../View/ui/ConfigureDialog.ui" line="344"/>
+ <location filename="../View/ui/ConfigureDialog.ui" line="398"/>
<source>Please restart application after language modification</source>
<translation>Un redémarrage de l'application est requis après le changement de langue</translation>
</message>
@@ -590,7 +620,7 @@
</message>
<message>
<location filename="../View/ui/NewStudy.ui" line="130"/>
- <source>Staring date</source>
+ <source>Starting date</source>
<translation>Date de départ</translation>
</message>
<message>
@@ -606,7 +636,7 @@
<message>
<location filename="../View/ui/NewStudy.ui" line="167"/>
<source>Last modification :</source>
- <translation>Date de modification :</translation>
+ <translation>Dernière modification :</translation>
</message>
<message>
<location filename="../View/ui/CustomPlotValuesSelectionDialog.ui" line="27"/>
@@ -621,45 +651,45 @@
<message>
<location filename="../View/ui/InitialConditions_Dialog_Generator_Discharge.ui" line="25"/>
<source>Discharge</source>
- <translation>Débit</translation>
+ <translation type="obsolete">Débit</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="33"/>
- <source>First cross section</source>
+ <location filename="../View/ui/MeshingOptions.ui" line="168"/>
+ <source>First cross-section</source>
<translation>Première section en travers</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="54"/>
- <source>Last cross section</source>
+ <location filename="../View/ui/MeshingOptions.ui" line="189"/>
+ <source>Last cross-section</source>
<translation>Dernière section en travers</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="79"/>
- <source>First guide line</source>
+ <location filename="../View/ui/MeshingOptions.ui" line="133"/>
+ <source>First guideline</source>
<translation>Première ligne directrice</translation>
</message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="100"/>
- <source>Last guide line</source>
- <translation>Dernière ligne directrice</translation>
+ <source>Last guideline</source>
+ <translation type="obsolete">Dernière ligne directrice</translation>
</message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="114"/>
- <source>Section space step</source>
+ <source>Space step</source>
<translation type="obsolete">Pas d'espace</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="164"/>
- <source>Distance computation guild line</source>
- <translation>Ligne directrice pour le calcule des distances</translation>
+ <location filename="../View/ui/MeshingOptions.ui" line="114"/>
+ <source>Guideline used for distance computation</source>
+ <translation>Ligne directrice pour le calcul des distances</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="204"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="79"/>
<source>Spline</source>
<translation>Spline</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="214"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="89"/>
<source>Linear</source>
<translation>Linéaire</translation>
</message>
@@ -690,29 +720,94 @@
</message>
<message>
<location filename="../View/ui/REPLineDialog.ui" line="57"/>
- <source>Comment lines start with '*' char (let see the mage documentation for more details)</source>
- <translation>Les lignes de commentaire commence pas un charactère '*' (voir la documentation de mage pour plus de détails)</translation>
+ <source>Comment lines start with '*' char (let see Mage documentation for more details)</source>
+ <translation type="obsolete">Les lignes de commentaire commencent par un caractère '*' (voir la documentation de Mage pour plus de détails)</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="20"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="157"/>
<source>Limits</source>
<translation>Limites</translation>
</message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="121"/>
<source>Options</source>
- <translation>Options</translation>
+ <translation type="obsolete">Options</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="127"/>
- <source>Section space step (m)</source>
+ <location filename="../View/ui/MeshingOptions.ui" line="36"/>
+ <source>Space step (m)</source>
<translation>Pas d'espace (m)</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="195"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="70"/>
<source>Type of interpolation:</source>
<translation>Type d'interpolation :</translation>
</message>
+ <message>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="25"/>
+ <source>Height (m)</source>
+ <translation>Hauteur (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/ConfigureDialog.ui" line="241"/>
+ <source>Stricklers</source>
+ <translation>Stricklers</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/UpdateKPOptions.ui" line="30"/>
+ <source>Distance computation</source>
+ <translation>Calcule des distances</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/UpdateKPOptions.ui" line="46"/>
+ <source>Second guide-line</source>
+ <translation>Deuxième ligne directrice</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/UpdateKPOptions.ui" line="63"/>
+ <source>First guide-line</source>
+ <translation>Première ligne directrice</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/UpdateKPOptions.ui" line="73"/>
+ <source>Origin</source>
+ <translation>Origine</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/UpdateKPOptions.ui" line="80"/>
+ <source>Origin value</source>
+ <translation>Valeur de l'origine</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Discharge.ui" line="25"/>
+ <source>Discharge (m³/s)</source>
+ <translation type="obsolete">Débit (m³/s)</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/MeshingOptions.ui" line="30"/>
+ <source>Parameters</source>
+ <translation>Paramètres</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/ConfigureDialog.ui" line="385"/>
+ <source>Langue</source>
+ <translation>Langue</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/REPLineDialog.ui" line="57"/>
+ <source><html><head/><body><p>Comment lines start with '*' char (let see Mage documentation for more details)</p></body></html></source>
+ <translation>Les lignes de commentaire commencent par un caractère '*' (voir la documentation de Mage pour plus de détails)</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/MeshingOptions.ui" line="123"/>
+ <source>Second guideline</source>
+ <translation>Seconde ligne directrice</translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Discharge.ui" line="25"/>
+ <source>Discharge (m³/s)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Documentation</name>
@@ -725,102 +820,102 @@
<context>
<name>Exception</name>
<message>
- <location filename="../Model/Except.py" line="54"/>
+ <location filename="../Model/Except.py" line="55"/>
<source>Generic error message</source>
<translation>Message d'erreur générique</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="60"/>
+ <location filename="../Model/Except.py" line="61"/>
<source>Undefined error message</source>
<translation>Message d'erreur non définie</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="75"/>
+ <location filename="../Model/Except.py" line="76"/>
<source>Method not implemented</source>
<translation>Méthode non implémentée</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="104"/>
+ <location filename="../Model/Except.py" line="105"/>
<source>Method</source>
<translation>Méthode</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="104"/>
+ <location filename="../Model/Except.py" line="105"/>
<source>not implemented</source>
<translation>non implémenté</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="104"/>
+ <location filename="../Model/Except.py" line="105"/>
<source>for class</source>
<translation>pour la classe</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="101"/>
+ <location filename="../Model/Except.py" line="102"/>
<source>Not implemented method</source>
<translation>Méthode non implémentée</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="115"/>
+ <location filename="../Model/Except.py" line="116"/>
<source>FileFormatError</source>
<translation>ErreurFormatDeFichier</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="123"/>
+ <location filename="../Model/Except.py" line="124"/>
<source>Invalid file format:</source>
<translation>Format de fichier invalide :</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="129"/>
+ <location filename="../Model/Except.py" line="130"/>
<source>File format error</source>
<translation>Erreur de format de fichier</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="132"/>
+ <location filename="../Model/Except.py" line="133"/>
<source>Invalid file format</source>
<translation>Format de fichier invalide</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="135"/>
+ <location filename="../Model/Except.py" line="136"/>
<source>Invalid file</source>
<translation>Fichier invalide</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="135"/>
+ <location filename="../Model/Except.py" line="136"/>
<source>format because of</source>
<translation>format à cause de</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="175"/>
+ <location filename="../Model/Except.py" line="176"/>
<source>Clipboard format error</source>
<translation>Erreur de format dans le presse-papier</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="157"/>
+ <location filename="../Model/Except.py" line="158"/>
<source>without header</source>
<translation>Sans en-tête</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="159"/>
+ <location filename="../Model/Except.py" line="160"/>
<source>with header</source>
<translation>Avec en-tête</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="164"/>
+ <location filename="../Model/Except.py" line="165"/>
<source>Invalid clipboard data format:</source>
<translation>Format des données du presse-papier invalide :</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="178"/>
+ <location filename="../Model/Except.py" line="179"/>
<source>Clipboard format unknown</source>
<translation>Presse-papier format inconnu</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="213"/>
+ <location filename="../Model/Except.py" line="214"/>
<source>External file dependence is missing</source>
<translation>Fichier externe d'une dépendence manquant</translation>
</message>
<message>
- <location filename="../Model/Except.py" line="193"/>
+ <location filename="../Model/Except.py" line="194"/>
<source>'@file' is missing for module @module:
'@path'</source>
<translation>le fichier '@file' est manquant pour le module @module : '@path'</translation>
@@ -829,32 +924,32 @@
<context>
<name>Form</name>
<message>
- <location filename="../View/ui/dummy.ui" line="14"/>
+ <location filename="../View/ui/Widgets/MainWindowTabCheckers.ui" line="14"/>
<source>Form</source>
<translation>Formulaire</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="42"/>
+ <location filename="../View/ui/about.ui" line="32"/>
<source>About Pamhyr2</source>
<translation>À propos de Pamhyr2</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="49"/>
+ <location filename="../View/ui/about.ui" line="39"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="56"/>
+ <location filename="../View/ui/about.ui" line="46"/>
<source>Version: @version</source>
- <translation>Version: @version</translation>
+ <translation>Version : @version</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="63"/>
+ <location filename="../View/ui/about.ui" line="53"/>
<source>License: GPLv3+</source>
- <translation>Licence: GPLv3+</translation>
+ <translation>Licence : GPLv3+</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="70"/>
+ <location filename="../View/ui/about.ui" line="60"/>
<source><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Source code</a></source>
<translation><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Code source</a></translation>
</message>
@@ -906,7 +1001,7 @@
<message>
<location filename="../View/ui/Widgets/MainWindowTabInfo.ui" line="74"/>
<source>River network</source>
- <translation>Réseau de la rivière</translation>
+ <translation>Réseau hydrographique</translation>
</message>
<message>
<location filename="../View/ui/Widgets/MainWindowTabInfo.ui" line="90"/>
@@ -985,8 +1080,8 @@
</message>
<message>
<location filename="../View/ui/Widgets/MainWindowTabInfo.ui" line="185"/>
- <source>Lateral contributions:</source>
- <translation>Contributions latérales :</translation>
+ <source>Lateral sources:</source>
+ <translation>Apports latéraux :</translation>
</message>
<message>
<location filename="../View/ui/Widgets/MainWindowTabInfo.ui" line="192"/>
@@ -1016,56 +1111,66 @@
<message>
<location filename="../View/ui/Widgets/MainWindowTabCheckers.ui" line="39"/>
<source>Errors summary</source>
- <translation>Résumer des erreurs</translation>
+ <translation>Résumé des erreurs</translation>
</message>
</context>
<context>
<name>Frictions</name>
<message>
<location filename="../View/Frictions/translate.py" line="31"/>
- <source>Stricklers</source>
- <translation>Stricklers</translation>
+ <source>Strickler coefficients</source>
+ <translation type="obsolete">Coefficients de Strickler</translation>
</message>
<message>
<location filename="../View/Frictions/translate.py" line="35"/>
- <source>Edit frictions</source>
- <translation>Éditer les frottements</translation>
+ <source>Edit friction coefficients</source>
+ <translation type="obsolete">Modifier les frottements</translation>
</message>
<message>
<location filename="../View/Frictions/translate.py" line="42"/>
- <source>Begin kp (m)</source>
- <translation>Pk de départ (m)</translation>
+ <source>Start (m)</source>
+ <translation>PK de départ (m)</translation>
</message>
<message>
<location filename="../View/Frictions/translate.py" line="43"/>
- <source>End kp (m)</source>
- <translation>Pk de fin (m)</translation>
+ <source>End (m)</source>
+ <translation>PK de fin (m)</translation>
</message>
<message>
<location filename="../View/Frictions/translate.py" line="44"/>
- <source>Begin strickler</source>
- <translation>Strickler de départ</translation>
+ <source>Start coefficient</source>
+ <translation>Coefficient de départ</translation>
</message>
<message>
<location filename="../View/Frictions/translate.py" line="45"/>
- <source>End strickler</source>
- <translation>Strickler de fin</translation>
+ <source>End coefficient</source>
+ <translation>Coefficient de fin</translation>
+ </message>
+ <message>
+ <location filename="../View/Frictions/translate.py" line="31"/>
+ <source>Stricklers</source>
+ <translation>Stricklers</translation>
+ </message>
+ <message>
+ <location filename="../View/Frictions/translate.py" line="35"/>
+ <source>Edit frictions</source>
+ <translation>Éditer les frotements</translation>
</message>
</context>
<context>
<name>Geometry</name>
<message>
- <location filename="../View/LateralContribution/translate.py" line="52"/>
+ <location filename="../View/Geometry/Translate.py" line="58"/>
<source>X (m)</source>
<translation>X (m)</translation>
</message>
<message>
- <location filename="../View/LateralContribution/translate.py" line="53"/>
+ <location filename="../View/Geometry/Translate.py" line="59"/>
<source>Y (m)</source>
<translation>Y (m)</translation>
</message>
<message>
- <location filename="../View/LateralContribution/translate.py" line="54"/>
+ <location filename="../View/Geometry/Translate.py" line="60"/>
<source>Z (m)</source>
<translation>Z (m)</translation>
</message>
@@ -1081,71 +1186,71 @@
</message>
<message>
<location filename="../View/Geometry/Translate.py" line="35"/>
- <source>File mage geometry (*.ST *.st)</source>
- <translation>Fichier géométrie Mage (*.ST *.st)</translation>
+ <source>Mage geometry file (*.ST *.st)</source>
+ <translation>Fichier Mage de géométrie (*.ST *.st)</translation>
</message>
<message>
<location filename="../View/Geometry/Translate.py" line="37"/>
- <source>File mage meshed geometry (*.M *.m)</source>
- <translation>Fichier géométrie maillée (*.M *.m)</translation>
+ <source>Mage meshed geometry file (*.M *.m)</source>
+ <translation>Fichier Mage de géométrie maillée (*.M *.m)</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="39"/>
- <source>All file (*)</source>
+ <location filename="../View/Geometry/Translate.py" line="41"/>
+ <source>All files (*)</source>
<translation>Tous les fichiers (*)</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="43"/>
+ <location filename="../View/Geometry/Translate.py" line="45"/>
<source>cross-section</source>
<translation>section en travers</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="44"/>
+ <location filename="../View/Geometry/Translate.py" line="46"/>
<source>cross-sections</source>
<translation>sections en travers</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="46"/>
+ <location filename="../View/Geometry/Translate.py" line="48"/>
<source>Transverse abscissa (m)</source>
<translation>Abscisse en travers (m)</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="50"/>
+ <location filename="../View/Geometry/Translate.py" line="52"/>
<source>Previous cross-section</source>
<translation>Section en travers précédente</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="53"/>
+ <location filename="../View/Geometry/Translate.py" line="55"/>
<source>Cross-section</source>
<translation>Section en travers</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="54"/>
+ <location filename="../View/Geometry/Translate.py" line="56"/>
<source>Next cross-section</source>
<translation>Section en travers suivante</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="63"/>
+ <location filename="../View/Geometry/Translate.py" line="65"/>
<source>Points</source>
<translation>Points</translation>
</message>
<message>
<location filename="../View/Geometry/Translate.py" line="67"/>
<source>First guideline</source>
- <translation>Première ligne directrice</translation>
+ <translation type="obsolete">Première ligne directrice</translation>
</message>
<message>
<location filename="../View/Geometry/Translate.py" line="68"/>
<source>Second guideline</source>
- <translation>Seconde ligne directrice</translation>
+ <translation type="obsolete">Seconde ligne directrice</translation>
</message>
<message>
<location filename="../View/Geometry/Translate.py" line="69"/>
- <source>Means between the two guideline</source>
- <translation>Moyenne entre les deux lignes directrices</translation>
+ <source>Mean over the two guidelines</source>
+ <translation type="obsolete">Moyenne sur les deux lignes directrices</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="77"/>
+ <location filename="../View/Geometry/Translate.py" line="82"/>
<source>Meshing</source>
<translation>Maillage</translation>
</message>
@@ -1154,11 +1259,6 @@
<source>Geometry cross-section</source>
<translation>Géométrie des sections en travers</translation>
</message>
- <message>
- <location filename="../View/Geometry/Profile/Translate.py" line="40"/>
- <source>Traversal abs (m)</source>
- <translation>Absice en travers (m)</translation>
- </message>
<message>
<location filename="../View/Geometry/Table.py" line="71"/>
<source>upstream</source>
@@ -1169,13 +1269,53 @@
<source>downstream</source>
<translation>aval</translation>
</message>
+ <message>
+ <location filename="../View/Geometry/Translate.py" line="39"/>
+ <source>Shapefile (*.SHP *.shp)</source>
+ <translation>Fichier shape (*.SHP *.shp)</translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Translate.py" line="69"/>
+ <source>the first guide-line</source>
+ <translation>la première ligne directrice</translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Translate.py" line="70"/>
+ <source>the second guide-line</source>
+ <translation>la seconde ligne directrice</translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Profile/Translate.py" line="35"/>
+ <source>Width</source>
+ <translation>Largeur</translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Profile/Translate.py" line="36"/>
+ <source>Area</source>
+ <translation>Aire</translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Profile/Translate.py" line="37"/>
+ <source>Perimeter</source>
+ <translation>Périmètre</translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Profile/Translate.py" line="44"/>
+ <source>Traversal abs (m)</source>
+ <translation>Abscisse en travers (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Translate.py" line="71"/>
+ <source>the mean over the two guide-lines</source>
+ <translation>la moyenne entre les deux ligne directrice</translation>
+ </message>
</context>
<context>
<name>HydraulicStructures</name>
<message>
<location filename="../View/HydraulicStructures/Translate.py" line="30"/>
<source>Hydraulic Structures</source>
- <translation>Structures hydrauliques</translation>
+ <translation>Ouvrages hydrauliques</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/Translate.py" line="34"/>
@@ -1205,8 +1345,8 @@
<name>LateralContribution</name>
<message>
<location filename="../View/LateralContribution/Edit/translate.py" line="30"/>
- <source>Edit lateral contribution</source>
- <translation>Éditer les contributions latérales</translation>
+ <source>Edit lateral sources</source>
+ <translation>Modifier les contributions latérales</translation>
</message>
<message>
<location filename="../View/LateralContribution/Edit/translate.py" line="35"/>
@@ -1220,7 +1360,7 @@
</message>
<message>
<location filename="../View/LateralContribution/translate.py" line="47"/>
- <source>Lateral contribution</source>
+ <source>Lateral sources</source>
<translation>Contributions latérales</translation>
</message>
<message>
@@ -1235,44 +1375,44 @@
</message>
<message>
<location filename="../View/LateralContribution/translate.py" line="60"/>
- <source>Begin kp (m)</source>
- <translation>Pk de départ (m)</translation>
+ <source>Start (m)</source>
+ <translation>PK de départ (m)</translation>
</message>
<message>
<location filename="../View/LateralContribution/translate.py" line="61"/>
- <source>End kp (m)</source>
- <translation>Pk de fin (m)</translation>
+ <source>End (m)</source>
+ <translation>PK de fin (m)</translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
- <location filename="../View/Translate.py" line="85"/>
+ <location filename="../View/Translate.py" line="86"/>
<source>Open debug window</source>
- <translation>Ouvrir la fenêtre de dégogage</translation>
+ <translation>Ouvrir la fenêtre de débogage</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="88"/>
+ <location filename="../View/Translate.py" line="89"/>
<source>Open SQLite debuging tool ('sqlitebrowser')</source>
- <translation>Ouvrir l'outis de dégogage SQLite ('sqlitebrowser')</translation>
+ <translation>Ouvrir l'outil de débogage SQLite ('sqlitebrowser')</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="91"/>
- <source>Activate this window</source>
+ <location filename="../View/Translate.py" line="92"/>
+ <source>Enable this window</source>
<translation>Activer cette fenêtre</translation>
</message>
<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"/>
- <source>toolBar</source>
- <translation>Barre d'outils</translation>
+ <location filename="../View/ui/GeometryReach.ui" line="112"/>
+ <source>Toolbar</source>
+ <translation type="obsolete">Barre d'outils</translation>
</message>
<message>
- <location filename="../View/ui/Stricklers.ui" line="70"/>
+ <location filename="../View/ui/GeometryReach.ui" line="169"/>
<source>Add</source>
<translation>Ajouter</translation>
</message>
@@ -1282,52 +1422,52 @@
<translation>Ajouter un casier</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/ReservoirList.ui" line="96"/>
<source>Delete reservoirs</source>
- <translation>Supprimer casier(s)</translation>
+ <translation>Supprimer les casier(s)</translation>
</message>
<message>
- <location filename="../View/ui/ReservoirList.ui" line="105"/>
+ <location filename="../View/ui/GeometryReach.ui" line="193"/>
<source>Edit</source>
- <translation>Éditer</translation>
+ <translation>modifier</translation>
</message>
<message>
<location filename="../View/ui/ReservoirList.ui" line="108"/>
- <source>Edit reservoir law</source>
- <translation>Éditer la loi du(es) casier(s)</translation>
+ <source>Edit reservoir equations</source>
+ <translation>Modifier la loi des casiers</translation>
</message>
<message>
- <location filename="../View/ui/Network.ui" line="218"/>
+ <location filename="../View/ui/Network.ui" line="118"/>
<source>Add node or edge</source>
<translation>Ajouter un nœud ou une arête</translation>
</message>
<message>
- <location filename="../View/ui/Network.ui" line="230"/>
+ <location filename="../View/ui/Network.ui" line="130"/>
<source>Remove node or edge</source>
<translation>Supprimer un nœud ou une arête</translation>
</message>
<message>
<location filename="../View/ui/EditSedimentLayers.ui" line="63"/>
<source>Add sediment layer</source>
- <translation>Ajouter une couche sedimentaire</translation>
+ <translation>Ajouter une couche sédimentaire</translation>
</message>
<message>
<location filename="../View/ui/EditSedimentLayers.ui" line="78"/>
<source>Delete sediment layer</source>
- <translation>Supprimer une couche sedimentaire</translation>
+ <translation>Supprimer une couche sédimentaire</translation>
</message>
<message>
<location filename="../View/ui/SedimentLayersList.ui" line="86"/>
<source>Edit sediment layer</source>
- <translation>Éditer la couche sedimentaire</translation>
+ <translation>Modifier la couche sédimentaire</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="270"/>
+ <location filename="../View/ui/REPLineList.ui" line="79"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
@@ -1337,192 +1477,192 @@
<translation>PAMHYR</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="98"/>
+ <location filename="../View/ui/MainWindow.ui" line="100"/>
<source>&File</source>
<translation>&Fichier</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="116"/>
- <source>&River Network</source>
+ <location filename="../View/ui/MainWindow.ui" line="118"/>
+ <source>&River network</source>
<translation>&Réseau</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="125"/>
+ <location filename="../View/ui/MainWindow.ui" line="127"/>
<source>&Geometry</source>
<translation>&Géometrie</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="134"/>
+ <location filename="../View/ui/MainWindow.ui" line="136"/>
<source>&Execute</source>
<translation>&Exécuter</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="144"/>
+ <location filename="../View/ui/MainWindow.ui" line="146"/>
<source>&Hydraulics</source>
<translation>&Hydraulique</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="155"/>
+ <location filename="../View/ui/MainWindow.ui" line="157"/>
<source>&Results</source>
<translation>&Résultats</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="162"/>
+ <location filename="../View/ui/MainWindow.ui" line="164"/>
<source>&Help</source>
<translation>&Aide</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="166"/>
+ <location filename="../View/ui/MainWindow.ui" line="168"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="170"/>
+ <location filename="../View/ui/MainWindow.ui" line="172"/>
<source>Pamhyr2 </source>
<translation>Pamhyr2 </translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="184"/>
+ <location filename="../View/ui/MainWindow.ui" line="186"/>
<source>&Sediment</source>
<translation>&Sédiment</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="195"/>
+ <location filename="../View/ui/MainWindow.ui" line="197"/>
<source>&Windows</source>
<translation>&Fenêtres</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="302"/>
+ <location filename="../View/ui/MainWindow.ui" line="333"/>
<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="330"/>
+ <location filename="../View/ui/MainWindow.ui" line="361"/>
<source>Open a study</source>
<translation>Ouvrir une étude</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="333"/>
+ <location filename="../View/ui/MainWindow.ui" line="364"/>
<source>Ctrl+O</source>
<translation>Ctrl+O</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="342"/>
+ <location filename="../View/ui/MainWindow.ui" line="373"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="487"/>
+ <location filename="../View/ui/MainWindow.ui" line="546"/>
<source>Close current study</source>
<translation>Fermer l'étude en cours</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="354"/>
+ <location filename="../View/ui/MainWindow.ui" line="385"/>
<source>Save</source>
<translation>Sauvegarder</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="357"/>
+ <location filename="../View/ui/MainWindow.ui" line="388"/>
<source>Save study</source>
<translation>Sauvegarder l'étude</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="360"/>
+ <location filename="../View/ui/MainWindow.ui" line="391"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="369"/>
+ <location filename="../View/ui/MainWindow.ui" line="400"/>
<source>Save as ...</source>
<translation>Sauvegarder sous ...</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="372"/>
+ <location filename="../View/ui/MainWindow.ui" line="403"/>
<source>Save study as ...</source>
<translation>Sauvegarder l'étude sous ...</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="375"/>
+ <location filename="../View/ui/MainWindow.ui" line="406"/>
<source>Ctrl+Shift+S</source>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="380"/>
- <source>Pamhyr configuration</source>
+ <location filename="../View/ui/MainWindow.ui" line="411"/>
+ <source>Pamhyr2 configuration</source>
<translation>Configuration de Pamhyr2</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="389"/>
+ <location filename="../View/ui/MainWindow.ui" line="420"/>
<source>Quit</source>
<translation>Quitter</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="392"/>
+ <location filename="../View/ui/MainWindow.ui" line="423"/>
<source>Quit application</source>
<translation>Quitter l'application</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="395"/>
+ <location filename="../View/ui/MainWindow.ui" line="426"/>
<source>Ctrl+F4</source>
<translation>Ctrl+F4</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="517"/>
+ <location filename="../View/ui/MainWindow.ui" line="576"/>
<source>Edit river network</source>
- <translation>Éditer le réseau</translation>
+ <translation>Modifier le réseau</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="405"/>
+ <location filename="../View/ui/MainWindow.ui" line="444"/>
<source>Edit geometry</source>
- <translation>Éditer la géométrie</translation>
+ <translation>Modifier la géométrie</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="138"/>
+ <location filename="../View/ui/GeometryReach.ui" line="148"/>
<source>Import geometry</source>
<translation>Importer une géométrie</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="146"/>
+ <location filename="../View/ui/GeometryReach.ui" line="160"/>
<source>Export geometry</source>
<translation>Exporter la géométrie</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="413"/>
- <source>Numerical parameter for solvers</source>
- <translation>Paramètres numeriques des solvers</translation>
+ <location filename="../View/ui/MainWindow.ui" line="452"/>
+ <source>Numerical parameters of solvers</source>
+ <translation>Paramètres numériques des solveurs</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="641"/>
- <source>Boundary conditions and punctual contributions</source>
- <translation>Condition aux limites et apports ponctuels</translation>
+ <location filename="../View/ui/MainWindow.ui" line="720"/>
+ <source>Boundary conditions and point sources</source>
+ <translation>Conditions aux limites et apports ponctuels</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="573"/>
+ <location filename="../View/ui/MainWindow.ui" line="648"/>
<source>Initial conditions</source>
<translation>Conditions initiales</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="431"/>
+ <location filename="../View/ui/MainWindow.ui" line="627"/>
<source>Edit friction</source>
- <translation>Éditer les frottements</translation>
+ <translation>Modifier les frottements</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="436"/>
- <source>Edit lateral contributions</source>
- <translation>Éditer les apports latéraux</translation>
+ <location filename="../View/ui/MainWindow.ui" line="615"/>
+ <source>Edit lateral sources</source>
+ <translation>Modifier les contributions latérales</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="502"/>
+ <location filename="../View/ui/MainWindow.ui" line="561"/>
<source>Run solver</source>
- <translation>Lancer solveur</translation>
+ <translation>Lancer le solveur</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="444"/>
+ <location filename="../View/ui/MainWindow.ui" line="503"/>
<source>F5</source>
<translation>F5</translation>
</message>
@@ -1532,167 +1672,162 @@
<translation>Ouvrir</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="452"/>
+ <location filename="../View/ui/MainWindow.ui" line="511"/>
<source>Visualize last results</source>
<translation>Visualisation des derniers résultats</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="455"/>
+ <location filename="../View/ui/MainWindow.ui" line="514"/>
<source>Visualize the last results</source>
- <translation>Visualisation des derniers resultats</translation>
+ <translation>Visualisation des derniers résultats</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="463"/>
+ <location filename="../View/ui/MainWindow.ui" line="522"/>
<source>About</source>
<translation>À propos</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="472"/>
+ <location filename="../View/ui/MainWindow.ui" line="531"/>
<source>Save current study</source>
<translation>Sauvegarder l'étude</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="475"/>
+ <location filename="../View/ui/MainWindow.ui" line="534"/>
<source>Save the study (Ctrl+S)</source>
<translation>Sauvegarde de l'étude (Ctrl+S)</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="490"/>
+ <location filename="../View/ui/MainWindow.ui" line="549"/>
<source>Close the study (Ctrl+F)</source>
<translation>Fermeture de l'étude (Ctrl+F)</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="493"/>
+ <location filename="../View/ui/MainWindow.ui" line="552"/>
<source>Ctrl+F</source>
<translation>Ctrl+F</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="505"/>
+ <location filename="../View/ui/MainWindow.ui" line="564"/>
<source>Run a solver</source>
<translation>Lancer un solveur</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="514"/>
+ <location filename="../View/ui/MainWindow.ui" line="573"/>
<source>River network</source>
<translation>Réseau</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="526"/>
+ <location filename="../View/ui/MainWindow.ui" line="585"/>
<source>Geometry</source>
<translation>Géometrie</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="529"/>
+ <location filename="../View/ui/MainWindow.ui" line="588"/>
<source>Edit reach geometry</source>
- <translation>Éditer la géométrie du bief actuel</translation>
+ <translation>Modifier la géométrie du bief actuel</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="534"/>
+ <location filename="../View/ui/MainWindow.ui" line="597"/>
<source>Boundary conditions</source>
<translation>Conditions aux limites</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="537"/>
- <source>Edit boundary conditions and punctual contributions</source>
- <translation>Éditer les conditions aux limites et les apports ponctuels</translation>
+ <location filename="../View/ui/MainWindow.ui" line="600"/>
+ <source>Edit boundary conditions and point sources</source>
+ <translation>Modifier les conditions aux limites et les apports ponctuels</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="545"/>
- <source>Lateral contribution</source>
+ <location filename="../View/ui/MainWindow.ui" line="612"/>
+ <source>Lateral sources</source>
<translation>Contributions latérales</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="548"/>
- <source>Edit lateral contribution</source>
- <translation>Éditer les contributions latérales</translation>
- </message>
- <message>
- <location filename="../View/ui/MainWindow.ui" line="553"/>
+ <location filename="../View/ui/MainWindow.ui" line="624"/>
<source>Friction</source>
<translation>Frottements</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="556"/>
- <source>Edit friction frictions</source>
- <translation>Éditer les frottements</translation>
+ <source>Edit friction coefficients</source>
+ <translation type="obsolete">Modifier les frottements</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="565"/>
+ <location filename="../View/ui/MainWindow.ui" line="636"/>
<source>Edit study</source>
- <translation>Éditer l'étude</translation>
+ <translation>Modifier l'étude</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="568"/>
<source>Edit the study metadata</source>
- <translation type="obsolete">Éditer les informations de l'étude</translation>
+ <translation type="obsolete">Modifier les informations de l'étude</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="576"/>
+ <location filename="../View/ui/MainWindow.ui" line="651"/>
<source>Define initial conditions</source>
<translation>Définir les conditions initiales</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="581"/>
+ <location filename="../View/ui/MainWindow.ui" line="656"/>
<source>Sediment layers</source>
- <translation>Couche sédimentaires</translation>
+ <translation>Couches sédimentaires</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="584"/>
+ <location filename="../View/ui/MainWindow.ui" line="659"/>
<source>Define sediment layers</source>
<translation>Définition des couches sédimentaires</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="589"/>
+ <location filename="../View/ui/MainWindow.ui" line="664"/>
<source>Edit reach sediment layers</source>
- <translation>Éditer les couches sédimentaires</translation>
+ <translation>Modifier les couches sédimentaires</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="594"/>
+ <location filename="../View/ui/MainWindow.ui" line="669"/>
<source>Mage</source>
<translation>Mage</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="597"/>
- <source>Open mage documentation</source>
- <translation>Ouvrir la domumentation de mage</translation>
+ <location filename="../View/ui/MainWindow.ui" line="672"/>
+ <source>Open Mage documentation</source>
+ <translation>Ouvrir la documentation de Mage</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="602"/>
+ <location filename="../View/ui/MainWindow.ui" line="677"/>
<source>Users (wiki)</source>
<translation>Utilisateurs (wiki)</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="607"/>
+ <location filename="../View/ui/MainWindow.ui" line="682"/>
<source>Developers (pdf)</source>
- <translation>Développeur (pdf)</translation>
+ <translation>Développeurs (pdf)</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="612"/>
+ <location filename="../View/ui/MainWindow.ui" line="687"/>
<source>Developers (html)</source>
- <translation>Développeur (html)</translation>
+ <translation>Développeurs (html)</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="617"/>
+ <location filename="../View/ui/MainWindow.ui" line="692"/>
<source>Reservoirs</source>
<translation>Casiers</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="620"/>
+ <location filename="../View/ui/MainWindow.ui" line="695"/>
<source>Edit reservoirs</source>
- <translation>Éditer les casiers</translation>
+ <translation>Modifier les casiers</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="625"/>
+ <location filename="../View/ui/HydraulicStructures.ui" line="14"/>
<source>Hydraulic structures</source>
- <translation>Structures hydraulique</translation>
+ <translation>Ouvrages hydrauliques</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="628"/>
+ <location filename="../View/ui/MainWindow.ui" line="703"/>
<source>Edit hydraulic structures</source>
- <translation>Éditer les structures hydraulique</translation>
+ <translation>Modifier les ouvrages hydrauliques</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="636"/>
+ <location filename="../View/ui/MainWindow.ui" line="711"/>
<source>Open results from file</source>
<translation>Ouvrir des résultats depuis un fichier</translation>
</message>
@@ -1708,11 +1843,11 @@
</message>
<message>
<location filename="../View/ui/DebugRepl.ui" line="26"/>
- <source>Eval</source>
+ <source>Evaluate</source>
<translation>Évaluer</translation>
</message>
<message>
- <location filename="../View/ui/DebugRepl.ui" line="33"/>
+ <location filename="../View/ui/DebugRepl.ui" line="39"/>
<source>Ctrl+Return</source>
<translation>Ctrl+Return</translation>
</message>
@@ -1724,10 +1859,10 @@
<message>
<location filename="../View/ui/EditSedimentLayers.ui" line="81"/>
<source>Delete selected sediment layer(s)</source>
- <translation>Supprimer la(les) couche(s) sédimentaire(s) sélectionnée(s)</translation>
+ <translation>Supprimer les couches sédimentaires sélectionné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>
@@ -1753,68 +1888,68 @@
</message>
<message>
<location filename="../View/ui/BoundaryConditions.ui" line="64"/>
- <source>Suspenssion</source>
+ <source>Suspension</source>
<translation>Suspension</translation>
</message>
<message>
<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>
+ <source>Add a new boundary condition or lateral source</source>
+ <translation>Ajouter une condition aux limites ou un apport latéral</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/LateralContributions.ui" line="147"/>
- <source>Edit boundary condition or lateral contribution</source>
- <translation>Éditer une condition aux limites ou un apport ponctuel</translation>
+ <source>Edit boundary condition or lateral source</source>
+ <translation>Modifier une condition aux limites ou un apport latéral</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>
<message>
<location filename="../View/ui/BoundaryConditions.ui" line="162"/>
- <source>Sort boundary condition by name</source>
+ <source>Sort by names</source>
<translation>Trier par nom</translation>
</message>
<message>
<location filename="../View/ui/Stricklers.ui" line="28"/>
- <source>Study stricklers</source>
- <translation>Stricklers de l'étude</translation>
+ <source>Strickler coefficients of the study</source>
+ <translation>Coefficients de Strickler de l'étude</translation>
</message>
<message>
<location filename="../View/ui/Stricklers.ui" line="38"/>
- <source>Application stricklers</source>
- <translation>Stricklers de l'application</translation>
+ <source>Strickler coefficients of the application</source>
+ <translation>Coefficients de Strickler de l'application</translation>
</message>
<message>
<location filename="../View/ui/Stricklers.ui" line="73"/>
- <source>Add new stricklers</source>
- <translation>Ajouter un Strickler</translation>
+ <source>Add new Strickler coefficients</source>
+ <translation>Ajouter un coefficient de Strickler</translation>
</message>
<message>
<location filename="../View/ui/Stricklers.ui" line="85"/>
- <source>Delete selected stricklers</source>
- <translation>Supprimer les Stricklers selectionnés</translation>
+ <source>Delete selected Strickler coefficients</source>
+ <translation>Supprimer les coefficients de Strickler selectionnés</translation>
</message>
<message>
<location filename="../View/ui/Stricklers.ui" line="97"/>
- <source>Sort stricklers</source>
- <translation>Trier les Stricklers</translation>
+ <source>Sort Strickler coefficients</source>
+ <translation>Trier les coefficients de Strickler</translation>
</message>
<message>
<location filename="../View/ui/BoundaryConditions.ui" line="117"/>
- <source>Add a new boundary condition or punctual contribution</source>
+ <source>Add a new boundary condition or point source</source>
<translation>Ajouter une condition aux limites ou un apport ponctuel</translation>
</message>
<message>
<location filename="../View/ui/BoundaryConditions.ui" line="147"/>
- <source>Edit boundary condition or punctual contribution</source>
- <translation>Éditer une condition aux limites ou un apport ponctuel</translation>
+ <source>Edit boundary condition or point source</source>
+ <translation>Modifier une condition aux limites ou un apport ponctuel</translation>
</message>
<message>
<location filename="../View/ui/Results.ui" line="152"/>
@@ -1828,38 +1963,38 @@
</message>
<message>
<location filename="../View/ui/Results.ui" line="201"/>
- <source>Hydrograph</source>
+ <source>Discharge time series</source>
<translation>Hydrogramme</translation>
</message>
<message>
<location filename="../View/ui/Results.ui" line="254"/>
- <source>Add custom visualization</source>
+ <source>Add customized visualization</source>
<translation>Ajouter une visualisation personnalisée</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="259"/>
+ <location filename="../View/ui/Results.ui" line="263"/>
<source>Reload</source>
<translation>Recharger</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="264"/>
+ <location filename="../View/ui/GeometryReach.ui" line="157"/>
<source>Export</source>
<translation>Exporter</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="267"/>
+ <location filename="../View/ui/Results.ui" line="275"/>
<source>Export raw data</source>
<translation>Exporter les données brutes</translation>
</message>
<message>
- <location filename="../View/ui/GeometryCrossSection.ui" line="82"/>
+ <location filename="../View/ui/GeometryReach.ui" line="181"/>
<source>delete</source>
<translation>supprimer</translation>
</message>
<message>
- <location filename="../View/ui/Frictions.ui" line="101"/>
- <source>Edit stricklers</source>
- <translation>Éditer des stricklers</translation>
+ <location filename="../View/ui/Frictions.ui" line="104"/>
+ <source>Edit Strickler coefficients</source>
+ <translation>Modifier les coefficients de Strickler</translation>
</message>
<message>
<location filename="../View/ui/WebView.ui" line="56"/>
@@ -1899,32 +2034,32 @@
<message>
<location filename="../View/ui/BasicHydraulicStructures.ui" line="14"/>
<source>Basic hydraulic structures</source>
- <translation>Ouvrages hydrauliques élémentaire</translation>
+ <translation>Ouvrages hydrauliques élémentaires</translation>
</message>
<message>
<location filename="../View/ui/BasicHydraulicStructures.ui" line="49"/>
<source>Enable / Disable basic hydraulic structure</source>
- <translation>Activer/Déactiver l'ouvrage hydraulique élémentaire</translation>
+ <translation>Activer/Désactiver l'ouvrage hydraulique élémentaire</translation>
</message>
<message>
- <location filename="../View/ui/Reservoir.ui" line="78"/>
+ <location filename="../View/ui/EditBoundaryConditions.ui" line="89"/>
<source>Add a new point</source>
- <translation>Add a new point</translation>
+ <translation>Ajouter un nouveau point</translation>
</message>
<message>
<location filename="../View/ui/Reservoir.ui" line="90"/>
<source>Delete points</source>
- <translation>Supprimer points</translation>
+ <translation>Supprimer les points</translation>
</message>
<message>
- <location filename="../View/ui/BasicHydraulicStructures.ui" line="136"/>
+ <location filename="../View/ui/HydraulicStructures.ui" line="133"/>
<source>Edit selected hydraulic structure</source>
- <translation>Éditer l'ouvrage hydraulique sélectionné</translation>
+ <translation>Modifier l'ouvrage hydraulique sélectionné</translation>
</message>
<message>
<location filename="../View/ui/SolverLog.ui" line="78"/>
<source>Stop</source>
- <translation>Stoper</translation>
+ <translation>Arrêter</translation>
</message>
<message>
<location filename="../View/ui/SolverLog.ui" line="87"/>
@@ -1944,45 +2079,40 @@
<message>
<location filename="../View/ui/SolverLog.ui" line="110"/>
<source>results</source>
- <translation>resultats</translation>
- </message>
- <message>
- <location filename="../View/ui/GeometryCrossSection.ui" line="70"/>
- <source>add</source>
- <translation>Ajouter</translation>
+ <translation>résultats</translation>
</message>
<message>
<location filename="../View/ui/GeometryCrossSection.ui" line="73"/>
- <source>Add a point on cross-section</source>
+ <source>Add a point to cross-section</source>
<translation>Ajouter un point à la section en travers</translation>
</message>
<message>
<location filename="../View/ui/GeometryCrossSection.ui" line="85"/>
<source>Delete selected point(s)</source>
- <translation>Supprimer le(s) point(s) sélectionné(s)</translation>
+ <translation>Supprimer les points sélectionnés</translation>
</message>
<message>
- <location filename="../View/ui/GeometryCrossSection.ui" line="94"/>
- <source>up</source>
+ <location filename="../View/ui/GeometryReach.ui" line="229"/>
+ <source>Up</source>
<translation>Monter</translation>
</message>
<message>
<location filename="../View/ui/GeometryCrossSection.ui" line="97"/>
<source>Move up selected point(s)</source>
- <translation>Déplacer le point sélectionné vers le haut</translation>
+ <translation>Déplacer les points sélectionnés vers le haut</translation>
</message>
<message>
- <location filename="../View/ui/GeometryCrossSection.ui" line="106"/>
- <source>down</source>
+ <location filename="../View/ui/GeometryReach.ui" line="241"/>
+ <source>Down</source>
<translation>Descendre</translation>
</message>
<message>
<location filename="../View/ui/GeometryCrossSection.ui" line="109"/>
- <source>Mode down selected point(s)</source>
- <translation>Déplacer le point sélectionné vers le bas</translation>
+ <source>Move down selected point(s)</source>
+ <translation>Déplacer les points sélectionnés vers le bas</translation>
</message>
<message>
- <location filename="../View/ui/GeometryCrossSection.ui" line="118"/>
+ <location filename="../View/ui/GeometryReach.ui" line="205"/>
<source>sort_asc</source>
<translation>sort_asc</translation>
</message>
@@ -1992,49 +2122,49 @@
<translation>Trier les points par leurs plus proches voisins</translation>
</message>
<message>
- <location filename="../View/ui/GeometryCrossSection.ui" line="130"/>
+ <location filename="../View/ui/GeometryReach.ui" line="217"/>
<source>sort_des</source>
<translation>sort_des</translation>
</message>
<message>
<location filename="../View/ui/GeometryCrossSection.ui" line="133"/>
<source>Sort reversed points by nearest neighbor</source>
- <translation>Trie inverser les points par leurs plus proche voisins</translation>
+ <translation>Trier/inverser les points par leurs plus proches voisins</translation>
</message>
<message>
<location filename="../View/ui/HydraulicStructures.ui" line="49"/>
<source>Enable / Disable hydraulic structure</source>
- <translation>Activer/Déactiver l'ouvrage hydraulique</translation>
+ <translation>Activer/Désactiver l'ouvrage hydraulique</translation>
</message>
<message>
<location filename="../View/ui/Reservoir.ui" line="102"/>
- <source>Edit elevation/surface law</source>
- <translation>Éditer loi élévation/surface</translation>
+ <source>Edit stage-area relation</source>
+ <translation>Modifier loi cote/surface</translation>
</message>
<message>
<location filename="../View/ui/Reservoir.ui" line="114"/>
- <source>Sort points by elevation</source>
- <translation>Trier les points par leur cote</translation>
+ <source>Sort points by elevations</source>
+ <translation>Trier les points par cote</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>
+ <translation>Modifier la liste des couches sédimentaires</translation>
</message>
<message>
<location filename="../View/ui/ReachSedimentLayers.ui" line="38"/>
- <source>Apply sediment layers on all reach</source>
+ <source>Apply sediment layers to all reaches</source>
<translation>Appliquer une liste de couches sédimentaires</translation>
</message>
<message>
<location filename="../View/ui/ReachSedimentLayers.ui" line="80"/>
<source>Edit profile</source>
- <translation>Éditer le profil</translation>
+ <translation>Modifier le profil</translation>
</message>
<message>
<location filename="../View/ui/ReachSedimentLayers.ui" line="83"/>
- <source>Edit profile sediment layer</source>
- <translation>Éditer les couches sédimentaires du profil</translation>
+ <source>Edit sediment layers of the profile</source>
+ <translation>Modifier les couches sédimentaires du profil</translation>
</message>
<message>
<location filename="../View/ui/InitialConditions.ui" line="30"/>
@@ -2044,57 +2174,52 @@
<message>
<location filename="../View/ui/InitialConditions.ui" line="37"/>
<source>Generate from discharge</source>
- <translation>Générer pour un débit donnée</translation>
+ <translation>Générer pour un débit donné</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions.ui" line="97"/>
+ <location filename="../View/ui/InitialConditions.ui" line="98"/>
<source>Add new initial condition</source>
<translation>Ajouter une nouvelle condition initiale</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions.ui" line="109"/>
+ <location filename="../View/ui/InitialConditions.ui" line="110"/>
<source>Delete inital condition</source>
<translation>Supprimer une condition initiale</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions.ui" line="118"/>
+ <location filename="../View/ui/InitialConditions.ui" line="119"/>
<source>sort</source>
<translation>sort</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions.ui" line="121"/>
- <source>Sort inital condition</source>
+ <location filename="../View/ui/InitialConditions.ui" line="122"/>
+ <source>Sort inital conditions</source>
<translation>Trier les conditions initiales</translation>
</message>
<message>
- <location filename="../View/ui/EditBoundaryConditions.ui" line="89"/>
- <source>Add a new point in boundary condition or punctual contribution</source>
- <translation>Ajouter un nouveau point</translation>
+ <location filename="../View/ui/BoundaryConditions.ui" line="117"/>
+ <source>Add a new point in boundary condition or point source</source>
+ <translation type="obsolete">Ajouter un nouveau point</translation>
</message>
<message>
<location filename="../View/ui/EditBoundaryConditions.ui" line="119"/>
<source>Sort boundary condition points</source>
- <translation>Trier les points des conditions aux limites</translation>
+ <translation type="obsolete">Trier les points des conditions aux limites</translation>
</message>
<message>
<location filename="../View/ui/EditLateralContribution.ui" line="82"/>
- <source>Add a new point in boundary condition or lateral contribution</source>
+ <source>Add a new point in boundary condition or lateral source</source>
<translation>Ajouter un nouveau point</translation>
</message>
- <message>
- <location filename="../View/ui/EditLateralContribution.ui" line="112"/>
- <source>Sort boundary condition point</source>
- <translation>Trier les points des conditions aux limites</translation>
- </message>
<message>
<location filename="../View/ui/ProfileSedimentLayers.ui" line="48"/>
<source>Add sediment layers</source>
- <translation>Ajouter une couche sedimentaire</translation>
+ <translation>Ajouter une couche sédimentaire</translation>
</message>
<message>
<location filename="../View/ui/ProfileSedimentLayers.ui" line="51"/>
<source>Add specific sediment layers on selected point(s)</source>
- <translation>Ajouter des couches spécifiques au(x) point(s) sélectionné(s)</translation>
+ <translation>Ajouter des couches spécifiques aux points sélectionnés</translation>
</message>
<message>
<location filename="../View/ui/ProfileSedimentLayers.ui" line="60"/>
@@ -2104,97 +2229,92 @@
<message>
<location filename="../View/ui/ProfileSedimentLayers.ui" line="63"/>
<source>Delete specific sediment layers of selected point(s)</source>
- <translation>Supprimer les couches sédimentaires au(x) point(s) sélectionné(s)</translation>
+ <translation>Supprimer les couches sédimentaires aux points sélectionnés</translation>
</message>
<message>
<location filename="../View/ui/ProfileSedimentLayers.ui" line="72"/>
<source>Edit sediment layers</source>
- <translation>Éditer les couches sédimentaires</translation>
+ <translation>Modifier les couches sédimentaires</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="135"/>
+ <location filename="../View/ui/GeometryReach.ui" line="145"/>
<source>Import</source>
<translation>Importer</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="158"/>
+ <location filename="../View/ui/GeometryReach.ui" line="172"/>
<source>Add a cross-section</source>
<translation>Ajouter une section en travers</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="170"/>
+ <location filename="../View/ui/GeometryReach.ui" line="184"/>
<source>Delete selected cross-section(s)</source>
- <translation>Supprimer la(es) section(s) en travers sélectionnée(s)</translation>
+ <translation>Supprimer les sections en travers sélectionnées</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="179"/>
- <source>edit</source>
- <translation>éditer</translation>
- </message>
- <message>
- <location filename="../View/ui/GeometryReach.ui" line="182"/>
+ <location filename="../View/ui/GeometryReach.ui" line="196"/>
<source>Edit selected cross section(s)</source>
- <translation>Éditer la(es) section(s) en travers sélectionnée(s)</translation>
+ <translation>Modifier les sections en travers sélectionnées</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="194"/>
- <source>Sort cross-sections by ascending KP</source>
+ <location filename="../View/ui/GeometryReach.ui" line="208"/>
+ <source>Sort cross-sections by ascending position</source>
<translation>Trier les sections en travers par PK croissant</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="206"/>
- <source>Sort cross-sections by descending KP</source>
+ <location filename="../View/ui/GeometryReach.ui" line="220"/>
+ <source>Sort cross-sections by descending position</source>
<translation>Trier les sections en travers par PK décroissant</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="218"/>
+ <location filename="../View/ui/GeometryReach.ui" line="232"/>
<source>Move up selected cross-section(s)</source>
- <translation>Déplacer la(s) section(s) en travers vers le haut</translation>
+ <translation>Déplacer les sections en travers vers le haut</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="230"/>
+ <location filename="../View/ui/GeometryReach.ui" line="244"/>
<source>Move down selected cross-section(s)</source>
- <translation>Déplacer la(es) section(s) en travers vers le bas</translation>
+ <translation>Déplacer les sections en travers vers le bas</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="235"/>
+ <location filename="../View/ui/GeometryReach.ui" line="253"/>
<source>Meshing</source>
<translation>Maillage</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="78"/>
+ <location filename="../View/Translate.py" line="79"/>
<source>Summary</source>
- <translation>Résumer</translation>
+ <translation>Résumé</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="81"/>
+ <location filename="../View/Translate.py" line="82"/>
<source>Checks</source>
<translation>Vérifications</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="200"/>
- <source>&Advansed</source>
+ <location filename="../View/ui/MainWindow.ui" line="202"/>
+ <source>&Advanced</source>
<translation>&Avancé</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="646"/>
- <source>&Additional file</source>
- <translation>Fichiers &supplémentaire</translation>
+ <location filename="../View/ui/MainWindow.ui" line="725"/>
+ <source>&Additional files</source>
+ <translation>Fichiers &supplémentaires</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="651"/>
+ <location filename="../View/ui/MainWindow.ui" line="730"/>
<source>REP additional lines</source>
- <translation>Lines REP supplémentaire</translation>
+ <translation>Lignes REP supplémentaires</translation>
</message>
<message>
<location filename="../View/ui/REPLineList.ui" line="46"/>
- <source>Add new additional line</source>
+ <source>Add new line</source>
<translation>Ajouter une nouvelle ligne</translation>
</message>
<message>
<location filename="../View/ui/REPLineList.ui" line="61"/>
<source>Delete additional line(s)</source>
- <translation>Supprimer la(es) ligne(s) supplementaire</translation>
+ <translation>Supprimer les lignes supplementaires</translation>
</message>
<message>
<location filename="../View/ui/REPLineList.ui" line="64"/>
@@ -2204,7 +2324,7 @@
<message>
<location filename="../View/ui/REPLineList.ui" line="76"/>
<source>Edit selected line(s)</source>
- <translation>Éditer la(es) ligne(s) selectionnée(s)</translation>
+ <translation>Modifier les lignes selectionnées</translation>
</message>
<message>
<location filename="../View/ui/AdditionalFile.ui" line="46"/>
@@ -2214,7 +2334,7 @@
<message>
<location filename="../View/ui/AdditionalFile.ui" line="55"/>
<source>File text</source>
- <translation>Text du fichiers</translation>
+ <translation>Texte du fichier</translation>
</message>
<message>
<location filename="../View/ui/AdditionalFile.ui" line="67"/>
@@ -2229,7 +2349,7 @@
<message>
<location filename="../View/ui/AdditionalFile.ui" line="83"/>
<source>The relative file path on executable directory</source>
- <translation>Le chemin relatif du fichier dans le répertoire d'execution</translation>
+ <translation>Le chemin relatif du fichier dans le répertoire d'exécution</translation>
</message>
<message>
<location filename="../View/ui/AdditionalFile.ui" line="93"/>
@@ -2249,84 +2369,84 @@
<message>
<location filename="../View/ui/AdditionalFileList.ui" line="58"/>
<source>Delete selected file(s)</source>
- <translation>Supprimer le(s) fichier(s) selectionné(s)</translation>
+ <translation>Supprimer les fichiers sélectionnés</translation>
</message>
<message>
<location filename="../View/ui/AdditionalFileList.ui" line="70"/>
<source>Edit file</source>
- <translation>Éditer fichier</translation>
+ <translation>Modifier fichier</translation>
</message>
<message>
- <location filename="../View/ui/MainWindow.ui" line="568"/>
+ <location filename="../View/ui/MainWindow.ui" line="639"/>
<source>Edit the study information</source>
- <translation>Éditer les information de l'étude</translation>
+ <translation>Modifier les informations de l'étude</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="240"/>
- <source>Update KP</source>
+ <location filename="../View/ui/GeometryReach.ui" line="112"/>
+ <source>toolBar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="243"/>
- <source>Recompute KP</source>
+ <location filename="../View/ui/MainWindow.ui" line="303"/>
+ <source>toolBar_2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../View/ui/GeometryCrossSection.ui" line="138"/>
- <source>Purge</source>
- <translation type="unfinished"></translation>
+ <location filename="../View/ui/MainWindow.ui" line="482"/>
+ <source>Edit frictions</source>
+ <translation>Éditer les frotements</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="251"/>
- <source>Purge cross-sections to keep a given number of points</source>
- <translation type="unfinished"></translation>
+ <location filename="../View/ui/GeometryReach.ui" line="266"/>
+ <source>Purge</source>
+ <translation>Purger</translation>
</message>
<message>
<location filename="../View/ui/GeometryCrossSection.ui" line="141"/>
<source>Purge the cross-section to keep a given number of points</source>
- <translation type="unfinished"></translation>
+ <translation>Purger les profiles pour garder qu'un nombre donné de points</translation>
</message>
<message>
<location filename="../View/ui/GeometryCrossSection.ui" line="146"/>
<source>Reverse</source>
- <translation type="unfinished"></translation>
+ <translation>Retourner</translation>
</message>
<message>
<location filename="../View/ui/GeometryCrossSection.ui" line="149"/>
<source>Reverse the points order</source>
- <translation type="unfinished"></translation>
+ <translation>Retourner l'ordre des points</translation>
</message>
-</context>
-<context>
- <name>MainWindowProfile</name>
<message>
- <location filename="../View/Geometry/Profile/Table.py" line="87"/>
- <source>La cote du fond</source>
- <comment>Z minimale</comment>
- <translation type="unfinished"></translation>
+ <location filename="../View/ui/InitialConditions.ui" line="134"/>
+ <source>Import from file</source>
+ <translation>Importer depuis un fichier</translation>
</message>
<message>
- <location filename="../View/Geometry/Profile/Table.py" line="91"/>
- <source>La cote maximale</source>
- <comment>Z maximale</comment>
- <translation type="unfinished"></translation>
+ <location filename="../View/ui/GeometryReach.ui" line="258"/>
+ <source>Update KP</source>
+ <translation>Mise à jour des PK</translation>
</message>
<message>
- <location filename="../View/Geometry/Profile/Table.py" line="109"/>
- <source>Rive gauche</source>
- <translation type="unfinished"></translation>
+ <location filename="../View/ui/GeometryReach.ui" line="261"/>
+ <source>Recompute KP</source>
+ <translation>Recalcule des PK</translation>
</message>
<message>
- <location filename="../View/Geometry/Profile/Table.py" line="113"/>
- <source>Rive droite</source>
- <translation type="unfinished"></translation>
+ <location filename="../View/ui/GeometryReach.ui" line="269"/>
+ <source>Purge cross-sections to keep a given number of points</source>
+ <translation>Purger les profiles pour garder un nombre fixer de points</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/EditLateralContribution.ui" line="112"/>
+ <source>Sort points</source>
+ <translation>Trier les points</translation>
</message>
</context>
<context>
<name>MainWindow_reach</name>
<message>
<location filename="../View/Results/PlotSedReach.py" line="233"/>
- <source>Kp (m)</source>
+ <source>Position (m)</source>
<translation>Pk (m)</translation>
</message>
<message>
@@ -2340,7 +2460,7 @@
<translation>X (m)</translation>
</message>
<message>
- <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="213"/>
+ <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="225"/>
<source>Select destination file</source>
<translation>Selectionner fichier de destination</translation>
</message>
@@ -2365,7 +2485,7 @@
<message>
<location filename="../View/Network/translate.py" line="36"/>
<source>Edit node reservoir</source>
- <translation>Éditer le casier du nœud</translation>
+ <translation>Modifier le casier du nœud</translation>
</message>
<message>
<location filename="../View/Network/translate.py" line="39"/>
@@ -2380,17 +2500,17 @@
<message>
<location filename="../View/Network/translate.py" line="47"/>
<source>Enable the reach</source>
- <translation>Activer l'arrête</translation>
+ <translation>Activer l'arête</translation>
</message>
<message>
<location filename="../View/Network/translate.py" line="48"/>
<source>Disable the reach</source>
- <translation>Déactiver l'arrête</translation>
+ <translation>Désactiver l'arête</translation>
</message>
<message>
<location filename="../View/Network/translate.py" line="50"/>
<source>Reverse the reach orientation</source>
- <translation>Inverser l'orientation de l'arrête</translation>
+ <translation>Inverser l'orientation de l'arête</translation>
</message>
<message>
<location filename="../View/Network/translate.py" line="61"/>
@@ -2426,7 +2546,7 @@
<message>
<location filename="../View/REPLines/Translate.py" line="33"/>
<source>Edit Mage REP lines</source>
- <translation>Éditer le lignes REP Mage</translation>
+ <translation>Modifier les lignes REP Mage</translation>
</message>
</context>
<context>
@@ -2444,7 +2564,7 @@
<message>
<location filename="../View/Reservoir/Edit/Translate.py" line="32"/>
<source>Edit Reservoir</source>
- <translation>Éditer le casier</translation>
+ <translation>Modifier le casier</translation>
</message>
</context>
<context>
@@ -2545,7 +2665,7 @@
<message>
<location filename="../View/SedimentLayers/Edit/translate.py" line="30"/>
<source>Edit Sediment Layers</source>
- <translation>Éditer les couches sédimentaires</translation>
+ <translation>Modifier les couches sédimentaires</translation>
</message>
<message>
<location filename="../View/SedimentLayers/Edit/translate.py" line="40"/>
@@ -2600,12 +2720,12 @@
<message>
<location filename="../View/SedimentLayers/Reach/translate.py" line="33"/>
<source>Apply sediment layers to reach</source>
- <translation>Appliquer des couches sédimentaire au bief</translation>
+ <translation>Appliquer des couches sédimentaires au bief</translation>
</message>
<message>
<location filename="../View/SedimentLayers/translate.py" line="30"/>
<source>Sediment Layers List</source>
- <translation>Liste des ensembles de couches sedimentaires</translation>
+ <translation>Liste des ensembles de couches sédimentaires</translation>
</message>
</context>
<context>
@@ -2623,7 +2743,7 @@
<message>
<location filename="../View/RunSolver/Log/Window.py" line="58"/>
<source>Solver logs</source>
- <translation>Selection des logs</translation>
+ <translation>Sélection des logs</translation>
</message>
</context>
<context>
@@ -2691,7 +2811,7 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="77"/>
<source>Implicitation parameter</source>
- <translation>Parametre d'implicitation</translation>
+ <translation>Paramètre d'implicitation</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="80"/>
@@ -2730,7 +2850,7 @@
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="101"/>
- <source>Maximun number of iterations (< 100)</source>
+ <source>Maximum number of iterations (< 100)</source>
<translation>Nombre maximum d'itérations (< 100)</translation>
</message>
<message>
@@ -2755,12 +2875,12 @@
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="116"/>
- <source>Number of iteration at maximum precision</source>
+ <source>Number of iterations at maximum precision</source>
<translation>Nombre d'itérations à la précision maximum</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="119"/>
- <source>Number of iteration before switch</source>
+ <source>Number of iterations before switch</source>
<translation>Nombre d'itérations avant changement</translation>
</message>
<message>
@@ -2791,7 +2911,7 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="137"/>
<source>Use Mage internal initialization (Y/N)</source>
- <translation>Utiliser l'initialisation interne de mage (O/N)</translation>
+ <translation>Utiliser l'initialisation interne de Mage (O/N)</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="141"/>
@@ -2830,8 +2950,8 @@
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="155"/>
- <source>Critic shields</source>
- <translation>Shields critique</translation>
+ <source>Critical Shields number</source>
+ <translation>Nombre de Shields critique</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="157"/>
@@ -2856,10 +2976,15 @@
</context>
<context>
<name>Stricklers</name>
+ <message>
+ <location filename="../View/Stricklers/translate.py" line="30"/>
+ <source>Strickler coefficients</source>
+ <translation>Coefficient de Strickler</translation>
+ </message>
<message>
<location filename="../View/Stricklers/translate.py" line="30"/>
<source>Stricklers</source>
- <translation>Stricklers</translation>
+ <translation type="obsolete">Stricklers</translation>
</message>
</context>
<context>
@@ -2867,7 +2992,7 @@
<message>
<location filename="../View/Study/Window.py" line="51"/>
<source>Edit study</source>
- <translation>Éditer l'étude</translation>
+ <translation>Modifier l'étude</translation>
</message>
<message>
<location filename="../View/Study/Window.py" line="56"/>
@@ -2878,43 +3003,43 @@
<context>
<name>Toolbar</name>
<message>
- <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="240"/>
+ <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="252"/>
<source>Default view</source>
<translation>Vue par défaut</translation>
</message>
<message>
- <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="241"/>
+ <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="253"/>
<source>Back to previous view</source>
<translation>Retour à la vue précédente</translation>
</message>
<message>
- <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="243"/>
- <source>Return to next view</source>
+ <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="255"/>
+ <source>Back to next view</source>
<translation>Retour à la vue suivante</translation>
</message>
<message>
- <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="245"/>
- <source>Axes panoramic</source>
+ <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="257"/>
+ <source>Panoramic axes</source>
<translation>Axes panoramiques</translation>
</message>
<message>
- <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="247"/>
+ <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="259"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
<message>
- <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="250"/>
+ <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="262"/>
<source>Isometric view (Shift+W)</source>
<translation>Vue isométrique (Shift+W)</translation>
</message>
<message>
- <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="252"/>
+ <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="264"/>
<source>Auto scale view (Shift+X)</source>
<translation>Vue automatique (Shift+X)</translation>
</message>
<message>
- <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="248"/>
- <source>Save the figure</source>
+ <location filename="../View/Tools/Plot/PamhyrToolbar.py" line="260"/>
+ <source>Save figure</source>
<translation>Sauvegarder la figure</translation>
</message>
</context>
@@ -2922,7 +3047,7 @@
<name>Unit</name>
<message>
<location filename="../View/Translate.py" line="55"/>
- <source>KP (m)</source>
+ <source>Position (m)</source>
<translation>PK (m)</translation>
</message>
<message>
@@ -2956,27 +3081,27 @@
<translation>Cote de l'eau (m)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="65"/>
+ <location filename="../View/Translate.py" line="66"/>
<source>Area (hectare)</source>
<translation>Aire (hectare)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="67"/>
+ <location filename="../View/Translate.py" line="68"/>
<source>Time (sec)</source>
- <translation>Temps (sec)</translation>
+ <translation>Temps (s)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="68"/>
+ <location filename="../View/Translate.py" line="69"/>
<source>Time (JJJ:HH:MM:SS)</source>
<translation>Temps (JJJ:HH:MM:SS)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="70"/>
+ <location filename="../View/Translate.py" line="71"/>
<source>Date (sec)</source>
- <translation>Date (sec)</translation>
+ <translation>Date (s)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="71"/>
+ <location filename="../View/Translate.py" line="72"/>
<source>Date (ISO format)</source>
<translation>Date (format ISO)</translation>
</message>
@@ -2985,8 +3110,13 @@
<source>Discharge (m³/s)</source>
<translation type="obsolete">Débit (m³/s)</translation>
</message>
- <message encoding="UTF-8">
+ <message>
<location filename="../View/Translate.py" line="64"/>
+ <source>Speed (m/s)</source>
+ <translation>Vitesse (m/s)</translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../View/Translate.py" line="65"/>
<source>Discharge (m³/s)</source>
<translation type="unfinished"></translation>
</message>