Merge branch V7_6_BR

diff --cc CMakeLists.txt
index 6b8e90fac9d80fcd6d266bf3f5cd03d7ca10e244,6431c21614ac85def8da0e33de890b146667c58a..dbf940714bd43519142597159a5ea51971a29982
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -30,11 -30,11 +30,11 @@@ CMAKE_POLICY(SET CMP0003 NEW
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
+ SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
  SET(${PROJECT_NAME_UC}_VERSION
    ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 -SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 +SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
  # Find KERNEL
  # ===========

diff --cc doc/salome/gui/GEOM/input/working_with_groups.doc
index df36fd6a2c5801ddd05c5f946b457c827a1a61bf,2ca5154dca81318cf7e1a33ab3e6ad5a67179e10..852047dfb04216c9bde75c4842cb30c26a38dc53
--- 1/doc/salome/gui/GEOM/input/working_with_groups.doc
--- 2/doc/salome/gui/GEOM/input/working_with_groups.doc
+++ b/doc/salome/gui/GEOM/input/working_with_groups.doc
@@@ -91,21 -91,16 +91,21 @@@ threshold value(s) is computed accordin
  Filtering capabilities are not available for vertices.
  
  In order to filter out some entities:
- - Activate one or two filtering controls by switching on corresponding check boxes;
- - Select required threshold comparator type; the following choices are available:
+ - Activate one or two filtering controls by switching on the corresponding check boxes;
+ - Select the required threshold comparator type; the following choices are available:
    - <b>Less Than</b> or <b>Equal or Less Than</b> for the first comparator;
    - <b>Greater Than</b> or <b>Equal or Greater Than</b> for the second comparator;
- - Enter required threshold value (values);
+ - Enter the required threshold value (values);
  - Press \b Apply button in the \b Filter group.
  
- The entities which satisfy entered filtering parameters will be automatically highlighted
+ The entities, which satisfy the entered filtering parameters, will be automatically highlighted
  in the 3D viewer.
  
 +\b Plot button into "Filter" group box provides an access 
 +to the \ref shape_statistics_operation_page "Shape Statistics" functionality with simplified look-n-feel:
 +
 +\image html shape_statistics_simple.png
 +
  \n <b>TUI Command:</b> <em>geompy.CreateGroup(MainShape,
  ShapeType),</em> where MainShape is a shape for which the group is
  created, ShapeType is a type of shapes in the created group.

diff --cc src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx
Simple merge

diff --cc src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
index 785ceb416981b193312b71282e678d0a553de318,77fb5e0c660e4c7df4be922ce05bb090e24f7fde..f5f50949689eb996fc3466134bc506f238a50cf4
--- 1/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
--- 2/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
@@@ -408,83 -393,94 +408,90 @@@ void GEOMAlgo_ShapeInfoFiller::FillDeta
        //
        aInfo.SetLocation(aPc);
        aInfo.SetPosition(aAx3);
 -      //
 -      return;
 -    }
 +    } // if (aNbV==3 && aNbE==3) {
      //
 -    if (!(aNbV==4 && aNbE==4)) {
 -      return;
 -    }
 -    //
 -    // aNbV==4 && aNbE==4 and all edges are segments
 -    aIt.Initialize(aF);
 -    for (; aIt.More(); aIt.Next()){
 -      aW=TopoDS::Wire(aIt.Value());
 -      break;
 -    }
 -    //
 -    aWExp.Init(aW, aF);
 -    for (i=0; aWExp.More(); aWExp.Next(), ++i) {
 -      aEx=aWExp.Current();
 -      const GEOMAlgo_ShapeInfo& aInfoEx=myMapInfo.FindFromKey(aEx);
 -      aDx[i]=aInfoEx.Direction();
 -      aPx[i]=aInfoEx.Location();
 -    }
 -    //
 -    Standard_Boolean isRectangle = Standard_True;
 -    for (i=0; i<4; ++i) {
 -      j=(i==3) ? 0 : i+1;
 -      aDot=aDx[i]*aDx[j];
 -      if (fabs (aDot) > myTolerance) {
 -        isRectangle = Standard_False;
 -        break;
 +    if (aNbV==4 && aNbE==4) {
 +      aIt.Initialize(aF);
 +      if (aIt.More()) {
 +        aW=*((TopoDS_Wire*)&aIt.Value());
 +      }
 +      //
 +      aWExp.Init(aW, aF);
 +      for (i=0; aWExp.More(); aWExp.Next(), ++i) {
 +        aEx=aWExp.Current();
 +        const GEOMAlgo_ShapeInfo& aInfoEx=myMapInfo.FindFromKey(aEx);
 +        aDx[i]=aInfoEx.Direction();
 +        aPx[i]=aInfoEx.Location();
        }
 -    }
 -    //
 -    // rectangle
 -    // shift location to the center
 -    aXYZc.SetCoord(0.,0.,0.);
 -    TopExp::MapShapes(aF, TopAbs_VERTEX, aMV);
 -    for (i=1; i<=aNbV; ++i) {
 -      const TopoDS_Vertex& aV=TopoDS::Vertex(aMV(i));
 -      aP=BRep_Tool::Pnt(aV);
 -      const gp_XYZ& aXYZ=aP.XYZ();
 -      aXYZc=aXYZc+aXYZ;
 -    }
 -    //
 -    // Location : aPc in center of rectangle
 -    // Position : 0z is plane normal
 -    //            0x is along the first edge (quadrangle) or
 -    //            along length (rectangle)
 -    //
 -    aXYZc.Divide(4.);
 -    aPc.SetXYZ(aXYZc);
 -    aDX=aDx[0];
 -    aInfo.SetLocation(aPc);
 -
 -    if (isRectangle) {
 -      // Calculate sizes
 -      gp_Lin aL0(aPx[0], aDx[0]);
 -      gp_Lin aL1(aPx[1], aDx[1]);
        //
 -      aD0=aL0.Distance(aPc);
 -      aD1=aL1.Distance(aPc);
++      Standard_Boolean isRectangle = Standard_True;
 +      for (i=0; i<4; ++i) {
 +        j=(i==3) ? 0 : i+1;
 +        aDot=aDx[i]*aDx[j];
 +        if (fabs (aDot) > myTolerance) {
-           aInfo.SetKindOfName(GEOMAlgo_KN_QUADRANGLE);
-           return;
++          isRectangle = Standard_False;
++          break;
 +        }
 +      }
        //
 -      aLength=aD1;
 -      aWidth =aD0;
 -
 -      if (aD0>aD1) {
 -        aLength=aD0;
 -        aWidth =aD1;
 -        aDX=aDx[1];
 +      // rectangle
-       aInfo.SetKindOfName(GEOMAlgo_KN_RECTANGLE);
-       //
-       // shift location to the center and calc. sizes
++      // shift location to the center
 +      aXYZc.SetCoord(0.,0.,0.);
 +      TopExp::MapShapes(aF, TopAbs_VERTEX, aMV);
 +      for (i=1; i<=aNbV; ++i) {
 +        const TopoDS_Vertex& aV=TopoDS::Vertex(aMV(i));
 +        aP=BRep_Tool::Pnt(aV);
 +        const gp_XYZ& aXYZ=aP.XYZ();
 +        aXYZc=aXYZc+aXYZ;
        }
        //
 -      aLength=2.*aLength;
 -      aWidth =2.*aWidth;
 +      // Location : aPc in center of rectangle
 +      // Position : 0z is plane normal
-       //            0x is along length
++      //            0x is along the first edge (quadrangle) or
++      //            along length (rectangle)
        //
 -      aInfo.SetLength(aLength);
 -      aInfo.SetWidth(aWidth);
 -      aInfo.SetKindOfName(GEOMAlgo_KN_RECTANGLE);
 -    } else {
 -      aInfo.SetKindOfName(GEOMAlgo_KN_QUADRANGLE);
 -    }
 -    //
 -    const gp_Dir& aDZ=aPln.Axis().Direction();
 -    gp_Ax2 aAx2(aPc, aDZ, aDX);
 -    gp_Ax3 aAx3(aAx2);
 -    aInfo.SetPosition(aAx3);
 -  }
 +      aXYZc.Divide(4.);
 +      aPc.SetXYZ(aXYZc);
-       //
-       gp_Lin aL0(aPx[0], aDx[0]);
-       gp_Lin aL1(aPx[1], aDx[1]);
-       //
-       aD0=aL0.Distance(aPc);
-       aD1=aL1.Distance(aPc);
-       //
-       aLength=aD0;
-       aWidth =aD1;
-       aDX=aL1.Direction();
-       if (aD0<aD1) {
++      aDX=aDx[0];
++      aInfo.SetLocation(aPc);
+ 
 -  return;
++      if (isRectangle) {
++      // Calculate sizes
++        gp_Lin aL0(aPx[0], aDx[0]);
++        gp_Lin aL1(aPx[1], aDx[1]);
++        //
++        aD0=aL0.Distance(aPc);
++        aD1=aL1.Distance(aPc);
++        //
 +        aLength=aD1;
 +        aWidth =aD0;
-         aDX=aL0.Direction();
++        
++        if (aD0>aD1) {
++          aLength=aD0;
++          aWidth =aD1;
++          aDX=aDx[1];
++        }
++        //
++        aLength=2.*aLength;
++        aWidth =2.*aWidth;
++        //
++        aInfo.SetLength(aLength);
++        aInfo.SetWidth(aWidth);
++        aInfo.SetKindOfName(GEOMAlgo_KN_RECTANGLE);
++      } else {
++        aInfo.SetKindOfName(GEOMAlgo_KN_QUADRANGLE);
 +      }
 +      //
-       aLength=2.*aLength;
-       aWidth =2.*aWidth;
-       //
-       aInfo.SetLocation(aPc);
-       aInfo.SetLength(aLength);
-       aInfo.SetWidth(aWidth);
-       //
 +      const gp_Dir& aDZ=aPln.Axis().Direction();
 +      gp_Ax2 aAx2(aPc, aDZ, aDX);
 +      gp_Ax3 aAx3(aAx2);
 +      aInfo.SetPosition(aAx3);
 +      //
 +    }// if (aNbV==4 && aNbE==4) {
 +    return;
 +  }// if (bSegment) {
 +  //
 +  //aInfo.SetKindOfName(GEOMAlgo_KN_PLANE);
  }
  //=======================================================================
  //function : FillDetails

