Translation update for SketchPlugin

diff --git a/src/SketchPlugin/SketchPlugin_msg_en.ts b/src/SketchPlugin/SketchPlugin_msg_en.ts
old mode 100644 (file)
new mode 100755 (executable)
index e3c2e60..de5c429
--- a/src/SketchPlugin/SketchPlugin_msg_en.ts
+++ b/src/SketchPlugin/SketchPlugin_msg_en.ts
@@ -2,266 +2,454 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="en_US">
   <context>
-    <name>Sketch</name>
+    <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "DirX" is not initialized.</source>
+      <source>Attribute "DirX" is not initialized.</source>
       <translation>Select a plane for the sketch</translation>
     </message>
+  </context>
+  <context>
+    <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "Features" is not initialized.</source>
+      <source>Attribute "Features" is not initialized.</source>
       <translation>Sketch objects are not defined</translation>
     </message>
+  </context>
+  <context>
+    <name>Sketch:External:GeomValidators_Face</name>
     <message>
-      <source>External - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>Only attribute selection can be used for the sketch face, not %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Sketch:External:GeomValidators_Face</name>
     <message>
-      <source>External - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>Sketch can be created only on a face</translation>
     </message>
+  </context>
+  <context>
+    <name>Sketch:External:GeomValidators_Face</name>
     <message>
-      <source>External - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>Sketch can be created only on a planar face</translation>
     </message>
+  </context>
+  <context>
+    <name>Sketch:External:GeomValidators_Face</name>
     <message>
-      <source>External - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation>Sketch can be created only on a cylindrical face</translation>
     </message>
+  </context>
+  <context>
+    <name>Sketch:External:GeomValidators_Face</name>
     <message>
-      <source>External - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation>Sketch cannot be created on the selected face</translation>
     </message>
+  </context>
+  <context>
+    <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "External" is not initialized.</source>
+      <source>Attribute "External" is not initialized.</source>
       <translation>Select the sketch plane</translation>
     </message>
+  </context>
+  <context>
+    <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "SolverDOF" is not initialized.</source>
+      <source>Attribute "SolverDOF" is not initialized.</source>
       <translation>Can not compute degrees of freedom</translation>
     </message>
+  </context>
+  <context>
+    <name>Sketch:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "SolverError" is not initialized.</source>
+      <source>Attribute "SolverError" is not initialized.</source>
       <translation>Can not compute the solver error</translation>
     </message>
   </context>
   
   <context>
-    <name>SketchCircle</name>
+    <name>SketchCircle:CircleRadius:GeomValidators_Positive</name>
     <message>
-      <source>CircleRadius - GeomValidators_Positive: Double is not positive.</source>
+      <source>Double is not positive.</source>
       <translation>Radius value is not positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchCircle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "CircleCenter" is not initialized.</source>
+      <source>Attribute "CircleCenter" is not initialized.</source>
       <translation>A center point is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchCircle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "FirstPoint" is not initialized.</source>
+      <source>Attribute "FirstPoint" is not initialized.</source>
       <translation>A first point is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchCircle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "SecondPoint" is not initialized.</source>
+      <source>Attribute "SecondPoint" is not initialized.</source>
       <translation>A second point is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchCircle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ThirdPoint" is not initialized.</source>
+      <source>Attribute "ThirdPoint" is not initialized.</source>
       <translation>A third point is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchCircle:CircleCenter</name>
     <message>
       <source>Attribute "CircleCenter" is locked by modification value in the viewer.</source>
       <translation>Select a center point</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchCircle:FirstPoint</name>
