From: mpv Date: Fri, 20 Sep 2019 14:36:15 +0000 (+0300) Subject: Added some missed translations and removed extra symbols in some sentences. X-Git-Tag: V9_4_0a2~4^2~77 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=381e834513ab0083a90da4b581dca57a39009266;p=modules%2Fshaper.git Added some missed translations and removed extra symbols in some sentences. --- diff --git a/src/CollectionPlugin/CollectionPlugin_msg_en.ts b/src/CollectionPlugin/CollectionPlugin_msg_en.ts index 3c2d28234..c34371bde 100644 --- a/src/CollectionPlugin/CollectionPlugin_msg_en.ts +++ b/src/CollectionPlugin/CollectionPlugin_msg_en.ts @@ -16,13 +16,6 @@ Constructions not allowed for selection. - - Group:group_list:GeomValidators_BodyShapes - - Error: Attribute \"%1\" does not supported by this validator. - Attribute "%1" does not supported by "GeomValidators_BodyShapes" validator. - - Group:Model_FeatureValidator diff --git a/src/CollectionPlugin/CollectionPlugin_msg_fr.ts b/src/CollectionPlugin/CollectionPlugin_msg_fr.ts index 38885da14..3bb78cda9 100644 --- a/src/CollectionPlugin/CollectionPlugin_msg_fr.ts +++ b/src/CollectionPlugin/CollectionPlugin_msg_fr.ts @@ -82,10 +82,6 @@ Error: Result construction selected. AA - - Error: Attribute \"%1\" does not supported by this validator. - AA - Group:Model_FeatureValidator diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts index f3779e279..635d8e604 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts +++ b/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts @@ -226,13 +226,6 @@ 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 - - Extrusion:base :FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - - - Extrusion:direction_object:GeomValidators_ShapeType @@ -654,13 +647,6 @@ 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 - - ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - - - ExtrusionCut:direction_object:GeomValidators_ShapeType @@ -1116,13 +1102,6 @@ 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 - - Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - - - Revolution:axis_object:GeomValidators_ShapeType @@ -1522,13 +1501,6 @@ 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 - - RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - - - RevolutionCut:axis_object:GeomValidators_ShapeType @@ -1949,13 +1921,6 @@ 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 - - ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - - - ExtrusionFuse:direction_object:GeomValidators_ShapeType @@ -2446,13 +2411,6 @@ 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 - - RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - - - RevolutionFuse:axis_object:GeomValidators_ShapeType @@ -2859,13 +2817,6 @@ Object for pipe path is not selected. - - Pipe:FeaturesPlugin_ValidatorPipeLocations - - Error: Feature \"%1\" does not supported by this validator. - Feature "%1" does not supported validator "FeaturesPlugin_ValidatorPipeLocations". - - Pipe:FeaturesPlugin_ValidatorPipeLocations @@ -3006,13 +2957,6 @@ 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 - - Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - - - Pipe:path_object:FeaturesPlugin_ValidatorPipePath @@ -3104,13 +3048,6 @@ Selected object has empty context. - - Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult - - Error: Feature \"%1\" does not supported by this validator. - Feature "%1" does not supported validator "FeaturesPlugin_ValidatorRemoveSubShapesResult". - - Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult @@ -3209,13 +3146,6 @@ - - Remove_SubShapes:base_shape:GeomValidators_BodyShapes - - Error: Attribute \"%1\" does not supported by this validator. - - - Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection @@ -3629,13 +3559,6 @@ Objects from the %1 group can be selected in the %2 document, but an objects from the %3 group is selected. - - Union:FeaturesPlugin_ValidatorUnionArguments - - Error: This validator supports only \"%1\" feature. - This validator "FeaturesPlugin_ValidatorUnionArguments" supports only "%1" feature. - - Union:FeaturesPlugin_ValidatorUnionArguments diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts index 1eec6ed65..40b87f8ec 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts +++ b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts @@ -1468,7 +1468,7 @@ AA - Angle for "from" for bounding plane + Angle for "from" bounding plane AA @@ -1950,13 +1950,6 @@ AA - - Extrusion:base :FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - AA - - Extrusion:direction_object:GeomValidators_ShapeType @@ -2392,13 +2385,6 @@ AA - - ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - AA - - ExtrusionCut:direction_object:GeomValidators_ShapeType @@ -2854,13 +2840,6 @@ AA - - Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - AA - - Revolution:axis_object:GeomValidators_ShapeType @@ -3260,13 +3239,6 @@ AA - - RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - AA - - RevolutionCut:axis_object:GeomValidators_ShapeType @@ -3687,13 +3659,6 @@ AA - - ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - AA - - ExtrusionFuse:direction_object:GeomValidators_ShapeType @@ -4184,13 +4149,6 @@ AA - - RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - AA - - RevolutionFuse:axis_object:GeomValidators_ShapeType @@ -4597,13 +4555,6 @@ AA - - Pipe:FeaturesPlugin_ValidatorPipeLocations - - Error: Feature \"%1\" does not supported by this validator. - AA - - Pipe:FeaturesPlugin_ValidatorPipeLocations @@ -4744,13 +4695,6 @@ AA - - Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration - - Error: Attribute \"%1\" does not supported by this validator. - AA - - Pipe:path_object:FeaturesPlugin_ValidatorPipePath @@ -4842,13 +4786,6 @@ AA - - Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult - - Error: Feature \"%1\" does not supported by this validator. - AA - - Remove_SubShapes:FeaturesPlugin_ValidatorRemoveSubShapesResult @@ -4947,13 +4884,6 @@ AA - - Remove_SubShapes:base_shape:GeomValidators_BodyShapes - - Error: Attribute \"%1\" does not supported by this validator. - AA - - Remove_SubShapes:subshapes:FeaturesPlugin_ValidatorRemoveSubShapesSelection @@ -5367,13 +5297,6 @@ AA - - Union:FeaturesPlugin_ValidatorUnionArguments - - Error: This validator supports only \"%1\" feature. - AA - - Union:FeaturesPlugin_ValidatorUnionArguments diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml index 26c0de8ff..aa7acc60e 100644 --- a/src/FeaturesPlugin/revolutionfuse_widget.xml +++ b/src/FeaturesPlugin/revolutionfuse_widget.xml @@ -63,7 +63,7 @@ + tooltip="Angle for "from" bounding plane"> diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp index 885259852..aa05113a8 100644 --- a/src/Model/Model_FeatureValidator.cpp +++ b/src/Model/Model_FeatureValidator.cpp @@ -57,9 +57,8 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr& th myNotObligatory.find(theFeature->getKind()); if (aFeatureFind == myNotObligatory.end() || // and it is obligatory for filling aFeatureFind->second.find(*it) == aFeatureFind->second.end()) { - // TODO(spo): exceptional case for translation - theError = "Attribute \"" + anAttr->id() + "\" is not initialized."; -// theError.arg(anAttr->id()); + theError = "Attribute \"%1\" is not initialized."; + theError.addParameter(anAttr->id()); return false; } } diff --git a/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp b/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp index 6b0dc115c..907832966 100644 --- a/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp +++ b/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp @@ -60,7 +60,6 @@ enum ColumnType { const char* NoName = ""; const char* NoValue = ""; -const char* NotValid = ""; /*! * \ingroup GUI @@ -435,13 +434,13 @@ QList ParametersPlugin_WidgetParamsMgr:: std::string aName = aParameter->string(ParametersPlugin_Parameter::VARIABLE_ID())->value(); if (aName.empty()) { - aValues << NoName; + aValues << translate(NoName); } else aValues << aName.c_str(); std::string aExpr = aParameter->string(ParametersPlugin_Parameter::EXPRESSION_ID())->value(); if (aName.empty()) { - aValues << NoValue; + aValues << translate(NoValue); } else aValues << aExpr.c_str(); @@ -574,8 +573,8 @@ FeaturePtr ParametersPlugin_WidgetParamsMgr::createParameter() const QTreeWidgetItem* ParametersPlugin_WidgetParamsMgr::createNewItem(QTreeWidgetItem* theParent) const { QStringList aValues; - aValues << NoName; - aValues << NoValue; + aValues << translate(NoName); + aValues << translate(NoValue); QTreeWidgetItem* aItem = new QTreeWidgetItem(aValues); if (theParent == myParameters) { @@ -819,7 +818,7 @@ bool ParametersPlugin_WidgetParamsMgr::isValid() for(int i = 0; i < myParameters->childCount(); i++) { aItem = myParameters->child(i); if ((aItem->text(Col_Name) == NoName) || - (aItem->text(Col_Equation) == NoValue) || + (aItem->text(Col_Equation) == translate(NoValue)) || (!ModelAPI_Expression::isVariable(aItem->text(Col_Name).toStdString())) ) { return false; } diff --git a/src/ParametersPlugin/ParametersPlugin_msg_fr.ts b/src/ParametersPlugin/ParametersPlugin_msg_fr.ts index 8a712b430..3989a75eb 100644 --- a/src/ParametersPlugin/ParametersPlugin_msg_fr.ts +++ b/src/ParametersPlugin/ParametersPlugin_msg_fr.ts @@ -133,6 +133,14 @@ See preview AA + + <NoName> + AA + + + <NoValue> + AA + diff --git a/src/SketchPlugin/SketchPlugin_msg_en.ts b/src/SketchPlugin/SketchPlugin_msg_en.ts index 35073532a..4b71ef4b3 100644 --- a/src/SketchPlugin/SketchPlugin_msg_en.ts +++ b/src/SketchPlugin/SketchPlugin_msg_en.ts @@ -4,14 +4,14 @@ Sketch:Model_FeatureValidator - Attribute "DirX" is not initialized. + Attribute "%1" is not initialized. Select a plane for the sketch Sketch:Model_FeatureValidator - Attribute "Features" is not initialized. + Attribute "%1" is not initialized. Sketch objects are not defined @@ -53,25 +53,43 @@ Sketch:Model_FeatureValidator - Attribute "External" is not initialized. + Attribute "%1" is not initialized. Select the sketch plane Sketch:Model_FeatureValidator - Attribute "SolverDOF" is not initialized. + Attribute "%1" is not initialized. Can not compute degrees of freedom Sketch:Model_FeatureValidator - Attribute "SolverError" is not initialized. + Attribute "%1" is not initialized. Can not compute the solver error + + SketchMacroCircle:center_point + + Attribute "%1" is locked by modification value in the viewer. + Select a point in the viewer + + + Attribute "%1" is not initialized. + Select a point in the viewer + + + + SketchMacroCircle:passed_point + + Attribute "%1" is locked by modification value in the viewer. + Select a point in the viewer + + SketchMacroCircle:CircleRadius:GeomValidators_Positive @@ -82,28 +100,28 @@ SketchMacroCircle:Model_FeatureValidator - Attribute "circle_center" is not initialized. + Attribute "%1" is not initialized. A center point is not selected SketchMacroCircle:Model_FeatureValidator - Attribute "FirstPoint" is not initialized. + Attribute "%1" is not initialized. A first point is not selected SketchMacroCircle:Model_FeatureValidator - Attribute "SecondPoint" is not initialized. + Attribute "%1" is not initialized. A second point is not selected SketchMacroCircle:Model_FeatureValidator - Attribute "ThirdPoint" is not initialized. + Attribute "%1" is not initialized. A third point is not selected @@ -159,15 +177,120 @@ SketchMacroCircle:Model_FeatureValidator - Attribute "circle_radius" is not initialized. + Attribute "%1" is not initialized. Set the circle radius + + + SketchMacroArc:Model_FeatureValidator + + Attribute "%1" is not initialized. + Select a point. + + + + SketchMacroArc:center_point + + Attribute "%1" is locked by modification value in the viewer. + Select a center point. + + + + SketchMacroArc:end_point_1 + + Attribute "%1" is locked by modification value in the viewer. + Select an end point in the viewer. + + + + SketchMacroArc:end_point_2 + + Attribute "%1" is locked by modification value in the viewer. + Select an end point in the viewer. + + + + SketchMacroArc:end_point_3 + + Attribute "%1" is locked by modification value in the viewer. + Select an end point in the viewer. + + + Attribute "%1" is not initialized. + Select an end point in the viewer. + + + + SketchMacroArc:passed_point + + Attribute "%1" is locked by modification value in the viewer. + Select an passed point in the viewer. + + + + SketchMacroArc:start_point_1 + + Attribute "%1" is locked by modification value in the viewer. + Select a start point. + + + + SketchMacroArc:start_point_2 + + Attribute "%1" is locked by modification value in the viewer. + Select a start point. + + + + + SketchMacroEllipse:Model_FeatureValidator + + Attribute "%1" is not initialized. + Select a point. + + + + SketchMacroEllipse:first_point + + Attribute "%1" is locked by modification value in the viewer. + Select a first point in the viewer. + + + + SketchMacroEllipse:passed_point + + Attribute "%1" is locked by modification value in the viewer. + Select a passed point. + + + + SketchMacroEllipse:second_point + + Attribute "%1" is locked by modification value in the viewer. + Select a second point. + + + + + SketchSplit:Model_FeatureValidator + + Attribute "%1" is not initialized. + Select a segment to split in the viewer. + + + + SketchSplit:SelectedObject:SketchPlugin_SplitValidator + + Select a segment to split in the viewer. + + + SketchConstraintHorizontal:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. Line is not selected @@ -231,14 +354,14 @@ SketchConstraintPerpendicular:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. First line is not selected SketchConstraintPerpendicular:Model_FeatureValidator - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. Second line is not selected @@ -358,7 +481,7 @@ SketchConstraintRadius:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. Circle is not selected @@ -407,7 +530,7 @@ SketchConstraintRadius:Model_FeatureValidator - Attribute "ConstraintValue" is not initialized. + Attribute "%1" is not initialized. Set the radius @@ -464,7 +587,7 @@ SketchConstraintVertical:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. Line is not selected @@ -528,42 +651,42 @@ SketchLine:Model_FeatureValidator - Attribute "EndPoint" is not initialized. + Attribute "%1" is not initialized. End point is not selected SketchLine:EndPoint - Attribute "EndPoint" is locked by modification value in the viewer. + Attribute "%1" is locked by modification value in the viewer. Select an end point in the viewer SketchLine:StartPoint - Attribute "StartPoint" is locked by modification value in the viewer. + Attribute "%1" is locked by modification value in the viewer. Select a start point in the viewer SketchLine:StartPoint - Attribute "StartPoint" is not initialized. + Attribute "%1" is not initialized. Start point is not selected SketchLine:EndPoint - Attribute "EndPoint" is not initialized. + Attribute "%1" is not initialized. End point is not selected SketchLine:Model_FeatureValidator - Attribute "StartPoint" is not initialized. + Attribute "%1" is not initialized. Select a start point @@ -571,14 +694,14 @@ SketchPoint:Model_FeatureValidator - Attribute "PointCoordinates" is not initialized. + Attribute "%1" is not initialized. Point is not defined SketchPoint:PointCoordinates - Attribute "PointCoordinates" is locked by modification value in the viewer. + Attribute "%1" is locked by modification value in the viewer. Select a point @@ -593,29 +716,36 @@ SketchRectangle:RectEndPoint - Attribute "RectEndPoint" is locked by modification value in the viewer. - Select an end point of the rectangle + Attribute "%1" is locked by modification value in the viewer. + Select an end point of the rectangle. SketchRectangle:RectStartPoint - Attribute "RectStartPoint" is locked by modification value in the viewer. - Select a first point of the rectangle + Attribute "%1" is locked by modification value in the viewer. + Select a point. SketchRectangle:Model_FeatureValidator - Attribute "RectStartPoint" is not initialized. - Select a first point of the rectangle + Attribute "%1" is not initialized. + Select a point. - SketchRectangle:Model_FeatureValidator + SketchRectangle:RectEndPoint + + Attribute "%1" is locked by modification value in the viewer. + Select a point. + + + + SketchRectangle:RectStartPoint - Attribute "RectEndPoint" is not initialized. - Select an end point of the rectangle + Attribute "%1" is locked by modification value in the viewer. + Select an point. @@ -636,35 +766,35 @@ SketchArc:ArcCenter - Attribute "center_point" is locked by modification value in the viewer. + Attribute "%1" is locked by modification value in the viewer. Select a center point SketchArc:ArcCenter - Attribute "center_point" is not initialized. + Attribute "%1" is not initialized. Center point is not defined SketchArc:ArcEndPoint - Attribute "ArcEndPoint" is locked by modification value in the viewer. + Attribute "%1" is locked by modification value in the viewer. Select an end point SketchArc:ArcPassedPoint - Attribute "ArcPassedPoint" is locked by modification value in the viewer. + Attribute "%1" is locked by modification value in the viewer. Select an intermediate point SketchArc:ArcStartPoint - Attribute "ArcStartPoint" is locked by modification value in the viewer. + Attribute "%1" is locked by modification value in the viewer. Select a start point @@ -685,14 +815,14 @@ SketchArc:Model_FeatureValidator - Attribute "ArcEndPoint" is not initialized. + Attribute "%1" is not initialized. End point is not defined SketchArc:Model_FeatureValidator - Attribute "ArcPassedPoint" is not initialized. + Attribute "%1" is not initialized. Intermediate point is not defined @@ -720,35 +850,35 @@ SketchArc:Model_FeatureValidator - Attribute "center_point" is not initialized. + Attribute "%1" is not initialized. Select an arc center SketchArc:Model_FeatureValidator:ArcStartPoint - Attribute "start_point" is not initialized. + Attribute "%1" is not initialized. Select an arc start point SketchArc:Model_FeatureValidator - Attribute "end_point" is not initialized. + Attribute "%1" is not initialized. Select an arc end point SketchArc:Model_FeatureValidator - Attribute "ArcPassedPoint" is not initialized. + Attribute "%1" is not initialized. Select an arc passed point SketchArc:Model_FeatureValidator - Attribute "ArcTangentPoint" is not initialized. + Attribute "%1" is not initialized. Select an arc tangent point @@ -762,14 +892,14 @@ SketchConstraintMirror:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. Mirror line is not selected SketchConstraintMirror:Model_FeatureValidator - Attribute "ConstraintMirrorList" is not initialized. + Attribute "%1" is not initialized. Objects for mirror are not selected @@ -819,14 +949,14 @@ SketchMultiRotation:Model_FeatureValidator - Attribute "AngleType" is not initialized. + Attribute "%1" is not initialized. Type of angle is not defined SketchMultiRotation:Model_FeatureValidator - Attribute "MultiRotationCenter" is not initialized. + Attribute "%1" is not initialized. Rotation center is not selected @@ -868,21 +998,21 @@ SketchMultiRotation:Model_FeatureValidator - Attribute "MultiRotationList" is not initialized. + Attribute "%1" is not initialized. Select objects to rotate SketchMultiRotation:Model_FeatureValidator - Attribute "MultiRotationAngle" is not initialized. + Attribute "%1" is not initialized. Set rotation angle SketchMultiRotation:Model_FeatureValidator - Attribute "MultiRotationObjects" is not initialized. + Attribute "%1" is not initialized. Set the number of resulting objects @@ -946,14 +1076,14 @@ SketchMultiTranslation:Model_FeatureValidator - Attribute "MultiTranslationEndPoint" is not initialized. + Attribute "%1" is not initialized. End point of translation vector is not defined SketchMultiTranslation:Model_FeatureValidator - Attribute "MultiTranslationList" is not initialized. + Attribute "%1" is not initialized. Objects for translation are not selected @@ -1004,14 +1134,14 @@ SketchMultiTranslation:Model_FeatureValidator - Attribute "MultiTranslationStartPoint" is not initialized. + Attribute "%1" is not initialized. Select a start point SketchMultiTranslation:Model_FeatureValidator - Attribute "MultiTranslationObjects" is not initialized. + Attribute "%1" is not initialized. Select a total number of objects @@ -1159,28 +1289,28 @@ SketchConstraintAngle:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. First object is not selected SketchConstraintAngle:Model_FeatureValidator - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. Second object is not selected SketchConstraintAngle:Model_FeatureValidator - Attribute "AngleValue" is not initialized. + Attribute "%1" is not initialized. Set the angle value SketchConstraintAngle:Model_FeatureValidator - Attribute "AngleType" is not initialized. + Attribute "%1" is not initialized. Type of angle is not set @@ -1293,14 +1423,14 @@ SketchConstraintCoincidence:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. First object is not selected SketchConstraintCoincidence:Model_FeatureValidator - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. Second object is not selected @@ -1350,14 +1480,14 @@ SketchConstraintDistance:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. First object is not selected SketchConstraintDistance:Model_FeatureValidator - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. Second object is not selected @@ -1385,21 +1515,21 @@ SketchConstraintDistance:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. First object is not selected SketchConstraintDistance:Model_FeatureValidator - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. Second object is not selected SketchConstraintDistance:Model_FeatureValidator - Attribute "ConstraintValue" is not initialized. + Attribute "%1" is not initialized. Set the distance @@ -1526,14 +1656,14 @@ SketchConstraintEqual:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. First object is not selected SketchConstraintEqual:Model_FeatureValidator - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. Second object is not selected @@ -1576,7 +1706,7 @@ SketchConstraintLength:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. Line is not selected @@ -1605,14 +1735,14 @@ SketchConstraintLength:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. Line is not selected SketchConstraintLength:Model_FeatureValidator - Attribute "ConstraintValue" is not initialized. + Attribute "%1" is not initialized. Set the length value @@ -1683,14 +1813,14 @@ SketchConstraintMiddle:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. First object is not selected SketchConstraintMiddle:Model_FeatureValidator - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. Second object is not selected @@ -1726,14 +1856,14 @@ SketchConstraintParallel:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. First line is not selected SketchConstraintParallel:Model_FeatureValidator - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. Second line is not selected @@ -1846,7 +1976,7 @@ SketchConstraintRigid:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. Object is not selected @@ -1917,14 +2047,14 @@ SketchConstraintTangent:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. First object is not selected SketchConstraintTangent:Model_FeatureValidator - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. Second object is not selected @@ -1968,14 +2098,14 @@ SketchFillet:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. Select one or several points for filet SketchFillet:Model_FeatureValidator - Attribute "ConstraintValue" is not initialized. + Attribute "%1" is not initialized. Set the fillet radius @@ -2040,7 +2170,7 @@ SketchProjection:Model_FeatureValidator - Attribute "ExternalFeature" is not initialized. + Attribute "%1" is not initialized. diff --git a/src/SketchPlugin/SketchPlugin_msg_fr.ts b/src/SketchPlugin/SketchPlugin_msg_fr.ts index 6fed6503c..a5a1b45b3 100644 --- a/src/SketchPlugin/SketchPlugin_msg_fr.ts +++ b/src/SketchPlugin/SketchPlugin_msg_fr.ts @@ -123,14 +123,7 @@ Sketch:Model_FeatureValidator - Attribute "DirX" is not initialized. - AA - - - - Sketch:Model_FeatureValidator - - Attribute "Features" is not initialized. + Attribute "%1" is not initialized. AA @@ -172,21 +165,7 @@ Sketch:Model_FeatureValidator - Attribute "External" is not initialized. - AA - - - - Sketch:Model_FeatureValidator - - Attribute "SolverDOF" is not initialized. - AA - - - - Sketch:Model_FeatureValidator - - Attribute "SolverError" is not initialized. + Attribute "%1" is not initialized. AA @@ -201,28 +180,7 @@ SketchMacroCircle:Model_FeatureValidator - Attribute "circle_center" is not initialized. - AA - - - - SketchMacroCircle:Model_FeatureValidator - - Attribute "FirstPoint" is not initialized. - AA - - - - SketchMacroCircle:Model_FeatureValidator - - Attribute "SecondPoint" is not initialized. - AA - - - - SketchMacroCircle:Model_FeatureValidator - - Attribute "ThirdPoint" is not initialized. + Attribute "%1" is not initialized. AA @@ -275,20 +233,6 @@ AA - - SketchMacroCircle:Model_FeatureValidator - - Attribute "circle_radius" is not initialized. - AA - - - - SketchMacroCircle:Model_FeatureValidator - - Attribute "circle_type" is not initialized. - AA - - SketchMacroCircle:center_point @@ -310,11 +254,7 @@ SketchMacroCircle:Model_FeatureValidator - Attribute "circle_type" is not initialized. - AA - - - Attribute "second_point" is not initialized. + Attribute "%1" is not initialized. AA @@ -395,7 +335,7 @@ SketchConstraintHorizontal:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. AA @@ -459,14 +399,7 @@ SketchConstraintPerpendicular:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintPerpendicular:Model_FeatureValidator - - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. AA @@ -586,7 +519,7 @@ SketchConstraintRadius:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. AA @@ -632,13 +565,6 @@ AA - - SketchConstraintRadius:Model_FeatureValidator - - Attribute "ConstraintValue" is not initialized. - AA - - SketchConstraintRadius:ConstraintEntityA:GeomValidators_ShapeType @@ -692,7 +618,7 @@ SketchConstraintVertical:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. AA @@ -756,7 +682,7 @@ SketchLine:Model_FeatureValidator - Attribute "EndPoint" is not initialized. + Attribute "%1" is not initialized. AA @@ -777,21 +703,21 @@ SketchLine:StartPoint - Attribute "StartPoint" is not initialized. + Attribute "%1" is not initialized. AA SketchLine:EndPoint - Attribute "EndPoint" is not initialized. + Attribute "%1" is not initialized. AA SketchLine:Model_FeatureValidator - Attribute "StartPoint" is not initialized. + Attribute "%1" is not initialized. AA @@ -821,7 +747,7 @@ SketchPoint:Model_FeatureValidator - Attribute "PointCoordinates" is not initialized. + Attribute "%1" is not initialized. AA @@ -864,14 +790,7 @@ SketchRectangle:Model_FeatureValidator - Attribute "RectStartPoint" is not initialized. - AA - - - - SketchRectangle:Model_FeatureValidator - - Attribute "RectEndPoint" is not initialized. + Attribute "%1" is not initialized. AA @@ -922,7 +841,7 @@ SketchArc:ArcCenter - Attribute "center_point" is not initialized. + Attribute "%1" is not initialized. AA @@ -964,14 +883,7 @@ SketchArc:Model_FeatureValidator - Attribute "ArcEndPoint" is not initialized. - AA - - - - SketchArc:Model_FeatureValidator - - Attribute "ArcPassedPoint" is not initialized. + Attribute "%1" is not initialized. AA @@ -996,38 +908,10 @@ AA - - SketchArc:Model_FeatureValidator - - Attribute "center_point" is not initialized. - AA - - SketchArc:Model_FeatureValidator:ArcStartPoint - Attribute "start_point" is not initialized. - AA - - - - SketchArc:Model_FeatureValidator - - Attribute "end_point" is not initialized. - AA - - - - SketchArc:Model_FeatureValidator - - Attribute "ArcPassedPoint" is not initialized. - AA - - - - SketchArc:Model_FeatureValidator - - Attribute "ArcTangentPoint" is not initialized. + Attribute "%1" is not initialized. AA @@ -1095,14 +979,7 @@ SketchConstraintMirror:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintMirror:Model_FeatureValidator - - Attribute "ConstraintMirrorList" is not initialized. + Attribute "%1" is not initialized. AA @@ -1152,14 +1029,7 @@ SketchMultiRotation:Model_FeatureValidator - Attribute "AngleType" is not initialized. - AA - - - - SketchMultiRotation:Model_FeatureValidator - - Attribute "MultiRotationCenter" is not initialized. + Attribute "%1" is not initialized. AA @@ -1198,27 +1068,6 @@ AA - - SketchMultiRotation:Model_FeatureValidator - - Attribute "MultiRotationList" is not initialized. - AA - - - - SketchMultiRotation:Model_FeatureValidator - - Attribute "MultiRotationAngle" is not initialized. - AA - - - - SketchMultiRotation:Model_FeatureValidator - - Attribute "MultiRotationObjects" is not initialized. - AA - - SketchMultiRotation:MultiRotationList:SketchPlugin_CopyValidator @@ -1279,14 +1128,7 @@ SketchMultiTranslation:Model_FeatureValidator - Attribute "MultiTranslationEndPoint" is not initialized. - AA - - - - SketchMultiTranslation:Model_FeatureValidator - - Attribute "MultiTranslationList" is not initialized. + Attribute "%1" is not initialized. AA @@ -1331,21 +1173,6 @@ Integer is not positive. AA - - - - SketchMultiTranslation:Model_FeatureValidator - - Attribute "MultiTranslationStartPoint" is not initialized. - AA - - - - SketchMultiTranslation:Model_FeatureValidator - - Attribute "MultiTranslationObjects" is not initialized. - AA - SketchMultiTranslation:MultiTranslationList:SketchPlugin_CopyValidator @@ -1491,28 +1318,7 @@ SketchConstraintAngle:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintAngle:Model_FeatureValidator - - Attribute "ConstraintEntityB" is not initialized. - AA - - - - SketchConstraintAngle:Model_FeatureValidator - - Attribute "AngleValue" is not initialized. - AA - - - - SketchConstraintAngle:Model_FeatureValidator - - Attribute "AngleType" is not initialized. + Attribute "%1" is not initialized. AA @@ -1625,14 +1431,7 @@ SketchConstraintCoincidence:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintCoincidence:Model_FeatureValidator - - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. AA @@ -1686,13 +1485,6 @@ AA - - SketchConstraintDistance:Model_FeatureValidator - - Attribute "ConstraintEntityB" is not initialized. - AA - - SketchConstraintDistance:ConstraintValue:GeomValidators_Positive @@ -1714,27 +1506,6 @@ AA - - SketchConstraintDistance:Model_FeatureValidator - - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintDistance:Model_FeatureValidator - - Attribute "ConstraintEntityB" is not initialized. - AA - - - - SketchConstraintDistance:Model_FeatureValidator - - Attribute "ConstraintValue" is not initialized. - AA - - SketchConstraintDistance:ConstraintEntityA:SketchPlugin_ExternalValidator @@ -1858,14 +1629,7 @@ SketchConstraintEqual:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintEqual:Model_FeatureValidator - - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. AA @@ -1908,7 +1672,7 @@ SketchConstraintLength:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. AA @@ -1932,21 +1696,6 @@ Integer is not positive. AA - - - - SketchConstraintLength:Model_FeatureValidator - - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintLength:Model_FeatureValidator - - Attribute "ConstraintValue" is not initialized. - AA - SketchConstraintLength:ConstraintEntityA:GeomValidators_ShapeType @@ -2015,14 +1764,7 @@ SketchConstraintMiddle:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintMiddle:Model_FeatureValidator - - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. AA @@ -2058,14 +1800,7 @@ SketchConstraintParallel:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintParallel:Model_FeatureValidator - - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. AA @@ -2178,7 +1913,7 @@ SketchConstraintRigid:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. AA @@ -2249,14 +1984,7 @@ SketchConstraintTangent:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchConstraintTangent:Model_FeatureValidator - - Attribute "ConstraintEntityB" is not initialized. + Attribute "%1" is not initialized. AA @@ -2300,14 +2028,7 @@ SketchFillet:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. - AA - - - - SketchFillet:Model_FeatureValidator - - Attribute "ConstraintValue" is not initialized. + Attribute "%1" is not initialized. AA @@ -2372,7 +2093,7 @@ SketchProjection:Model_FeatureValidator - Attribute "ExternalFeature" is not initialized. + Attribute "%1" is not initialized. AA @@ -2495,7 +2216,7 @@ SketchConstraintAngle:Model_FeatureValidator - Attribute "AngleReversedLine1" is not initialized. + Attribute "%1" is not initialized. AA @@ -2584,7 +2305,7 @@ SketchConstraintCollinear:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. AA @@ -2765,7 +2486,7 @@ SketchConstraintDistanceHorizontal:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. AA @@ -2864,7 +2585,7 @@ SketchConstraintDistanceVertical:Model_FeatureValidator - Attribute "ConstraintEntityA" is not initialized. + Attribute "%1" is not initialized. AA @@ -3277,7 +2998,7 @@ SketchDrawer:Model_FeatureValidator - Attribute "base_shape" is not initialized. + Attribute "%1" is not initialized. AA @@ -3329,7 +3050,7 @@ SketchFillet:Model_FeatureValidator - Attribute "fillet_point" is not initialized. + Attribute "%1" is not initialized. AA @@ -3399,7 +3120,7 @@ SketchIntersectionPoint:Model_FeatureValidator - Attribute "ExternalFeature" is not initialized. + Attribute "%1" is not initialized. AA @@ -3470,19 +3191,7 @@ SketchMacroArc:Model_FeatureValidator - Attribute "center_point" is not initialized. - AA - - - Attribute "end_point_1" is not initialized. - AA - - - Attribute "end_point_2" is not initialized. - AA - - - Attribute "end_point_3" is not initialized. + Attribute "%1" is not initialized. AA @@ -3563,13 +3272,6 @@ AA - - SketchMacroArc:Model_FeatureValidator - - Attribute "arc_type" is not initialized. - AA - - SketchMacroArc:center_point @@ -3657,15 +3359,7 @@ SketchMacroCircle:Model_FeatureValidator - Attribute "center_point" is not initialized. - AA - - - Attribute "first_point" is not initialized. - AA - - - Attribute "passed_point" is not initialized. + Attribute "%1" is not initialized. AA @@ -3705,13 +3399,6 @@ AA - - SketchMacroCircle:Model_FeatureValidator - - Attribute "third_point" is not initialized. - AA - - SketchMacroCircle:first_point @@ -3763,11 +3450,7 @@ SketchMacroEllipse:Model_FeatureValidator - Attribute "first_point" is not initialized. - AA - - - Attribute "passed_point" is not initialized. + Attribute "%1" is not initialized. AA @@ -3832,7 +3515,7 @@ SketchMacroEllipse:Model_FeatureValidator - Attribute "ellipse_type" is not initialized. + Attribute "%1" is not initialized. AA @@ -4195,7 +3878,7 @@ SketchSplit:Model_FeatureValidator - Attribute "SelectedObject" is not initialized. + Attribute "%1" is not initialized. AA @@ -4232,7 +3915,7 @@ SketchTrim:Model_FeatureValidator - Attribute "SelectedObject" is not initialized. + Attribute "%1" is not initialized. AA diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml index 1e51edf26..319ddd271 100644 --- a/src/SketchPlugin/plugin-Sketch.xml +++ b/src/SketchPlugin/plugin-Sketch.xml @@ -45,7 +45,7 @@ enable_value="enable_by_preferences"/> - @@ -65,7 +65,7 @@ enable_value="enable_by_preferences"/> --> #include +#include + static void sendMessage(const char* theMessageName) { @@ -352,13 +354,19 @@ bool SketchSolver_Group::resolveConstraints() void SketchSolver_Group::computeDoF() { std::ostringstream aDoFMsg; + static const std::string aMsgContext("Sketch"); int aDoF = mySketchSolver->dof(); /// "DoF = 0" content of string value is used in PartSet by Sketch edit /// If it is changed, it should be corrected also there - if (aDoF == 0) - aDoFMsg << "Sketch is fully fixed (DoF = 0)"; - else - aDoFMsg << "DoF (degrees of freedom) = " << aDoF; + if (aDoF == 0) { + static const std::string aMsgDoF("Sketch is fully fixed (DoF = 0)"); + aDoFMsg << Config_Translator::translate(aMsgContext, aMsgDoF).c_str(); + } else { + static const std::string aMsgDoF("DoF (degrees of freedom) = %1"); + Events_InfoMessage aMsg(aMsgContext, aMsgDoF); + aMsg.arg(aDoF); + aDoFMsg << Config_Translator::translate(aMsg).c_str(); + } mySketch->string(SketchPlugin_Sketch::SOLVER_DOF())->setValue(aDoFMsg.str()); if (aDoF > 0 && myDOF <= 0)