Added some missed translations and removed extra symbols in some sentences.

diff --git a/src/CollectionPlugin/CollectionPlugin_msg_en.ts b/src/CollectionPlugin/CollectionPlugin_msg_en.ts
index 3c2d28234f0d7a1e12046faff1037271fad59caa..c34371bde45f06a26cd33ff51109d66cd1770358 100644 (file)
--- a/src/CollectionPlugin/CollectionPlugin_msg_en.ts
+++ b/src/CollectionPlugin/CollectionPlugin_msg_en.ts
@@ -16,13 +16,6 @@
       <translation>Constructions not allowed for selection.</translation>
     </message>
   </context>
-  <context>
-    <name>Group:group_list:GeomValidators_BodyShapes</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>Attribute "%1" does not supported by "GeomValidators_BodyShapes" validator.</translation>
-    </message>
-  </context>
   <context>
     <name>Group:Model_FeatureValidator</name>
     <message>

diff --git a/src/CollectionPlugin/CollectionPlugin_msg_fr.ts b/src/CollectionPlugin/CollectionPlugin_msg_fr.ts
index 38885da140ce848d0b880483d4d4f2c2d26b4982..3bb78cda98936e11147b162103be34ac68724faf 100644 (file)
--- a/src/CollectionPlugin/CollectionPlugin_msg_fr.ts
+++ b/src/CollectionPlugin/CollectionPlugin_msg_fr.ts
@@ -82,10 +82,6 @@
       <source>Error: Result construction selected.</source>
       <translation>AA</translation>
     </message>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
   </context>
   <context>
     <name>Group:Model_FeatureValidator</name>

diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts
index f3779e279e6d21e4a66807af07eda6276cbbe001..635d8e6048c3285199835ec252c2574ef2047dd1 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts
+++ b/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts
@@ -226,13 +226,6 @@
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
   </context>
-  <context>
-    <name>Extrusion:base :FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation></translation>
-    </message>
-  </context>
   <context>
     <name>Extrusion:direction_object:GeomValidators_ShapeType</name>
     <message>
@@ -654,13 +647,6 @@
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
   </context>
-  <context>
-    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation></translation>
-    </message>
-  </context>
   <context>
     <name>ExtrusionCut:direction_object:GeomValidators_ShapeType</name>
     <message>
@@ -1116,13 +1102,6 @@
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
   </context>
-  <context>
-    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation></translation>
-    </message>
-  </context>
   <context>
     <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
@@ -1522,13 +1501,6 @@
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
   </context>
-  <context>
-    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation></translation>
-    </message>
-  </context>
   <context>
     <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
@@ -1949,13 +1921,6 @@
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
   </context>
-  <context>
-    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation></translation>
-    </message>
-  </context>
   <context>
     <name>ExtrusionFuse:direction_object:GeomValidators_ShapeType</name>
     <message>
@@ -2446,13 +2411,6 @@
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
   </context>
-  <context>
-    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation></translation>
-    </message>
-  </context>
   <context>
     <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
@@ -2859,13 +2817,6 @@
       <translation>Object for pipe path is not selected.</translation>
     </message>
   </context>
-  <context>
-    <name>Pipe:FeaturesPlugin_ValidatorPipeLocations</name>
-    <message>
-      <source>Error: Feature \"%1\" does not supported by this validator.</source>
-      <translation>Feature "%1" does not supported validator "FeaturesPlugin_ValidatorPipeLocations".</translation>
-    </message>
-  </context>
   <context>
     <name>Pipe:FeaturesPlugin_ValidatorPipeLocations</name>
     <message>
@@ -3006,13 +2957,6 @@
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
   </context>
-  <context>
-    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation></translation>
-    </message>
-  </context>
   <context>
     <name>Pipe:path_object:FeaturesPlugin_ValidatorPipePath</name>
     <message>
@@ -3104,13 +3048,6 @@
       <translation>Selected object has empty context.</translation>
     </message>
   </context>
-  <context>
-    <name>Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult</name>
-    <message>
-      <source>Error: Feature \"%1\" does not supported by this validator.</source>
-      <translation>Feature "%1" does not supported validator "FeaturesPlugin_ValidatorRemoveSubShapesResult".</translation>
-    </message>
-  </context>
   <context>
     <name>Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult</name>
     <message>
@@ -3209,13 +3146,6 @@
       <translation></translation>
     </message>
   </context>
-  <context>
-    <name>Remove_SubShapes:base_shape:GeomValidators_BodyShapes</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation></translation>
-    </message>
-  </context>
   <context>
     <name>Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection</name>
     <message>
@@ -3629,13 +3559,6 @@
       <translation>Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</translation>
     </message>
   </context>
