Update translations

diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
index f31c5312f124ecf44db60113ec4b9d6be3ddeea8..b1112f712f8dade7994f76a7aa1935ab36bd55ac 100644 (file)
--- 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( "Properties (color, line width, shrink size, ...)" ) );
+  setWindowTitle( tr( "DIALOG_TITLE" ) );
   setSizeGripEnabled( true );
 
   // -------------------------------
@@ -75,26 +75,26 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
   topLayout->setMargin( MARGIN );
 
   // -------------------------------
-  QGroupBox* ButtonGroup1 = new QGroupBox( tr( "Elements" ), this );
+  QGroupBox* ButtonGroup1 = new QGroupBox( tr( "GRP_ELEMENTS" ), this );
   QGridLayout* ButtonGroup1Layout = new QGridLayout( ButtonGroup1 );
   ButtonGroup1Layout->setSpacing( SPACING );
   ButtonGroup1Layout->setMargin( MARGIN );
 
-  QLabel* TextLabel_Fill = new QLabel( tr( "Surface color" ), ButtonGroup1 );
+  QLabel* TextLabel_Fill = new QLabel( tr( "SURFACE_COLOR_LBL" ), ButtonGroup1 );
 
   toolSurfColor = new QtxBiColorTool(ButtonGroup1);
-  toolSurfColor->setText( tr( "Back surface color" ));
+  toolSurfColor->setText( tr( "BACKSURFACE_COLOR_LBL" ));
 
-  QLabel* TextLabel_Outline = new QLabel( tr( "Outline color" ), ButtonGroup1 );
+  QLabel* TextLabel_Outline = new QLabel( tr( "OUTLINE_COLOR_LBL" ), ButtonGroup1 );
   btnOutlineColor = new QtxColorButton( ButtonGroup1 );
 
-  QLabel* TextLabel_Wireframe = new QLabel( tr( "Wireframe color" ), ButtonGroup1 );
+  QLabel* TextLabel_Wireframe = new QLabel( tr( "WIREFRAME_COLOR_LBL" ), ButtonGroup1 );
   btnWireframeColor = new QtxColorButton( ButtonGroup1 );
 
-  QLabel* TextLabel_0DElements_Color = new QLabel( tr( "0D elements" ), ButtonGroup1 );
+  QLabel* TextLabel_0DElements_Color = new QLabel( tr( "0D_ELEMENTS_COLOR_LBL" ), ButtonGroup1 );
   btn0DElementsColor = new QtxColorButton( ButtonGroup1 );
 
-  QLabel* TextLabel_0DElements_Size = new QLabel( tr( "Size of 0D elements" ), ButtonGroup1 );
+  QLabel* TextLabel_0DElements_Size = new QLabel( tr( "0D_ELEMENTS_SIZE_LBL" ), ButtonGroup1 );
   SpinBox_0DElements_Size = new SalomeApp_IntSpinBox( ButtonGroup1 );
   SpinBox_0DElements_Size->setAcceptNames( false ); // No Notebook variables allowed
   SpinBox_0DElements_Size->setRange( 1, 10 );
@@ -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( "Line width" ), ButtonGroup1 );
+  QLabel* TextLabel_Width = new QLabel( tr( "LINE_WIDTH_LBL" ), ButtonGroup1 );
   SpinBox_Width = new SalomeApp_IntSpinBox( ButtonGroup1 );
   SpinBox_Width->setAcceptNames( false ); // No Notebook variables allowed
   SpinBox_Width->setRange( 1, 5 );
@@ -110,7 +110,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
   SpinBox_Width->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   SpinBox_Width->setButtonSymbols( QSpinBox::PlusMinus );
 
-  QLabel* TextLabel_ShrinkCoeff = new QLabel( tr( "Shrink coef." ), ButtonGroup1 );
+  QLabel* TextLabel_ShrinkCoeff = new QLabel( tr( "SHRINK_COEF_LBL" ), ButtonGroup1 );
   SpinBox_Shrink = new SalomeApp_IntSpinBox( ButtonGroup1 );
   SpinBox_Shrink->setAcceptNames( false ); // No Notebook variables allowed
   SpinBox_Shrink->setRange( 20, 100 );
@@ -138,15 +138,15 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
   ButtonGroup1Layout->addWidget( SpinBox_Shrink,             3, 3 );
 
   // -------------------------------
-  QGroupBox* ButtonGroup2 = new QGroupBox( tr( "Nodes" ), this );
+  QGroupBox* ButtonGroup2 = new QGroupBox( tr( "GRP_NODES" ), this );
   QGridLayout* ButtonGroup2Layout = new QGridLayout( ButtonGroup2 );
   ButtonGroup2Layout->setSpacing( SPACING );
   ButtonGroup2Layout->setMargin( MARGIN );
 
