Improved the GUI translations and some Sketch translations added.

diff --git a/src/BuildPlugin/BuildPlugin_msg_fr.ts b/src/BuildPlugin/BuildPlugin_msg_fr.ts
index 9be086e2cc198381340cfc0e2209127bb224e8fd..bd63e96993e79705228b0effbd07d147730a09bc 100644 (file)
--- a/src/BuildPlugin/BuildPlugin_msg_fr.ts
+++ b/src/BuildPlugin/BuildPlugin_msg_fr.ts
@@ -519,9 +519,6 @@
       <translation>AA</translation>
     </message>
   </context>
-
-  <!-- MissedTranslations -->
-
   <context>
     <name>CompSolid</name>
     <message>

diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp
index f89385297b0f9133a3b0606a50d451b2c4b8d265..bdee88f6cac56ec01bf317f4126917e3112ce9b1 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.cpp
+++ b/src/PartSet/PartSet_WidgetPoint2d.cpp
@@ -102,7 +102,7 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
 
   // the control should accept the focus, so the boolean flag is corrected to be true
   myIsObligatory = true;
-  QString aPageName = QString::fromStdString(theData->getProperty(CONTAINER_PAGE_NAME));
+  QString aPageName = translate(theData->getProperty(CONTAINER_PAGE_NAME));
   myGroupBox = new QGroupBox(aPageName, theParent);
   myGroupBox->setFlat(false);
 

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index 4b540a735bd6294cacfc5da7c41fe18130e2749b..960429f713e9fc098117195161d2d9c49fcc738a 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -102,7 +102,7 @@ myIsSelection(false)
   // Size of the View control
   mySizeOfViewWidget = new QWidget(aFirstWgt);
   QHBoxLayout* aSizeLayout = new QHBoxLayout(mySizeOfViewWidget);
-  aSizeLayout->addWidget(new QLabel("Size of the view", mySizeOfViewWidget));
+  aSizeLayout->addWidget(new QLabel(tr("Size of the view"), mySizeOfViewWidget));
   mySizeOfView = new QLineEdit(mySizeOfViewWidget);
 
   QDoubleValidator* aValidator = new QDoubleValidator(0, DBL_MAX, 12, mySizeOfView);

diff --git a/src/PartSet/PartSet_msg_fr.ts b/src/PartSet/PartSet_msg_fr.ts
index b3cbfdf12b94a0fec3877f07db5bd0cf6c49bd15..eb1991aca24ce69b253c112aea7fd313364eaa11 100644 (file)
--- a/src/PartSet/PartSet_msg_fr.ts
+++ b/src/PartSet/PartSet_msg_fr.ts
@@ -67,6 +67,11 @@ Error: %1</source>
 </context>
 <context>
     <name>PartSet_WidgetSketchLabel</name>
+    <message>
+        <location filename="PartSet_WidgetSketchLabel.cpp" line="105"/>
+        <source>Size of the view</source>
+        <translation>AA</translation>
+    </message>
     <message>
         <location filename="PartSet_WidgetSketchLabel.cpp" line="126"/>
         <source>Remove external dependencies</source>

diff --git a/src/SHAPERGUI/resources/LightApp.xml.in b/src/SHAPERGUI/resources/LightApp.xml.in
index f7672ab2db462dda540c811a3301a8dd322597bd..b2c131899793fe29cf64dcb14d6cb184fd706141 100644 (file)
--- a/src/SHAPERGUI/resources/LightApp.xml.in
+++ b/src/SHAPERGUI/resources/LightApp.xml.in
@@ -17,6 +17,9 @@
   <section name="resources">
     <!-- Module resources -->
     <parameter name="SHAPER" value="%SHAPER_ROOT_DIR%/share/salome/resources/shaper"/>
+    <parameter name="ModuleBase" value="%SHAPER_ROOT_DIR%/share/salome/resources/shaper"/>
+    <parameter name="PartSet" value="%SHAPER_ROOT_DIR%/share/salome/resources/shaper"/>
+    <parameter name="XGUI" value="%SHAPER_ROOT_DIR%/share/salome/resources/shaper"/>
   </section>
   <section name="Viewer" >
     <!-- Viewer preferences -->

diff --git a/src/SketchPlugin/SketchPlugin_msg_fr.ts b/src/SketchPlugin/SketchPlugin_msg_fr.ts
index 24ce02a5578e381b7b0965463d2e2c16ac56bdd8..92e46f39c8d3deb9d3ef7bed702a6bed43614433 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_msg_fr.ts
+++ b/src/SketchPlugin/SketchPlugin_msg_fr.ts
@@ -282,7 +282,116 @@
       <translation>AA</translation>
     </message>
   </context>
-  
+  <context>
+    <name>SketchMacroCircle:Model_FeatureValidator</name>
+    <message>
+      <source>Attribute "circle_type" is not initialized.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:center_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:passed_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:Model_FeatureValidator</name>
+    <message>
+      <source>Attribute "circle_type" is not initialized.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Attribute "second_point" is not initialized.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:center_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Center point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:first_point</name>
+    <message>
+      <source>First point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:passed_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Passed point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:second_point</name>
+    <message>
+      <source>Second point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchMacroCircle:third_point</name>
+    <message>
+      <source>Third point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchCircle:Auxiliary</name>
+    <message>
+      <source>Auxiliary</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Construction element</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchCircle:circle_center</name>
+    <message>
+      <source>Center</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchCircle:circle_radius</name>
+    <message>
+      <source>Radius:</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Set radius</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+
   <context>
     <name>SketchConstraintHorizontal:Model_FeatureValidator</name>
     <message>
