Issue #1005: To improve user-friendship of error-messages for features and attributes

Improved translations.

diff --git a/src/BuildPlugin/BuildPlugin_msg_en.ts b/src/BuildPlugin/BuildPlugin_msg_en.ts
index d37e172a7297350903d4de091011e807e0fd3fd1..025babe9398fa53bd37c04bb37e43517654ef94d 100644 (file)
--- a/src/BuildPlugin/BuildPlugin_msg_en.ts
+++ b/src/BuildPlugin/BuildPlugin_msg_en.ts
@@ -2,280 +2,448 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="en_US">
   <context>
-    <name>Edge</name>
+    <name>Edge:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Could not get selection list.</source>
+      <source>Could not get selection list.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Edge:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Empty selection list.</source>
+      <source>Empty selection list.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Edge:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Could not get selection.</source>
-      <translation>Selected object is empty.</translation>
+      <source>Could not get selection.</source>
+      <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Edge:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Attribute have empty context.</source>
-      <translation>Selected object has empty context.</translation>
+      <source>Attribute have empty context.</source>
+      <translation>Selected object not valid.</translation>
     </message>
+  </context>
+  <context>
+    <name>Edge:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Empty shape selected.</source>
+      <source>Empty shape selected.</source>
       <translation>Empty shape selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Edge:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Inifinte objects not acceptable.</source>
+      <source>Inifinte objects not acceptable.</source>
       <translation>Inifinte objects not acceptable.</translation>
     </message>
+  </context>
+  <context>
+    <name>Edge:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
-    </message>    
-    
+    </message>
+  </context>
+  <context>
+    <name>Edge:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_objects" is not initialized.</source>
+      <source>Attribute "base_objects" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
   </context>
 
   <context>
-    <name>Face</name>
+    <name>Face:BuildPlugin_ValidatorBaseForFace</name>
     <message>
-      <source>BuildPlugin_ValidatorBaseForFace: Empty attribute \"%1\".</source>
+      <source>Empty attribute \"%1\".</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:BuildPlugin_ValidatorBaseForFace</name>
     <message>
-      <source>BuildPlugin_ValidatorBaseForFace: Error while checking if edges intersects.</source>
+      <source>Error while checking if edges intersects.</source>
       <translation>Error while checking if edges intersects.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:BuildPlugin_ValidatorBaseForFace</name>
     <message>
-      <source>BuildPlugin_ValidatorBaseForFace: Selected objects have intersections.</source>
+      <source>Selected objects have intersections.</source>
       <translation>Selected objects have intersections.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:BuildPlugin_ValidatorBaseForFace</name>
     <message>
-      <source>BuildPlugin_ValidatorBaseForFace: Selected objects are not planar.</source>
+      <source>Selected objects are not planar.</source>
       <translation>Selected objects are not planar.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:BuildPlugin_ValidatorBaseForFace</name>
     <message>
-      <source>BuildPlugin_ValidatorBaseForFace: Selected objects does not have closed contours.</source>
+      <source>Selected objects does not have closed contours.</source>
       <translation>Selected objects does not have closed contours.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Face:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_objects" is not initialized.</source>
+      <source>Attribute "base_objects" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Could not get selection list.</source>
-      <translation></translation>
+      <source>Could not get selection list.</source>
+      <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Empty selection list.</source>
+      <source>Empty selection list.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Could not get selection.</source>
-      <translation></translation>
+      <source>Could not get selection.</source>
+      <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Attribute have empty context.</source>
-      <translation></translation>
+      <source>Attribute have empty context.</source>
+      <translation>Selected object not valid.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Empty shape selected.</source>
-      <translation></translation>
+      <source>Empty shape selected.</source>
+      <translation>Empty shape selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Inifinte objects not acceptable.</source>
+      <source>Inifinte objects not acceptable.</source>
       <translation>Inifinte objects not acceptable.</translation>
     </message>
+  </context>
+  <context>
+    <name>Face:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
   </context>
 
   <context>
-    <name>Shell</name>
+    <name>Shell:base_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>base_objects - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Shell:base_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>base_objects - GeomValidators_ShapeType: It has reference to an empty attribute</source>
-      <translation>It has reference to an empty attribute</translation>
+      <source>It has reference to an empty attribute</source>
+      <translation>Selected object not valid.</translation>
     </message>
+  </context>
+  <context>
+    <name>Shell:base_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>base_objects - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>Shell:base_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>base_objects - 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>Shell:base_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>base_objects - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Shell:base_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>base_objects - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Shell:base_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>base_objects - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>Objects not selected.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Shell:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_objects" is not initialized.</source>
+      <source>Attribute "base_objects" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
   </context>
 
-
   <context>
-    <name>SubShapes</name>
+    <name>SubShapes:subshapes:BuildPlugin_ValidatorSubShapesSelection</name>
     <message>
-      <source>subshapes - BuildPlugin_ValidatorSubShapesSelection: Could not get selection list.</source>
+      <source>Could not get selection list.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:subshapes:BuildPlugin_ValidatorSubShapesSelection</name>
     <message>
-      <source>subshapes - BuildPlugin_ValidatorSubShapesSelection: Base shape is empty.</source>
+      <source>Base shape is empty.</source>
       <translation>Base shape not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:subshapes:BuildPlugin_ValidatorSubShapesSelection</name>
     <message>
-      <source>subshapes - BuildPlugin_ValidatorSubShapesSelection: Empty attribute in list.</source>
-      <translation>Objects not selected.</translation>
+      <source>Empty attribute in list.</source>
+      <translation>Selected object not valid.</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:subshapes:BuildPlugin_ValidatorSubShapesSelection</name>
     <message>
-      <source>subshapes - BuildPlugin_ValidatorSubShapesSelection: Selected shape has unacceptable type.</source>
+      <source>Selected shape has unacceptable type.</source>
       <translation>Selected shape has unacceptable type.</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:subshapes:BuildPlugin_ValidatorSubShapesSelection</name>
     <message>
-      <source>subshapes - BuildPlugin_ValidatorSubShapesSelection: Selected shape is not inside base face.</source>
+      <source>Selected shape is not inside base face.</source>
       <translation>Selected shape is not inside base.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>SubShapes:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_shape" is not initialized.</source>
-      <translation>Objects not selected.</translation>
+      <source>Attribute "base_shape" is not initialized.</source>
+      <translation>Base shape not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "subshapes" is not initialized.</source>
-      <translation>Objects not selected.</translation>
+      <source>Attribute "subshapes" is not initialized.</source>
+      <translation>Sub-shapes not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
-      <translation>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <translation>Base shape should be one of the next type: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: It has reference to an empty attribute</source>
-      <translation></translation>
+      <source>It has reference to an empty attribute</source>
+      <translation>Selected object not valid.</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Base shape not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>Base shape not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>Base shape not selected.</translation>
     </message>
   </context>
 
   <context>
-    <name>Vertex</name>
+    <name>Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Could not get selection list.</source>
+      <source>Could not get selection list.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
+    <message>
+      <source>Empty selection list.</source>
+      <translation>Objects not selected.</translation>
+    </message>
+  </context>
+  <context>
+    <name>Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Empty selection list.</source>
+      <source>Empty selection list.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Could not get selection.</source>
+      <source>Could not get selection.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Attribute have empty context.</source>
-      <translation>Selected object has empty context.</translation>
+      <source>Attribute have empty context.</source>
+      <translation>Selected object not valid.</translation>
     </message>
+  </context>
+  <context>
+    <name>Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Empty shape selected.</source>
+      <source>Empty shape selected.</source>
       <translation>Empty shape selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Inifinte objects not acceptable.</source>
+      <source>Inifinte objects not acceptable.</source>
       <translation>Inifinte objects not acceptable.</translation>
     </message>
+  </context>
+  <context>
+    <name>Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Vertex:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_objects" is not initialized.</source>
+      <source>Attribute "base_objects" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
   </context>
 
   <context>
-    <name>Wire</name>
+    <name>Wire:BuildPlugin_ValidatorBaseForWire</name>
     <message>
-      <source>BuildPlugin_ValidatorBaseForWire: Empty attribute \"%1\".</source>
+      <source>Empty attribute \"%1\".</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Wire:BuildPlugin_ValidatorBaseForWire</name>
     <message>
-      <source>BuildPlugin_ValidatorBaseForWire: Result wire empty. Probably it has disconnected edges or non-manifold.</source>
+      <source>Result wire empty. Probably it has disconnected edges or non-manifold.</source>
       <translation>Result wire empty. Probably it has disconnected edges or non-manifold.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Wire:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_objects" is not initialized.</source>
+      <source>Attribute "base_objects" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Wire</name>
     <message>
       <source>Model_FeatureValidator: Attribute "add_contour" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Wire:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Could not get selection list.</source>
+      <source>Could not get selection list.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Wire:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Empty selection list.</source>
+      <source>Empty selection list.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Wire:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Could not get selection.</source>
+      <source>Could not get selection.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Wire:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Attribute have empty context.</source>
+      <source>Attribute have empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Wire:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Empty shape selected.</source>
+      <source>Empty shape selected.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Wire:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Inifinte objects not acceptable.</source>
+      <source>Inifinte objects not acceptable.</source>
       <translation>Inifinte objects not acceptable.</translation>
     </message>
+  </context>
+  <context>
+    <name>Wire:base_objects:BuildPlugin_ValidatorBaseForBuild</name>
     <message>
-      <source>base_objects - BuildPlugin_ValidatorBaseForBuild: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
   </context>

diff --git a/src/CollectionPlugin/CollectionPlugin_msg_en.ts b/src/CollectionPlugin/CollectionPlugin_msg_en.ts
index 4e73b5b4af284cecad5e85776723c572253ddeed..8c403d24879132c34d2a600e08a88a7affd3406a 100644 (file)
--- a/src/CollectionPlugin/CollectionPlugin_msg_en.ts
+++ b/src/CollectionPlugin/CollectionPlugin_msg_en.ts
@@ -3,22 +3,30 @@
 <TS version="2.0" language="en_US">
 
   <context>
-    <name>Group</name>
+    <name>Group:group_list:GeomValidators_BodyShapes</name>
     <message>
-      <source>group_list - GeomValidators_BodyShapes: Error: Context is empty.</source>
+      <source>Error: Context is empty.</source>
       <translation>Selected object has empty context.</translation>
     </message>
+  </context>
+  <context>
+    <name>Group:group_list:GeomValidators_BodyShapes</name>
     <message>