-  <context>
-    <name>Union:FeaturesPlugin_ValidatorUnionArguments</name>
-    <message>
-      <source>Error: This validator supports only \"%1\" feature.</source>
-      <translation>This validator "FeaturesPlugin_ValidatorUnionArguments" supports only "%1" feature.</translation>
-    </message>
-  </context>
   <context>
     <name>Union:FeaturesPlugin_ValidatorUnionArguments</name>
     <message>

diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
index 1eec6ed65598ed523f356d76b0993c71548760ed..40b87f8ec0820aee05bafc761fa34ea4e68d0dd0 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
+++ b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
@@ -1468,7 +1468,7 @@
       <translation>AA</translation>
     </message>
     <message>
-      <source>Angle for "from" for bounding plane</source>
+      <source>Angle for "from" bounding plane</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -1950,13 +1950,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>Extrusion:base :FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>Extrusion:direction_object:GeomValidators_ShapeType</name>
     <message>
@@ -2392,13 +2385,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>ExtrusionCut:direction_object:GeomValidators_ShapeType</name>
     <message>
@@ -2854,13 +2840,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
@@ -3260,13 +3239,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
@@ -3687,13 +3659,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>ExtrusionFuse:direction_object:GeomValidators_ShapeType</name>
     <message>
@@ -4184,13 +4149,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
@@ -4597,13 +4555,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>Pipe:FeaturesPlugin_ValidatorPipeLocations</name>
-    <message>
-      <source>Error: Feature \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>Pipe:FeaturesPlugin_ValidatorPipeLocations</name>
     <message>
@@ -4744,13 +4695,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>Pipe:path_object:FeaturesPlugin_ValidatorPipePath</name>
     <message>
@@ -4842,13 +4786,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult</name>
-    <message>
-      <source>Error: Feature \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult</name>
     <message>
@@ -4947,13 +4884,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>Remove_SubShapes:base_shape:GeomValidators_BodyShapes</name>
-    <message>
-      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection</name>
     <message>
@@ -5367,13 +5297,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>Union:FeaturesPlugin_ValidatorUnionArguments</name>
-    <message>
-      <source>Error: This validator supports only \"%1\" feature.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>Union:FeaturesPlugin_ValidatorUnionArguments</name>
     <message>

diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml
index 26c0de8ffec76c7048b3c67048efb259a20b2c8d..aa7acc60e061d0c9e891839394f3d326043e3839 100644 (file)
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -63,7 +63,7 @@
           <doublevalue id="from_offset" label="Angle"
             step="1.0" default="0"
             icon="icons/Features/angle_up_down.png"
-            tooltip="Angle for &quot;from&quot; for bounding plane">
+            tooltip="Angle for &quot;from&quot; bounding plane">
           </doublevalue>
         </groupbox>
         <groupbox title="To">

diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp
index 885259852ee090b8061e310eac6597de176cb7fd..aa05113a834f7bd5e395ec2b56747ca7feffc528 100644 (file)
--- a/src/Model/Model_FeatureValidator.cpp
+++ b/src/Model/Model_FeatureValidator.cpp
@@ -57,9 +57,8 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& th
         myNotObligatory.find(theFeature->getKind());
       if (aFeatureFind == myNotObligatory.end() || // and it is obligatory for filling
           aFeatureFind->second.find(*it) == aFeatureFind->second.end()) {
-        // TODO(spo): exceptional case for translation
-        theError = "Attribute \"" + anAttr->id() + "\" is not initialized.";
-//        theError.arg(anAttr->id());
+        theError = "Attribute \"%1\" is not initialized.";
+        theError.addParameter(anAttr->id());
         return false;
       }
     }

