diff --git a/src/app/calculators/pbcloison/en.json b/src/app/calculators/pbcloison/en.json
index 83f004a88c58e43852f9861fd2e07a4dcdcf17e9..e621e15fb27199e75f3246ce6c3e82f6dfb78ebf 100644
--- a/src/app/calculators/pbcloison/en.json
+++ b/src/app/calculators/pbcloison/en.json
@@ -3,34 +3,5 @@
     "fs_wall_device": "Device",
 
     "select_upstream_basin": "Upstream basin",
-    "select_downstream_basin": "Downstream basin",
-
-    "select_structure_Orifice": "Orifice",
-    "select_structure_VanneRectangulaire": "Rectangular gate",
-    "select_structure_SeuilRectangulaire": "Rectangular weir",
-    "select_structure_SeuilTriangulaire": "Triangular weir",
-    "select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
-
-    "select_loidebit_Orifice_OrificeSubmerged": "Submerged orifice",
-    "select_loidebit_Orifice_OrificeFree": "Free orifice",
-
-    "select_loidebit_VanneRectangulaire_GateCem88d": "Weir/Orifice Cemagref 88",
-    "select_loidebit_VanneRectangulaire_GateCem88v": "Weir/Undershot gate Cemagref 88",
-    "select_loidebit_VanneRectangulaire_GateCunge80": "Cunge (1980)",
-    "select_loidebit_VanneRectangulaire_RectangularOrificeFree": "Free flow gate",
-    "select_loidebit_VanneRectangulaire_RectangularOrificeSubmerged": "Submerged gate",
-
-    "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "V-notch sharp-crested weir (Villemonte)",
-    "select_loidebit_SeuilTriangulaire_TriangularWeirBroad": "V-notch broad-crested weir (Bos)",
-
-    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
-
-    "select_loidebit_SeuilRectangulaire_WeirCem88d": "Weir/Orifice Cemagref 88",
-    "select_loidebit_SeuilRectangulaire_WeirCem88v": "Weir/Undershot gate Cemagref 88",
-    "select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
-    "select_loidebit_SeuilRectangulaire_WeirSubmerged": "Submerged weir",
-    "select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1957",
-    "select_loidebit_SeuilRectangulaire_WeirFree": "Free flow weir",
-    "select_loidebit_SeuilRectangulaire_KIVI": "Kindsvater-Carter and Villemonte",
-    "select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge (1980)"
+    "select_downstream_basin": "Downstream basin"
 }
diff --git a/src/app/calculators/pbcloison/fr.json b/src/app/calculators/pbcloison/fr.json
index e02e713f3602e08b138a20923fecca7caf3cac33..472d7d8973cead05e13d0793e1b112c9c99e501d 100644
--- a/src/app/calculators/pbcloison/fr.json
+++ b/src/app/calculators/pbcloison/fr.json
@@ -3,34 +3,5 @@
     "fs_wall_device": "Ouvrage",
 
     "select_upstream_basin": "Bassin amont",