+    <message>
+      <source>Attribute "FirstPoint" is locked by modification value in the viewer.</source>
+      <translation>Select a center point</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchCircle:SecondPoint</name>
+    <message>
+      <source>Attribute "SecondPoint" is locked by modification value in the viewer.</source>
+      <translation>Select a center point</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchCircle:ThirdPoint</name>
+    <message>
+      <source>Attribute "ThirdPoint" is locked by modification value in the viewer.</source>
+      <translation>Select a center point</translation>
+    </message>
+  </context>
+  <context>
+    <name>SketchCircle:CircleRadius</name>
     <message>
       <source>Attribute "CircleRadius" is locked by modification value in the viewer.</source>
       <translation>Select a radius distance</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchCircle:CircleRadius:GeomValidators_Positive</name>
     <message>
-      <source>CircleRadius - GeomValidators_Positive: Integer is not initialized.</source>
+      <source>Integer is not initialized.</source>
       <translation>Integer radius is not initialized</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchCircle:CircleRadius:GeomValidators_Positive</name>
     <message>
-      <source>CircleRadius - GeomValidators_Positive: Integer is not positive.</source>
+      <source>Integer is not positive.</source>
       <translation>Integer radius must be set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchCircle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "CircleRadius" is not initialized.</source>
+      <source>Attribute "CircleRadius" is not initialized.</source>
       <translation>Set the circle radius</translation>
     </message>
   </context>
   
   <context>
-    <name>SketchConstraintHorizontal</name>
+    <name>SketchConstraintHorizontal:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintHorizontal</name>
     <message>
       <source>ModelAPI_StateInvalidArgument</source>
       <translation>Wrong object is selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintHorizontal:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintHorizontal:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>The constraint argument does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintHorizontal:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The constraint argument refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintHorizontal:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The constraint argument refers to %1 but must be %2</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintHorizontal:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The constraint argument of type %1 is not supported</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintHorizontal:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintHorizontal:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
   </context>
+  
   <context>
-    <name>SketchConstraintPerpendicular</name>
+    <name>SketchConstraintPerpendicular:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>First line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "ConstraintEntityB" is not initialized.</source>
       <translation>Second line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>First line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Second line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>The second line references to not acceptable shape type. The type should be: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The second line refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The second line refers to %1 but must be %2</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The second line of type %1 is not supported</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The second line refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The second line refers to the empty shape</translation>
-    </message>    
+    </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityA:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>Two external lines can not be constrained as perpendicular</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The first line refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The first line shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintPerpendicular:ConstraintEntityB:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>Two external lines can not be constrained as perpendicular</translation>
     </message>
   </context>
   
   <context>
-    <name>SketchConstraintRadius</name>
+    <name>SketchConstraintRadius:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Circle is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintFlyoutValuePnt</name>
     <message>
       <source>Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer.</source>
       <translation>Flyout value point is not clicked in the viewer</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Double is not initialized.</source>
+      <source>Double is not initialized.</source>
       <translation>Radius value is not positive</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Double is not positive.</source>
+      <source>Double is not positive.</source>
       <translation>Radius must be positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Integer is not initialized.</source>
+      <source>Integer is not initialized.</source>
       <translation>Integer radius must be set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Integer is not positive.</source>
+      <source>Integer is not positive.</source>
       <translation>Integer radius must be positive</translation>
     </message>
-
+  </context>
+  <context>
+    <name>SketchConstraintRadius:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintValue" is not initialized.</source>
+      <source>Attribute "ConstraintValue" is not initialized.</source>
       <translation>Set the radius</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The circle argument refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The circle argument shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRadius:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
   </context>
@@ -272,80 +460,123 @@
       <source>ModelAPI_StateInvalidArgument</source>
       <translation>Wrong object is selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintVertical:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintVertical:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Line is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintVertical:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>The first line references to not acceptable shape type. The type should be: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintVertical:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The first line refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintVertical:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The first line refers to %1 but must be %2</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintVertical:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The first line of type %1 is not supported</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintVertical:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The first line refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintVertical:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The first line refers to the empty shape</translation>
     </message>
   </context>
   
   <context>
-    <name>SketchLine</name>
+    <name>SketchLine:GeomValidators_Different</name>
     <message>