-  QLabel* TextLabel_Nodes_Color = new QLabel( tr( "Color" ), ButtonGroup2 );
+  QLabel* TextLabel_Nodes_Color = new QLabel( tr( "NODES_COLOR_LBL" ), ButtonGroup2 );
   btnNodeColor = new QtxColorButton( ButtonGroup2 );
 
-  QGroupBox* MarkerGroup = new QGroupBox( tr( "Marker" ), ButtonGroup2 );
+  QGroupBox* MarkerGroup = new QGroupBox( tr( "NODES_MARKER_LBL" ), ButtonGroup2 );
   QVBoxLayout* MarkerGroupLayout = new QVBoxLayout( MarkerGroup );
   MarkerGroupLayout->setSpacing( 0 );
   MarkerGroupLayout->setMargin( 0 );
@@ -161,22 +161,22 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
   ButtonGroup2Layout->setColumnStretch( 2, 1 );
 
   // -------------------------------
-  QGroupBox* ButtonGroup3 = new QGroupBox( tr( "Orientation of faces" ), this );
+  QGroupBox* ButtonGroup3 = new QGroupBox( tr( "GRP_ORIENTATION" ), this );
   QGridLayout* ButtonGroup3Layout = new QGridLayout( ButtonGroup3 );
   ButtonGroup3Layout->setSpacing( SPACING );
   ButtonGroup3Layout->setMargin( MARGIN );
 
-  QLabel* TextLabel_Orientation_Color = new QLabel( tr( "Color" ), ButtonGroup3 );
+  QLabel* TextLabel_Orientation_Color = new QLabel( tr( "ORIENTATION_COLOR_LBL" ), ButtonGroup3 );
   btnOrientationColor = new QtxColorButton( ButtonGroup3 );
 
-  QLabel* TextLabel_Orientation_Scale = new QLabel( tr( "Scale" ), ButtonGroup3 );
+  QLabel* TextLabel_Orientation_Scale = new QLabel( tr( "ORIENTATION_SCALE_LBL" ), ButtonGroup3 );
   SpinBox_Orientation_Scale = new SMESHGUI_SpinBox( ButtonGroup3 );
   SpinBox_Orientation_Scale->setAcceptNames( false ); // No Notebook variables allowed
   SpinBox_Orientation_Scale->RangeStepAndValidator( .05, .5, .05, "parametric_precision" );
   SpinBox_Orientation_Scale->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   SpinBox_Orientation_Scale->setButtonSymbols( QSpinBox::PlusMinus );
 
-  CheckBox_Orientation_3DVectors = new QCheckBox( tr( "3D vectors" ), ButtonGroup3 );
+  CheckBox_Orientation_3DVectors = new QCheckBox( tr( "3D_VECTORS_LBL" ), ButtonGroup3 );
 
   ButtonGroup3Layout->addWidget( TextLabel_Orientation_Color,    0, 0 );
   ButtonGroup3Layout->addWidget( btnOrientationColor,            0, 1 );
@@ -185,15 +185,15 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
   ButtonGroup3Layout->addWidget( CheckBox_Orientation_3DVectors, 1, 0, 1, 4 );
 
   // -------------------------------
-  QGroupBox* ButtonGroup4 = new QGroupBox( tr( "Selection" ), this );
+  QGroupBox* ButtonGroup4 = new QGroupBox( tr( "GRP_SELECTION" ), this );
   QGridLayout* ButtonGroup4Layout = new QGridLayout( ButtonGroup4 );
   ButtonGroup3Layout->setSpacing( SPACING );
   ButtonGroup3Layout->setMargin( MARGIN );
   
-  QLabel* TextLabel_Selection_Color = new QLabel( tr( "Selection color" ), ButtonGroup4 );
+  QLabel* TextLabel_Selection_Color = new QLabel( tr( "SELECTION_COLOR_LBL" ), ButtonGroup4 );
   btnSelectionColor = new QtxColorButton( ButtonGroup4 );
   
-  QLabel* TextLabel_Preselection_Color = new QLabel( tr( "Pre-selection color" ), ButtonGroup4 );
+  QLabel* TextLabel_Preselection_Color = new QLabel( tr( "PRESELECTION_COLOR_LBL" ), ButtonGroup4 );
   btnPreselectionColor = new QtxColorButton( ButtonGroup4 );
   
   ButtonGroup4Layout->addWidget( TextLabel_Selection_Color,      0, 0 );
@@ -207,14 +207,14 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
   GroupButtonsLayout->setSpacing( SPACING );
   GroupButtonsLayout->setMargin( MARGIN );
 
