From 7e21630302070cadad4584840624f05a0ec049b1 Mon Sep 17 00:00:00 2001 From: azv Date: Mon, 23 Sep 2019 11:03:38 +0300 Subject: [PATCH] Update translations for SketchPlugin_Validators. --- src/SketchPlugin/SketchPlugin_Validators.cpp | 8 ++- src/SketchPlugin/SketchPlugin_msg_en.ts | 54 ++++++++++++++++---- src/SketchPlugin/SketchPlugin_msg_fr.ts | 51 ++++++++++++++++++ 3 files changed, 99 insertions(+), 14 deletions(-) diff --git a/src/SketchPlugin/SketchPlugin_Validators.cpp b/src/SketchPlugin/SketchPlugin_Validators.cpp index 1d62d8f24..63ab98c89 100644 --- a/src/SketchPlugin/SketchPlugin_Validators.cpp +++ b/src/SketchPlugin/SketchPlugin_Validators.cpp @@ -308,10 +308,8 @@ bool SketchPlugin_EqualAttrValidator::isValid(const AttributePtr& theAttribute, aFeature->getKind() != SketchPlugin_Circle::ID() && aFeature->getKind() != SketchPlugin_Arc::ID() && aFeature->getKind() != SketchPlugin_Ellipse::ID()) { - theError = "The %1 feature kind of attribute is wrong. It should be %2 or %3 or %4 or %5"; - theError.arg(aFeature->getKind()).arg(SketchPlugin_Line::ID()) - .arg(SketchPlugin_Circle::ID()).arg(SketchPlugin_Arc::ID()) - .arg(SketchPlugin_Ellipse::ID()); + theError = "The %1 feature is not supported by the Equal constraint."; + theError.arg(aFeature->getKind()); // wrong type of attribute return false; } @@ -328,7 +326,7 @@ bool SketchPlugin_EqualAttrValidator::isValid(const AttributePtr& theAttribute, // TODO } if (!isOk) { - theError = "Feature with kinds %1 and %2 can not be equal."; + theError = "Features with kinds %1 and %2 can not be equal."; theError.arg(aType[0]).arg(aType[1]); return false; } diff --git a/src/SketchPlugin/SketchPlugin_msg_en.ts b/src/SketchPlugin/SketchPlugin_msg_en.ts index 4b71ef4b3..2c58422c7 100644 --- a/src/SketchPlugin/SketchPlugin_msg_en.ts +++ b/src/SketchPlugin/SketchPlugin_msg_en.ts @@ -1652,6 +1652,14 @@ An empty object is used. An empty object is used + + The %1 feature is not supported by the Equal constraint. + The %1 feature is not supported by the Equal constraint. + + + Features with kinds %1 and %2 can not be equal. + Features with kinds %1 and %2 can not be equal. + SketchConstraintEqual:Model_FeatureValidator @@ -2037,6 +2045,13 @@ Diferent objects should be selected + + SketchConstraintTangent:ConstraintEntityA:SketchPlugin_TangentAttr + + Two segments cannot be tangent + Two segments cannot be tangent + + SketchConstraintTangent:ConstraintEntityB:SketchPlugin_TangentAttr @@ -2151,22 +2166,43 @@ The attribute with the %1 type is not processed An argument of type %1 of the projection feature is not supported - - - SketchProjection:ExternalFeature:SketchPlugin_ProjectionValidator - The attribute %1 should be an edge - The projected item must be an edge + The attribute %1 should be an edge or vertex + The projected item must be an edge or a vertex - - - SketchProjection:ExternalFeature:SketchPlugin_ProjectionValidator There is no sketch referring to the current feature The projection feature has no sketch + + Unable to project feature from the same sketch + Feature from the current sketch cannot be projected + + + Error: Line is orthogonal to the sketch plane. + Error: Line is orthogonal to the sketch plane. + + + Error: Circle is orthogonal to the sketch plane. + Error: Circle is orthogonal to the sketch plane. + + + Error: Arc is orthogonal to the sketch plane. + Error: Arc is orthogonal to the sketch plane. + + + Error: Ellipse is orthogonal to the sketch plane. + Error: Ellipse is orthogonal to the sketch plane. + + + Error: Elliptic Arc is orthogonal to the sketch plane. + Error: Elliptic Arc is orthogonal to the sketch plane. + + + Error: Selected object is not supported for projection. + Error: Selected object is not supported for projection. + - SketchProjection:Model_FeatureValidator diff --git a/src/SketchPlugin/SketchPlugin_msg_fr.ts b/src/SketchPlugin/SketchPlugin_msg_fr.ts index a5a1b45b3..6ce7cdbfb 100644 --- a/src/SketchPlugin/SketchPlugin_msg_fr.ts +++ b/src/SketchPlugin/SketchPlugin_msg_fr.ts @@ -1625,6 +1625,14 @@ An empty object is used. AA + + The %1 feature is not supported by the Equal constraint. + AA + + + Features with kinds %1 and %2 can not be equal. + AA + SketchConstraintEqual:Model_FeatureValidator @@ -1974,6 +1982,13 @@ AA + + SketchConstraintTangent:ConstraintEntityA:SketchPlugin_TangentAttr + + Two segments cannot be tangent + AA + + SketchConstraintTangent:ConstraintEntityB:SketchPlugin_TangentAttr @@ -3824,10 +3839,46 @@ SketchProjection:ExternalFeature:SketchPlugin_ProjectionValidator + + The attribute with the %1 type is not processed + AA + The attribute %1 should be an edge or vertex AA + + There is no sketch referring to the current feature + AA + + + Unable to project feature from the same sketch + AA + + + Error: Line is orthogonal to the sketch plane. + AA + + + Error: Circle is orthogonal to the sketch plane. + AA + + + Error: Arc is orthogonal to the sketch plane. + AA + + + Error: Ellipse is orthogonal to the sketch plane. + AA + + + Error: Elliptic Arc is orthogonal to the sketch plane. + AA + + + Error: Selected object is not supported for projection. + AA + SketchProjection:IncludeToResult -- 2.39.2