-      <source>GeomValidators_Different: Attributes StartPoint and EndPoint are equal.</source>
+      <source>Attributes StartPoint and EndPoint are equal.</source>
       <translation>Start point and end point are the same</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchLine:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "EndPoint" is not initialized.</source>
+      <source>Attribute "EndPoint" 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>
       <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>
       <translation>Select a start point in the viewer</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchLine:StartPoint</name>
     <message>
       <source>Attribute "StartPoint" 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>
       <translation>End point is not selected</translation>
     </message>
-
+  </context>
+  <context>
+    <name>SketchLine:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "StartPoint" is not initialized.</source>
+      <source>Attribute "StartPoint" is not initialized.</source>
       <translation>Select a start point</translation>
     </message>
   </context>
-  
+
   <context>
-    <name>SketchPoint</name>
+    <name>SketchPoint:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "PointCoordindates" is not initialized.</source>
+      <source>Attribute "PointCoordindates" is not initialized.</source>
       <translation>Point is not defined</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchPoint:PointCoordindates</name>
     <message>
       <source>Attribute "PointCoordindates" is locked by modification value in the viewer.</source>
       <translation>Select a point</translation>
@@ -353,916 +584,1463 @@
   </context>
   
   <context>
-    <name>SketchRectangle</name>
+    <name>SketchRectangle:GeomValidators_Different</name>
     <message>
-      <source>GeomValidators_Different: Attributes RectStartPoint and RectEndPoint are equal.</source>
+      <source>Attributes RectStartPoint and RectEndPoint are equal.</source>
       <translation>Start point and end point must be different</translation>
     </message>
+  </context>
+  <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>
     </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>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchRectangle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "RectStartPoint" is not initialized.</source>
+      <source>Attribute "RectStartPoint" is not initialized.</source>
       <translation>Select a first point of the rectangle</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchRectangle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "RectEndPoint" is not initialized.</source>
+      <source>Attribute "RectEndPoint" is not initialized.</source>
       <translation>Select an end point of the rectangle</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchArc</name>
+    <name>SketchArc:ArcRadius:GeomValidators_Positive</name>
     <message>
-      <source>ArcRadius - GeomValidators_Positive: Double is not initialized.</source>
+      <source>Double is not initialized.</source>
       <translation>Radius value is not positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:ArcTangentPoint:SketchPlugin_ArcTangentPoint</name>
     <message>
-      <source>ArcTangentPoint - SketchPlugin_ArcTangentPoint: The attribute ArcTangentPoint should be a point</source>
+      <source>The attribute ArcTangentPoint should be a point</source>
       <translation>Arc tangent point is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:ArcCenter</name>
     <message>
       <source>Attribute "ArcCenter" 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 "ArcCenter" 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>
       <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>
       <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>
       <translation>Select a start point</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:GeomValidators_Different</name>
     <message>
-      <source>GeomValidators_Different: Attributes ArcCenter and ArcStartPoint are equal.</source>
+      <source>Attributes ArcCenter and ArcStartPoint are equal.</source>
       <translation>Center point and end point must be different</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:GeomValidators_Different</name>
     <message>
-      <source>GeomValidators_Different: Attributes ArcStartPoint and ArcEndPoint are equal.</source>
+      <source>Attributes ArcStartPoint and ArcEndPoint are equal.</source>
       <translation>Start point and end point must be different</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ArcEndPoint" is not initialized.</source>
+      <source>Attribute "ArcEndPoint" is not initialized.</source>
       <translation>End point is not defined</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ArcPassedPoint" is not initialized.</source>
+      <source>Attribute "ArcPassedPoint" is not initialized.</source>
       <translation>Intermediate point is not defined</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:ArcRadius:GeomValidators_Positive</name>
     <message>
-      <source>ArcRadius - GeomValidators_Positive: Double is not positive.</source>
+      <source>Double is not positive.</source>
       <translation>Acr radius must e positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:ArcRadius:GeomValidators_Positive</name>
     <message>