diff --cc src/GEOMGUI/GEOM_msg_en.ts
Simple merge

diff --cc src/GEOMGUI/GEOM_msg_fr.ts
index 54b86aee7abbd293d7c8511f5da5d2704b259d36,203e4d6aae3dd10b29293fbbc64dbe7be2e9ef4e..0d8d4623c3bbb62f7dd84caf99fa79a2861d1980
--- 1/src/GEOMGUI/GEOM_msg_fr.ts
--- 2/src/GEOMGUI/GEOM_msg_fr.ts
+++ b/src/GEOMGUI/GEOM_msg_fr.ts
@@@ -3424,13 -3468,9 +3476,13 @@@ Choisissez une face, une coque ou un so
          <source>PREF_DIMENSIONS_SHOW_UNITS</source>
          <translation>Afficher les unités</translation>
      </message>
 +    <message>
 +        <source>PREF_DIMENSIONS_USE_TEXT3D</source>
 +        <translation type="unfinished">Use 3D text</translation>
 +    </message>
      <message>
          <source>PREF_HIDE_INPUT_OBJECT</source>
-         <translation type="unfinished">Hide input objects from the viewer</translation>
+         <translation>Cacher dans la vue les objets en entrée</translation>
      </message>
      <message>
          <source>PREF_ISOS</source>

