merge from V4_1_0_maintainance branch (from tag mergeto_BR_QT4_Dev_29Jul08)

diff --git a/doc/salome/gui/GEOM/input/scale_operation.doc b/doc/salome/gui/GEOM/input/scale_operation.doc
index ed5b94fc653b2bc637cc704072fdc9a674097813..a9a3ab8c4952d309f46b46e6009da86f511a1fc0 100644 (file)
--- a/doc/salome/gui/GEOM/input/scale_operation.doc
+++ b/doc/salome/gui/GEOM/input/scale_operation.doc
@@ -20,12 +20,12 @@ shape. For this, you need to define the \b Shape to be scaled, the
 \n <b>TUI Command:</b> <em>geompy.MakeScaleAlongAxes(Shape, CenterOfScale, FactorX, FactorY, FactorZ)</em>
 \n <b>Arguments:</b> Name + 1 shape(s) + 1 vertex + 3 Scale Factors.
 
-\note If <b>Central Point</b> is not defined, the scaling will be
-performed relatively the origin of global coordinate system.
+\note If the <b>Central Point</b> is not defined, the scaling will be
+performed relatively the origin of the global coordinate system.
 
-\note Scaling by a factor is a simple transformation, it does not modify
-geometry of the shape, while scaling by different factors along axes
-is a general transformation, which can modify geometry, for example, a
+\note Scaling by one factor is a simple transformation, it does not modify the
+geometry of the shape, while scaling by several different factors along axes
+is a general transformation, which can modify the geometry, for example, a
 circle can be transformed into an ellipse.
 
 \n <b>Example of simple scaling:</b>
@@ -34,7 +34,7 @@ circle can be transformed into an ellipse.
 
 \image html scale_transformsn2.png
 
-\n <b>Example of scaling on different factors along axes:</b>
+\n <b>Example of scaling by different factors along axes:</b>
 
 \image html scale_transformsn3.png
 

diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index 9339f4a4721fc4d1702d9e6538a064345c647027..3dbe49e5dd0e3fc6386227cced2045d237c98df9 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
@@ -163,7 +163,7 @@ void GEOMImpl_IInsertOperations::Export
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
-      SetErrorCode("Export driver failed");
+      SetErrorCode("Not enough space on disk, or you haven't permissions to write this directory");
       return;
     }
   }