Correct compilation errors

diff --git a/src/Config/Config_Translator.cpp b/src/Config/Config_Translator.cpp
index 9a03118fef50c818e2a5b952e9ef8eb31d151a07..b6984f002c392ce619ed3093e9544382a7ae30b1 100644 (file)
--- a/src/Config/Config_Translator.cpp
+++ b/src/Config/Config_Translator.cpp
@@ -109,7 +109,7 @@ std::string insertParameters(const std::string& theString, const std::list<std::
   std::string aParam;
   for (i=1, aIt = theParams.cbegin(); aIt != theParams.cend(); aIt++, i++) {
     aParam = (*aIt);
-    sprintf_s(aBuf, "%d", i);
+    sprintf(aBuf, "%d", i);
     std::string aCode = std::string("%") + std::string(aBuf);
     size_t aPos = aResult.find(aCode);
     if (aPos != std::string::npos) {

diff --git a/src/Config/Config_Translator.h b/src/Config/Config_Translator.h
index 72a305ec97803c1325baa2cdd3037dd6de78b084..cab88afdfc72eca3012fd227de8097b8ff132679 100644 (file)
--- a/src/Config/Config_Translator.h
+++ b/src/Config/Config_Translator.h
@@ -13,6 +13,8 @@
 #include <string>
 #include <map>
 
+
+/// The definition provides collection and writing of missed translations
 //#define MISSED_TRANSLATION
 
 /**

diff --git a/src/Events/Events_InfoMessage.h b/src/Events/Events_InfoMessage.h
index bf92b3af308f70a815628ecb56e4c92ff789ec13..e441219553e9c1d838d35c9ba5370eee7bb2abb6 100644 (file)
--- a/src/Events/Events_InfoMessage.h
+++ b/src/Events/Events_InfoMessage.h
@@ -63,7 +63,7 @@ public:
   void addParameter(double theParam) 
   { 
     char aBuf[50];
-    int n = sprintf_s(aBuf, "%g", theParam);
+    int n = sprintf(aBuf, "%g", theParam);
     std::string aStr(aBuf);
     myParameters.push_back(aStr); 
   }
@@ -73,7 +73,7 @@ public:
   void addParameter(int theParam) 
   { 
     char aBuf[50];
-    int n = sprintf_s(aBuf, "%d", theParam);
+    int n = sprintf(aBuf, "%d", theParam);
     std::string aStr(aBuf);
     myParameters.push_back(aStr); 
   }

diff --git a/src/SketchPlugin/SketchPlugin_msg_en.ts b/src/SketchPlugin/SketchPlugin_msg_en.ts
index 32b56ab36a2cddd6b9891fe5bd86df87d8e195a9..7861640f7b185eefa31894e32f99805245f19216 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_msg_en.ts
+++ b/src/SketchPlugin/SketchPlugin_msg_en.ts
@@ -55,6 +55,10 @@
       <source>ModelAPI_StateInvalidArgument</source>
       <translation>Wrong object is selected</translation>
     </message>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation>Line is not selected</translation>
+    </message>
   </context>
   
   <context>
@@ -65,7 +69,15 @@
     </message>
     <message>
       <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
-      <translation>Select second line is not selected</translation>
+      <translation>Second line is not selected</translation>
+    </message>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation>First line is not selected</translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - GeomValidators_ShapeType: The object is empty</source>
+      <translation>Second line is not selected</translation>
     </message>
   </context>
   
@@ -75,6 +87,18 @@
       <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Circle is nopt selected</translation>
     </message>
+    <message>
+      <source>Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintValue - GeomValidators_Positive: Double is not initialized.</source>
+      <translation></translation>
+    </message>
   </context>
   
   <context>
@@ -87,6 +111,10 @@
       <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
       <translation>Line is not selected</translation>
     </message>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation>Line is not selected</translation>
+    </message>
   </context>
   
   <context>
@@ -107,6 +135,14 @@
       <source>Attribute "StartPoint" is locked by modification value in the viewer.</source>
       <translation>Select a start point in the viewer</translation>
     </message>
+    <message>
+      <source>Attribute "StartPoint" is not initialized.</source>
+      <translation>Start point is not selected</translation>
+    </message>
+    <message>
+      <source>Attribute "EndPoint" is not initialized.</source>
+      <translation></translation>
+    </message>
   </context>
   
   <context>
@@ -184,4 +220,248 @@
       <translation>Intermediate point is not defined</translation>
     </message>
   </context>
+
+  <context>
+    <name>SketchConstraintMirror</name>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation>Line is not selected</translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <translation>Mirror line is not selected</translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintMirrorList" is not initialized.</source>
+      <translation>Objects for mirror are not selected</translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchMultiRotation</name>
+    <message>
+      <source>Model_FeatureValidator: Attribute "AngleType" is not initialized.</source>
+      <translation>Type of angle is not defined</translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "MultiRotationCenter" is not initialized.</source>
+      <translation>Rotation center is not selected</translation>
+    </message>
+    <message>
+      <source>MultiRotationCenter - GeomValidators_ShapeType: The object is empty</source>
+      <translation>Rotation center is not selected</translation>
+    </message>
+  </context>
+  
+  <context>
+    <name>SketchMultiTranslation</name>
+    <message>
+      <source>Model_FeatureValidator: Attribute "MultiTranslationEndPoint" is not initialized.</source>
+      <translation>End point of translation vector is not defined</translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "MultiTranslationList" is not initialized.</source>
+      <translation>Objects for translation are not selected</translation>
+    </message>
+    <message>
+      <source>MultiTranslationEndPoint - GeomValidators_ShapeType: The object is empty</source>
+      <translation>End point of translation vector is not selected</translation>
+    </message>
+    <message>
+      <source>MultiTranslationStartPoint - GeomValidators_ShapeType: The object is empty</source>
+      <translation>Start point of translation vector is not selected</translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchConstraintAngle</name>
+    <message>
+      <source>Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - GeomValidators_ShapeType: The object is empty</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "AngleReversedLine1" is not initialized.</source>
+      <translation></translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchConstraintCoincidence</name>
+    <message>
+      <source>ConstraintEntityA - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <translation></translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchConstraintDistance</name>
+    <message>
+      <source>Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - GeomValidators_ShapeType: The object is empty</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintValue - GeomValidators_Positive: Double is not initialized.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <translation></translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchConstraintEqual</name>
+    <message>
+      <source>ConstraintEntityA - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - SketchPlugin_EqualAttr: An empty object is used.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <translation></translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchConstraintLength</name>
+    <message>
+      <source>Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintValue - GeomValidators_Positive: Double is not initialized.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <translation></translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchConstraintMiddle</name>
+    <message>
+      <source>ConstraintEntityA - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - SketchPlugin_MiddlePointAttr: Middle point constraint allows points and lines only</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <translation></translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchConstraintParallel</name>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - GeomValidators_ShapeType: The object is empty</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <translation></translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchConstraintRigid</name>
+    <message>
+      <source>ConstraintEntityA - GeomValidators_ShapeType: The object is empty</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <translation></translation>
+    </message>
+  </context>
+
+  <context>
+    <name>SketchConstraintTangent</name>
+    <message>
+      <source>ConstraintEntityA - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityA and ConstraintEntityB attributes.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - PartSet_DifferentObjects: The feature uses one  object in ConstraintEntityB and ConstraintEntityA attributes.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>ConstraintEntityB - SketchPlugin_TangentAttr: It uses an empty object</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized.</source>
+      <translation></translation>
+    </message>
+    <message>
+      <source>Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized.</source>
+      <translation></translation>
+    </message>
+  </context>
 </TS>