diff --cc src/GEOMGUI/GEOM_msg_ja.ts
index 5f181fa6e1237c139277da9f90b8c2577fe50db1,fc01a2b0a21fe2901087aec1cf5f965f8a0f0da8..6efba76e0b9f9bb483c940df350fca65d89633bb
--- 1/src/GEOMGUI/GEOM_msg_ja.ts
--- 2/src/GEOMGUI/GEOM_msg_ja.ts
+++ b/src/GEOMGUI/GEOM_msg_ja.ts
@@@ -412,29 -424,9 +424,29 @@@
        <translation>自己交差の検出</translation>
      </message>
      <message>
-         <source>GEOM_FAST_CHECK_INTERSECTIONS</source>
-         <translation type="unfinished">Fast intersection</translation>
+       <source>GEOM_FAST_CHECK_INTERSECTIONS</source>
+       <translation>クイック交点</translation>
      </message>
-         <source>GEOM_SHAPE_STATISTICS</source>
-         <translation type="unfinished">Shape Statistics</translation>
 +    <message>
++      <source>GEOM_SHAPE_STATISTICS</source>
++      <translation type="unfinished">Shape Statistics</translation>
 +    </message>
 +    <message>
 +      <source>GEOM_CHECK_SELF_INTERSECTIONS_FAILED</source>
 +      <translation>自己交差の検出に失敗しました</translation>
 +    </message>
 +    <message>
 +      <source>GEOM_NO_SELF_INTERSECTIONS</source>
 +      <translation>自己交差は検出されませんでした。</translation>
 +    </message>
 +    <message>
 +      <source>GEOM_SELF_INTERSECTIONS_FOUND</source>
 +      <translation>自己交差が検出されました。</translation>
 +    </message>
 +    <message>
 +      <source>GEOM_CHECK_SELF_INTERSECTIONS_ERRORS</source>
 +      <translation>警告: 操作中にエラーがあったので、リストが不完全かもしれない</translation>
 +    </message>
      <message>
        <source>GEOM_CIRCLE</source>
        <translation>Circle</translation>