diff --git a/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp b/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp
index 6b0dc115c00c46c9c67b1270a145fcea42472708..9078329662e93044b3d61496b2e572539f63be1d 100644 (file)
--- a/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp
+++ b/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp
@@ -60,7 +60,6 @@ enum ColumnType {
 
 const char* NoName = "<NoName>";
 const char* NoValue = "<NoValue>";
-const char* NotValid = "<NotValid>";
 
 /*!
  * \ingroup GUI
@@ -435,13 +434,13 @@ QList<QStringList> ParametersPlugin_WidgetParamsMgr::
 
     std::string aName = aParameter->string(ParametersPlugin_Parameter::VARIABLE_ID())->value();
     if (aName.empty()) {
-      aValues << NoName;
+      aValues << translate(NoName);
     } else
       aValues << aName.c_str();
 
     std::string aExpr = aParameter->string(ParametersPlugin_Parameter::EXPRESSION_ID())->value();
     if (aName.empty()) {
-      aValues << NoValue;
+      aValues << translate(NoValue);
     } else
       aValues << aExpr.c_str();
 
@@ -574,8 +573,8 @@ FeaturePtr ParametersPlugin_WidgetParamsMgr::createParameter() const
 QTreeWidgetItem* ParametersPlugin_WidgetParamsMgr::createNewItem(QTreeWidgetItem* theParent) const
 {
   QStringList aValues;
-  aValues << NoName;
-  aValues << NoValue;
+  aValues << translate(NoName);
+  aValues << translate(NoValue);
 
   QTreeWidgetItem* aItem = new QTreeWidgetItem(aValues);
   if (theParent == myParameters) {
@@ -819,7 +818,7 @@ bool ParametersPlugin_WidgetParamsMgr::isValid()
   for(int i = 0; i < myParameters->childCount(); i++) {
     aItem = myParameters->child(i);
     if ((aItem->text(Col_Name) == NoName) ||
-        (aItem->text(Col_Equation) == NoValue) ||
+        (aItem->text(Col_Equation) == translate(NoValue)) ||
         (!ModelAPI_Expression::isVariable(aItem->text(Col_Name).toStdString())) ) {
       return false;
     }

diff --git a/src/ParametersPlugin/ParametersPlugin_msg_fr.ts b/src/ParametersPlugin/ParametersPlugin_msg_fr.ts
index 8a712b43038b9a1c0c7e6104e918d63145563d37..3989a75eb1917d1d4074a51113b814c39fce8849 100644 (file)
--- a/src/ParametersPlugin/ParametersPlugin_msg_fr.ts
+++ b/src/ParametersPlugin/ParametersPlugin_msg_fr.ts
@@ -133,6 +133,14 @@
       <source>See preview</source>
       <translation>AA</translation>
     </message>
+    <message>
+      <source>&lt;NoName&gt;</source>
+      <translation>AA</translation>
+    </message>
+    <message>
+    <source>&lt;NoValue&gt;</source>
+    <translation>AA</translation>
+  </message>
   </context>
 
   <context>

diff --git a/src/SketchPlugin/SketchPlugin_msg_en.ts b/src/SketchPlugin/SketchPlugin_msg_en.ts
index 35073532a9aa0da21eb161a7c403823d2c46033c..4b71ef4b39c42cf656d8040e92a6c0dae8156ad9 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_msg_en.ts
+++ b/src/SketchPlugin/SketchPlugin_msg_en.ts
@@ -4,14 +4,14 @@
   <context>
     <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "DirX" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select a plane for the sketch</translation>
     </message>
   </context>
   <context>
     <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "Features" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Sketch objects are not defined</translation>
     </message>
   </context>
@@ -53,25 +53,43 @@
   <context>
     <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "External" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select the sketch plane</translation>
     </message>
   </context>
   <context>
     <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "SolverDOF" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Can not compute degrees of freedom</translation>
     </message>
   </context>
   <context>
     <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "SolverError" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Can not compute the solver error</translation>
     </message>
   </context>
   
+  <context>
+    <name>SketchMacroCircle:center_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a point in the viewer</translation>
+    </message>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>Select a point in the viewer</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroCircle:passed_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a point in the viewer</translation>
+    </message>
+  </context>
   <context>
     <name>SketchMacroCircle:CircleRadius:GeomValidators_Positive</name>
     <message>
@@ -82,28 +100,28 @@
   <context>
     <name>SketchMacroCircle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "circle_center" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>A center point is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchMacroCircle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "FirstPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>A first point is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchMacroCircle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "SecondPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>A second point is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchMacroCircle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ThirdPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>A third point is not selected</translation>
     </message>
   </context>
@@ -159,15 +177,120 @@
   <context>
     <name>SketchMacroCircle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "circle_radius" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Set the circle radius</translation>
     </message>
   </context>
+
+  <context>
+    <name>SketchMacroArc:Model_FeatureValidator</name>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>Select a point.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:center_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a center point.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:end_point_1</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select an end point in the viewer.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:end_point_2</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select an end point in the viewer.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:end_point_3</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select an end point in the viewer.</translation>
+    </message>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>Select an end point in the viewer.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:passed_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select an passed point in the viewer.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:start_point_1</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a start point.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroArc:start_point_2</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a start point.</translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchMacroEllipse:Model_FeatureValidator</name>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>Select a point.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroEllipse:first_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a first point in the viewer.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroEllipse:passed_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a passed point.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchMacroEllipse:second_point</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a second point.</translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchSplit:Model_FeatureValidator</name>
+    <message>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>Select a segment to split in the viewer.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchSplit:SelectedObject:SketchPlugin_SplitValidator</name>
+    <message>
+      <source>Select a segment to split in the viewer.</source>
+      <translation></translation>
+    </message>
+  </context>
   
   <context>
     <name>SketchConstraintHorizontal:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Line is not selected</translation>
     </message>
   </context>
@@ -231,14 +354,14 @@
   <context>
     <name>SketchConstraintPerpendicular:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>First line is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintPerpendicular:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Second line is not selected</translation>
     </message>
   </context>
@@ -358,7 +481,7 @@
   <context>
     <name>SketchConstraintRadius:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Circle is not selected</translation>
     </message>
   </context>
@@ -407,7 +530,7 @@
   <context>
     <name>SketchConstraintRadius:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintValue" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Set the radius</translation>
     </message>
   </context>
@@ -464,7 +587,7 @@
   <context>
     <name>SketchConstraintVertical:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Line is not selected</translation>
     </message>
   </context>
@@ -528,42 +651,42 @@
   <context>
     <name>SketchLine:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "EndPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>End point is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchLine:EndPoint</name>
     <message>
-      <source>Attribute "EndPoint" is locked by modification value in the viewer.</source>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
       <translation>Select an end point in the viewer</translation>
     </message>
   </context>
   <context>
     <name>SketchLine:StartPoint</name>
     <message>
-      <source>Attribute "StartPoint" is locked by modification value in the viewer.</source>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
       <translation>Select a start point in the viewer</translation>
     </message>
   </context>
   <context>
     <name>SketchLine:StartPoint</name>
     <message>
-      <source>Attribute "StartPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Start point is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchLine:EndPoint</name>
     <message>
-      <source>Attribute "EndPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>End point is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchLine:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "StartPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select a start point</translation>
     </message>
   </context>
@@ -571,14 +694,14 @@
   <context>
     <name>SketchPoint:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "PointCoordinates" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Point is not defined</translation>
     </message>
   </context>
   <context>
     <name>SketchPoint:PointCoordinates</name>
     <message>
-      <source>Attribute "PointCoordinates" is locked by modification value in the viewer.</source>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
       <translation>Select a point</translation>
     </message>
   </context>
@@ -593,29 +716,36 @@
   <context>
     <name>SketchRectangle:RectEndPoint</name>
     <message>
-      <source>Attribute "RectEndPoint" is locked by modification value in the viewer.</source>
-      <translation>Select an end point of the rectangle</translation>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select an end point of the rectangle.</translation>
     </message>
   </context>
   <context>
     <name>SketchRectangle:RectStartPoint</name>
     <message>
-      <source>Attribute "RectStartPoint" is locked by modification value in the viewer.</source>
-      <translation>Select a first point of the rectangle</translation>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a point.</translation>
     </message>
   </context>
   <context>
     <name>SketchRectangle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "RectStartPoint" is not initialized.</source>
-      <translation>Select a first point of the rectangle</translation>
+      <source>Attribute "%1" is not initialized.</source>
+      <translation>Select a point.</translation>
     </message>
   </context>
   <context>
-    <name>SketchRectangle:Model_FeatureValidator</name>
+    <name>SketchRectangle:RectEndPoint</name>
+    <message>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select a point.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchRectangle:RectStartPoint</name>
     <message>
-      <source>Attribute "RectEndPoint" is not initialized.</source>
-      <translation>Select an end point of the rectangle</translation>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
+      <translation>Select an point.</translation>
     </message>
   </context>
 
@@ -636,35 +766,35 @@
   <context>
     <name>SketchArc:ArcCenter</name>
     <message>
-      <source>Attribute "center_point" is locked by modification value in the viewer.</source>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
       <translation>Select a center point</translation>
     </message>
   </context>
   <context>
     <name>SketchArc:ArcCenter</name>
     <message>
-      <source>Attribute "center_point" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Center point is not defined</translation>
     </message>
   </context>
   <context>
     <name>SketchArc:ArcEndPoint</name>
     <message>
-      <source>Attribute "ArcEndPoint" is locked by modification value in the viewer.</source>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
       <translation>Select an end point</translation>
     </message>
   </context>
   <context>
     <name>SketchArc:ArcPassedPoint</name>
     <message>
-      <source>Attribute "ArcPassedPoint" is locked by modification value in the viewer.</source>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
       <translation>Select an intermediate point</translation>
     </message>
   </context>
   <context>
     <name>SketchArc:ArcStartPoint</name>
     <message>
-      <source>Attribute "ArcStartPoint" is locked by modification value in the viewer.</source>
+      <source>Attribute "%1" is locked by modification value in the viewer.</source>
       <translation>Select a start point</translation>
     </message>
   </context>
@@ -685,14 +815,14 @@
   <context>
     <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ArcEndPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>End point is not defined</translation>
     </message>
   </context>
   <context>
     <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ArcPassedPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Intermediate point is not defined</translation>
     </message>
   </context>
@@ -720,35 +850,35 @@
   <context>
     <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "center_point" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select an arc center</translation>
     </message>
   </context>
   <context>
     <name>SketchArc:Model_FeatureValidator:ArcStartPoint</name>
     <message>
-      <source>Attribute "start_point" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select an arc start point</translation>
     </message>
   </context>
   <context>
     <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "end_point" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select an arc end point</translation>
     </message>
   </context>
   <context>
     <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ArcPassedPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select an arc passed point</translation>
     </message>
   </context>
   <context>
     <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ArcTangentPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select an arc tangent point</translation>
     </message>
   </context>
@@ -762,14 +892,14 @@
   <context>
     <name>SketchConstraintMirror:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Mirror line is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintMirror:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintMirrorList" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Objects for mirror are not selected</translation>
     </message>
   </context>
@@ -819,14 +949,14 @@
   <context>
     <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "AngleType" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Type of angle is not defined</translation>
     </message>
   </context>
   <context>
     <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "MultiRotationCenter" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Rotation center is not selected</translation>
     </message>
   </context>
@@ -868,21 +998,21 @@
   <context>
     <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "MultiRotationList" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select objects to rotate</translation>
     </message>
   </context>
   <context>
     <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "MultiRotationAngle" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Set rotation angle</translation>
     </message>
   </context>
   <context>
     <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "MultiRotationObjects" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Set the number of resulting objects</translation>
     </message>
   </context>
@@ -946,14 +1076,14 @@
   <context>
     <name>SketchMultiTranslation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "MultiTranslationEndPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>End point of translation vector is not defined</translation>
     </message>
   </context>
   <context>
     <name>SketchMultiTranslation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "MultiTranslationList" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Objects for translation are not selected</translation>
     </message>
   </context>
@@ -1004,14 +1134,14 @@
   <context>
     <name>SketchMultiTranslation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "MultiTranslationStartPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select a start point</translation>
     </message>
   </context>
   <context>
     <name>SketchMultiTranslation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "MultiTranslationObjects" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select a total number of objects</translation>
     </message>
   </context>
@@ -1159,28 +1289,28 @@
   <context>
     <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "AngleValue" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Set the angle value</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "AngleType" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Type of angle is not set</translation>
     </message>
   </context>
@@ -1293,14 +1423,14 @@
   <context>
     <name>SketchConstraintCoincidence:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintCoincidence:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
   </context>
@@ -1350,14 +1480,14 @@
   <context>
     <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
   </context>
@@ -1385,21 +1515,21 @@
   <context>
     <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintValue" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Set the distance</translation>
     </message>
   </context>
@@ -1526,14 +1656,14 @@
   <context>
     <name>SketchConstraintEqual:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintEqual:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
   </context>
@@ -1576,7 +1706,7 @@
   <context>
     <name>SketchConstraintLength:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Line is not selected</translation>
     </message>
   </context>
@@ -1605,14 +1735,14 @@
   <context>
     <name>SketchConstraintLength:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Line is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintLength:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintValue" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Set the length value</translation>
     </message>
   </context>
@@ -1683,14 +1813,14 @@
   <context>
     <name>SketchConstraintMiddle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintMiddle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
   </context>
@@ -1726,14 +1856,14 @@
   <context>
     <name>SketchConstraintParallel:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>First line is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintParallel:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Second line is not selected</translation>
     </message>
   </context>
@@ -1846,7 +1976,7 @@
   <context>
     <name>SketchConstraintRigid:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Object is not selected</translation>
     </message>
   </context>
@@ -1917,14 +2047,14 @@
   <context>
     <name>SketchConstraintTangent:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
   </context>
   <context>
     <name>SketchConstraintTangent:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
   </context>
@@ -1968,14 +2098,14 @@
   <context>
     <name>SketchFillet:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Select one or several points for filet</translation>
     </message>
   </context>
   <context>
     <name>SketchFillet:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintValue" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>Set the fillet radius</translation>
     </message>
   </context>
@@ -2040,7 +2170,7 @@
   <context>
     <name>SketchProjection:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ExternalFeature" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation></translation>
     </message>
   </context>

diff --git a/src/SketchPlugin/SketchPlugin_msg_fr.ts b/src/SketchPlugin/SketchPlugin_msg_fr.ts
index 6fed6503cdfb61e30a65f2b649b2e8d4d6f54a66..a5a1b45b30a1e8a6a5fb67e3567b0721d73d7f8e 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_msg_fr.ts
+++ b/src/SketchPlugin/SketchPlugin_msg_fr.ts
@@ -123,14 +123,7 @@
   <context>
     <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "DirX" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>Sketch:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "Features" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -172,21 +165,7 @@
   <context>
     <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "External" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>Sketch:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "SolverDOF" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>Sketch:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "SolverError" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -201,28 +180,7 @@
   <context>
     <name>SketchMacroCircle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "circle_center" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchMacroCircle:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "FirstPoint" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchMacroCircle:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "SecondPoint" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchMacroCircle:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ThirdPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -275,20 +233,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>SketchMacroCircle:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "circle_radius" is not initialized.</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>
-  </context>
   <context>
     <name>SketchMacroCircle:center_point</name>
     <message>
@@ -310,11 +254,7 @@
   <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>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -395,7 +335,7 @@
   <context>
     <name>SketchConstraintHorizontal:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -459,14 +399,7 @@
   <context>
     <name>SketchConstraintPerpendicular:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintPerpendicular:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -586,7 +519,7 @@
   <context>
     <name>SketchConstraintRadius:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -632,13 +565,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>SketchConstraintRadius:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintValue" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>SketchConstraintRadius:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
@@ -692,7 +618,7 @@
   <context>
     <name>SketchConstraintVertical:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -756,7 +682,7 @@
   <context>
     <name>SketchLine:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "EndPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -777,21 +703,21 @@
   <context>
     <name>SketchLine:StartPoint</name>
     <message>
-      <source>Attribute "StartPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
   <context>
     <name>SketchLine:EndPoint</name>
     <message>
-      <source>Attribute "EndPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
   <context>
     <name>SketchLine:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "StartPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -821,7 +747,7 @@
   <context>
     <name>SketchPoint:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "PointCoordinates" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -864,14 +790,7 @@
   <context>
     <name>SketchRectangle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "RectStartPoint" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchRectangle:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "RectEndPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -922,7 +841,7 @@
   <context>
     <name>SketchArc:ArcCenter</name>
     <message>
-      <source>Attribute "center_point" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -964,14 +883,7 @@
   <context>
     <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ArcEndPoint" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchArc:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ArcPassedPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -996,38 +908,10 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>SketchArc:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "center_point" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>SketchArc:Model_FeatureValidator:ArcStartPoint</name>
     <message>
-      <source>Attribute "start_point" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchArc:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "end_point" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchArc:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ArcPassedPoint" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchArc:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ArcTangentPoint" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -1095,14 +979,7 @@
   <context>
     <name>SketchConstraintMirror:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintMirror:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintMirrorList" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -1152,14 +1029,7 @@
   <context>
     <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "AngleType" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchMultiRotation:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "MultiRotationCenter" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -1198,27 +1068,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>SketchMultiRotation:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "MultiRotationList" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchMultiRotation:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "MultiRotationAngle" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchMultiRotation:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "MultiRotationObjects" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>SketchMultiRotation:MultiRotationList:SketchPlugin_CopyValidator</name>
     <message>
@@ -1279,14 +1128,7 @@
   <context>
     <name>SketchMultiTranslation:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "MultiTranslationEndPoint" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchMultiTranslation:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "MultiTranslationList" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -1331,21 +1173,6 @@
       <source>Integer is not positive.</source>
       <translation>AA</translation>
     </message>
-
-  </context>
-  <context>
-    <name>SketchMultiTranslation:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "MultiTranslationStartPoint" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchMultiTranslation:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "MultiTranslationObjects" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
   </context>
   <context>
     <name>SketchMultiTranslation:MultiTranslationList:SketchPlugin_CopyValidator</name>
@@ -1491,28 +1318,7 @@
   <context>
     <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintAngle:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintAngle:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "AngleValue" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintAngle:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "AngleType" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -1625,14 +1431,7 @@
   <context>
     <name>SketchConstraintCoincidence:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintCoincidence:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -1686,13 +1485,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>SketchConstraintDistance:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>SketchConstraintDistance:ConstraintValue:GeomValidators_Positive</name>
     <message>
@@ -1714,27 +1506,6 @@
       <translation>AA</translation>
     </message>
   </context>
-  <context>
-    <name>SketchConstraintDistance:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintDistance:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintDistance:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintValue" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
   <context>
     <name>SketchConstraintDistance:ConstraintEntityA:SketchPlugin_ExternalValidator</name>
     <message>
@@ -1858,14 +1629,7 @@
   <context>
     <name>SketchConstraintEqual:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintEqual:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -1908,7 +1672,7 @@
   <context>
     <name>SketchConstraintLength:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -1932,21 +1696,6 @@
       <source>Integer is not positive.</source>
       <translation>AA</translation>
     </message>
-
-  </context>
-  <context>
-    <name>SketchConstraintLength:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintLength:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintValue" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
   </context>
   <context>
     <name>SketchConstraintLength:ConstraintEntityA:GeomValidators_ShapeType</name>
@@ -2015,14 +1764,7 @@
   <context>
     <name>SketchConstraintMiddle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintMiddle:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -2058,14 +1800,7 @@
   <context>
     <name>SketchConstraintParallel:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintParallel:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -2178,7 +1913,7 @@
   <context>
     <name>SketchConstraintRigid:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -2249,14 +1984,7 @@
   <context>
     <name>SketchConstraintTangent:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchConstraintTangent:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -2300,14 +2028,7 @@
   <context>
     <name>SketchFillet:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-  </context>
-  <context>
-    <name>SketchFillet:Model_FeatureValidator</name>
-    <message>
-      <source>Attribute "ConstraintValue" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -2372,7 +2093,7 @@
   <context>
     <name>SketchProjection:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ExternalFeature" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -2495,7 +2216,7 @@
   <context>
     <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "AngleReversedLine1" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -2584,7 +2305,7 @@
   <context>
     <name>SketchConstraintCollinear:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -2765,7 +2486,7 @@
   <context>
     <name>SketchConstraintDistanceHorizontal:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -2864,7 +2585,7 @@
   <context>
     <name>SketchConstraintDistanceVertical:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -3277,7 +2998,7 @@
   <context>
     <name>SketchDrawer:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "base_shape" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -3329,7 +3050,7 @@
   <context>
     <name>SketchFillet:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "fillet_point" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -3399,7 +3120,7 @@
   <context>
     <name>SketchIntersectionPoint:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ExternalFeature" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -3470,19 +3191,7 @@
   <context>
     <name>SketchMacroArc:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "center_point" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-    <message>
-      <source>Attribute "end_point_1" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-    <message>
-      <source>Attribute "end_point_2" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-    <message>
-      <source>Attribute "end_point_3" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -3563,13 +3272,6 @@
       <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>
@@ -3657,15 +3359,7 @@
   <context>
     <name>SketchMacroCircle:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "center_point" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-    <message>
-      <source>Attribute "first_point" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-    <message>
-      <source>Attribute "passed_point" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -3705,13 +3399,6 @@
       <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>
@@ -3763,11 +3450,7 @@
   <context>
     <name>SketchMacroEllipse:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "first_point" is not initialized.</source>
-      <translation>AA</translation>
-    </message>
-    <message>
-      <source>Attribute "passed_point" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -3832,7 +3515,7 @@
   <context>
     <name>SketchMacroEllipse:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "ellipse_type" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -4195,7 +3878,7 @@
   <context>
     <name>SketchSplit:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "SelectedObject" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>
@@ -4232,7 +3915,7 @@
   <context>
     <name>SketchTrim:Model_FeatureValidator</name>
     <message>
-      <source>Attribute "SelectedObject" is not initialized.</source>
+      <source>Attribute "%1" is not initialized.</source>
       <translation>AA</translation>
     </message>
   </context>

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 1e51edf26457a80de245ff7d5e7a39a110713b9b..319ddd2717259dc8fce32b974efedc19d125223a 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -45,7 +45,7 @@
                                  enable_value="enable_by_preferences"/>
         <sketch-2dpoint_selector id="EndPoint" accept_expressions="0" title="End point" tooltip="End point coordinates"
                                  enable_value="enable_by_preferences"/>
-        <labelvalue id="LineLength" accept_expressions="0" label="Length:" default="computed" icon="icons/Sketch/distance_value.png"
+        <labelvalue id="LineLength" accept_expressions="0" label="Length" default="computed" icon="icons/Sketch/distance_value.png"
                      tooltip="Line length" obligatory="0" enable_value="false"/>
         <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
         <validator id="GeomValidators_Different" parameters="StartPoint,EndPoint"/>
@@ -65,7 +65,7 @@
                                  enable_value="enable_by_preferences"/>
         <labelvalue id="circle_radius"
                     icon="icons/Sketch/radius.png"
-                    label="Radius:"
+                    label="Radius"
                     tooltip="Set radius"
                     default="computed"
                     accept_expressions="0"
@@ -130,7 +130,7 @@
         </toolbox>
         <labelvalue id="circle_radius"
                     icon="icons/Sketch/radius.png"
-                    label="Radius:"
+                    label="Radius"
                     tooltip="Set radius"
                     default="computed"
                     accept_expressions="0"
@@ -169,7 +169,7 @@
         <validator id="GeomValidators_Different" parameters="center_point,start_point,end_point"/>
         <labelvalue id="radius"
                     icon="icons/Sketch/radius.png"
-                    label="Radius:"
+                    label="Radius"
                     tooltip="Set radius"
                     accept_expressions="0"
                     min="0"
@@ -179,7 +179,7 @@
         </labelvalue>
         <labelvalue id="angle"
                     icon="icons/Sketch/angle.png"
-                    label="Angle:"
+                    label="Angle"
                     tooltip="Set angle"
                     default="0"
                     use_reset="false"
@@ -294,7 +294,7 @@
         </toolbox>
         <labelvalue id="radius"
                     icon="icons/Sketch/radius.png"
-                    label="Radius:"
+                    label="Radius"
                     tooltip="Set radius"
                     accept_expressions="0"
                     min="0"
@@ -304,7 +304,7 @@
         </labelvalue>
         <labelvalue id="angle"
                     icon="icons/Sketch/angle.png"
-                    label="Angle:"
+                    label="Angle"
                     tooltip="Set angle"
                     default="0"
                     use_reset="false"
@@ -409,7 +409,7 @@
                                  enable_value="enable_by_preferences"/>
         <labelvalue id="ellipse_major_radius"
                     icon="icons/Sketch/radius_major.png"
-                    label="Major radius:"
+                    label="Major radius"
                     tooltip="Set major radius"
                     default="computed"
                     accept_expressions="0"
@@ -417,7 +417,7 @@
         </labelvalue>
         <labelvalue id="ellipse_minor_radius"
                     icon="icons/Sketch/radius_minor.png"
-                    label="Minor radius:"
+                    label="Minor radius"
                     tooltip="Set minor radius"
                     default="computed"
                     accept_expressions="0"
@@ -482,7 +482,7 @@
 <!--        <validator id="GeomValidators_Different" parameters="center_point_ref,passed_point_ref"/> -->
         <labelvalue id="major_radius"
                     icon="icons/Sketch/radius_major.png"
-                    label="Major radius:"
+                    label="Major radius"
                     tooltip="Set major radius"
                     default="computed"
                     accept_expressions="0"
@@ -492,7 +492,7 @@
         </labelvalue>
         <labelvalue id="minor_radius"
                     icon="icons/Sketch/radius_minor.png"
-                    label="Minor radius:"
+                    label="Minor radius"
                     tooltip="Set minor radius"
                     default="computed"
                     accept_expressions="0"
@@ -565,7 +565,7 @@
           <validator id="SketchPlugin_ReplicationReference" parameters="ConstraintEntityC"/>
         </sketch_shape_selector>
         <sketch_multi_selector id="ConstraintMirrorList"
-            label="Segments:"
+            label="Segments"
             tooltip="Select list of objects to be mirrored"
             shape_types="Edges"
             use_external="true"
@@ -582,7 +582,7 @@
         tooltip="Copy objects and move"
         helpfile="translationFeature.html">
         <sketch_multi_selector id="MultiTranslationList"
-            label="Segments:"
+            label="Segments"
             tooltip="Select list of objects to be translated"
             shape_types="Edges"
             use_external="true"
@@ -651,7 +651,7 @@
         tooltip="Copy objects and rotate"
         helpfile="rotationFeature.html">
         <sketch_multi_selector id="MultiRotationList"
-            label="Segments:"
+            label="Segments"
             tooltip="Select list of objects to be rotated"
             shape_types="Edges"
             use_external="true"

diff --git a/src/SketchSolver/SketchSolver_Group.cpp b/src/SketchSolver/SketchSolver_Group.cpp
index 84d701e2b2c10c9b1f7d77566a1c3a64638e5129..28d5550ab198b94e2490468c2d60027ad1c0a986 100644 (file)
--- a/src/SketchSolver/SketchSolver_Group.cpp
+++ b/src/SketchSolver/SketchSolver_Group.cpp
@@ -33,6 +33,8 @@
 #include <SketchPlugin_MultiRotation.h>
 #include <SketchPlugin_MultiTranslation.h>
 
+#include <Config_Translator.h>
+
 
 static void sendMessage(const char* theMessageName)
 {
@@ -352,13 +354,19 @@ bool SketchSolver_Group::resolveConstraints()
 void SketchSolver_Group::computeDoF()
 {
   std::ostringstream aDoFMsg;
+  static const std::string aMsgContext("Sketch");
   int aDoF = mySketchSolver->dof();
   /// "DoF = 0" content of string value is used in PartSet by Sketch edit
   /// If it is changed, it should be corrected also there
-  if (aDoF == 0)
-    aDoFMsg << "Sketch is fully fixed (DoF = 0)";
-  else
-    aDoFMsg << "DoF (degrees of freedom) = " << aDoF;
+  if (aDoF == 0) {
+    static const std::string aMsgDoF("Sketch is fully fixed (DoF = 0)");
+    aDoFMsg << Config_Translator::translate(aMsgContext, aMsgDoF).c_str();
+  } else {
+    static const std::string aMsgDoF("DoF (degrees of freedom) = %1");
+    Events_InfoMessage aMsg(aMsgContext, aMsgDoF);
+    aMsg.arg(aDoF);
+    aDoFMsg << Config_Translator::translate(aMsg).c_str();
+  }
   mySketch->string(SketchPlugin_Sketch::SOLVER_DOF())->setValue(aDoFMsg.str());
 
   if (aDoF > 0 && myDOF <= 0)