Additional fix of issue 0019875: to clarify the labels of the GUI panel for group...

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index b1b0753c98aea656c3394ab57de929e426c58759..df5b31147ece66702e888e2cd93978fad17816cb 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -3849,24 +3849,24 @@ Number of sketch points too small</translation>
             <translation>Select All</translation>
         </message>
         <message>
-            <source>SELECT_SUB_SHAPES</source>
-            <translation>Select Sub-Shapes</translation>
+            <source>SHAPE_SEL_RESTR</source>
+            <translation>Main Shape Selection restriction</translation>
         </message>
         <message>
             <source>SHAPE_TYPE</source>
             <translation>Shape Type</translation>
         </message>
         <message>
-            <source>ALL_SUBSHAPES</source>
-            <translation>All</translation>
+            <source>NO_RESTR</source>
+            <translation>No restriction</translation>
         </message>
         <message>
-            <source>GET_IN_PLACE</source>
-            <translation>In Place of Second Shape</translation>
+            <source>GEOM_PARTS_OF_SHAPE2</source>
+            <translation>Geometrical parts of the Second Shape</translation>
         </message>
         <message>
             <source>SUBSHAPES_OF_SHAPE2</source>
-            <translation>Sub-Shapes of Second Shape</translation>
+            <translation>Only Sub-Shapes of the Second Shape</translation>
         </message>
         <message>
             <source>SECOND_SHAPE</source>

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index fd555bdd02a8e2c2ebe0a0bd3731a03db5a2cc38..66537a00ea7e1fc37deea9c0430b6911a25788b9 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -102,11 +102,11 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg( Mode mode, GeometryGUI* theGeometryGUI, QW
   myShape2Name->setReadOnly( true );
   myShape2Name->setEnabled( false );
 
-  mySelectionWayGroupBox = new QGroupBox( tr("SELECT_SUB_SHAPES"), GroupMedium );
+  mySelectionWayGroupBox = new QGroupBox( tr("SHAPE_SEL_RESTR"), GroupMedium );
   mySelectionWayGroup = new QButtonGroup( mySelectionWayGroupBox );
-  QRadioButton* allSubs     = new QRadioButton( tr( "ALL_SUBSHAPES" )      , mySelectionWayGroupBox );
-  QRadioButton* inPlaceSubs = new QRadioButton( tr( "GET_IN_PLACE" )       , mySelectionWayGroupBox );
-  QRadioButton* shape2Subs  = new QRadioButton( tr( "SUBSHAPES_OF_SHAPE2" ), mySelectionWayGroupBox );
+  QRadioButton* allSubs     = new QRadioButton( tr( "NO_RESTR" )            , mySelectionWayGroupBox );
+  QRadioButton* inPlaceSubs = new QRadioButton( tr( "GEOM_PARTS_OF_SHAPE2" ), mySelectionWayGroupBox );
+  QRadioButton* shape2Subs  = new QRadioButton( tr( "SUBSHAPES_OF_SHAPE2" ) , mySelectionWayGroupBox );
   QVBoxLayout* mySelWayLayout = new QVBoxLayout( mySelectionWayGroupBox );
   mySelWayLayout->setMargin( 9 );
   mySelWayLayout->setSpacing( 6 );