@@@ -2468,13 -2548,9 +2568,13 @@@
        <translation>自己交差の確認</translation>
      </message>
      <message>
-         <source>MEN_FAST_CHECK_INTERSECTIONS</source>
-         <translation type="unfinished">Fast intersection</translation>
+       <source>MEN_FAST_CHECK_INTERSECTIONS</source>
+       <translation>クイック交点</translation>
      </message>
 +    <message>
 +        <source>MEN_SHAPE_STATISTICS</source>
 +        <translation type="unfinished">Shape Statistics</translation>
 +    </message>
      <message>
        <source>MEN_CHECK_FREE_BNDS</source>
        <translation>自由境界の確認</translation>
@@@ -3367,13 -3463,9 +3487,13 @@@
        <source>PREF_DIMENSIONS_SHOW_UNITS</source>
        <translation>測定単位の表示</translation>
      </message>
 +    <message>
 +      <source>PREF_DIMENSIONS_USE_TEXT3D</source>
 +      <translation type="unfinished">Use 3D text</translation>
 +    </message>
      <message>
        <source>PREF_HIDE_INPUT_OBJECT</source>
-       <translation type="unfinished">Hide input objects from the viewer</translation>
+       <translation>ビューワから入力したオブジェクトの非表示</translation>
      </message>
      <message>
        <source>PREF_ISOS</source>
@@@ -3492,13 -3584,9 +3612,13 @@@
        <translation>自己交差の確認</translation>
      </message>
      <message>
-         <source>STB_FAST_CHECK_INTERSECTIONS</source>
-         <translation type="unfinished">Fast intersection</translation>
+       <source>STB_FAST_CHECK_INTERSECTIONS</source>
+       <translation>クイック交点</translation>
      </message>
-         <source>STB_SHAPE_STATISTICS</source>
-         <translation type="unfinished">Shape Statistics</translation>
 +    <message>
++      <source>STB_SHAPE_STATISTICS</source>
++      <translation type="unfinished">Shape Statistics</translation>
 +    </message>
      <message>
        <source>STB_CHECK_FREE_BNDS</source>
        <translation>自由境界をチェック</translation>
@@@ -4117,12 -4217,8 +4249,12 @@@
      </message>
      <message>
        <source>TOP_FAST_CHECK_INTERSECTIONS</source>
-       <translation type="unfinished">Fast intersection</translation>
+       <translation>クイック交点</translation>
      </message>
 +    <message>
 +      <source>TOP_SHAPE_STATISTICS</source>
 +      <translation type="unfinished">Shape Statistics</translation>
 +    </message>
      <message>
        <source>TOP_CHECK_FREE_BNDS</source>
        <translation>自由境界を確認</translation>
@@@ -5201,40 -5333,48 +5369,52 @@@
      </message>
      <message>
        <source>CC_PNT_ITEM_X_Y_Z</source>
-       <translation>X=%1, Y=%2, Z=%3</translation>
+       <translation type="unfinished">X=%1, Y=%2, Z=%3</translation>
      </message>
      <message>
-         <source>GEOM_FILTER</source>
-         <translation type="unfinished">Filter</translation>
+       <source>GEOM_FILTER</source>
+       <translation>フィルタ</translation>
      </message>
      <message>
-         <source>GEOM_LESS_THAN</source>
-         <translation type="unfinished">Less Than</translation>
+       <source>GEOM_LESS_THAN</source>
+       <translation>未満</translation>
      </message>
      <message>
-         <source>GEOM_LESSOREQUAL_THAN</source>
-         <translation type="unfinished">Equal or Less Than</translation>
+       <source>GEOM_LESSOREQUAL_THAN</source>
+       <translation>以下</translation>
      </message>
      <message>
-         <source>GEOM_GREAT_THAN</source>
-         <translation type="unfinished">Greater Than</translation>
+       <source>GEOM_GREAT_THAN</source>
+       <translation>超える</translation>
      </message>
      <message>