-    "select_downstream_basin": "Bassin aval",
-
-    "select_structure_Orifice": "Orifice",
-    "select_structure_SeuilRectangulaire": "Seuil rectangulaire",
-    "select_structure_SeuilTriangulaire": "Seuil triangulaire",
-    "select_structure_SeuilTriangulaireTrunc": "Seuil triangulaire tronqué",
-    "select_structure_VanneRectangulaire": "Vanne rectangulaire",
-
-    "select_loidebit_Orifice_OrificeSubmerged": "Orifice noyé",
-    "select_loidebit_Orifice_OrificeFree": "Orifice dénoyé",
-
-    "select_loidebit_VanneRectangulaire_GateCem88d": "Déversoir/Orifice Cemagref 88",
-    "select_loidebit_VanneRectangulaire_GateCem88v": "Déversoir/Vanne de fond Cemagref 88",
-    "select_loidebit_VanneRectangulaire_GateCunge80": "Cunge (1980)",
-    "select_loidebit_VanneRectangulaire_RectangularOrificeFree": "Vanne dénoyée",
-    "select_loidebit_VanneRectangulaire_RectangularOrificeSubmerged": "Vanne noyée",
-
-    "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire mince (Villemonte)",
-    "select_loidebit_SeuilTriangulaire_TriangularWeirBroad": "Déversoir triangulaire épais (Bos)",
-
-    "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué (Villemonte)",
-
-    "select_loidebit_SeuilRectangulaire_WeirCem88d": "Déversoir/Orifice Cemagref 88",
-    "select_loidebit_SeuilRectangulaire_WeirCem88v": "Déversoir/Vanne de fond Cemagref 88",
-    "select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)",
-    "select_loidebit_SeuilRectangulaire_WeirSubmerged": "Seuil noyé",
-    "select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1957",
-    "select_loidebit_SeuilRectangulaire_WeirFree": "Seuil dénoyé",
-    "select_loidebit_SeuilRectangulaire_KIVI": "Kindsvater-Carter et Villemonte",
-    "select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge (1980)"
+    "select_downstream_basin": "Bassin aval"
 }
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 9f3f67c26dff27e09cd5c58d964717536ccb2b4d..c0e3e9e1a33f022185cfbfd669268ef5a3dfbada 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -52,8 +52,10 @@
     "ERROR_PARAMDEF_VALUE_UNDEFINED": "value of '%symbol%' parameter is undefined",
     "ERROR_PARAMDOMAIN_INTERVAL_BOUNDS": "invalid %minValue%/%maxValue% min/max boundaries for 'interval' parameter definition domain",
     "ERROR_PARAMDOMAIN_INVALID": "parameter '%symbol%: non supported '%domain%' definition domain",
+    "ERROR_PREBARRAGE_NON_CONVERGENCE": "Pre-sam: non-convergence of the calculation",
     "ERROR_PROBLEM_LOADING_SESSION": "Session loaded, with errors",
     "ERROR_REMOUS_NO_WATER_LINE": "No water line can be calculated",
+    "ERROR_STRUCTURE_AU_MOINS_UNE": "A structure needs at least one device",
     "WARNING_REMOUS_PAS_CALCUL_DEPUIS_AMONT": "Upstream boundary condition < Critical elevation: no possible calculation from upstream",
     "WARNING_REMOUS_PAS_CALCUL_DEPUIS_AVAL": "Downstream boundary condition < Critical elevation: no possible calculation from downstream",
     "ERROR_REMOUS_PAS_CALCUL": "No possible calculation, neither from upstream nor from downstream",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index e71c1d1a239d9a2b737745dab283635d3ef0e1f7..e83b62b87044461c9942055a754610a80f9563fe 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -52,8 +52,10 @@
     "ERROR_PARAMDEF_VALUE_UNDEFINED": "La valeur du paramètre %symbol% n'est pas définie",
     "ERROR_PARAMDOMAIN_INTERVAL_BOUNDS": "Les bornes (%minValue%/%maxValue%) de l'intervalle sont incorrectes",
     "ERROR_PARAMDOMAIN_INVALID": "Paramètre '%symbol%'&nbsp;: le domaine de définition '%domain%' est incorrect",
+    "ERROR_PREBARRAGE_NON_CONVERGENCE": "Pré-barrage&nbsp;: non convergence du calcul",
     "ERROR_PROBLEM_LOADING_SESSION": "Session chargée, avec des erreurs",
     "ERROR_REMOUS_NO_WATER_LINE": "Aucune ligne d'eau ne peut être calculée",
+    "ERROR_STRUCTURE_AU_MOINS_UNE": "Il faut au moins un ouvrage dans une structure",
     "WARNING_REMOUS_PAS_CALCUL_DEPUIS_AMONT": "Condition limite amont > Hauteur critique&nbsp;: pas de calcul possible depuis l'amont",
     "WARNING_REMOUS_PAS_CALCUL_DEPUIS_AVAL": "Condition limite aval < Hauteur critique&nbsp;: pas de calcul possible depuis l'aval",
     "ERROR_REMOUS_PAS_CALCUL": "Aucun calcul possible ni depuis l'amont ni depuis l'aval",