diff --git a/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png b/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png
index 4a76b1a73..be0536d83 100644
Binary files a/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png and b/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png differ
diff --git a/doc/salome/gui/SMESH/input/blsurf_hypo.doc b/doc/salome/gui/SMESH/input/blsurf_hypo.doc
index 94c1697bf..6a5467599 100644
--- a/doc/salome/gui/SMESH/input/blsurf_hypo.doc
+++ b/doc/salome/gui/SMESH/input/blsurf_hypo.doc
@@ -417,6 +417,8 @@ The enforced vertex is the projection of a point defined by its
If a group name is specified, the enforced nodes will be added in the group. If the group does not exist it will be created.
+You can specify BLSURF to use the internal vertices of the faces as enforced vertices by checking Use internal vertices.
+
See Also a sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including enforced vertices.
\ref blsurf_top "Back to top"
diff --git a/doc/salome/gui/SMESH/input/colors_size.doc b/doc/salome/gui/SMESH/input/colors_size.doc
index 1ac27a494..07ddd29ac 100644
--- a/doc/salome/gui/SMESH/input/colors_size.doc
+++ b/doc/salome/gui/SMESH/input/colors_size.doc
@@ -1,6 +1,6 @@
/*!
-\page colors_size_page Colors / Size
+\page colors_size_page Display settings
\image html colors_size.png
@@ -16,7 +16,7 @@ generated on base of the Surface color by changing its brightness and sat
Wireframe color - color of element borders in wireframe mode.
0D slements - color of 0D elements.
Size of 0D slements - size of 0D elements.
-
Width - width of lines (edges and borders of elements).
+
Line width - width of lines (edges and borders of elements).
Shrink coef. - relative space of elements compared to gaps between
them in shrink mode.
diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index bac8dd37e..a3a601a83 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -2145,7 +2145,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
case 1134: // Clipping
case 1133: // Tranparency
- case 1132: // Colors / Size
+ case 1132: // Display preferences (colors, shrink size, line width, ...)
// Display Mode
case 215: // Nodes
diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
index b1ad47d13..f512cffdd 100644
--- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
@@ -66,7 +66,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
mySMESHGUI( theModule )
{
setModal( true );
- setWindowTitle( tr( "Preferences - Set Color" ) );
+ setWindowTitle( tr( "Display settings (color, line width, shrink size, ...)" ) );
setSizeGripEnabled( true );
// -------------------------------
@@ -83,7 +83,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
QLabel* TextLabel_Fill = new QLabel( tr( "Surface color" ), ButtonGroup1 );
toolSurfColor = new QtxBiColorTool(ButtonGroup1);
- toolSurfColor->setText("Back surface color");
+ toolSurfColor->setText( tr( "Back surface color" ));
QLabel* TextLabel_Outline = new QLabel( tr( "Outline color" ), ButtonGroup1 );
btnOutlineColor = new QtxColorButton( ButtonGroup1 );
@@ -102,7 +102,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
SpinBox_0DElements_Size->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
SpinBox_0DElements_Size->setButtonSymbols( QSpinBox::PlusMinus );
- QLabel* TextLabel_Width = new QLabel( tr( "Width" ), ButtonGroup1 );
+ QLabel* TextLabel_Width = new QLabel( tr( "Line width" ), ButtonGroup1 );
SpinBox_Width = new SalomeApp_IntSpinBox( ButtonGroup1 );
SpinBox_Width->setAcceptNames( false ); // No Notebook variables allowed
SpinBox_Width->setRange( 1, 5 );
diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 089cff567..8374d260f 100644
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -205,7 +205,7 @@
MEN_COLORS
- Colors / Size
+ Display settingsMEN_COMPUTE
@@ -2497,7 +2497,7 @@ Please check preferences of Mesh module.
STB_COLORS
- Colors / Size
+ Display settingsSTB_COMPUTE
@@ -3057,7 +3057,7 @@ Please check preferences of Mesh module.
TOP_COLORS
- Colors / Size
+ Display settingsTOP_COMPUTE
diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index 569d06b91..cde60f25c 100755
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -205,7 +205,7 @@
MEN_COLORS
- Couleurs / Taille
+ Paramètres d'affichageMEN_COMPUTE
@@ -927,6 +927,78 @@
STB_SPLIT_TO_TETRAEclater en tétraèdres
+
+ Display settings (color, line width, shrink size, ...)
+ Paramètres d'affichage (couleur, épaisseur des traits, taille des éléments réduits, ...)
+
+
+ Elements
+ Eléments
+
+
+ Surface color
+ Couleur de surface
+
+
+ Back surface color
+ Couleur arrière
+
+
+ Outline color
+ Couleur de contour
+
+
+ Wireframe color
+ Couleur en mode fil de fer
+
+
+ 0D elements
+ Eléments 0D
+
+
+ Size of 0D elements
+ Taille des éléments 0D
+
+
+ Line width
+ Epaisseur des traits
+
+
+ Shrink coef.
+ Coef. de contraction
+
+
+ Nodes
+ Nœuds
+
+
+ Color
+ Couleur
+
+
+ Marker
+ Marqueur
+
+
+ Orientation of faces
+ Orientation des faces
+
+
+ Scale
+ Facteur d'échelle
+
+
+ 3D vectors
+ Vecteurs 3D
+
+
+ &Cancel
+ &Annuler
+
+
+ &Help
+ Ai&de
+ MESHERS_FILE_CANT_OPENImpossible d'ouvrir le fichier de ressource
@@ -2497,7 +2569,7 @@ Vérifiez la limite dans les préférences du module Mesh.
STB_COLORS
- Couleurs / Taille
+ Paramètres d'affichageSTB_COMPUTE
@@ -3057,7 +3129,7 @@ Vérifiez la limite dans les préférences du module Mesh.
TOP_COLORS
- Couleurs / Taille
+ Paramètres d'affichageTOP_COMPUTE
@@ -3688,6 +3760,14 @@ Ouvrez une fenêtre VTK et essayez de nouveau
PREF_NB_SEGMENTSNombre de segments par défaut
+
+ SMESH_PREF_MESH_LOADING
+ Chargement de maillage
+
+
+ PREF_FORGET_MESH_AT_HYP_MODIF
+ Ne pas charger le maillage du fichier d'étude à la modification d'une hypothèse
+ PREF_AUTO_UPDATEMettre à jour automatiquement