@@ -686,6 +795,28 @@
       <translation>AA</translation>
     </message>
   </context>
+  <context>
+    <name>SketchLine:EndPoint</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>End point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchLine:StartPoint</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Start point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
 
   <context>
     <name>SketchPoint:Model_FeatureValidator</name>
@@ -701,6 +832,13 @@
       <translation>AA</translation>
     </message>
   </context>
+  <context>
+    <name>SketchPoint:PointCoordinates</name>
+    <message>
+      <source>Point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
   
   <context>
     <name>SketchRectangle:GeomValidators_Different</name>
@@ -737,6 +875,28 @@
       <translation>AA</translation>
     </message>
   </context>
+  <context>
+    <name>SketchRectangle:RectEndPoint</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>End point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchRectangle:RectStartPoint</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Start point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
 
   <context>
     <name>SketchArc:ArcRadius:GeomValidators_Positive</name>
@@ -871,6 +1031,60 @@
       <translation>AA</translation>
     </message>
   </context>
+  <context>
+    <name>SketchArc:Auxiliary</name>
+    <message>
+      <source>Auxiliary</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Construction element</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchArc:angle</name>
+    <message>
+      <source>Angle:</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Set angle</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchArc:center_point</name>
+    <message>
+      <source>Center</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchArc:end_point</name>
+    <message>
+      <source>End point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchArc:radius</name>
+    <message>
+      <source>Radius:</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Set radius</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchArc:start_point</name>
+    <message>
+      <source>Start point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
   <context>
     <name>SketchConstraintMirror:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
@@ -2162,9 +2376,6 @@
       <translation>AA</translation>
     </message>
   </context>
-
-  <!-- MissedTranslations -->
-
   <context>
     <name>Sketch</name>
     <message>
@@ -2176,15 +2387,7 @@
       <translation>AA</translation>
     </message>
     <message>
-      <source>DoF (degrees of freedom) = 2</source>
-      <translation>AA</translation>
-    </message>
-    <message>
-      <source>DoF (degrees of freedom) = 4</source>
-      <translation>AA</translation>
-    </message>
-    <message>
-      <source>DoF (degrees of freedom) = 5</source>
+      <source>DoF (degrees of freedom) = %1</source>
       <translation>AA</translation>
     </message>
     <message>
@@ -3360,6 +3563,74 @@
       <translation>AA</translation>
     </message>
   </context>
+  <context>
+    <name>SketchMacroArc:Model_FeatureValidator</name>
+    <message>
+      <source>Attribute "arc_type" is not initialized.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:center_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Center point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:end_point_1</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>End point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:end_point_2</name>
+    <message>
+      <source>End point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:end_point_3</name>
+    <message>
+      <source>End point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:passed_point</name>
+    <message>
+      <source>Passed point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:start_point_1</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Start point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:start_point_2</name>
+    <message>
+      <source>Start point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
 
   <context>
     <name>SketchMacroCircle</name>
@@ -3434,6 +3705,38 @@
       <translation>AA</translation>
     </message>
   </context>
+  <context>
+    <name>SketchMacroCircle:Model_FeatureValidator</name>
+    <message>
+      <source>Attribute "third_point" is not initialized.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:first_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:second_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:third_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
 
   <context>
     <name>SketchMacroEllipse</name>
@@ -3526,6 +3829,133 @@
       <translation>AA</translation>
     </message>
   </context>
+  <context>
+    <name>SketchMacroEllipse:Model_FeatureValidator</name>
+    <message>
+      <source>Attribute "ellipse_type" is not initialized.</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroEllipse:first_point</name>
+    <message>
+      <source>Center point</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Major axis start point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroEllipse:passed_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Passed point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroEllipse:second_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Major axis end point</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Major axis point</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchEllipse:Auxiliary</name>
+    <message>
+      <source>Auxiliary</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Construction element</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchEllipse:ellipse_center</name>
+    <message>
+      <source>Center</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchEllipse:ellipse_first_focus</name>
+    <message>
+      <source>First focus</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchEllipse:ellipse_major_axis_end_point</name>
+    <message>
+      <source>Major axis end</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchEllipse:ellipse_major_axis_start_point</name>
+    <message>
+      <source>Major axis start</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchEllipse:ellipse_major_radius</name>
+    <message>
+      <source>Major radius:</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Set major radius</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchEllipse:ellipse_minor_axis_end_point</name>
+    <message>
+      <source>Minor axis end</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchEllipse:ellipse_minor_axis_start_point</name>
+    <message>
+      <source>Minor axis start</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchEllipse:ellipse_minor_radius</name>
+    <message>
+      <source>Minor radius:</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+      <source>Set minor radius</source>
+      <translation>AA</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchEllipse:ellipse_second_focus</name>
+    <message>
+      <source>Second focus</source>
+      <translation>AA</translation>
+    </message>
+  </context>
 
   <context>
     <name>SketchMultiRotation</name>