-      <source>ArcRadius - GeomValidators_Positive: Integer is not initialized.</source>
+      <source>Integer is not initialized.</source>
       <translation>Integer arc radius must be set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:ArcRadius:GeomValidators_Positive</name>
     <message>
-      <source>ArcRadius - GeomValidators_Positive: Integer is not positive.</source>
+      <source>Integer is not positive.</source>
       <translation>Integer arc radius must be positive</translation>
-    </message>    
+    </message>
+  </context>
+  <context>
+    <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ArcCenter" is not initialized.</source>
+      <source>Attribute "ArcCenter" is not initialized.</source>
       <translation>Select an arc center</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:Model_FeatureValidator:ArcStartPoint</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ArcStartPoint" is not initialized.</source>
+      <source>Attribute "ArcStartPoint" is not initialized.</source>
       <translation>Select an arc start point</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ArcEndPoint" is not initialized.</source>
+      <source>Attribute "ArcEndPoint" is not initialized.</source>
       <translation>Select an arc end point</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ArcPassedPoint" is not initialized.</source>
+      <source>Attribute "ArcPassedPoint" is not initialized.</source>
       <translation>Select an arc passed point</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchArc:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ArcTangentPoint" is not initialized.</source>
+      <source>Attribute "ArcTangentPoint" is not initialized.</source>
       <translation>Select an arc tangent point</translation>
     </message>
   </context>
   <context>
-    <name>SketchConstraintMirror</name>
+    <name>SketchConstraintMirror:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMirror:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Mirror line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMirror:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintMirrorList" is not initialized.</source>
+      <source>Attribute "ConstraintMirrorList" is not initialized.</source>
       <translation>Objects for mirror are not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMirror:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>The mirror line references to not acceptable shape type. The type should be: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMirror:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The mirror line refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMirror:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The mirror line refers to %1 but must be %2</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMirror:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The mirror line of type %1 is not supported</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMirror:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The mirror line refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMirror:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The mirror line refers to the empty shape</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchMultiRotation</name>
+    <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "AngleType" is not initialized.</source>
+      <source>Attribute "AngleType" is not initialized.</source>
       <translation>Type of angle is not defined</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "MultiRotationCenter" is not initialized.</source>
+      <source>Attribute "MultiRotationCenter" is not initialized.</source>
       <translation>Rotation center is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationCenter:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiRotationCenter - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Rotation center is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationObjects:GeomValidators_Positive</name>
     <message>
-      <source>MultiRotationObjects - GeomValidators_Positive: Double is not initialized.</source>
+      <source>Double is not initialized.</source>
       <translation>The total number of rotated objects is not set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationObjects:GeomValidators_Positive</name>
     <message>
-      <source>MultiRotationObjects - GeomValidators_Positive: Double is not positive.</source>
+      <source>Double is not positive.</source>
       <translation>The total number of rotated objects must be positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationObjects:GeomValidators_Positive</name>
     <message>
-      <source>MultiRotationObjects - GeomValidators_Positive: Integer is not initialized.</source>
+      <source>Integer is not initialized.</source>
       <translation>The total number of rotated objects is not set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationObjects:GeomValidators_Positive</name>
     <message>
-      <source>MultiRotationObjects - GeomValidators_Positive: Integer is not positive.</source>
+      <source>Integer is not positive.</source>
       <translation>The total number of rotated objects must be positive</translation>
     </message>
-
+  </context>
+  <context>
+    <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "MultiRotationList" is not initialized.</source>
+      <source>Attribute "MultiRotationList" is not initialized.</source>
       <translation>Select objects to rotate</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "MultiRotationAngle" is not initialized.</source>
+      <source>Attribute "MultiRotationAngle" is not initialized.</source>
       <translation>Set rotation angle</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "MultiRotationObjects" is not initialized.</source>