-  QPushButton* buttonOk = new QPushButton( tr( "&OK" ), GroupButtons );
+  QPushButton* buttonOk = new QPushButton( tr( "SMESH_BUT_OK" ), GroupButtons );
   buttonOk->setAutoDefault( true );
   buttonOk->setDefault( true );
 
-  QPushButton* buttonCancel = new QPushButton( tr( "&Cancel" ), GroupButtons );
+  QPushButton* buttonCancel = new QPushButton( tr( "SMESH_BUT_CANCEL" ), GroupButtons );
   buttonCancel->setAutoDefault( true );
 
-  QPushButton* buttonHelp = new QPushButton( tr( "&Help" ), GroupButtons );
+  QPushButton* buttonHelp = new QPushButton( tr( "SMESH_BUT_HELP" ), GroupButtons );
   buttonHelp->setAutoDefault( true );
 
   GroupButtonsLayout->addWidget( buttonOk );

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index d5cbb074b66013408da1fd8bc9f1f0c815fe8a2f..73fbcf50bda77612b09e02615b13bb843e952006 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -6585,4 +6585,87 @@ as they are of improper type:
         <translation>%1-%2 from %3 items shown</translation>
     </message>
 </context>
+<context>
+    <name>SMESHGUI_Preferences_ColorDlg</name>
+    <message>
+        <source>DIALOG_TITLE</source>
+        <translation>Properties (color, line width, shrink size, ...)</translation>
+    </message>
+    <message>
+        <source>GRP_ELEMENTS</source>
+        <translation>Elements</translation>
+    </message>
+    <message>
+        <source>SURFACE_COLOR_LBL</source>
+        <translation>Surface color</translation>
+    </message>
+    <message>
+        <source>BACKSURFACE_COLOR_LBL</source>
+        <translation>Back surface color</translation>
+    </message>
+    <message>
+        <source>OUTLINE_COLOR_LBL</source>
+        <translation>Outline color</translation>
+    </message>
+    <message>
+        <source>WIREFRAME_COLOR_LBL</source>
+        <translation>Wireframe color</translation>
+    </message>
+    <message>
+        <source>0D_ELEMENTS_COLOR_LBL</source>
+        <translation>0D elements</translation>
+    </message>
+    <message>
+        <source>0D_ELEMENTS_SIZE_LBL</source>
+        <translation>Size of 0D elements</translation>
+    </message>
+    <message>
+        <source>LINE_WIDTH_LBL</source>
+        <translation>Line width</translation>
+    </message>
+    <message>
+        <source>SHRINK_COEF_LBL</source>
+        <translation>Shrink coef.</translation>
+    </message>
+    <message>
+        <source>GRP_NODES</source>
+        <translation>Nodes</translation>
+    </message>
+    <message>
+        <source>NODES_COLOR_LBL</source>
+        <translation>Color</translation>
+    </message>
+    <message>
+        <source>NODES_MARKER_LBL</source>
+        <translation>Marker</translation>
+    </message>
+    <message>
+        <source>GRP_ORIENTATION</source>
+        <translation>Orientation of faces</translation>
+    </message>
+    <message>
+        <source>ORIENTATION_COLOR_LBL</source>
+        <translation>Color</translation>
+    </message>
+    <message>
+        <source>ORIENTATION_SCALE_LBL</source>
+        <translation>Scale</translation>
+    </message>
+    <message>
+        <source>3D_VECTORS_LBL</source>
+        <translation>3D vectors</translation>
+    </message>
+    <message>
+        <source>GRP_SELECTION</source>
+        <translation>Selection</translation>
+    </message>
+    <message>
+        <source>SELECTION_COLOR_LBL</source>
+        <translation>Selection color</translation>
+    </message>
+    <message>
+        <source>PRESELECTION_COLOR_LBL</source>
+        <translation>Pre-selection color</translation>
+    </message>
+</context>
 </TS>

diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index 2e704cf47f16dd1c14e5c6a65df122822d37a50d..25b41f62c267d865ffbe108209e9443f2bc66ba1 100755 (executable)
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -951,78 +951,6 @@
         <source>STB_SPLIT_TO_TETRA</source>
         <translation>Eclater en tétraèdres</translation>
     </message>