-         <source>GEOM_GREATOREQUAL_THAN</source>
-         <translation type="unfinished">Equal or Greater Than</translation>
+       <source>GEOM_GREATOREQUAL_THAN</source>
+       <translation>以上</translation>
      </message>
      <message>
-         <source>GEOM_SOME_SHAPES_SELECTED</source>
-         <translation type="unfinished">%1 shape(s) has(have) been selected</translation>
+       <source>GEOM_SOME_SHAPES_SELECTED</source>
+       <translation>%1 個選択済み</translation>
      </message>
      <message>
-         <source>GEOM_NO_SHAPES_SELECTED</source>
-         <translation type="unfinished">There are no shapes that meet filtering parameters</translation>
+       <source>GEOM_NO_SHAPES_SELECTED</source>
+       <translation>フィルタリングパラメータに適合する形状はありません</translation>
+     </message>
+     <message>
+       <source>GEOM_HEALING_STATS_TITLE</source>
+       <translation>行われた変更</translation>
+     </message>
+     <message>
+       <source>GEOM_HEALING_STATS_COL_1</source>
+       <translation>カウント</translation>
+     </message>
+     <message>
+       <source>GEOM_HEALING_STATS_COL_2</source>
+       <translation>修正</translation>
      </message>
 +    <message>
 +        <source>GEOM_PLOT_DISTRIBUTION</source>
 +        <translation type="unfinished">Plot</translation>
 +    </message>
    </context>
    <context>
      <name>GeometryGUI</name>
@@@ -7090,223 -7218,230 +7269,293 @@@
        <translation>V-Isoline</translation>
      </message>
    </context>
- <context>
+   <context>
      <name>MeasureGUI_CheckSelfIntersectionsDlg</name>
      <message>
-         <source>GEOM_CHECK_INTE_INTERSECTIONS</source>
-         <translation type="unfinished">Self-intersections</translation>
+       <source>GEOM_CHECK_INTE_INTERSECTIONS</source>
+       <translation>自己交差</translation>
      </message>
      <message>
-         <source>GEOM_CHECK_INTE_SUBSHAPES</source>
-         <translation type="unfinished">Sub-shapes</translation>
+       <source>GEOM_CHECK_INTE_SUBSHAPES</source>
+       <translation>サブ形状</translation>
      </message>
      <message>
-         <source>GEOM_CHECK_INTE_CHECK_LEVEL</source>
-         <translation type="unfinished">Level of check</translation>
+       <source>GEOM_CHECK_INTE_CHECK_LEVEL</source>
+       <translation>チェックのレベル</translation>
      </message>
      <message>
-         <source>GEOM_CHECK_INTE_SUMMARY</source>
-         <translation type="unfinished">Summary</translation>
+       <source>GEOM_CHECK_INTE_SUMMARY</source>
+       <translation>サマリ</translation>
      </message>
      <message>
-         <source>GEOM_CHECK_INTE_COMPUTE</source>
-         <translation type="unfinished">Compute self-intersections</translation>
+       <source>GEOM_CHECK_INTE_COMPUTE</source>
+       <translation>自己交差の計算</translation>
      </message>
      <message>
-         <source>GEOM_SELF_INTERSECTION_NAME</source>
-         <translation type="unfinished">Self_intersection</translation>
+       <source>GEOM_SELF_INTERSECTION_NAME</source>
+       <translation>自己交差</translation>
      </message>
      <message>
-         <source>GEOM_NO_SELF_INTERSECTIONS</source>
-         <translation type="unfinished">There are no self-intersections in the shape</translation>
+       <source>GEOM_NO_SELF_INTERSECTIONS</source>
+       <translation>形状内に自己交差はありません。</translation>
      </message>
      <message>
-         <source>GEOM_SELF_INTERSECTIONS_FOUND</source>
-         <translation type="unfinished">Some self-intersections detected</translation>
+       <source>GEOM_SELF_INTERSECTIONS_FOUND</source>
+       <translation>いくつかの自己交差が検出されました</translation>
      </message>
      <message>
