IPAL9153, IPAL9148, IPAL9150

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 3a83a3364f0f33fc3b7bb4265da8d76a13c03cb3..6f22f89613b8334cd2e9aabe7fe9c3b9165c2a9b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -2489,7 +2489,7 @@ void SMESHGUI::initialize( CAM_Application* app )
   createSMESHAction( 6012, "TAPER",           "ICON_TAPER" ,        0, true );
   createSMESHAction( 6013, "ASPECT",          "ICON_ASPECT" ,       0, true );
   createSMESHAction( 6014, "MIN_ANG",         "ICON_ANGLE" ,        0, true );
   createSMESHAction( 6012, "TAPER",           "ICON_TAPER" ,        0, true );
   createSMESHAction( 6013, "ASPECT",          "ICON_ASPECT" ,       0, true );
   createSMESHAction( 6014, "MIN_ANG",         "ICON_ANGLE" ,        0, true );

-  createSMESHAction( 6015, "WRAP",            "ICON_WRAP" ,         0, true );
+  createSMESHAction( 6015, "WARP",            "ICON_WARP" ,         0, true );

   createSMESHAction( 6016, "SKEW",            "ICON_SKEW",          0, true );
   createSMESHAction( 6017, "ASPECT_3D",       "ICON_ASPECT_3D",     0, true );
   createSMESHAction( 6018, "LENGTH_2D",       "ICON_LENGTH_2D",     0, true );
   createSMESHAction( 6016, "SKEW",            "ICON_SKEW",          0, true );
   createSMESHAction( 6017, "ASPECT_3D",       "ICON_ASPECT_3D",     0, true );
   createSMESHAction( 6018, "LENGTH_2D",       "ICON_LENGTH_2D",     0, true );


@@ -2980,7 +2980,7 @@ void SMESHGUI::initialize( CAM_Application* app )
   popupMgr()->setRule( action( 6014 ), aMeshInVtkHasFaces, true );
   popupMgr()->setRule( action( 6014 ), "controlMode = 'eMinimumAngle'", false );
 
   popupMgr()->setRule( action( 6014 ), aMeshInVtkHasFaces, true );
   popupMgr()->setRule( action( 6014 ), "controlMode = 'eMinimumAngle'", false );
 

-  popupMgr()->insert( action( 6015 ), anId, -1 ); // WRAP
+  popupMgr()->insert( action( 6015 ), anId, -1 ); // WARP

   popupMgr()->setRule( action( 6015 ), aMeshInVtkHasFaces, true );
   popupMgr()->setRule( action( 6015 ), "controlMode = 'eWarping'", false );
 
   popupMgr()->setRule( action( 6015 ), aMeshInVtkHasFaces, true );
   popupMgr()->setRule( action( 6015 ), "controlMode = 'eWarping'", false );
 

diff --git a/src/SMESHGUI/SMESH_images.po b/src/SMESHGUI/SMESH_images.po
index 679a49c7fef916bb41c8f4d678a2b6f2e282c3ec..758dcba14862141a0e7604ef7eca837719fe77f2 100644 (file)
--- a/src/SMESHGUI/SMESH_images.po
+++ b/src/SMESHGUI/SMESH_images.po
@@ -297,7 +297,7 @@ msgstr "mesh_aspect_3d.png"
 msgid "ICON_ANGLE"
 msgstr "mesh_angle.png"
 
 msgid "ICON_ANGLE"
 msgstr "mesh_angle.png"
 

-msgid "ICON_WRAP"
+msgid "ICON_WARP"

 msgstr "mesh_wrap.png"
 
 msgid "ICON_SKEW"
 msgstr "mesh_wrap.png"
 
 msgid "ICON_SKEW"

diff --git a/src/SMESHGUI/SMESH_msg_en.po b/src/SMESHGUI/SMESH_msg_en.po
index 21b6193f663bfeb0cb04be7cfd3506146978e03f..21d7730e407ca1f786d27d51e514268e24b09aa1 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.po
+++ b/src/SMESHGUI/SMESH_msg_en.po
@@ -790,6 +790,14 @@ msgstr "Entities"
 msgid "SMESH_MESHINFO_ALL_TYPES"
 msgstr "Heterogenous"
 
 msgid "SMESH_MESHINFO_ALL_TYPES"
 msgstr "Heterogenous"
 

+#Polygons
+msgid "SMESH_MESHINFO_POLYGONES"
+msgstr "Polygons"
+
+#polyhedres
+msgid "SMESH_MESHINFO_POLYEDRES"
+msgstr "Polyhedres"
+

 #No valid selection :
 msgid "SMESH_BAD_SELECTION"
 msgstr "No valid selection"
 #No valid selection :
 msgid "SMESH_BAD_SELECTION"
 msgstr "No valid selection"


@@ -1433,6 +1441,9 @@ msgstr "Laplacian"
 msgid "SMESHGUI_SmoothingDlg::CENTROIDAL"
 msgstr "Centroidal"
 
 msgid "SMESHGUI_SmoothingDlg::CENTROIDAL"
 msgstr "Centroidal"
 

+msgid "SMESHGUI_SmoothingDlg::IS_PARAMETRIC"
+msgstr "in paramteric space"
+

 #----------------------------------------------------
 
 msgid "SMESHGUI_ExtrusionDlg::EXTRUSION_ALONG_LINE"
 #----------------------------------------------------
 
 msgid "SMESHGUI_ExtrusionDlg::EXTRUSION_ALONG_LINE"


@@ -1892,8 +1903,8 @@ msgstr "Aspect Ratio"
 msgid "MEN_MIN_ANG"
 msgstr "Minimum Angle"
 
 msgid "MEN_MIN_ANG"
 msgstr "Minimum Angle"
 

-msgid "MEN_WRAP"
-msgstr "Wraping"
+msgid "MEN_WARP"
+msgstr "Warping angle"

 
 msgid "MEN_SKEW"
 msgstr "Skew"
 
 msgid "MEN_SKEW"
 msgstr "Skew"


@@ -2219,7 +2230,7 @@ msgid "TOP_MIN_ANG"
 msgstr "Minimum Angle"
 
 msgid "TOP_WARP"
 msgstr "Minimum Angle"
 
 msgid "TOP_WARP"

-msgstr "Wraping"
+msgstr "Warping angle"

 
 msgid "TOP_SKEW"
 msgstr "Skew"
 
 msgid "TOP_SKEW"
 msgstr "Skew"


@@ -2490,7 +2501,7 @@ msgid "STB_MIN_ANG"
 msgstr "Minimum Angle"
 
 msgid "STB_WARP"
 msgstr "Minimum Angle"
 
 msgid "STB_WARP"

-msgstr "Wraping"
+msgstr "Warping angle"

 
 msgid "STB_SKEW"
 msgstr "Skew"
 
 msgid "STB_SKEW"
 msgstr "Skew"