+      <source>Attribute "MultiRotationObjects" is not initialized.</source>
       <translation>Set the number of resulting objects</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationList:SketchPlugin_CopyValidator</name>
     <message>
-      <source>MultiRotationList - SketchPlugin_CopyValidator: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationList:SketchPlugin_CopyValidator</name>
     <message>
-      <source>MultiRotationList - SketchPlugin_CopyValidator: The object %1 is a result of copy</source>
+      <source>The object %1 is a result of copy</source>
       <translation>The object %1 is a result of copy and can not be rotated</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationCenter:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiRotationCenter - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationCenter:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiRotationCenter - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The rotation center refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationCenter:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiRotationCenter - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The rotation center shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationCenter:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiRotationCenter - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationCenter:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiRotationCenter - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The rotation center refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiRotation:MultiRotationCenter:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiRotationCenter - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The rotation center refers to the empty shape</translation>
     </message>
   </context>
   
   <context>
-    <name>SketchMultiTranslation</name>
+    <name>SketchMultiTranslation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "MultiTranslationEndPoint" is not initialized.</source>
+      <source>Attribute "MultiTranslationEndPoint" is not initialized.</source>
       <translation>End point of translation vector is not defined</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "MultiTranslationList" is not initialized.</source>
+      <source>Attribute "MultiTranslationList" is not initialized.</source>
       <translation>Objects for translation are not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationEndPoint - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>End point of translation vector is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationStartPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationStartPoint - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Start point of translation vector is not selected</translation>
     </message>
-    
+
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationObjects:GeomValidators_Positive</name>
     <message>
-      <source>MultiTranslationObjects - GeomValidators_Positive: Double is not initialized.</source>
+      <source>Double is not initialized.</source>
       <translation>The total number of translated objects is not set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationObjects:GeomValidators_Positive</name>
     <message>
-      <source>MultiTranslationObjects - GeomValidators_Positive: Double is not positive.</source>
+      <source>Double is not positive.</source>
       <translation>The total number of translated objects must be positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationObjects:GeomValidators_Positive</name>
     <message>
-      <source>MultiTranslationObjects - GeomValidators_Positive: Integer is not initialized.</source>
+      <source>Integer is not initialized.</source>
       <translation>The total number of translated objects is not set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationObjects:GeomValidators_Positive</name>
     <message>
-      <source>MultiTranslationObjects - GeomValidators_Positive: Integer is not positive.</source>
+      <source>Integer is not positive.</source>
       <translation>The total number of translated objects must be positive</translation>
     </message>
 
+  </context>
+  <context>
+    <name>SketchMultiTranslation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "MultiTranslationStartPoint" is not initialized.</source>
+      <source>Attribute "MultiTranslationStartPoint" is not initialized.</source>
       <translation>Select a start point</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "MultiTranslationObjects" is not initialized.</source>
+      <source>Attribute "MultiTranslationObjects" is not initialized.</source>
       <translation>Select a total number of objects</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationList:SketchPlugin_CopyValidator</name>
     <message>
-      <source>MultiTranslationList - SketchPlugin_CopyValidator: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationList:SketchPlugin_CopyValidator</name>
     <message>
-      <source>MultiTranslationList - SketchPlugin_CopyValidator: The object %1 is a result of copy</source>
+      <source>The object %1 is a result of copy</source>
       <translation>The object %1 is a result of copy and can not be translated</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationStartPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationStartPoint - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationStartPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationStartPoint - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The translation start point refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationStartPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationStartPoint - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The translation start point shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationStartPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationStartPoint - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationStartPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationStartPoint - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Select a start point</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationStartPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationStartPoint - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The start point refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationStartPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationStartPoint - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The start point refers to the empty shape</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationEndPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationEndPoint - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationEndPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationEndPoint - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The translation end point refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationEndPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationEndPoint - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The translation end point shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationEndPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationEndPoint - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationEndPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationEndPoint - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Select an end point</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationEndPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationEndPoint - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The end point refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchMultiTranslation:MultiTranslationEndPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>MultiTranslationEndPoint - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The end point refers to the empty shape</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintAngle</name>