-         <source>GEOM_CHECK_SELF_INTERSECTIONS_FAILED</source>
-         <translation type="unfinished">Detection of self-intersections failed</translation>
+       <source>GEOM_CHECK_SELF_INTERSECTIONS_FAILED</source>
+       <translation>自己交差の検出に失敗しました</translation>
+     </message>
+     <message>
+       <source>GEOM_CHECK_SELF_INTERSECTIONS_ERRORS</source>
+       <translation>警告: 操作中にエラーが発生したため、リストは完成されません。</translation>
+     </message>
+     <message>
+       <source>GEOM_CHECK_INTE_V_V</source>
+       <translation>頂点から頂点</translation>
+     </message>
+     <message>
+       <source>GEOM_CHECK_INTE_V_E</source>
+       <translation>頂点からエッジ と上記すべて</translation>
+     </message>
+     <message>
+       <source>GEOM_CHECK_INTE_E_E</source>
+       <translation>エッジからエッジと上記すべて</translation>
      </message>
      <message>
-         <source>GEOM_CHECK_SELF_INTERSECTIONS_ERRORS</source>
-         <translation type="unfinished">Warning: there were errors during the operation, so the list may be incomplete.</translation>
+       <source>GEOM_CHECK_INTE_V_F</source>
+       <translation>頂点から面と上記すべて</translation>
      </message>
      <message>
-         <source>GEOM_CHECK_INTE_V_V</source>
-         <translation type="unfinished">Vertex to Vertex</translation>
+       <source>GEOM_CHECK_INTE_E_F</source>
+       <translation>エッジから面と上記すべて</translation>
      </message>
      <message>
-         <source>GEOM_CHECK_INTE_V_E</source>
-         <translation type="unfinished">Vertex to Edge + all above</translation>
+       <source>GEOM_CHECK_INTE_ALL</source>
+       <translation>面から面と上記すべて</translation>
      </message>
-   <message>
-     <source>GEOM_CHECK_INTE_E_E</source>
-     <translation type="unfinished">Edge to Edge + all above</translation>
-   </message>
-   <message>
-     <source>GEOM_CHECK_INTE_V_F</source>
-     <translation type="unfinished">Vertex to Face + all above</translation>
-   </message>
-   <message>
-     <source>GEOM_CHECK_INTE_E_F</source>
-     <translation type="unfinished">Edge to Face + all above</translation>
-   </message>
-   <message>
-     <source>GEOM_CHECK_INTE_ALL</source>
-     <translation type="unfinished">Face to Face + all above</translation>
-   </message>
- </context>
- <context>
+   </context>
+   <context>
      <name>MeasureGUI_FastCheckIntersectionsDlg</name>
      <message>
-         <source>GEOM_FAST_CHECK_INT_DEFLECT</source>
-         <translation type="unfinished">Deflection coefficient</translation>
+       <source>GEOM_FAST_CHECK_INT_DEFLECT</source>
+       <translation>たわみ係数</translation>
      </message>
      <message>
-         <source>GEOM_FAST_CHECK_INT_DETECT_GAPS</source>
-         <translation type="unfinished">Detect gaps with tolerance</translation>
+       <source>GEOM_FAST_CHECK_INT_DETECT_GAPS</source>
+       <translation>トレランスによるギャップ検出</translation>
      </message>
      <message>
-         <source>GEOM_FAST_CHECK_INT_SUBSHAPES</source>
-         <translation type="unfinished">Sub-shapes of Object %1:</translation>
+       <source>GEOM_FAST_CHECK_INT_SUBSHAPES</source>
+       <translation>オブジェクト %1 のサブ形状:</translation>
      </message>
      <message>
-         <source>GEOM_FAST_CHECK_INT_COMPUTE</source>
-         <translation type="unfinished">Compute intersections</translation>
+       <source>GEOM_FAST_CHECK_INT_COMPUTE</source>
+       <translation>交点の計算</translation>
      </message>
      <message>
-         <source>GEOM_FAST_INTERSECTION_NAME</source>
-         <translation type="unfinished">Fast_intersection</translation>
+       <source>GEOM_FAST_INTERSECTION_NAME</source>
+       <translation>クイック交点</translation>
      </message>
      <message>
-         <source>GEOM_FAST_INTERSECTION_FAILS</source>
-         <translation type="unfinished">No intersections</translation>
+       <source>GEOM_FAST_INTERSECTION_FAILS</source>
+       <translation>交点はない</translation>
      </message>
      <message>
-         <source>GEOM_FAST_CHECK_OBJ</source>
-         <translation type="unfinished">Objects And Results</translation>
+       <source>GEOM_FAST_CHECK_OBJ</source>
+       <translation>オブジェクトと結果</translation>
      </message>