-      <source>group_list - GeomValidators_BodyShapes: Error: Result construction selected.</source>
+      <source>Error: Result construction selected.</source>
       <translation>Constructions not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Group:group_list:GeomValidators_BodyShapes</name>
     <message>
-      <source>group_list - GeomValidators_BodyShapes: Error: Attribute \"%1\" does not supported by this validator.</source>
+      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
       <translation>Attribute "%1" does not supported by "GeomValidators_BodyShapes" validator.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Group:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "group_list" is not initialized.</source>
+      <source>Attribute "group_list" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
   </context>

diff --git a/src/Config/Config_Translator.h b/src/Config/Config_Translator.h
index 9359085fa4e6f75c536058c7e60259b08993de5f..23c6f1850c8fcfe8f9579498d91855554c08f9c6 100644 (file)
--- a/src/Config/Config_Translator.h
+++ b/src/Config/Config_Translator.h
@@ -15,7 +15,7 @@
 
 
 /// The definition provides collection and writing of missed translations
-#define MISSED_TRANSLATION
+//#define MISSED_TRANSLATION
 
 /**
  * \class Config_Translator

diff --git a/src/ConstructionPlugin/ConstructionPlugin_msg_en.ts b/src/ConstructionPlugin/ConstructionPlugin_msg_en.ts
index 886162cda255571cc5a248b269ddd0b29dc68411..c09bc99303cf260a184108935b9860952fe06ba4 100644 (file)
--- a/src/ConstructionPlugin/ConstructionPlugin_msg_en.ts
+++ b/src/ConstructionPlugin/ConstructionPlugin_msg_en.ts
@@ -1,170 +1,279 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="en_US">
+
   <context>
-    <name>Axis</name>
+    <name>Axis:CylindricalFace:GeomValidators_Face</name>
     <message>
-      <source>CylindricalFace - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The axis by face references to not acceptable shape type. The type should be: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:CylindricalFace:GeomValidators_Face</name>
     <message>
-      <source>CylindricalFace - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>The axis by face can be created only on a face</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:CylindricalFace:GeomValidators_Face</name>
     <message>
-      <source>CylindricalFace - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>The axis by face can be created only on a planar face</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:CylindricalFace:GeomValidators_Face</name>
     <message>
-      <source>CylindricalFace - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation>The axis by face can be created only on a cylindrical face</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:CylindricalFace:GeomValidators_Face</name>
     <message>
-      <source>CylindricalFace - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation>The axis by a face cannot be created on the selected face</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "FirstPoint" is not initialized.</source>
+      <source>Attribute "FirstPoint" is not initialized.</source>
       <translation>Select the first point</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "SecondPoint" is not initialized.</source>
+      <source>Attribute "SecondPoint" is not initialized.</source>
       <translation>Select the second point</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "CylindricalFace" is not initialized.</source>
+      <source>Attribute "CylindricalFace" is not initialized.</source>
       <translation>Select the cylindrical face</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ConstructionComposite</name>
     <message>
-      <source>FirstPoint - GeomValidators_ConstructionComposite: 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 first point, not %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ConstructionComposite</name>
     <message>
-      <source>FirstPoint - GeomValidators_ConstructionComposite: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The first point refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ConstructionComposite</name>
     <message>
-      <source>FirstPoint - GeomValidators_ConstructionComposite: Uses composite construction feature without sub-features.</source>
+      <source>Uses composite construction feature without sub-features.</source>
       <translation>The first point uses composite construction feature without sub-features</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>FirstPoint - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
-      <translation>THe first point does not contain element with acceptable shape type. The type should be: %1</translation>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: %1</source>
+      <translation>The first point does not contain element with acceptable shape type. The type should be: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>FirstPoint - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The first point refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>FirstPoint - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The first point refers to %1 but must be %2</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>FirstPoint - 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 point of type %1 is not supported</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>FirstPoint - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>The first point refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>FirstPoint - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The first point refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:FirstPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>FirstPoint - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The first point refers to the empty shape</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_ConstructionComposite</name>
     <message>
-      <source>SecondPoint - GeomValidators_ConstructionComposite: 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 second point, not %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_ConstructionComposite</name>
     <message>
-      <source>SecondPoint - GeomValidators_ConstructionComposite: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The second point refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_ConstructionComposite</name>
     <message>
-      <source>SecondPoint - GeomValidators_ConstructionComposite: Uses composite construction feature without sub-features.</source>
+      <source>Uses composite construction feature without sub-features.</source>
       <translation>The second point uses composite construction feature without sub-features</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>SecondPoint - 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 point does not contain element with acceptable shape type. The type should be: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>SecondPoint - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>The second point refers to nothing</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPointGeomValidators_ShapeType</name>
     <message>
-      <source>SecondPoint - GeomValidators_ShapeType: Shape type is "%1", it should be "%2"</source>
+      <source>Shape type is "%1", it should be "%2"</source>
       <translation>The second point refers to %1 but must be %2</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>SecondPoint - 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 point of type %1 is not supported</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>SecondPoint - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>The second point refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>SecondPoint - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>The second point refers to not existing item</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_ShapeType</name>
     <message>
-      <source>SecondPoint - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>The second point refers to the empty shape</translation>
     </message>
+  </context>
+  <context>
+    <name>Axis:SecondPoint:GeomValidators_DifferentShapes</name>
     <message>
-      <source>SecondPoint - GeomValidators_DifferentShapes: The feature uses equal shapes.</source>
+      <source>The feature uses equal shapes.</source>
       <translation>The axis points must be different</translation>
     </message>
   </context>
-  
+
   <context>
-    <name>Plane</name>
+    <name>Plane:planeFace:GeomValidators_Face</name>
     <message>
-      <source>planeFace - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation>The plane references to not acceptable shape type. The type should be: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Plane:planeFace:GeomValidators_Face</name>
     <message>
-      <source>planeFace - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>The plane can be created only on a face</translation>
     </message>
+  </context>
+  <context>
+    <name>Plane:planeFace:GeomValidators_Face</name>
     <message>
-      <source>planeFace - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>The plane can be created only on a planar face</translation>
     </message>
+  </context>
+  <context>
+    <name>Plane:planeFace:GeomValidators_Face</name>
     <message>
-      <source>planeFace - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation>The plane can be created only on a cylindrical face</translation>
     </message>
+  </context>
+  <context>
+    <name>Plane:planeFace:GeomValidators_Face</name>
     <message>
-      <source>planeFace - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation>The plane cannot be created on the selected face</translation>
     </message>
+  </context>
+  <context>
+    <name>Plane:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "planeFace" is not initialized.</source>
+      <source>Attribute "planeFace" is not initialized.</source>
       <translation>Select the plane face</translation>
     </message>
+  </context>
+  <context>
+    <name>Plane:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "distance" is not initialized.</source>
+      <source>Attribute "distance" is not initialized.</source>
       <translation>Set the distance</translation>
     </message>
   </context>
-  
+
   <context>
-    <name>Point</name>
+    <name>Point:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "x" is not initialized.</source>
+      <source>Attribute "x" is not initialized.</source>
       <translation>Select the x coordinate</translation>
     </message>
+  </context>
+  <context>
+    <name>Point:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "y" is not initialized.</source>
+      <source>Attribute "y" is not initialized.</source>
       <translation>Select the y coordinate</translation>
     </message>
+  </context>
+  <context>
+    <name>Point:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "z" is not initialized.</source>
+      <source>Attribute "z" is not initialized.</source>
       <translation>Select the z coordinate</translation>
     </message>
   </context>

diff --git a/src/ExchangePlugin/ExchangePlugin_msg_en.ts b/src/ExchangePlugin/ExchangePlugin_msg_en.ts
index accc1d17a0a69c5e3881b114f10a0ea4619815f5..9afb36bb1801d6ca964b8d0ba50a311732348e58 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_msg_en.ts
+++ b/src/ExchangePlugin/ExchangePlugin_msg_en.ts
@@ -1,54 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="en_US">
+
   <context>
-    <name>Import</name>
+    <name>Import:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "file_path" is not initialized.</source>
+      <source>Attribute "file_path" is not initialized.</source>
       <translation>Input file name for import</translation>
     </message>
+  </context>
+  <context>
+    <name>Import:file_path:ExchangePlugin_ImportFormat</name>
     <message>
-      <source>file_path - ExchangePlugin_ImportFormat: File name is empty.</source>
+      <source>File name is empty.</source>
       <translation>Input file name for import</translation>
     </message>
   </context>
-  
+
   <context>
-    <name>Export</name>
+    <name>Export:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "file_format" is not initialized.</source>
+      <source>Attribute "file_format" is not initialized.</source>
       <translation>Export file name is not defined</translation>
     </message>
+  </context>
+  <context>
+    <name>Export:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "selection_list" is not initialized.</source>
+      <source>Attribute "selection_list" is not initialized.</source>
       <translation>Objects for export are not selected</translation>
     </message>
+  </context>
+  <context>
+    <name>Export:file_path:ExchangePlugin_ExportFormat</name>
     <message>
-      <source>file_path - ExchangePlugin_ExportFormat: File name is empty.</source>
+      <source>File name is empty.</source>
       <translation>Export file name is not defined</translation>
     </message>
+  </context>
+  <context>
+    <name>Export:selection_list:GeomValidators_Finite</name>
     <message>
-      <source>selection_list - GeomValidators_Finite: Infinite result is selected.</source>
+      <source>Infinite result is selected.</source>
       <translation>Olny finitive shapes can be exported</translation>
-    </message>    
+    </message>
+  </context>
+  <context>
+    <name>Export:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "file_path" is not initialized.</source>
+      <source>Attribute "file_path" is not initialized.</source>
       <translation>Define the path of the exported file</translation>
     </message>
+  </context>
+  <context>
+    <name>Export:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "selection_list" is not initialized.</source>
+      <source>Attribute "selection_list" is not initialized.</source>
       <translation>Select the exported shapes</translation>
     </message>
+  </context>
+  <context>
+    <name>Export:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "xao_file_path" is not initialized.</source>
+      <source>Attribute "xao_file_path" is not initialized.</source>
       <translation>Define the path of the exported XAO file</translation>
     </message>
+  </context>
+  <context>
+    <name>Export:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "xao_author" is not initialized.</source>
+      <source>Attribute "xao_author" is not initialized.</source>
       <translation>Set the XAO file author</translation>
     </message>
+  </context>
+  <context>
+    <name>Export:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "xao_geometry_name" is not initialized.</source>
+      <source>Attribute "xao_geometry_name" is not initialized.</source>
       <translation>Set the XAO file geometry name</translation>
     </message>
   </context>

diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts
index eaf0e9ff7ce8f49f9e09c4c440951fae1b470090..cb35243414dcdb2a7efd1880de6772cf626fcb95 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts
+++ b/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts
@@ -1,2207 +1,3701 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="en_US">
+
   <context>
-    <name>Extrusion</name>
+    <name>Extrusion:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: FromSize = -ToSize and bounding planes are coincident.</source>
+      <source>FromSize = -ToSize and bounding planes are coincident.</source>
       <translation>FromSize = -ToSize and bounding planes are coincident.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base" is not initialized.</source>
+      <source>Attribute "base" is not initialized.</source>
       <translation>Base object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Object is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: ToSize = -FromSize.</source>
+      <source>ToSize = -FromSize.</source>
       <translation>ToSize = -FromSize.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Extrusion:FeaturesPlugin_ValidatorExtrusionDir</name>
     <message>
-      <source>FeaturesPlugin_ValidatorExtrusionDir: Error: Validator should be used with 2 parameters for extrusion.</source>
+      <source>Error: Validator should be used with 2 parameters for extrusion.</source>
       <translation>Validator "FeaturesPlugin_ValidatorExtrusionDir" should be used with 2 parameters for extrusion.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:FeaturesPlugin_ValidatorExtrusionDir</name>
     <message>
-      <source>FeaturesPlugin_ValidatorExtrusionDir: Error: Direction is parallel to one of the selected face or face on selected shell.</source>
+      <source>Error: Direction is parallel to one of the selected face or face on selected shell.</source>
       <translation>Direction is parallel to one of the selected face or face on selected shell.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "sketch" is not initialized.</source>
+      <source>Attribute "sketch" is not initialized.</source>
       <translation>Base object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base" is not initialized.</source>
+      <source>Attribute "base" is not initialized.</source>
       <translation>Base object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "direction_object" is not initialized.</source>
+      <source>Attribute "direction_object" is not initialized.</source>
       <translation>Direction object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_size" is not initialized.</source>
+      <source>Attribute "to_size" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_size" is not initialized.</source>
+      <source>Attribute "from_size" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_object" is not initialized.</source>
+      <source>Attribute "from_object" is not initialized.</source>
       <translation>From object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_offset" is not initialized.</source>
+      <source>Attribute "from_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_object" is not initialized.</source>
+      <source>Attribute "to_object" is not initialized.</source>
       <translation>To object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_offset" is not initialized.</source>
+      <source>Attribute "to_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: The attribute with the %1 type is not processed</source>
+      <source>Error: The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: Wrong parameters in XML definition for %1 type</source>
+      <source>Error: Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Wrong parameters in XML definition for %1 type</source>
+      <source>Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Validator parameters is empty.</source>
+      <source>Error: Validator parameters is empty.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute contains unacceptable shape.</source>
+      <source>Error: Attribute contains unacceptable shape.</source>
       <translation>Shape with unacceptable type selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Compound should contain only faces and edges.</source>
+      <source>Error: Compound should contain only faces and edges.</source>
       <translation>Compound should contain only faces and edges.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
+      <source>Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
       <translation>Object from this sketch is already selected. Sketch is not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
+      <source>Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
       <translation>Whole sketch with this object is already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Wire with wrong orientation selected.</source>
+      <source>Error: Wire with wrong orientation selected.</source>
       <translation>Wire with wrong orientation selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Objects with such wire already selected. Don't allow to select this object.</source>
+      <source>Error: Objects with such wire already selected. Don't allow to select this object.</source>
       <translation>Objects with such wire already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty attribute.</source>
+      <source>Error: Empty attribute.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute have empty context.</source>
+      <source>Error: Attribute have empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty shape selected</source>
+      <source>Error: Empty shape selected</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Infinite constructions is not allowed as base.</source>
+      <source>Error: Infinite constructions is not allowed as base.</source>
       <translation>Infinite constructions is not allowed as base.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Error: Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
+      <source>Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:base :FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute \"%1\" does not supported by this validator.</source>
+      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Direction object not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>Direction object not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>Direction object not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a cylinder.</source>
-      <translation></translation>
+      <source>The shape is not a cylinder.</source>
+      <translation>The shape is not a cylinder.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not an available face.</source>
-      <translation></translation>
+      <source>The shape is not an available face.</source>
+      <translation>The shape is not an available face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a cylinder.</source>
-      <translation></translation>
+      <source>The shape is not a cylinder.</source>
+      <translation>The shape is not a cylinder.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not an available face.</source>
-      <translation></translation>
+      <source>The shape is not an available face.</source>
+      <translation>The shape is not an available face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: Wrong number of validator arguments in xml(expected 9).</source>
-      <translation></translation>
+      <source>Wrong number of validator arguments in xml(expected 9).</source>
+      <translation>Wrong number of validator arguments in xml(expected 9).</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: ToSize = -FromSize.</source>
+      <source>ToSize = -FromSize.</source>
       <translation>ToSize = -FromSize.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: From face selection is invalid.</source>
+      <source>From face selection is invalid.</source>
       <translation>From face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: To face selection is invalid.</source>
+      <source>To face selection is invalid.</source>
       <translation>To face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: From face selection is invalid.</source>
+      <source>From face selection is invalid.</source>
       <translation>From face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: To face selection is invalid.</source>
+      <source>To face selection is invalid.</source>
       <translation>To face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: FromSize = -ToSize and bounding planes are coincident.</source>
+      <source>FromSize = -ToSize and bounding planes are coincident.</source>
       <translation>FromSize = -ToSize and bounding planes are coincident.</translation>
     </message>
+  </context>
+  <context>
+    <name>Extrusion:FeaturesPlugin_ValidatorExtrusionDir</name>
     <message>
-      <source>FeaturesPlugin_ValidatorExtrusionDir: Error: Base objects list contains vertex or edge, so attribute "direction_object" can not be used with default value. Select direction for extrusion.</source>
+      <source>Error: Base objects list contains vertex or edge, so attribute "direction_object" can not be used with default value. Select direction for extrusion.</source>
       <translation>Base objects list contains vertex or edge, so default direction cannot be used. Select direction for extrusion.</translation>
     </message>
   </context>
-  
+
   <context>
-    <name>ExtrusionCut</name>
+    <name>ExtrusionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: FromSize = -ToSize and bounding planes are coincident.</source>
+      <source>FromSize = -ToSize and bounding planes are coincident.</source>
       <translation>FromSize = -ToSize and bounding planes are coincident.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base" is not initialized.</source>
+      <source> Attribute "base" is not initialized.</source>
       <translation>Base object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: </source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: </source>
       <translation>Selected objects contain element with unacceptable shape type.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Object is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The result is empty</source>
+      <source>The result is empty</source>
       <translation>Object is not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>ExtrusionCut:FeaturesPlugin_ValidatorExtrusionDir</name>
     <message>
-      <source>FeaturesPlugin_ValidatorExtrusionDir: Error: Validator should be used with 2 parameters for extrusion.</source>
+      <source>Error: Validator should be used with 2 parameters for extrusion.</source>
       <translation>Validator "FeaturesPlugin_ValidatorExtrusionDir" should be used with 2 parameters for extrusion.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:FeaturesPlugin_ValidatorExtrusionDir</name>
     <message>
-      <source>FeaturesPlugin_ValidatorExtrusionDir: Error: Direction is parallel to one of the selected face or face on selected shell.</source>
+      <source>Error: Direction is parallel to one of the selected face or face on selected shell.</source>
       <translation>Direction is parallel to one of the selected face or face on selected shell.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "sketch" is not initialized.</source>
+      <source>Attribute "sketch" is not initialized.</source>
       <translation>Base object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "direction_object" is not initialized.</source>
+      <source>Attribute "direction_object" is not initialized.</source>
       <translation>Direction object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_size" is not initialized.</source>
+      <source>Attribute "to_size" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_size" is not initialized.</source>
+      <source>Attribute "from_size" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_object" is not initialized.</source>
+      <source>Attribute "from_object" is not initialized.</source>
       <translation>From object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_offset" is not initialized.</source>
+      <source>Attribute "from_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_object" is not initialized.</source>
+      <source>Attribute "to_object" is not initialized.</source>
       <translation>To object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_offset" is not initialized.</source>
-      <translation></translation>
+      <source>Attribute "to_offset" is not initialized.</source>
+      <translation>Enter "To" offset.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "main_objects" is not initialized.</source>
+      <source>Attribute "main_objects" is not initialized.</source>
       <translation>Objects for cut are not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: The attribute with the %1 type is not processed</source>
+      <source>Error: The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: Wrong parameters in XML definition for %1 type</source>
+      <source>Error: Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Wrong parameters in XML definition for %1 type</source>
+      <source>Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Validator parameters is empty.</source>
+      <source>Error: Validator parameters is empty.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute contains unacceptable shape.</source>
+      <source>Error: Attribute contains unacceptable shape.</source>
       <translation>Shape with unacceptable type selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Compound should contain only faces and edges.</source>
+      <source>Error: Compound should contain only faces and edges.</source>
       <translation>Compound should contain only faces and edges.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
+      <source>Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
       <translation>Object from this sketch is already selected. Sketch is not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
+      <source>Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
       <translation>Whole sketch with this object is already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Wire with wrong orientation selected.</source>
+      <source>Error: Wire with wrong orientation selected.</source>
       <translation>Wire with wrong orientation selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Objects with such wire already selected. Don't allow to select this object.</source>
+      <source>Error: Objects with such wire already selected. Don't allow to select this object.</source>
       <translation>Objects with such wire already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty attribute.</source>
-      <translation></translation>
+      <source>Error: Empty attribute.</source>
+      <translation>Select base objects.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut</name>
     <message>
       <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute have empty context.</source>
-      <translation></translation>
+      <translation>Selected object is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty shape selected</source>
-      <translation></translation>
+      <source>Error: Empty shape selected</source>
+      <translation>Error: Empty shape selected</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Infinite constructions is not allowed as base.</source>
+      <source>Error: Infinite constructions is not allowed as base.</source>
       <translation>Infinite constructions is not allowed as base.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Error: Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
+      <source>Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute \"%1\" does not supported by this validator.</source>
+      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: Wrong number of validator arguments in xml(expected 9).</source>
+      <source>Wrong number of validator arguments in xml(expected 9).</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: ToSize = -FromSize.</source>
+      <source>ToSize = -FromSize.</source>
       <translation>ToSize = -FromSize.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: From face selection is invalid.</source>
+      <source>From face selection is invalid.</source>
       <translation>From face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: To face selection is invalid.</source>
+      <source>To face selection is invalid.</source>
       <translation>To face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: From face selection is invalid.</source>
+      <source>From face selection is invalid.</source>
       <translation>From face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: To face selection is invalid.</source>
+      <source>To face selection is invalid.</source>
       <translation>To face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: FromSize = -ToSize and bounding planes are coincident.</source>
+      <source>FromSize = -ToSize and bounding planes are coincident.</source>
       <translation>FromSize = -ToSize and bounding planes are coincident.</translation>
     </message>
   </context>
-  
   <context>
-    <name>Revolution</name>
-    <message>
-      <source>GeomValidators_ZeroOffset: FromSize = -ToSize and bounding planes are coincident.</source>
-      <translation>FromAngle = -ToAngle and bounding planes are coincident.</translation>
-    </message>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "axis_object" is not initialized.</source>
+      <source>Attribute "axis_object" is not initialized.</source>
       <translation>Revolution axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Revolution axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Object is not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Revolution:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: Wrong number of validator arguments in xml(expected 9).</source>
+      <source>Wrong number of validator arguments in xml(expected 9).</source>
       <translation>Wrong number of validator "GeomValidators_ZeroOffset" arguments in xml(expected 9).</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: ToSize = -FromSize.</source>
+      <source>ToSize = -FromSize.</source>
       <translation>ToAngle = -FromAngle.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: From face selection is invalid.</source>
+      <source>From face selection is invalid.</source>
       <translation>From face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>GeomValidators_ZeroOffset: To face selection is invalid.</source>
-      <translation>To face selection is invalid.</translation>
-    </message>
-
-    <message>
-      <source>Model_FeatureValidator: Attribute "sketch" is not initialized.</source>
+      <source>Attribute "sketch" is not initialized.</source>
       <translation>Base object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base" is not initialized.</source>
+      <source>Attribute "base" is not initialized.</source>
       <translation>Base object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "axis_object" is not initialized.</source>
+      <source>Attribute "axis_object" is not initialized.</source>
       <translation>Axis object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_angle" is not initialized.</source>
+      <source>Attribute "to_angle" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_angle" is not initialized.</source>
+      <source>Attribute "from_angle" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_object" is not initialized.</source>
+      <source>Attribute "from_object" is not initialized.</source>
       <translation>From object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_offset" is not initialized.</source>
+      <source>Attribute "from_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_object" is not initialized.</source>
+      <source>Attribute "to_object" is not initialized.</source>
       <translation>To object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_offset" is not initialized.</source>
+      <source>Attribute "to_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: The attribute with the %1 type is not processed</source>
+      <source>Error: The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: Wrong parameters in XML definition for %1 type</source>
+      <source>Error: Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Wrong parameters in XML definition for %1 type</source>
+      <source>Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Validator parameters is empty.</source>
+      <source>Error: Validator parameters is empty.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute contains unacceptable shape.</source>
+      <source>Error: Attribute contains unacceptable shape.</source>
       <translation>Shape with unacceptable type selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Compound should contain only faces and edges.</source>
+      <source>Error: Compound should contain only faces and edges.</source>
       <translation>Compound should contain only faces and edges.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
+      <source>Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
       <translation>Object from this sketch is already selected. Sketch is not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
+      <source>Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
       <translation>Whole sketch with this object is already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Wire with wrong orientation selected.</source>
+      <source>Error: Wire with wrong orientation selected.</source>
       <translation>Wire with wrong orientation selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Objects with such wire already selected. Don't allow to select this object.</source>
+      <source>Error: Objects with such wire already selected. Don't allow to select this object.</source>
       <translation>Objects with such wire already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty attribute.</source>
+      <source>Error: Empty attribute.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute have empty context.</source>
+      <source>Error: Attribute have empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty shape selected</source>
+      <source>Error: Empty shape selected</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Infinite constructions is not allowed as base.</source>
+      <source>Error: Infinite constructions is not allowed as base.</source>
       <translation>Infinite constructions is not allowed as base.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Error: Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
+      <source>Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute \"%1\" does not supported by this validator.</source>
+      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:to_object:GeomValidators_Face</name>
+    <message>
+      <source>The shape is not a face.</source>
+      <translation>"To" should be a planar face.</translation>
+    </message>
+  </context>
+  <context>
+    <name>Revolution:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Revolution:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
   </context>
-  
   <context>
-    <name>RevolutionCut</name>
+    <name>RevolutionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: FromSize = -ToSize and bounding planes are coincident.</source>
+      <source>FromSize = -ToSize and bounding planes are coincident.</source>
       <translation>FromAngle = -ToAngle and bounding planes are coincident.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "axis_object" is not initialized.</source>
+      <source>Attribute "axis_object" is not initialized.</source>
       <translation>Revolution axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Revolution axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: </source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: </source>
       <translation>Selected objects contain element with unacceptable shape type.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Object is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The result is empty</source>
+      <source>The result is empty</source>
       <translation>Object is not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>RevolutionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: Wrong number of validator arguments in xml(expected 9).</source>
+      <source>Wrong number of validator arguments in xml(expected 9).</source>
       <translation>Wrong number of validator "GeomValidators_ZeroOffset" arguments in xml(expected 9).</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: ToSize = -FromSize.</source>
+      <source>ToSize = -FromSize.</source>
       <translation>ToAngle = -FromAngle.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: From face selection is invalid.</source>
+      <source>From face selection is invalid.</source>
       <translation>From face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: To face selection is invalid.</source>
+      <source>To face selection is invalid.</source>
       <translation>To face selection is invalid.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "sketch" is not initialized.</source>
+      <source>Attribute "sketch" is not initialized.</source>
       <translation>Base object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base" is not initialized.</source>
+      <source>Attribute "base" is not initialized.</source>
       <translation>Base object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "axis_object" is not initialized.</source>
+      <source>Attribute "axis_object" is not initialized.</source>
       <translation>Axis object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_angle" is not initialized.</source>
+      <source>Attribute "to_angle" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_angle" is not initialized.</source>
+      <source>Attribute "from_angle" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_object" is not initialized.</source>
+      <source>Attribute "from_object" is not initialized.</source>
       <translation>From object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_offset" is not initialized.</source>
+      <source>Attribute "from_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_object" is not initialized.</source>
+      <source>Attribute "to_object" is not initialized.</source>
       <translation>To object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_offset" is not initialized.</source>
+      <source>Attribute "to_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "main_objects" is not initialized.</source>
+      <source>Attribute "main_objects" is not initialized.</source>
       <translation>Objects for cut is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: The attribute with the %1 type is not processed</source>
+      <source>Error: The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: Wrong parameters in XML definition for %1 type</source>
+      <source>Error: Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Wrong parameters in XML definition for %1 type</source>
+      <source>Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Validator parameters is empty.</source>
+      <source>Error: Validator parameters is empty.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute contains unacceptable shape.</source>
+      <source>Error: Attribute contains unacceptable shape.</source>
       <translation>Shape with unacceptable type selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Compound should contain only faces and edges.</source>
+      <source>Error: Compound should contain only faces and edges.</source>
       <translation>Compound should contain only faces and edges.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
+      <source>Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
       <translation>Object from this sketch is already selected. Sketch is not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
+      <source>Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
       <translation>Whole sketch with this object is already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Wire with wrong orientation selected.</source>
+      <source>Error: Wire with wrong orientation selected.</source>
       <translation>Wire with wrong orientation selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Objects with such wire already selected. Don't allow to select this object.</source>
+      <source>Error: Objects with such wire already selected. Don't allow to select this object.</source>
       <translation>Objects with such wire already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty attribute.</source>
+      <source>Error: Empty attribute.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute have empty context.</source>
+      <source>Error: Attribute have empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty shape selected</source>
+      <source>Error: Empty shape selected</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Infinite constructions is not allowed as base.</source>
+      <source>Error: Infinite constructions is not allowed as base.</source>
       <translation>Infinite constructions is not allowed as base.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Error: Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
+      <source>Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute \"%1\" does not supported by this validator.</source>
+      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionCut:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
   </context>
-  
   <context>
-    <name>ExtrusionFuse</name>
+    <name>ExtrusionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: FromSize = -ToSize and bounding planes are coincident.</source>
+      <source>FromSize = -ToSize and bounding planes are coincident.</source>
       <translation>FromSize = -ToSize and bounding planes are coincident.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base" is not initialized.</source>
+      <source>Attribute "base" is not initialized.</source>
       <translation>Base objects for extrusion are not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: </source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: </source>
       <translation>Selected objects contain element with unacceptable shape type.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Object is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The result is empty</source>
+      <source>The result is empty</source>
       <translation>Object is not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>ExtrusionFuse:FeaturesPlugin_ValidatorExtrusionDir</name>
     <message>
-      <source>FeaturesPlugin_ValidatorExtrusionDir: Error: Validator should be used with 2 parameters for extrusion.</source>
+      <source>Error: Validator should be used with 2 parameters for extrusion.</source>
       <translation>Validator "FeaturesPlugin_ValidatorExtrusionDir" should be used with 2 parameters for extrusion.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:FeaturesPlugin_ValidatorExtrusionDir</name>
     <message>
-      <source>FeaturesPlugin_ValidatorExtrusionDir: Error: Direction is parallel to one of the selected face or face on selected shell.</source>
+      <source>Error: Direction is parallel to one of the selected face or face on selected shell.</source>
       <translation>Direction is parallel to one of the selected face or face on selected shell.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "sketch" is not initialized.</source>
+      <source>Attribute "sketch" is not initialized.</source>
       <translation>Base object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base" is not initialized.</source>
+      <source>Attribute "base" is not initialized.</source>
       <translation>Base object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "direction_object" is not initialized.</source>
+      <source>Attribute "direction_object" is not initialized.</source>
       <translation>Direction object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_size" is not initialized.</source>
+      <source>Attribute "to_size" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_size" is not initialized.</source>
+      <source>Attribute "from_size" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_object" is not initialized.</source>
+      <source>Attribute "from_object" is not initialized.</source>
       <translation>From object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_offset" is not initialized.</source>
+      <source>Attribute "from_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_object" is not initialized.</source>
+      <source>Attribute "to_object" is not initialized.</source>
       <translation>To object for extrusion is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_offset" is not initialized.</source>
+      <source>Attribute "to_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "main_objects" is not initialized.</source>
+      <source>Attribute "main_objects" is not initialized.</source>
       <translation>Objects for fuse is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: The attribute with the %1 type is not processed</source>
+      <source>Error: The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: Wrong parameters in XML definition for %1 type</source>
+      <source>Error: Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Wrong parameters in XML definition for %1 type</source>
+      <source>Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Validator parameters is empty.</source>
+      <source>Error: Validator parameters is empty.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute contains unacceptable shape.</source>
+      <source>Error: Attribute contains unacceptable shape.</source>
       <translation>Shape with unacceptable type selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Compound should contain only faces and edges.</source>
+      <source>Error: Compound should contain only faces and edges.</source>
       <translation>Compound should contain only faces and edges.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
+      <source>Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
       <translation>Object from this sketch is already selected. Sketch is not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
+      <source>Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
       <translation>Whole sketch with this object is already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Wire with wrong orientation selected.</source>
+      <source>Error: Wire with wrong orientation selected.</source>
       <translation>Wire with wrong orientation selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Objects with such wire already selected. Don't allow to select this object.</source>
+      <source>Error: Objects with such wire already selected. Don't allow to select this object.</source>
       <translation>Objects with such wire already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty attribute.</source>
+      <source>Error: Empty attribute.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute have empty context.</source>
+      <source>Error: Attribute have empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty shape selected</source>
+      <source>Error: Empty shape selected</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Infinite constructions is not allowed as base.</source>
+      <source>Error: Infinite constructions is not allowed as base.</source>
       <translation>Infinite constructions is not allowed as base.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Error: Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
+      <source>Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute \"%1\" does not supported by this validator.</source>
+      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:direction_object:GeomValidators_ShapeType</name>
     <message>
-      <source>direction_object - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: Wrong number of validator arguments in xml(expected 9).</source>
+      <source>Wrong number of validator arguments in xml(expected 9).</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: ToSize = -FromSize.</source>
+      <source>ToSize = -FromSize.</source>
       <translation>ToSize = -FromSize.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: From face selection is invalid.</source>
+      <source>From face selection is invalid.</source>
       <translation>From face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: To face selection is invalid.</source>
+      <source>To face selection is invalid.</source>
       <translation>To face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: From face selection is invalid.</source>
+      <source>From face selection is invalid.</source>
       <translation>From face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: To face selection is invalid.</source>
+      <source>To face selection is invalid.</source>
       <translation>To face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>ExtrusionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: FromSize = -ToSize and bounding planes are coincident.</source>
+      <source>FromSize = -ToSize and bounding planes are coincident.</source>
       <translation>FromSize = -ToSize and bounding planes are coincident.</translation>
     </message>
   </context>
-  
   <context>
-    <name>RevolutionFuse</name>
+    <name>RevolutionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: FromSize = -ToSize and bounding planes are coincident.</source>
+      <source>FromSize = -ToSize and bounding planes are coincident.</source>
       <translation>FromAngle = -ToAngle and bounding planes are coincident.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "axis_object" is not initialized.</source>
+      <source>Attribute "axis_object" is not initialized.</source>
       <translation>Revolution axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Revolution axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: It does not contain element with acceptable shape type. The type should be one of the next: </source>
+      <source>It does not contain element with acceptable shape type. The type should be one of the next: </source>
       <translation>Selected objects contain element with unacceptable shape type.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Object is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: The result is empty</source>
+      <source>The result is empty</source>
       <translation>Object is not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>RevolutionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: Wrong number of validator arguments in xml(expected 9).</source>
+      <source>Wrong number of validator arguments in xml(expected 9).</source>
       <translation>Wrong number of validator "GeomValidators_ZeroOffset" arguments in xml(expected 9).</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: ToSize = -FromSize.</source>
+      <source>ToSize = -FromSize.</source>
       <translation>ToAngle = -FromAngle.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: From face selection is invalid.</source>
+      <source>From face selection is invalid.</source>
       <translation>From face selection is invalid.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:GeomValidators_ZeroOffset</name>
     <message>
-      <source>GeomValidators_ZeroOffset: To face selection is invalid.</source>
+      <source>To face selection is invalid.</source>
       <translation>To face selection is invalid.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "sketch" is not initialized.</source>
+      <source>Attribute "sketch" is not initialized.</source>
       <translation>Base object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base" is not initialized.</source>
+      <source>Attribute "base" is not initialized.</source>
       <translation>Base object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "axis_object" is not initialized.</source>
+      <source>Attribute "axis_object" is not initialized.</source>
       <translation>Axis object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_angle" is not initialized.</source>
+      <source>Attribute "to_angle" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_angle" is not initialized.</source>
+      <source>Attribute "from_angle" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_object" is not initialized.</source>
+      <source>Attribute "from_object" is not initialized.</source>
       <translation>From object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "from_offset" is not initialized.</source>
+      <source>Attribute "from_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_object" is not initialized.</source>
+      <source>Attribute "to_object" is not initialized.</source>
       <translation>To object for revolution is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "to_offset" is not initialized.</source>
+      <source>Attribute "to_offset" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "main_objects" is not initialized.</source>
+      <source>Attribute "main_objects" is not initialized.</source>
       <translation>Objects for fuse is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: The attribute with the %1 type is not processed</source>
+      <source>Error: The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Error: Wrong parameters in XML definition for %1 type</source>
+      <source>Error: Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:sketch:FeaturesPlugin_ValidatorCompositeLauncher</name>
     <message>
-      <source>sketch - FeaturesPlugin_ValidatorCompositeLauncher: Wrong parameters in XML definition for %1 type</source>
+      <source>Wrong parameters in XML definition for %1 type</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Validator parameters is empty.</source>
+      <source>Error: Validator parameters is empty.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute contains unacceptable shape.</source>
+      <source>Error: Attribute contains unacceptable shape.</source>
       <translation>Shape with unacceptable type selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Compound should contain only faces and edges.</source>
+      <source>Error: Compound should contain only faces and edges.</source>
       <translation>Compound should contain only faces and edges.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
+      <source>Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
       <translation>Object from this sketch is already selected. Sketch is not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
+      <source>Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
       <translation>Whole sketch with this object is already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Wire with wrong orientation selected.</source>
+      <source>Error: Wire with wrong orientation selected.</source>
       <translation>Wire with wrong orientation selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Objects with such wire already selected. Don't allow to select this object.</source>
+      <source>Error: Objects with such wire already selected. Don't allow to select this object.</source>
       <translation>Objects with such wire already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty attribute.</source>
+      <source>Error: Empty attribute.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute have empty context.</source>
+      <source>Error: Attribute have empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty shape selected</source>
+      <source>Error: Empty shape selected</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Infinite constructions is not allowed as base.</source>
+      <source>Error: Infinite constructions is not allowed as base.</source>
       <translation>Infinite constructions is not allowed as base.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Error: Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
+      <source>Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute \"%1\" does not supported by this validator.</source>
+      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"From" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:from_object:GeomValidators_Face</name>
     <message>
-      <source>from_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a face.</source>
+      <source>The shape is not a face.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a plane.</source>
+      <source>The shape is not a plane.</source>
       <translation>"To" should be a planar face.</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not a cylinder.</source>
+      <source>The shape is not a cylinder.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:to_object:GeomValidators_Face</name>
     <message>
-      <source>to_object - GeomValidators_Face: The shape is not an available face.</source>
+      <source>The shape is not an available face.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>RevolutionFuse:main_objects:GeomValidators_ShapeType</name>
     <message>
-      <source>main_objects - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
   </context>
-
   <context>
-    <name>Boolean</name>
+    <name>Boolean:GeomValidators_BooleanArguments</name>
     <message>
-      <source>GeomValidators_BooleanArguments: Not enough arguments</source>
+      <source>Not enough arguments</source>
       <translation>Not enough arguments for the operation</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Boolean:GeomValidators_BooleanArguments</name>
     <message>
-      <source>GeomValidators_BooleanArguments: Wrong number of arguments (expected 3).</source>
+      <source>Wrong number of arguments (expected 3).</source>
       <translation>Wrong number of validator "GeomValidators_BooleanArguments" arguments (expected 3).</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Boolean:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "bool_type" is not initialized.</source>
+      <source>Attribute "bool_type" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "main_objects" is not initialized.</source>
+      <source>Attribute "main_objects" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "tool_objects" is not initialized.</source>
+      <source>Attribute "tool_objects" is not initialized.</source>
       <translation>Tools not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:main_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: This validator can only work with selection list attributes in \"Boolean\" feature.</source>
+      <source>Error: This validator can only work with selection list attributes in \"Boolean\" feature.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:main_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Empty attribute selection.</source>
+      <source>Error: Empty attribute selection.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:main_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Empty selection context.</source>
+      <source>Error: Empty selection context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:main_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Result construction not allowed for selection.</source>
+      <source>Error: Result construction not allowed for selection.</source>
       <translation>Result construction not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:main_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Empty shape.</source>
+      <source>Error: Empty shape.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:main_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Local selection not allowed.</source>
+      <source>Error: Local selection not allowed.</source>
       <translation>Local selection not allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:main_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Selected shape has the wrong type.</source>
+      <source>Error: Selected shape has the wrong type.</source>
       <translation>Selected shape has the wrong type.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:main_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Selected shape has the wrong type.</source>
+      <source>Error: Selected shape has the wrong type.</source>
       <translation>Selected shape has the wrong type.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:tool_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>tool_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: This validator can only work with selection list attributes in \"Boolean\" feature.</source>
+      <source>Error: This validator can only work with selection list attributes in \"Boolean\" feature.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:tool_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>tool_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Empty attribute selection.</source>
+      <source>Error: Empty attribute selection.</source>
       <translation>Tools not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:tool_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>tool_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Empty selection context.</source>
+      <source>Error: Empty selection context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:tool_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>tool_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Result construction not allowed for selection.</source>
+      <source>Error: Result construction not allowed for selection.</source>
       <translation>Result construction not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:tool_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>tool_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Empty shape.</source>
+      <source>Error: Empty shape.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:tool_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>tool_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Local selection not allowed.</source>
+      <source>Error: Local selection not allowed.</source>
       <translation>Local selection not allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:tool_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>tool_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Selected shape has the wrong type.</source>
+      <source>Error: Selected shape has the wrong type.</source>
       <translation>Selected shape has the wrong type.</translation>
     </message>
+  </context>
+  <context>
+    <name>Boolean:tool_objects:FeaturesPlugin_ValidatorBooleanSelection</name>
     <message>
-      <source>tool_objects - FeaturesPlugin_ValidatorBooleanSelection: Error: Selected shape has the wrong type.</source>
+      <source>Error: Selected shape has the wrong type.</source>
       <translation>Selected shape has the wrong type.</translation>
     </message>
   </context>
-  
   <context>
-    <name>Partition</name>
+    <name>Partition:GeomValidators_MinObjectsSelected</name>
     <message>
-      <source>GeomValidators_MinObjectsSelected: Error: Attribute \"%1\" should contain at least %2 items.</source>
+      <source>Error: Attribute \"%1\" should contain at least %2 items.</source>
       <translation>At least %2 object(s) should be selected in "%1"</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Partition:GeomValidators_MinObjectsSelected</name>
     <message>
-      <source>GeomValidators_MinObjectsSelected: Error: Wrong number of arguments (expected 2): selection list id and min number of objects</source>
+      <source>Error: Wrong number of arguments (expected 2): selection list id and min number of objects</source>
       <translation>Wrong number of validator "GeomValidators_MinObjectsSelected" arguments(expected 2): selection list id and min number of objects.</translation>
     </message>
+  </context>
+  <context>
+    <name>Partition:GeomValidators_MinObjectsSelected</name>
     <message>
-      <source>GeomValidators_MinObjectsSelected: Error: Could not get attribute \"%1\".</source>
+      <source>Error: Could not get attribute \"%1\".</source>
       <translation>Objects not selected.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Partition:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_objects" is not initialized.</source>
+      <source>Attribute "base_objects" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Partition:base_objects:FeaturesPlugin_ValidatorPartitionSelection</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorPartitionSelection: Error: This validator can only work with selection list in \"Partition\" feature.</source>
+      <source>Error: This validator can only work with selection list in \"Partition\" feature.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Partition:base_objects:FeaturesPlugin_ValidatorPartitionSelection</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorPartitionSelection: Error: Only body shapes and construction planes are allowed for selection.</source>
+      <source>Error: Only body shapes and construction planes are allowed for selection.</source>
       <translation>Only body shapes and construction planes are allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Partition:base_objects:FeaturesPlugin_ValidatorPartitionSelection</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorPartitionSelection: Error: Only body shapes and construction planes are allowed for selection.</source>
+      <source>Error: Only body shapes and construction planes are allowed for selection.</source>
       <translation>Only body shapes and construction planes are allowed for selection.</translation>
     </message>
   </context>
-  
   <context>
-    <name>Pipe</name>
+    <name>Pipe:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_objects" is not initialized.</source>
+      <source>Attribute "base_objects" is not initialized.</source>
       <translation>Base object for pipe is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "binormal" is not initialized.</source>
+      <source>Attribute "binormal" is not initialized.</source>
       <translation>Binormal vector is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "path_object" is not initialized.</source>
+      <source>Attribute "path_object" is not initialized.</source>
       <translation>Object for pipe path is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:binormal:GeomValidators_ShapeType</name>
     <message>
-      <source>binormal - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Binormal vector is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:path_object:FeaturesPlugin_ValidatorPipePath</name>
     <message>
-      <source>path_object - FeaturesPlugin_ValidatorPipePath: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation>Object for pipe path is not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Pipe:FeaturesPlugin_ValidatorPipeLocations</name>
     <message>
-      <source>FeaturesPlugin_ValidatorPipeLocations: Error: Feature \"%1\" does not supported by this validator.</source>
+      <source>Error: Feature \"%1\" does not supported by this validator.</source>
       <translation>Feature "%1" does not supported validator "FeaturesPlugin_ValidatorPipeLocations".</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:FeaturesPlugin_ValidatorPipeLocations</name>
     <message>
-      <source>FeaturesPlugin_ValidatorPipeLocations: Error: Could not get \"%1\" attribute.</source>
+      <source>Error: Could not get \"%1\" attribute.</source>
       <translation>Could not get "%1" attribute</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:FeaturesPlugin_ValidatorPipeLocations</name>
     <message>
-      <source>FeaturesPlugin_ValidatorPipeLocations: Error: Number of locations should be the same as base objects.</source>
+      <source>Error: Number of locations should be the same as base objects.</source>
       <translation>Number of locations should be the same as base objects.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Pipe:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_objects" is not initialized.</source>
+      <source>Attribute "base_objects" is not initialized.</source>
       <translation>>Base object for pipe is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "path_object" is not initialized.</source>
+      <source>Attribute "path_object" is not initialized.</source>
       <translation>Object for pipe path is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "binormal" is not initialized.</source>
+      <source>Attribute "binormal" is not initialized.</source>
       <translation>Binormal vector is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "locations_objects" is not initialized.</source>
+      <source>Attribute "locations_objects" is not initialized.</source>
       <translation>Locations not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Validator parameters is empty.</source>
+      <source>Error: Validator parameters is empty.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute contains unacceptable shape.</source>
+      <source>Error: Attribute contains unacceptable shape.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Compound should contain only faces and edges.</source>
+      <source>Error: Compound should contain only faces and edges.</source>
       <translation>Compound should contain only faces and edges.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
+      <source>Error: Object from this sketch is already selected. Sketch is not allowed for selection.</source>
       <translation>Object from this sketch is already selected. Sketch is not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
+      <source>Error: Whole sketch with this object is already selected. Don't allow to select this object.</source>
       <translation>Whole sketch with this object is already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Wire with wrong orientation selected.</source>
+      <source>Error: Wire with wrong orientation selected.</source>
       <translation>Wire with wrong orientation selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Objects with such wire already selected. Don't allow to select this object.</source>
+      <source>Error: Objects with such wire already selected. Don't allow to select this object.</source>
       <translation>Objects with such wire already selected. Don't allow to select this object.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty attribute.</source>
+      <source>Error: Empty attribute.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute have empty context.</source>
+      <source>Error: Attribute have empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Empty shape selected</source>
+      <source>Error: Empty shape selected</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Infinite constructions is not allowed as base.</source>
+      <source>Error: Infinite constructions is not allowed as base.</source>
       <translation>Infinite constructions is not allowed as base.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape is in the local selection. Only global selection is allowed.</source>
+      <source>Error: Selected shape is in the local selection. Only global selection is allowed.</source>
       <translation>Selected shape is in the local selection. Only global selection is allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
+      <source>Error: Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</source>
       <translation>Selected shape has unacceptable type. Acceptable types are: faces or wires on sketch, whole sketch(if it has at least one face), and whole objects with shape types: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorBaseForGeneration: Error: Attribute \"%1\" does not supported by this validator.</source>
+      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:path_object:FeaturesPlugin_ValidatorPipePath</name>
     <message>
-      <source>path_object - FeaturesPlugin_ValidatorPipePath: Error: This validator can only work with path selector in \"Pipe\" feature.</source>
+      <source>Error: This validator can only work with path selector in \"Pipe\" feature.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:path_object:FeaturesPlugin_ValidatorPipePath</name>
     <message>
-      <source>path_object - FeaturesPlugin_ValidatorPipePath: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:path_object:FeaturesPlugin_ValidatorPipePath</name>
     <message>
-      <source>path_object - FeaturesPlugin_ValidatorPipePath: Error: Local selection of wires not allowed.</source>
+      <source>Error: Local selection of wires not allowed.</source>
       <translation>Local selection of wires not allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:binormal:GeomValidators_ShapeType</name>
     <message>
-      <source>binormal - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:binormal:GeomValidators_ShapeType</name>
     <message>
-      <source>binormal - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:binormal:GeomValidators_ShapeType</name>
     <message>
-      <source>binormal - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:binormal:GeomValidators_ShapeType</name>
     <message>
-      <source>binormal - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:binormal:GeomValidators_ShapeType</name>
     <message>
-      <source>binormal - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:binormal:GeomValidators_ShapeType</name>
     <message>
-      <source>binormal - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Pipe:binormal:GeomValidators_ShapeType</name>
     <message>
-      <source>binormal - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
   </context>
-  
   <context>
-    <name>Remove_SubShapes</name>
+    <name>Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult</name>
     <message>
-      <source>FeaturesPlugin_ValidatorRemoveSubShapesResult: Error: Base shape is empty.</source>
+      <source>Error: Base shape is empty.</source>
       <translation>Base shape is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_BodyShapes</name>
     <message>
-      <source>base_shape - GeomValidators_BodyShapes: Error: Context is empty.</source>
+      <source>Error: Context is empty.</source>
       <translation>Selected object has empty context.</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection</name>
     <message>
-      <source>subshapes - FeaturesPlugin_ValidatorRemoveSubShapesSelection: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation>Selected object has empty context.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult</name>
     <message>
-      <source>FeaturesPlugin_ValidatorRemoveSubShapesResult: Error: Feature \"%1\" does not supported by this validator.</source>
+      <source>Error: Feature \"%1\" does not supported by this validator.</source>
       <translation>Feature "%1" does not supported validator "FeaturesPlugin_ValidatorRemoveSubShapesResult".</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult</name>
     <message>
-      <source>FeaturesPlugin_ValidatorRemoveSubShapesResult: Error: Could not get \"%1\" attribute.</source>
+      <source>Error: Could not get \"%1\" attribute.</source>
       <translation>Could not get "%1" attribute.</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult</name>
     <message>
-      <source>FeaturesPlugin_ValidatorRemoveSubShapesResult: Error: Base shape is empty.</source>
+      <source>Error: Base shape is empty.</source>
       <translation>Base shape is empty.</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult</name>
     <message>
-      <source>FeaturesPlugin_ValidatorRemoveSubShapesResult: Error: Resulting shape is not valid.</source>
+      <source>Error: Resulting shape is not valid.</source>
       <translation>Resulting shape is not valid.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Remove_SubShapes:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_shape" is not initialized.</source>
+      <source>Attribute "base_shape" is not initialized.</source>
       <translation>Base shape is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "subshapes" is not initialized.</source>
+      <source>Attribute "subshapes" is not initialized.</source>
       <translation>Sub-shapes is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2"</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_ShapeType</name>
     <message>
-      <source>base_shape - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_BodyShapes</name>
     <message>
-      <source>base_shape - GeomValidators_BodyShapes: Error: Context is empty.</source>
+      <source>Error: Context is empty.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_BodyShapes</name>
     <message>
-      <source>base_shape - GeomValidators_BodyShapes: Error: Result construction selected.</source>
+      <source>Error: Result construction selected.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:base_shape:GeomValidators_BodyShapes</name>
     <message>
-      <source>base_shape - GeomValidators_BodyShapes: Error: Attribute \"%1\" does not supported by this validator.</source>
+      <source>Error: Attribute \"%1\" does not supported by this validator.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection</name>
     <message>
-      <source>subshapes - FeaturesPlugin_ValidatorRemoveSubShapesSelection: Error: This validator can only work with selection list in \"Remove Sub-Shapes\" feature.</source>
+      <source>Error: This validator can only work with selection list in \"Remove Sub-Shapes\" feature.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection</name>
     <message>
-      <source>subshapes - FeaturesPlugin_ValidatorRemoveSubShapesSelection: Error: Could not get \"%1\" attribute.</source>
+      <source>Error: Could not get \"%1\" attribute.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection</name>
     <message>
-      <source>subshapes - FeaturesPlugin_ValidatorRemoveSubShapesSelection: Error: Empty context.</source>
+      <source>Error: Empty context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection</name>
     <message>
-      <source>subshapes - FeaturesPlugin_ValidatorRemoveSubShapesSelection: Error: Empty base shape.</source>
+      <source>Error: Empty base shape.</source>
       <translation>Base shape not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection</name>
     <message>
-      <source>subshapes - FeaturesPlugin_ValidatorRemoveSubShapesSelection: Error: Only sub-shapes of selected shape is allowed for selection.</source>
+      <source>Error: Only sub-shapes of selected shape is allowed for selection.</source>
       <translation>Only sub-shapes of selected shape is allowed for selection.</translation>
     </message>
   </context>
-  
   <context>
-    <name>Intersection</name>
+    <name>Intersection:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "main_objects" is not initialized.</source>
+      <source>Attribute "main_objects" is not initialized.</source>
       <translation>Main objects is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "tool_objects" is not initialized.</source>
+      <source>Attribute "tool_objects" is not initialized.</source>
       <translation>Tool objects is not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Intersection:tool_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>tool_objects - GeomValidators_IntersectionSelection: Error: empty selection.</source>
+      <source>Error: empty selection.</source>
       <translation>Empty selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:tool_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>tool_objects - GeomValidators_IntersectionSelection: Error: empty attribute selection.</source>
+      <source>Error: empty attribute selection.</source>
       <translation>Attribute selection is empty.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:tool_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>tool_objects - GeomValidators_IntersectionSelection: Error: empty selection context.</source>
+      <source>Error: empty selection context.</source>
       <translation>Selected object has empty context.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:tool_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>tool_objects - GeomValidators_IntersectionSelection: Error: empty feature.</source>
+      <source>Error: empty feature.</source>
       <translation>Selected objects has empty feature.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:tool_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>tool_objects - GeomValidators_IntersectionSelection: Error: %1 shape is not allowed for selection.</source>
+      <source>Error: %1 shape is not allowed for selection.</source>
       <translation>%1 shape is not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:tool_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>tool_objects - GeomValidators_IntersectionSelection: Error: empty shape.</source>
+      <source>Error: empty shape.</source>
       <translation>Empty shape selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:tool_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>tool_objects - GeomValidators_IntersectionSelection: Error: selected shape has the wrong type.</source>
+      <source>Error: selected shape has the wrong type.</source>
       <translation>Selected shape has the wrong type.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Intersection:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "main_objects" is not initialized.</source>
+      <source>Attribute "main_objects" is not initialized.</source>
       <translation>Main objects is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "tool_objects" is not initialized.</source>
+      <source>Attribute "tool_objects" is not initialized.</source>
       <translation>Tool objects is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:main_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>main_objects - GeomValidators_IntersectionSelection: Error: empty selection.</source>
+      <source>Error: empty selection.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:main_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>main_objects - GeomValidators_IntersectionSelection: Error: empty attribute selection.</source>
+      <source>Error: empty attribute selection.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:main_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>main_objects - GeomValidators_IntersectionSelection: Error: empty selection context.</source>
+      <source>Error: empty selection context.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:main_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>main_objects - GeomValidators_IntersectionSelection: Error: empty feature.</source>
+      <source>Error: empty feature.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:main_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>main_objects - GeomValidators_IntersectionSelection: Error: %1 shape is not allowed for selection.</source>
+      <source>Error: %1 shape is not allowed for selection.</source>
       <translation>%1 shape is not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:main_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>main_objects - GeomValidators_IntersectionSelection: Error: empty shape.</source>
+      <source>Error: empty shape.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:main_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>main_objects - GeomValidators_IntersectionSelection: Error: Local selection not allowed.</source>
+      <source>Error: Local selection not allowed.</source>
       <translation>Local selection not allowed.</translation>
     </message>
+  </context>
+  <context>
+    <name>Intersection:main_objects:GeomValidators_IntersectionSelection</name>
     <message>
-      <source>main_objects - GeomValidators_IntersectionSelection: Error: selected shape has the wrong type.</source>
+      <source>Error: selected shape has the wrong type.</source>
       <translation>Selected shape has the wrong type.</translation>
     </message>
   </context>
-  
   <context>
-    <name>Placement</name>
+    <name>Placement:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "placement_end_shape" is not initialized.</source>
+      <source>Attribute "placement_end_shape" is not initialized.</source>
       <translation>End placement shape is not defined.</translation>
     </message>
+  </context>
+  <context>
+    <name>Placement:placement_end_shape:PartSet_DifferentObjects</name>
     <message>
-      <source>placement_end_shape - PartSet_DifferentObjects: The feature uses one shape in placement_end_shape and placement_start_shape attributes.</source>
+      <source>The feature uses one shape in placement_end_shape and placement_start_shape attributes.</source>
       <translation>Start and end placement shapes are the same.</translation>
     </message>
+  </context>
+  <context>
+    <name>Placement:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "placement_centering" is not initialized.</source>
+      <source>Attribute "placement_centering" is not initialized.</source>
       <translation>Attribute "placement_centering" is not initialized.</translation>
     </message>
+  </context>
+  <context>
+    <name>Placement:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "placement_objects_list" is not initialized.</source>
+      <source>Attribute "placement_objects_list" is not initialized.</source>
       <translation>Objects for placement are not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Placement:placement_objects_list:FeaturesPlugin_ValidatorTransform</name>
     <message>
-      <source>placement_objects_list - FeaturesPlugin_ValidatorTransform: 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>Placement:placement_objects_list:FeaturesPlugin_ValidatorTransform</name>
     <message>
-      <source>placement_objects_list - FeaturesPlugin_ValidatorTransform: Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</source>
+      <source>Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</source>
       <translation>Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Placement:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "placement_start_shape" is not initialized.</source>
+      <source>Attribute "placement_start_shape" is not initialized.</source>
       <translation>Start placement shape is not defined.</translation>
     </message>
+  </context>
+  <context>
+    <name>Placement:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "placement_reverse_direction" is not initialized.</source>
+      <source>Attribute "placement_reverse_direction" is not initialized.</source>
       <translation></translation>
     </message>
   </context>
-  
   <context>
-    <name>Rotation</name>
+    <name>Rotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "angle" is not initialized.</source>
+      <source>Attribute "angle" is not initialized.</source>
       <translation>Angle is not defined.</translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "axis_object" is not initialized.</source>
+      <source>Attribute "axis_object" is not initialized.</source>
       <translation>Rotation axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Rotation axis is not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Rotation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - 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>Selected objects contain element with unacceptable shape type.</translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>It has reference to an empty attribute.</translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2".</translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - 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>Rotation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Rotation axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>Rotation axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>Rotation axis is not selected.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Rotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "main_objects" is not initialized.</source>
+      <source>Attribute "main_objects" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "axis_object" is not initialized.</source>
+      <source>Attribute "axis_object" is not initialized.</source>
       <translation>Axis not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "angle" is not initialized.</source>
+      <source>Attribute "angle" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:main_objects:FeaturesPlugin_ValidatorTransform</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorTransform: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Rotation:main_objects:FeaturesPlugin_ValidatorTransform</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorTransform: Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</source>
+      <source>Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</source>
       <translation>Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</translation>
     </message>
   </context>
-  
   <context>
-    <name>Translation</name>
+    <name>Translation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "axis_object" is not initialized.</source>
+      <source>Attribute "axis_object" is not initialized.</source>
       <translation>Translation axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Translation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The object is empty</source>
+      <source>The object is empty</source>
       <translation>Translation axis is not selected.</translation>
     </message>
-    
+  </context>
+  <context>
+    <name>Translation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - 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>It does not contain element with acceptable shape type. The type should be one of the next: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>Translation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: It has reference to an empty attribute</source>
+      <source>It has reference to an empty attribute</source>
       <translation>It has reference to an empty attribute</translation>
     </message>
+  </context>
+  <context>
+    <name>Translation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: Shape type is \"%1\", it should be \"%2\"</source>
+      <source>Shape type is \"%1\", it should be \"%2\"</source>
       <translation>Shape type is "%1", it should be "%2".</translation>
     </message>
+  </context>
+  <context>
+    <name>Translation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - 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>Translation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The result is empty</source>
+      <source>The result is empty</source>
       <translation>Translation axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Translation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>Translation axis is not selected.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Translation:axis_object:GeomValidators_ShapeType</name>
     <message>
-      <source>axis_object - GeomValidators_ShapeType: The shape is empty</source>
+      <source>The shape is empty</source>
       <translation>Translation axis is not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Translation:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "distance" is not initialized.</source>
+      <source>Attribute "distance" is not initialized.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Translation:main_objects:FeaturesPlugin_ValidatorTransform</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorTransform: The attribute with the %1 type is not processed</source>
+      <source>The attribute with the %1 type is not processed</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Translation:main_objects:FeaturesPlugin_ValidatorTransform</name>
     <message>
-      <source>main_objects - FeaturesPlugin_ValidatorTransform: Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</source>
+      <source>Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</source>
       <translation>Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected.</translation>
     </message>
   </context>
-  
   <context>
-    <name>Union</name>
+    <name>Union:FeaturesPlugin_ValidatorUnionArguments</name>
     <message>
-      <source>FeaturesPlugin_ValidatorUnionArguments: Error: This validator supports only \"%1\" feature.</source>
+      <source>Error: This validator supports only \"%1\" feature.</source>
       <translation>This validator "FeaturesPlugin_ValidatorUnionArguments" supports only "%1" feature.</translation>
     </message>
+  </context>
+  <context>
+    <name>Union:FeaturesPlugin_ValidatorUnionArguments</name>
     <message>
-      <source>FeaturesPlugin_ValidatorUnionArguments: Error: Could not get \"%1\" attribute.</source>
+      <source>Error: Could not get \"%1\" attribute.</source>
       <translation>Could not get "%1" attribute.</translation>
     </message>
+  </context>
+  <context>
+    <name>Union:FeaturesPlugin_ValidatorUnionArguments</name>
     <message>
-      <source>FeaturesPlugin_ValidatorUnionArguments: Error: Not all shapes have shared topology.</source>
+      <source>Error: Not all shapes have shared topology.</source>
       <translation>Not all shapes have shared topology.</translation>
     </message>
-
+  </context>
+  <context>
+    <name>Union:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "base_objects" is not initialized.</source>
+      <source>Attribute "base_objects" is not initialized.</source>
       <translation>Objects not selected.</translation>
     </message>
+  </context>
+  <context>
+    <name>Union:base_objects:FeaturesPlugin_ValidatorUnionSelection</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorUnionSelection: Error: This validator can only work with selection list in \"%1\" feature.</source>
+      <source>Error: This validator can only work with selection list in \"%1\" feature.</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Union:base_objects:FeaturesPlugin_ValidatorUnionSelection</name>
     <message>
-      <source>base_objects - FeaturesPlugin_ValidatorUnionSelection: Error: Whole compsolids not allowed for selection.</source>
+      <source>Error: Whole compsolids not allowed for selection.</source>
       <translation>Whole compsolids not allowed for selection.</translation>
     </message>
+  </context>
+  <context>
+    <name>Union:GeomValidators_MinObjectsSelected</name>
     <message>
-      <source>GeomValidators_MinObjectsSelected: Error: Wrong number of arguments (expected 2): selection list id and min number of objects</source>
+      <source>Error: Wrong number of arguments (expected 2): selection list id and min number of objects</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Union:GeomValidators_MinObjectsSelected</name>
     <message>
-      <source>GeomValidators_MinObjectsSelected: Error: Could not get attribute \"%1\".</source>
+      <source>Error: Could not get attribute \"%1\".</source>
       <translation></translation>
     </message>
+  </context>
+  <context>
+    <name>Union:GeomValidators_MinObjectsSelected</name>
     <message>
-      <source>GeomValidators_MinObjectsSelected: Error: Attribute \"%1\" should contain at least %2 items.</source>
+      <source>Error: Attribute \"%1\" should contain at least %2 items.</source>
       <translation></translation>
     </message>
   </context>

diff --git a/src/ParametersPlugin/ParametersPlugin_msg_en.ts b/src/ParametersPlugin/ParametersPlugin_msg_en.ts
index 1fa991f471e686b16b07ce93adf092ce3459fbf7..1ad0164da2ad1e7f253094d0d932f6ac9f61c111 100755 (executable)
--- a/src/ParametersPlugin/ParametersPlugin_msg_en.ts
+++ b/src/ParametersPlugin/ParametersPlugin_msg_en.ts
@@ -5,14 +5,16 @@
   <context>
     <name>Parameter</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "variable" is not initialized.</source>
+      <source>Attribute "variable" is not initialized.</source>
       <translation>Set the variable name</translation>
     </message>
+  </context>
+  <context>
+    <name>Parameter:Model_FeatureValidator</name>
     <message>
-      <source>Model_FeatureValidator: Attribute "expression" is not initialized.</source>
+      <source>Attribute "expression" is not initialized.</source>
       <translation>Set the expression</translation>
     </message>
   </context>
 
-
 </TS>

diff --git a/src/PythonAddons/PythonAddons_msg_en.ts b/src/PythonAddons/PythonAddons_msg_en.ts
index 4d0b1db7d2b1be0fdb306af1a7b4479bca7d3a5e..7492435b0c3479093661570a780013015f6e3dc3 100644 (file)
--- a/src/PythonAddons/PythonAddons_msg_en.ts
+++ b/src/PythonAddons/PythonAddons_msg_en.ts
@@ -2,70 +2,114 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="en_US">
 <context>
-  <name>Box</name>
+  <name>Box:Model_FeatureValidator</name>
   <message>
-    <source>Model_FeatureValidator: Attribute "height" is not initialized.</source>
+    <source>Attribute "height" is not initialized.</source>
     <translation>Height of the box is not defined.</translation>
   </message>
-
+</context>
+<context>
+  <name>Box:height:GeomValidators_Positive</name>
   <message>
-    <source>height - GeomValidators_Positive: Double is not initialized.</source>
+    <source>Double is not initialized.</source>
     <translation>Height of the box is not defined.</translation>
   </message>
+</context>
+<context>
+  <name>Box:height:GeomValidators_Positive</name>
   <message>
-    <source>height - GeomValidators_Positive: Double is not positive.</source>
+    <source>Double is not positive.</source>
     <translation>Height of the box is too small.</translation>
   </message>
+</context>
+<context>
+  <name>Box:height:GeomValidators_Positive</name>
   <message>
-    <source>height - GeomValidators_Positive: Integer is not initialized.</source>
+    <source>Integer is not initialized.</source>
     <translation>Height of the box is not defined.</translation>
   </message>
+</context>
+<context>
+  <name>Box:height:GeomValidators_Positive</name>
   <message>
-    <source>height - GeomValidators_Positive: Integer is not positive.</source>
+    <source>Integer is not positive.</source>
     <translation>Height of the box is too small.</translation>
   </message>
+</context>
+<context>
+  <name>Box:Model_FeatureValidator</name>
   <message>
-    <source>Model_FeatureValidator: Attribute "width" is not initialized.</source>
+    <source>Attribute "width" is not initialized.</source>
     <translation>Set the box width</translation>
   </message>
+</context>
+<context>
+  <name>Box:Model_FeatureValidator</name>
   <message>
-    <source>Model_FeatureValidator: Attribute "length" is not initialized.</source>
+    <source>Attribute "length" is not initialized.</source>
     <translation>Set the box length</translation>
   </message>
+</context>
+<context>
+  <name>Box:Model_FeatureValidator</name>
   <message>
-    <source>Model_FeatureValidator: Attribute "height" is not initialized.</source>
+    <source>Attribute "height" is not initialized.</source>
     <translation>Set the box height</translation>
   </message>
+</context>
+<context>
+  <name>Box:width:GeomValidators_Positive</name>
   <message>
-    <source>width - GeomValidators_Positive: Double is not initialized.</source>
+    <source>Double is not initialized.</source>
     <translation>Set the box width</translation>
   </message>
+</context>
+<context>
+  <name>Box:width:GeomValidators_Positive</name>
   <message>
-    <source>width - GeomValidators_Positive: Double is not positive.</source>
+    <source>Double is not positive.</source>
     <translation>The box width must be positive</translation>
   </message>
+</context>
+<context>
+  <name>Box:width:GeomValidators_Positive</name>
   <message>
-    <source>width - GeomValidators_Positive: Integer is not initialized.</source>
+    <source>Integer is not initialized.</source>
     <translation></translation>
   </message>
+</context>
+<context>
+  <name>Box:width:GeomValidators_Positive</name>
   <message>
-    <source>width - GeomValidators_Positive: Integer is not positive.</source>
+    <source>Integer is not positive.</source>
     <translation></translation>
   </message>
+</context>
+<context>
+  <name>Box:length:GeomValidators_Positive</name>
   <message>
-    <source>length - GeomValidators_Positive: Double is not initialized.</source>
+    <source>Double is not initialized.</source>
     <translation>Set the box length</translation>
   </message>
+</context>
+<context>
+  <name>Box:length:GeomValidators_Positive</name>
   <message>
-    <source>length - GeomValidators_Positive: Double is not positive.</source>
+    <source>Double is not positive.</source>
     <translation>The box width must be positive</translation>
   </message>
+</context>
+<context>
+  <name>Box:length:GeomValidators_Positive</name>
   <message>
-    <source>length - GeomValidators_Positive: Integer is not initialized.</source>
+    <source>Integer is not initialized.</source>
     <translation></translation>
   </message>
+</context>
+<context>
+  <name>Box:length:GeomValidators_Positive</name>
   <message>
-    <source>length - GeomValidators_Positive: Integer is not positive.</source>
+    <source>Integer is not positive.</source>
     <translation></translation>
   </message>
 </context>

diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index ed44c1d91bd19973a65bc191d25ba14c1ca0df4e..bea2a1fad7a8c5188ccd4ae69ddbb88f671ea8f9 100644 (file)
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -249,9 +249,9 @@ bool SHAPERGUI::activateModule(SUIT_Study* theStudy)
   }
   myProxyViewer->activateViewer(true);
 
-  // Postrrocessing for LoadScriptId to remove created(if it was created) SALOME Object Browser\r
-  connect(getApp()->action(LightApp_Application::UserID+1), SIGNAL(triggered(bool)),\r
-          this, SLOT(onScriptLoaded()));\r
+  // Postrrocessing for LoadScriptId to remove created(if it was created) SALOME Object Browser
+  connect(getApp()->action(LightApp_Application::UserID+1), SIGNAL(triggered(bool)),
+          this, SLOT(onScriptLoaded()));
   return isDone;
 }
 
@@ -296,9 +296,9 @@ bool SHAPERGUI::deactivateModule(SUIT_Study* theStudy)
   aResMgr->setValue("Study", "store_positions", myIsStorePositions);
   getApp()->setEditEnabled(myIsEditEnabled);
 
-  // Postrrocessing for LoadScriptId to remove created(if it was created) SALOME Object Browser\r
-  disconnect(getApp()->action(LightApp_Application::UserID+1), SIGNAL(triggered(bool)),\r
-             this, SLOT(onScriptLoaded()));\r
+  // Postrrocessing for LoadScriptId to remove created(if it was created) SALOME Object Browser
+  disconnect(getApp()->action(LightApp_Application::UserID+1), SIGNAL(triggered(bool)),
+             this, SLOT(onScriptLoaded()));
 
   return LightApp_Module::deactivateModule(theStudy);
 }