+    <name>SketchConstraintAngle:ConstraintFlyoutValuePnt</name>
     <message>
       <source>Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer.</source>
       <translation>Flyout value point is not clicked in the viewer</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Second object is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityB:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>An angle can not be created between two external objects</translation>
     </message>
-
+  </context>
+  <context>
+    <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "ConstraintEntityB" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "AngleValue" is not initialized.</source>
+      <source>Attribute "AngleValue" is not initialized.</source>
       <translation>Set the angle value</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "AngleType" is not initialized.</source>
+      <source>Attribute "AngleType" is not initialized.</source>
       <translation>Type of angle is not set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The first object refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The first object shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityA:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>Angle can not be created on two external entities</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The second object refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The second object shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintAngle:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintCoincidence</name>
+    <name>SketchConstraintCoincidence:ConstraintEntityA:PartSet_DifferentObjects</name>
     <message>
-      <source>ConstraintEntityA - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
+      <source>The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
       <translation>Diferent objects should be selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintCoincidence:ConstraintEntityB:PartSet_DifferentObjects</name>
     <message>
-      <source>ConstraintEntityB - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
+      <source>The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
       <translation>Diferent objects should be selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintCoincidence:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintCoincidence:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "ConstraintEntityB" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintCoincidence:ConstraintEntityB:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>A coincidence can not be created between two external objects</translation>
-    </message>    
-
+    </message>
+  </context>
+  <context>
+    <name>SketchConstraintCoincidence:ConstraintEntityA:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>A coincidence can not be created between two external objects</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintDistance</name>
+    <name>SketchConstraintDistance:ConstraintFlyoutValuePnt</name>
     <message>
       <source>Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer.</source>
       <translation>Flyout value point is not clicked in the viewer</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Second object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Double is not initialized.</source>
+      <source>Double is not initialized.</source>
       <translation>Distance value must be set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "ConstraintEntityB" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Double is not positive.</source>
+      <source>Double is not positive.</source>
       <translation>Distance value must be positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Integer is not initialized.</source>
+      <source>Integer is not initialized.</source>
       <translation>Integer distance value must be set</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Integer is not positive.</source>
+      <source>Integer is not positive.</source>
       <translation>Integer distance value must be positive</translation>
-    </message>    
-
+    </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "ConstraintEntityB" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintValue" is not initialized.</source>
+      <source>Attribute "ConstraintValue" is not initialized.</source>
       <translation>Set the distance</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityA:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>Distance can not be set between two external objects</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The first object refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The first object shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityB:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>Distance can not be set between two external objects</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The second object refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The second object shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintDistance:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintEqual</name>
+    <name>SketchConstraintEqual:ConstraintEntityA:PartSet_DifferentObjects</name>
     <message>
-      <source>ConstraintEntityA - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
+      <source>The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
       <translation>Diferent objects should be selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintEqual:ConstraintEntityB:PartSet_DifferentObjects</name>
     <message>
-      <source>ConstraintEntityB - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
+      <source>The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
       <translation>Diferent objects should be selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintEqual:ConstraintEntityB:SketchPlugin_EqualAttr</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_EqualAttr: An empty object is used.</source>
+      <source>An empty object is used.</source>
       <translation>An empty object is used</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintEqual:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintEqual:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "ConstraintEntityB" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintEqual:ConstraintEntityB:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>An equality can not be set between two external objects</translation>
-    </message>    
-
+    </message>
+  </context>
+  <context>
+    <name>SketchConstraintEqual:ConstraintEntityA:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>An equality can not be set between two external objects</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintLength</name>
+    <name>SketchConstraintLength:ConstraintFlyoutValuePnt</name>
     <message>
       <source>Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer.</source>
       <translation>Flyout value point is not clicked in the viewer</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Double is not initialized.</source>