- </context>
- <context>
+   </context>
+   <context>
 +    <name>MeasureGUI_ShapeStatisticsDlg</name>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_TYPE</source>
 +        <translation type="unfinished">Type</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_LENGTH</source>
 +        <translation type="unfinished">Edges length</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_AREA</source>
 +        <translation type="unfinished">Faces area</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_VOLUME</source>
 +        <translation type="unfinished">Solids volume</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_NB_INTERVALS</source>
 +        <translation type="unfinished">Number of intervals</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_SCALAR_RANGE</source>
 +        <translation type="unfinished">Scalar range</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_COMPUTE</source>
 +        <translation type="unfinished">Compute</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_MIN</source>
 +        <translation type="unfinished">Min</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_MAX</source>
 +        <translation type="unfinished">Max</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_CREATE_GROUPS</source>
 +        <translation type="unfinished">Create Groups</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_DISTRIBUTION_NB_ENT</source>
 +        <translation type="unfinished">Number of entities</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_MIN_ERROR</source>
 +        <translation type="unfinished">Set minimal range value or switch-off Scalar range</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_MAX_ERROR</source>
 +        <translation type="unfinished">Set maximal range value or switch-off Scalar range</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_SHAPE_STATISTICS_MIN_MAX_ERROR</source>
 +        <translation type="unfinished">Minimal range value can not be more than maximal</translation>
 +    </message>
 +    <message>
 +        <source>GEOM_MSG_GROUPS_CREATED</source>
 +        <translation type="unfinished">%1 groups created</translation>
 +    </message>
- </context>
- <context>
++  </context>
++  <context>
      <name>TransformationGUI_ExtensionDlg</name>
      <message>
-         <source>GEOM_EXTENSION_TITLE</source>
-         <translation type="unfinished">Extension of Edge or Face</translation>
+       <source>GEOM_EXTENSION_TITLE</source>
+       <translation>エッジまたは面の拡張</translation>
      </message>
      <message>
-         <source>GEOM_EXTENSION</source>
-         <translation type="unfinished">Extension</translation>
+       <source>GEOM_EXTENSION</source>
+       <translation>拡張</translation>
      </message>
      <message>
-         <source>GEOM_EXTENSION_MIN</source>
-         <translation type="unfinished">First Parameter</translation>
+       <source>GEOM_EXTENSION_MIN</source>
+       <translation>第1パラメータ</translation>
      </message>
      <message>
-         <source>GEOM_EXTENSION_MAX</source>
-         <translation type="unfinished">Last Parameter</translation>
+       <source>GEOM_EXTENSION_MAX</source>
+       <translation>最後のパラメータ</translation>
      </message>
      <message>
-         <source>GEOM_EXTENSION_MIN_U</source>
-         <translation type="unfinished">First U-Parameter</translation>
+       <source>GEOM_EXTENSION_MIN_U</source>
+       <translation>第1U-パラメータ</translation>
      </message>
      <message>
-         <source>GEOM_EXTENSION_MAX_U</source>
-         <translation type="unfinished">Last U-Parameter</translation>
+       <source>GEOM_EXTENSION_MAX_U</source>
+       <translation>最後のU-パラメータ</translation>
      </message>
      <message>
-         <source>GEOM_EXTENSION_MIN_V</source>
-         <translation type="unfinished">First V-Parameter</translation>
+       <source>GEOM_EXTENSION_MIN_V</source>
+       <translation>第1V-パラメータ</translation>
      </message>
      <message>
-         <source>GEOM_EXTENSION_MAX_V</source>
-         <translation type="unfinished">Last V-Parameter</translation>
+       <source>GEOM_EXTENSION_MAX_V</source>
+       <translation>最後のV-パラメータ</translation>
      </message>
      <message>
-         <source>GEOM_EXTENSION_EDGE_NAME</source>
-         <translation type="unfinished">ExtendedEdge</translation>
+       <source>GEOM_EXTENSION_EDGE_NAME</source>
+       <translation>ExtendedEdge</translation>
      </message>
      <message>
-         <source>GEOM_EXTENSION_FACE_NAME</source>
-         <translation type="unfinished">ExtendedFace</translation>
+       <source>GEOM_EXTENSION_FACE_NAME</source>
+       <translation>拡張面</translation>
      </message>
- </context>
- <context>
+   </context>
+   <context>
      <name>EntityGUI_SurfFromFaceDlg</name>
      <message>