-    <message>
-        <source>Properties (color, line width, shrink size, ...)</source>
-        <translation>Propriétés (couleur, épaisseur des traits, taille des éléments réduits, ...)</translation>
-    </message>
-    <message>
-        <source>Elements</source>
-        <translation>Eléments</translation>
-    </message>
-    <message>
-        <source>Surface color</source>
-        <translation>Couleur de surface</translation>
-    </message>
-    <message>
-        <source>Back surface color</source>
-        <translation>Couleur arrière</translation>
-    </message>
-    <message>
-        <source>Outline color</source>
-        <translation>Couleur de contour</translation>
-    </message>
-    <message>
-        <source>Wireframe color</source>
-        <translation>Couleur en mode fil de fer</translation>
-    </message>
-    <message>
-        <source>0D elements</source>
-        <translation>Eléments 0D</translation>
-    </message>
-    <message>
-        <source>Size of 0D elements</source>
-        <translation>Taille des éléments 0D</translation>
-    </message>
-    <message>
-        <source>Line width</source>
-        <translation>Epaisseur des traits</translation>
-    </message>
-    <message>
-        <source>Shrink coef.</source>
-        <translation>Coef. de contraction</translation>
-    </message>
-    <message>
-        <source>Nodes</source>
-        <translation>Nœuds</translation>
-    </message>
-    <message>
-        <source>Color</source>
-        <translation>Couleur</translation>
-    </message>
-    <message>
-        <source>Marker</source>
-        <translation>Marqueur</translation>
-    </message>
-    <message>
-        <source>Orientation of faces</source>
-        <translation>Orientation des faces</translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation>Facteur d&apos;échelle</translation>
-    </message>
-    <message>
-        <source>3D vectors</source>
-        <translation>Vecteurs 3D</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Annuler</translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation>Ai&amp;de</translation>
-    </message>
     <message>
         <source>MESHERS_FILE_CANT_OPEN</source>
         <translation>Impossible d&apos;ouvrir le fichier de ressource</translation>
@@ -6654,4 +6582,87 @@ en raison de leurs types incompatibles:
         <translation>%1-%2 sur %3 éléments affichés</translation>
     </message>
 </context>
+<context>
+    <name>SMESHGUI_Preferences_ColorDlg</name>
+    <message>
+        <source>DIALOG_TITLE</source>
+        <translation>Propriétés (couleur, épaisseur des traits, taille des éléments réduits, ...)</translation>
+    </message>
+    <message>
+        <source>GRP_ELEMENTS</source>
+        <translation>Eléments</translation>
+    </message>
+    <message>
+        <source>SURFACE_COLOR_LBL</source>
+        <translation>Couleur de surface</translation>
+    </message>
+    <message>
+        <source>BACKSURFACE_COLOR_LBL</source>
+        <translation>Couleur arrière</translation>
+    </message>
+    <message>
+        <source>OUTLINE_COLOR_LBL</source>
+        <translation>Couleur de contour</translation>
+    </message>
+    <message>
+        <source>WIREFRAME_COLOR_LBL</source>
+        <translation>Couleur en mode fil de fer</translation>
+    </message>
+    <message>
+        <source>0D_ELEMENTS_COLOR_LBL</source>
+        <translation>Eléments 0D</translation>
+    </message>
+    <message>
+        <source>0D_ELEMENTS_SIZE_LBL</source>
+        <translation>Taille des éléments 0D</translation>
+    </message>
+    <message>
+        <source>LINE_WIDTH_LBL</source>
+        <translation>Epaisseur des traits</translation>
+    </message>
+    <message>
+        <source>SHRINK_COEF_LBL</source>
+        <translation>Coef. de contraction</translation>
+    </message>
+    <message>
+        <source>GRP_NODES</source>
+        <translation>Nœuds</translation>
+    </message>
+    <message>
+        <source>NODES_COLOR_LBL</source>
+        <translation>Couleur</translation>
+    </message>
+    <message>
+        <source>NODES_MARKER_LBL</source>
+        <translation>Marqueur</translation>
+    </message>
+    <message>
+        <source>GRP_ORIENTATION</source>
+        <translation>Orientation des faces</translation>
+    </message>
+    <message>
+        <source>ORIENTATION_COLOR_LBL</source>
+        <translation>Couleur</translation>
+    </message>
+    <message>
+        <source>ORIENTATION_SCALE_LBL</source>
+        <translation>Facteur d&apos;échelle</translation>
+    </message>
+    <message>
+        <source>3D_VECTORS_LBL</source>
+        <translation>Vecteurs 3D</translation>
+    </message>
+    <message>
+        <source>GRP_SELECTION</source>
+        <translation>Sélection</translation>
+    </message>
+    <message>
+        <source>SELECTION_COLOR_LBL</source>
+        <translation>Couleur de sélection</translation>
+    </message>
+    <message>
+        <source>PRESELECTION_COLOR_LBL</source>
+        <translation>Couleur de pré-sélection</translation>
+    </message>
+</context>
 </TS>