+      <source>Double is not initialized.</source>
       <translation>Set the length value</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Line is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Double is not positive.</source>
+      <source>Double is not positive.</source>
       <translation>Length value is not positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Integer is not initialized.</source>
+      <source>Integer is not initialized.</source>
       <translation>Set the integer length value</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Integer is not positive.</source>
+      <source>Integer is not positive.</source>
       <translation>Integer length value is not positive</translation>
-    </message>    
+    </message>
 
+  </context>
+  <context>
+    <name>SketchConstraintLength:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintValue" is not initialized.</source>
+      <source>Attribute "ConstraintValue" is not initialized.</source>
       <translation>Set the length value</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The line refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The line shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintLength:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintMiddle</name>
+    <name>SketchConstraintMiddle:ConstraintEntityA:PartSet_DifferentObjects</name>
     <message>
-      <source>ConstraintEntityA - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
+      <source>The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
       <translation>Diferent objects should be selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMiddle:ConstraintEntityB:PartSet_DifferentObjects</name>
     <message>
-      <source>ConstraintEntityB - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
+      <source>The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
       <translation>Diferent objects should be selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMiddle:ConstraintEntityB:SketchPlugin_MiddlePointAttr</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_MiddlePointAttr: Middle point constraint allows points and lines only</source>
+      <source>Middle point constraint allows points and lines only</source>
       <translation>Not point or line is selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMiddle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintMiddle:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "ConstraintEntityB" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintMiddle:ConstraintEntityB:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>A middle can not be set for two external objects</translation>
     </message>
-
+  </context>
+  <context>
+    <name>SketchConstraintMiddle:ConstraintEntityA:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>A middle can not be set for two external objects</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintParallel</name>
+    <name>SketchConstraintParallel:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Second object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>First line is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "ConstraintEntityB" is not initialized.</source>
       <translation>Second line is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityB:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>A parallel can not be set between two external objects</translation>
     </message>
-
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The first line refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The first line shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityA:SketchPlugin_ExternalValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_ExternalValidator: Both features, attribute and attribute in parameter, are external.</source>
+      <source>Both features, attribute and attribute in parameter, are external.</source>
       <translation>A parallel can not be set between two external objects</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>Shape type must be %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The second line refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The second line shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The attribute with the %1 type is not processed</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The constraint argument refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintParallel:ConstraintEntityB:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityB - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The constraint argument refers to the empty shape</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintRigid</name>
+    <name>SketchConstraintRigid:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRigid:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Object is not selected</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>SketchConstraintRigid:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
       <translation>The fixed constraint references to not acceptable shape type. The type should be: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRigid:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The fixed constraint refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRigid:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The fixed constraint refers to %1 but must be %2</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRigid:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The fixed constraint of type %1 is not supported</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRigid:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The fixed constraint refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintRigid:ConstraintEntityA:GeomValidators_ShapeType</name>
     <message>
-      <source>ConstraintEntityA - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The fixed constraint refers to the empty shape</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintTangent</name>
+    <name>SketchConstraintTangent:ConstraintEntityA:PartSet_DifferentObjects</name>
     <message>
-      <source>ConstraintEntityA - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
+      <source>The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
       <translation>Diferent objects should be selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintTangent:ConstraintEntityB:PartSet_DifferentObjects</name>
     <message>
-      <source>ConstraintEntityB - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
+      <source>The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
       <translation>Diferent objects should be selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintTangent:ConstraintEntityB:SketchPlugin_TangentAttr</name>
     <message>
-      <source>ConstraintEntityB - SketchPlugin_TangentAttr: It uses an empty object</source>
+      <source>It uses an empty object</source>
       <translation>Selection is not valid</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintTangent:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>First object is not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintTangent:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <source>Attribute "ConstraintEntityB" is not initialized.</source>
       <translation>Second object is not selected</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintSplit</name>