-         <source>GEOM_SURF_FROM_FACE_TITLE</source>
-         <translation type="unfinished">Surface From Face Construction</translation>
+       <source>GEOM_SURF_FROM_FACE_TITLE</source>
+       <translation>面から表面の作成</translation>
+     </message>
+     <message>
+       <source>GEOM_SURF_FROM_FACE</source>
+       <translation>面から表面</translation>
+     </message>
+     <message>
+       <source>GEOM_SURF_FROM_FACE_NAME</source>
+       <translation>SurfaceFromFace</translation>
+     </message>
+   </context>
+   <context>
+     <name>OperationGUI_TransferDataDlg</name>
+     <message>
+       <source>GEOM_TRANSFER_DATA_TITLE</source>
+       <translation>データ転送</translation>
+     </message>
+     <message>
+       <source>GEOM_TRANSFER_DATA</source>
+       <translation>データ転送</translation>
+     </message>
+     <message>
+       <source>GEOM_TRANSFER_DATA_FROM</source>
+       <translation>ソース形状</translation>
+     </message>
+     <message>
+       <source>GEOM_TRANSFER_DATA_TO</source>
+       <translation>行き先形状</translation>
+     </message>
+     <message>
+       <source>GEOM_TRANSFER_DATA_METHOD</source>
+       <translation>検出操作のタイプ</translation>
+     </message>
+     <message>
+       <source>GEOM_TD_METHOD_GETINPLACE</source>
+       <translation>場所の中で取得</translation>
+     </message>
+     <message>
+       <source>GEOM_TD_METHOD_GETINPLACE_OLD</source>
+       <translation>場所（旧）の中で取得</translation>
+     </message>
+     <message>
+       <source>GEOM_TD_METHOD_GETINPLACE_HISTORY</source>
+       <translation>履歴より場所の中で取得</translation>
+     </message>
+     <message>
+       <source>GEOM_TRANSFER_DATA_INFO</source>
+       <translation>データ転送: 情報</translation>
+     </message>
+     <message>
+       <source>GEOM_TRANSFER_DATA_NOT_COPIED</source>
+       <translation>コピーされたものはありません。</translation>
+     </message>
+     <message>
+       <source>GEOM_TRANSFER_DATA_COPIED</source>
+       <translation>以下のデータがコピーされます:</translation>
+     </message>
+     <message>
+       <source>GEOM_TRANSFER_DATA_NAMES</source>
+       <translation>名前: %2 の %1</translation>
      </message>
      <message>
-         <source>GEOM_SURF_FROM_FACE</source>
-         <translation type="unfinished">Surface From Face</translation>
+       <source>GEOM_TRANSFER_DATA_MATERIALS</source>
+       <translation>材料: %2 の %1</translation>
+     </message>
+   </context>
+   <context>
+     <name>TransformationGUI_ProjectionOnCylDlg</name>
+     <message>
+       <source>GEOM_PROJ_ON_CYL_TITLE</source>
+       <translation>円筒上に投影</translation>
      </message>
      <message>
-         <source>GEOM_SURF_FROM_FACE_NAME</source>
-         <translation type="unfinished">SurfaceFromFace</translation>
+       <source>GEOM_PROJ_ON_CYL_START_ANGLE</source>
+       <translation>Starting angle</translation>
      </message>
- </context>
+     <message>
+       <source>GEOM_PROJ_ON_CYL_LENGTH_ANGLE</source>
+       <translation>Length angle</translation>
+     </message>
+   </context>
  </TS>

diff --cc src/GEOMGUI/GeometryGUI.cxx
Simple merge

diff --cc src/GroupGUI/GroupGUI_GroupDlg.cxx
Simple merge

diff --cc src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx
index 370204f943b527def41a9b8ff8f2fef79723f211,b8954462a47086e2b200fc517793492fd24865f1..4618f9c808b1dce56a0985731f035d63b5020862
--- 1/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx
--- 2/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx
@@@ -808,10 -805,9 +808,12 @@@ void MeasureGUI_ManageDimensionsDlg::On
                               myEditObject->GetStudyEntry(),
                               GEOM::propertyName( GEOM::Dimensions ),
                               QVariant() );
-   redisplay( myEditObject.get() );
 +
 -    redisplay( myEditObject.get());
+   if ( myIsNeedRedisplay ) {
++    redisplay( myEditObject.get() );
+   }
 +  
 +  myGeomGUI->emitDimensionsUpdated( QString( myEditObject->GetStudyEntry() ) );
  }
  
  //=================================================================================