+    <name>SketchConstraintSplit:ConstraintEntityA:SketchPlugin_SplitValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_SplitValidator: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>Only attribute selection can be used for the sketch face, not %1</translation>
     </message>
   </context>
 
   <context>
-    <name>SketchConstraintFillet</name>
+    <name>SketchConstraintFillet:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Double is not initialized.</source>
+      <source>Double is not initialized.</source>
       <translation>Set the fillet radius</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Double is not positive.</source>
+      <source>Double is not positive.</source>
       <translation>The fillet radius must be positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Integer is not initialized.</source>
+      <source>Integer is not initialized.</source>
       <translation>Set the integer fillet radius</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:ConstraintValue:GeomValidators_Positive</name>
     <message>
-      <source>ConstraintValue - GeomValidators_Positive: Integer is not positive.</source>
+      <source>Integer is not positive.</source>
       <translation>The integer fillet radius must be positive</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <source>Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Select one or several points for filet</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ConstraintValue" is not initialized.</source>
+      <source>Attribute "ConstraintValue" is not initialized.</source>
       <translation>Set the fillet radius</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:ConstraintEntityA:SketchPlugin_FilletVertexValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_FilletVertexValidator: Error: List of points is empty.</source>
+      <source>Error: List of points is empty.</source>
       <translation>List of points is empty</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:ConstraintEntityA:SketchPlugin_FilletVertexValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_FilletVertexValidator: Error: one of the selected point does not have coicidence.</source>
+      <source>Error: one of the selected point does not have coicidence.</source>
       <translation>One of the selected point does not have coicidence</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:ConstraintEntityA:SketchPlugin_FilletVertexValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_FilletVertexValidator: Error: One of the selected points does not have two suitable edges for fillet.</source>
+      <source>Error: One of the selected points does not have two suitable edges for fillet.</source>
       <translation>One of the selected points does not have two suitable edges for fillet</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:ConstraintEntityA:SketchPlugin_FilletVertexValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_FilletVertexValidator: Error: Edges in selected point has tangent constraint.</source>
+      <source>Error: Edges in selected point has tangent constraint.</source>
       <translation>Edges in selected point has tangent constraint</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchConstraintFillet:ConstraintEntityA:SketchPlugin_FilletVertexValidator</name>
     <message>
-      <source>ConstraintEntityA - SketchPlugin_FilletVertexValidator: Error: Edges in selected point has tangent constraint.</source>
+      <source>Error: Edges in selected point has tangent constraint.</source>
       <translation>Edges in selected point has tangent constraint</translation>
     </message>
   </context>
   
   <context>
-    <name>SketchProjection</name>
+    <name>SketchProjection:ExternalFeature:SketchPlugin_ProjectionValidator</name>
     <message>
-      <source>ExternalFeature - SketchPlugin_ProjectionValidator: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>An argument of type %1 of the projection feature is not supported</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchProjection:ExternalFeature:SketchPlugin_ProjectionValidator</name>
     <message>
-      <source>ExternalFeature - SketchPlugin_ProjectionValidator: The attribute %1 should be an edge</source>
+      <source>The attribute %1 should be an edge</source>
       <translation>The projected item must be an edge</translation>
     </message>
+  </context>
+  <context>
+    <name>SketchProjection:ExternalFeature:SketchPlugin_ProjectionValidator</name>
     <message>
-      <source>ExternalFeature - SketchPlugin_ProjectionValidator: There is no sketch referring to the current feature</source>
+      <source>There is no sketch referring to the current feature</source>
       <translation>The projection feature has no sketch</translation>
     </message>
   </context>
   
   <context>
-    <name>SketchProjection</name>
+    <name>SketchProjection:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "ExternalFeature" is not initialized.</source>
+      <source>Attribute "ExternalFeature" is not initialized.</source>
       <translation></translation>
     </message>
   </context>