From: mpv Date: Mon, 30 Sep 2019 12:48:57 +0000 (+0300) Subject: Corrections for the English and the French translations. X-Git-Tag: V9_4_0a2~4^2~54 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bf7a4270d9f969a46f44ba0947b99f98b355dc74;p=modules%2Fshaper.git Corrections for the English and the French translations. --- diff --git a/src/BuildPlugin/BuildPlugin_Validators.cpp b/src/BuildPlugin/BuildPlugin_Validators.cpp index 45d859844..65be34119 100644 --- a/src/BuildPlugin/BuildPlugin_Validators.cpp +++ b/src/BuildPlugin/BuildPlugin_Validators.cpp @@ -99,7 +99,7 @@ bool BuildPlugin_ValidatorBaseForBuild::isValid(const AttributePtr& theAttribute std::dynamic_pointer_cast(aContext); if(aConstruction.get()) { if(aConstruction->isInfinite()) { - theError = "Inifinte objects not acceptable."; + theError = "Infinite objects not acceptable."; return false; } diff --git a/src/BuildPlugin/BuildPlugin_msg_en.ts b/src/BuildPlugin/BuildPlugin_msg_en.ts index a29504da9..25c950d5f 100644 --- a/src/BuildPlugin/BuildPlugin_msg_en.ts +++ b/src/BuildPlugin/BuildPlugin_msg_en.ts @@ -39,8 +39,8 @@ Edge:base_objects:BuildPlugin_ValidatorBaseForBuild - Inifinte objects not acceptable. - Inifinte objects not acceptable. + Infinite objects not acceptable. + Infinite objects not acceptable. @@ -130,8 +130,8 @@ Face:base_objects:BuildPlugin_ValidatorBaseForBuild - Inifinte objects not acceptable. - Inifinte objects not acceptable. + Infinite objects not acceptable. + Infinite objects not acceptable. @@ -343,8 +343,8 @@ Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild - Inifinte objects not acceptable. - Inifinte objects not acceptable. + Infinite objects not acceptable. + Infinite objects not acceptable. @@ -428,8 +428,8 @@ Wire:base_objects:BuildPlugin_ValidatorBaseForBuild - Inifinte objects not acceptable. - Inifinte objects not acceptable. + Infinite objects not acceptable. + Infinite objects not acceptable. diff --git a/src/BuildPlugin/BuildPlugin_msg_fr.ts b/src/BuildPlugin/BuildPlugin_msg_fr.ts index 98732ac04..bbd8fb9b8 100644 --- a/src/BuildPlugin/BuildPlugin_msg_fr.ts +++ b/src/BuildPlugin/BuildPlugin_msg_fr.ts @@ -98,7 +98,7 @@ Edge:base_objects:BuildPlugin_ValidatorBaseForBuild - Inifinte objects not acceptable. + Infinite objects not acceptable. Les objets infinis ne sont pas acceptés. @@ -189,7 +189,7 @@ Face:base_objects:BuildPlugin_ValidatorBaseForBuild - Inifinte objects not acceptable. + Infinite objects not acceptable. Les objets infinis ne sont pas acceptés. @@ -402,7 +402,7 @@ Vertex:base_objects:BuildPlugin_ValidatorBaseForBuild - Inifinte objects not acceptable. + Infinite objects not acceptable. Les objets infinis ne sont pas acceptés. @@ -487,7 +487,7 @@ Wire:base_objects:BuildPlugin_ValidatorBaseForBuild - Inifinte objects not acceptable. + Infinite objects not acceptable. Les objets infinis ne sont pas acceptés. @@ -880,7 +880,7 @@ Fermé - Makes the polyline closed. + Closes the polyline. Ferme la polyligne. diff --git a/src/BuildPlugin/polyline_widget.xml b/src/BuildPlugin/polyline_widget.xml index 2c283b8b1..a744731cd 100644 --- a/src/BuildPlugin/polyline_widget.xml +++ b/src/BuildPlugin/polyline_widget.xml @@ -6,6 +6,6 @@ concealment="true"> - + diff --git a/src/ConnectorPlugin/ConnectorPlugin_msg_fr.ts b/src/ConnectorPlugin/ConnectorPlugin_msg_fr.ts index 73255ab40..b8e153550 100644 --- a/src/ConnectorPlugin/ConnectorPlugin_msg_fr.ts +++ b/src/ConnectorPlugin/ConnectorPlugin_msg_fr.ts @@ -4,7 +4,7 @@ ExportToGEOM - Export all bodies and groups into GEOM module + Export all results and groups into GEOM module Exporter tous les résultats et groupes dans le module GEOM diff --git a/src/ConnectorPlugin/plugin-Connector.xml b/src/ConnectorPlugin/plugin-Connector.xml index caac05b28..d0eb76878 100644 --- a/src/ConnectorPlugin/plugin-Connector.xml +++ b/src/ConnectorPlugin/plugin-Connector.xml @@ -4,7 +4,7 @@ diff --git a/src/ConstructionPlugin/ConstructionPlugin_Validators.cpp b/src/ConstructionPlugin/ConstructionPlugin_Validators.cpp index a26f2f519..d11d3c3f0 100644 --- a/src/ConstructionPlugin/ConstructionPlugin_Validators.cpp +++ b/src/ConstructionPlugin/ConstructionPlugin_Validators.cpp @@ -54,7 +54,7 @@ bool ConstructionPlugin_ValidatorPointLines::isValid(const AttributePtr& theAttr GeomShapePtr aLineShape1 = aLineAttribute1->value(); ResultPtr aContext1 = aLineAttribute1->context(); if(!aContext1.get()) { - theError = "One of the attribute not initialized."; + theError = "One of the attribute is not initialized."; return false; } if(!aLineShape1.get()) { @@ -120,7 +120,7 @@ bool ConstructionPlugin_ValidatorPointEdgeAndPlaneNotParallel::isValid( GeomShapePtr aShape1 = anAttribute1->value(); ResultPtr aContext1 = anAttribute1->context(); if(!aContext1.get()) { - theError = "One of the attribute not initialized."; + theError = "One of the attribute is not initialized."; return false; } if(!aShape1.get()) { @@ -174,7 +174,7 @@ bool ConstructionPlugin_ValidatorPlaneThreePoints::isValid(const AttributePtr& t GeomShapePtr aPointShape1 = aPointAttribute1->value(); ResultPtr aContext1 = aPointAttribute1->context(); if(!aContext1.get()) { - theError = "One of the attribute not initialized."; + theError = "One of the attribute is not initialized."; return false; } if(!aPointShape1.get()) { @@ -252,7 +252,7 @@ bool ConstructionPlugin_ValidatorPlaneLinePoint::isValid( GeomShapePtr aShape1 = anAttribute1->value(); ResultPtr aContext1 = anAttribute1->context(); if(!aContext1.get()) { - theError = "One of the attribute not initialized."; + theError = "One of the attribute is not initialized."; return false; } if(!aShape1.get()) { @@ -310,7 +310,7 @@ bool ConstructionPlugin_ValidatorPlaneTwoParallelPlanes::isValid( GeomShapePtr aShape1 = anAttribute1->value(); ResultPtr aContext1 = anAttribute1->context(); if(!aContext1.get()) { - theError = "One of the attribute not initialized."; + theError = "One of the attribute is not initialized."; return false; } if(!aShape1.get()) { @@ -363,7 +363,7 @@ bool ConstructionPlugin_ValidatorAxisTwoNotParallelPlanes::isValid( GeomShapePtr aShape1 = anAttribute1->value(); ResultPtr aContext1 = anAttribute1->context(); if(!aContext1.get()) { - theError = "One of the attribute not initialized."; + theError = "One of the attribute is not initialized."; return false; } if(!aShape1.get()) { @@ -414,7 +414,7 @@ bool ConstructionPlugin_ValidatorPointThreeNonParallelPlanes::isValid( GeomShapePtr aShape1 = anAttribute1->value(); ResultPtr aContext1 = anAttribute1->context(); if (!aContext1.get()) { - theError = "One of the attribute not initialized."; + theError = "One of the attribute is not initialized."; return false; } if (!aShape1.get()) { diff --git a/src/ConstructionPlugin/ConstructionPlugin_msg_en.ts b/src/ConstructionPlugin/ConstructionPlugin_msg_en.ts index c09bc9930..420ff5438 100644 --- a/src/ConstructionPlugin/ConstructionPlugin_msg_en.ts +++ b/src/ConstructionPlugin/ConstructionPlugin_msg_en.ts @@ -153,7 +153,7 @@ Axis:SecondPoint:GeomValidators_ShapeType It does not contain element with acceptable shape type. The type should be one of the next: %1 - THe second point does not contain element with acceptable shape type. The type should be: %1 + The second point does not contain element with acceptable shape type. The type should be: %1 diff --git a/src/ConstructionPlugin/ConstructionPlugin_msg_fr.ts b/src/ConstructionPlugin/ConstructionPlugin_msg_fr.ts index a17aeb275..e3bff4eae 100644 --- a/src/ConstructionPlugin/ConstructionPlugin_msg_fr.ts +++ b/src/ConstructionPlugin/ConstructionPlugin_msg_fr.ts @@ -333,7 +333,7 @@ Axis:plane1:ConstructionPlugin_ValidatorAxisTwoNotParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -351,7 +351,7 @@ Axis:plane2:ConstructionPlugin_ValidatorAxisTwoNotParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -667,7 +667,7 @@ Plane:line:ConstructionPlugin_ValidatorPlaneLinePoint - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -707,7 +707,7 @@ Plane:plane1:ConstructionPlugin_ValidatorPlaneTwoParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -725,7 +725,7 @@ Plane:plane2:ConstructionPlugin_ValidatorPlaneTwoParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -754,7 +754,7 @@ Plane:point1:ConstructionPlugin_ValidatorPlaneThreePoints - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -772,7 +772,7 @@ Plane:point2:ConstructionPlugin_ValidatorPlaneThreePoints - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -790,14 +790,14 @@ Plane:point3:ConstructionPlugin_ValidatorPlaneThreePoints - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. Plane:point:ConstructionPlugin_ValidatorPlaneLinePoint - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -919,7 +919,7 @@ Point:intersection_line_1:ConstructionPlugin_ValidatorPointLines - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -937,7 +937,7 @@ Point:intersection_line_2:ConstructionPlugin_ValidatorPointLines - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -1112,35 +1112,35 @@ Point:intersection_line:ConstructionPlugin_ValidatorPointEdgeAndPlaneNotParallel - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. Point:intersection_plane:ConstructionPlugin_ValidatorPointEdgeAndPlaneNotParallel - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. Point:intersection_plane_1:ConstructionPlugin_ValidatorPointThreeNonParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. Point:intersection_plane_2:ConstructionPlugin_ValidatorPointThreeNonParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. Point:intersection_plane_3:ConstructionPlugin_ValidatorPointThreeNonParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. @@ -1203,35 +1203,35 @@ Point:intersection_line:ConstructionPlugin_ValidatorPointEdgeAndPlaneNotParallel - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. Point:intersection_plane:ConstructionPlugin_ValidatorPointEdgeAndPlaneNotParallel - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. Point:intersection_plane_1:ConstructionPlugin_ValidatorPointThreeNonParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. Point:intersection_plane_2:ConstructionPlugin_ValidatorPointThreeNonParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. Point:intersection_plane_3:ConstructionPlugin_ValidatorPointThreeNonParallelPlanes - One of the attribute not initialized. + One of the attribute is not initialized. Un des attributs n’est pas initialisé. diff --git a/src/ExchangePlugin/ExchangePlugin_msg_en.ts b/src/ExchangePlugin/ExchangePlugin_msg_en.ts index ccc645ab8..774af05d1 100644 --- a/src/ExchangePlugin/ExchangePlugin_msg_en.ts +++ b/src/ExchangePlugin/ExchangePlugin_msg_en.ts @@ -42,7 +42,7 @@ Export:selection_list:GeomValidators_Finite Infinite result is selected. - Olny finitive shapes can be exported + Only finitive shapes can be exported diff --git a/src/ExchangePlugin/ExchangePlugin_msg_fr.ts b/src/ExchangePlugin/ExchangePlugin_msg_fr.ts index 91269daad..085347047 100644 --- a/src/ExchangePlugin/ExchangePlugin_msg_fr.ts +++ b/src/ExchangePlugin/ExchangePlugin_msg_fr.ts @@ -26,8 +26,8 @@ Déverser - Dump python script - Déverser dans un script Python + Dump Python script + Déverser dans un script Python diff --git a/src/ExchangePlugin/plugin-Exchange.xml b/src/ExchangePlugin/plugin-Exchange.xml index b4ea8631a..59a246ecd 100644 --- a/src/ExchangePlugin/plugin-Exchange.xml +++ b/src/ExchangePlugin/plugin-Exchange.xml @@ -11,7 +11,7 @@ helpfile="exportFeature.html"> - & thePart, const ModelHighAPI_Selection& theTo); /// \ingroup CPPHighAPI -/// \brief Calculate radius of circular. +/// \brief Calculate radius of circular edge, cylindrical surface or sphere. FEATURESAPI_EXPORT double measureRadius(const std::shared_ptr& thePart, const ModelHighAPI_Selection& theObject); diff --git a/src/FeaturesPlugin/FeaturesPlugin_Measurement.h b/src/FeaturesPlugin/FeaturesPlugin_Measurement.h index 4f8b516b6..e84668d7d 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Measurement.h +++ b/src/FeaturesPlugin/FeaturesPlugin_Measurement.h @@ -211,7 +211,7 @@ private: void computeLength(); /// Compute minimal distance between pair of shapes void computeDistance(); - /// Compute radius of circular edge or cylindrical face + /// Compute radius of circular edge, cylindrical surface or sphere. void computeRadius(); /// Compute angle(s) between pair of edges if they are intersected void computeAngle(); diff --git a/src/FeaturesPlugin/FeaturesPlugin_Validators.cpp b/src/FeaturesPlugin/FeaturesPlugin_Validators.cpp index d7755548e..44de21fb5 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Validators.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Validators.cpp @@ -299,7 +299,7 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValid(const AttributePtr& theA if(aSelectedWiresFromObjects.isBound(aWire)) { theError = - "Error: Objects with such wire already selected. Don't allow to select this object."; + "Error: Objects with this wire already selected. Don't allow to select this object."; return false; } @@ -461,7 +461,7 @@ bool FeaturesPlugin_ValidatorBaseForGeneration::isValidAttribute(const Attribute GeomValidators_ShapeType aShapeTypeValidator; if(!aShapeTypeValidator.isValid(anAttr, theArguments, theError)) { theError = "Error: Selected shape has unacceptable type. Acceptable types are: faces or " - "wires on sketch, whole sketch(if it has at least one face), " + "wires on sketch, whole sketch (if it has at least one face), " "and whole objects with shape types: %1"; std::string anArgumentString; for(auto anIt = theArguments.cbegin(); anIt != theArguments.cend(); ++anIt) { diff --git a/src/FeaturesPlugin/FeaturesPlugin_Validators.h b/src/FeaturesPlugin/FeaturesPlugin_Validators.h index 6af882454..c2ec597df 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Validators.h +++ b/src/FeaturesPlugin/FeaturesPlugin_Validators.h @@ -71,7 +71,7 @@ class FeaturesPlugin_ValidatorPipeLocationsNumber: public ModelAPI_FeatureValida /// \class FeaturesPlugin_ValidatorBaseForGeneration /// \ingroup Validators /// \brief A validator for selection base for generation. Allows to select faces on sketch, -/// whole sketch(if it has at least one face), and following objects: vertex, edge, wire, face. +/// whole sketch (if it has at least one face), and following objects: vertex, edge, wire, face. class FeaturesPlugin_ValidatorBaseForGeneration: public ModelAPI_AttributeValidator { public: diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts index 635d8e604..f383d9803 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts +++ b/src/FeaturesPlugin/FeaturesPlugin_msg_en.ts @@ -180,8 +180,8 @@ Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. - Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. + Objects with this wire already selected. Don't allow to select this object. @@ -222,8 +222,8 @@ Extrusion: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 - 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 + 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 + 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 @@ -362,8 +362,8 @@ Extrusion:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). - Wrong number of validator arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). + Wrong number of validator arguments in xml (expected 9). @@ -601,8 +601,8 @@ ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. - Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. + Objects with this wire already selected. Don't allow to select this object. @@ -643,8 +643,8 @@ ExtrusionCut: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 - 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 + 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 + 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 @@ -832,7 +832,7 @@ ExtrusionCut:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). @@ -902,8 +902,8 @@ Revolution:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). - Wrong number of validator "GeomValidators_ZeroOffset" arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). + Wrong number of validator "GeomValidators_ZeroOffset" arguments in xml (expected 9). @@ -1056,8 +1056,8 @@ Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. - Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. + Objects with this wire already selected. Don't allow to select this object. @@ -1098,8 +1098,8 @@ Revolution: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 - 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 + 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 + 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 @@ -1287,8 +1287,8 @@ RevolutionCut:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). - Wrong number of validator "GeomValidators_ZeroOffset" arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). + Wrong number of validator "GeomValidators_ZeroOffset" arguments in xml (expected 9). @@ -1379,7 +1379,7 @@ RevolutionCut:Model_FeatureValidator Attribute "main_objects" is not initialized. - Objects for cut is not selected. + Objects for cut are not selected. @@ -1455,8 +1455,8 @@ RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. - Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. + Objects with this wire already selected. Don't allow to select this object. @@ -1497,8 +1497,8 @@ RevolutionCut: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 - 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 + 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 + 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 @@ -1875,8 +1875,8 @@ ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. - Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. + Objects with this wire already selected. Don't allow to select this object. @@ -1917,8 +1917,8 @@ ExtrusionFuse: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 - 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 + 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 + 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 @@ -2106,7 +2106,7 @@ ExtrusionFuse:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). @@ -2197,8 +2197,8 @@ RevolutionFuse:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). - Wrong number of validator "GeomValidators_ZeroOffset" arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). + Wrong number of validator "GeomValidators_ZeroOffset" arguments in xml (expected 9). @@ -2365,8 +2365,8 @@ RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. - Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. + Objects with this wire already selected. Don't allow to select this object. @@ -2407,8 +2407,8 @@ RevolutionFuse: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 - 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 + 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 + 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 @@ -2744,7 +2744,7 @@ Partition:GeomValidators_MinObjectsSelected Error: Wrong number of arguments (expected 2): selection list id and min number of objects - Wrong number of validator "GeomValidators_MinObjectsSelected" arguments(expected 2): selection list id and min number of objects. + Wrong number of validator "GeomValidators_MinObjectsSelected" arguments (expected 2): selection list id and min number of objects. @@ -2911,8 +2911,8 @@ Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. - Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. + Objects with this wire already selected. Don't allow to select this object. @@ -2953,8 +2953,8 @@ Pipe: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 - 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 + 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 + 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 @@ -3220,7 +3220,7 @@ Intersection:tool_objects:GeomValidators_IntersectionSelection Error: empty feature. - Selected objects has empty feature. + Selected objects have empty feature. diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts index d6983c15d..017f9cb0f 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts +++ b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts @@ -23,11 +23,11 @@ ExtrusionCut - ExtrusionCut + Enlèvement de matière extrudé ExtrusionFuse - ExtrusionFuse + Bossage extrudé Fillet @@ -67,11 +67,11 @@ RevolutionCut - RevolutionCut + Enlèvement de matière avec révolution RevolutionFuse - RevolutionFuse + Bossage avec révolution Scale @@ -355,7 +355,7 @@ Extrusion:sketch - Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it. + Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it. Sélectionnez : <br /> 1. Face plane d'un objet non esquissé ou d'un plan. La création de l’esquisse sera lancée. <br /> 2. Une face ou un contour d’esquisse existant. L'extrusion sera remplie par elle. <br /> 3. Une forme de résultat existante de type: contours / arête / sommets. L'extrusion sera remplie par elle. @@ -365,7 +365,7 @@ ExtrusionCut ExtrusionCut - ExtrusionCut + Enlèvement de matière extrudé Cuts an extrusion from a solid @@ -520,7 +520,7 @@ ExtrusionCut:sketch - Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it. + Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it. Sélectionnez : <br /> 1. Face plane d'un objet non esquissé ou d'un plan. La création de l’esquisse sera lancée. <br /> 2. Une face ou un contour d’esquisse existant. L'extrusion sera remplie par elle. <br /> 3. Une forme de résultat existante de type: contours / arête / sommets. L'extrusion sera remplie par elle. @@ -530,7 +530,7 @@ ExtrusionFuse ExtrusionFuse - ExtrusionFuse + Bossage extrudé Fuses an extrusion with a solid @@ -678,7 +678,7 @@ ExtrusionFuse:sketch - Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it. + Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it. Sélectionnez : <br /> 1. Face plane d'un objet non esquissé ou d'un plan. La création de l’esquisse sera lancée. <br /> 2. Une face ou un contour d’esquisse existant. L'extrusion sera remplie par elle. <br /> 3. Une forme de résultat existante de type: contours / arête / sommets. L'extrusion sera remplie par elle. @@ -873,7 +873,7 @@ Objets - Select objects(compounds, compsolids, solids, shells, faces or edges) + Select objects (compounds, compsolids, solids, shells, faces or edges) Sélectionner des objets (assemblages, solides composites, coques, faces ou arêtes) @@ -1238,7 +1238,7 @@ Revolution:sketch - Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it. + Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it. Sélectionnez : <br /> 1. Face plane d'un objet non esquissé ou d'un plan. La création de l’esquisse sera lancée. <br /> 2. Une face ou un contour d’esquisse existant. L'extrusion sera remplie par elle. <br /> 3. Une forme de résultat existante de type: contours / arête / sommets. L'extrusion sera remplie par elle. @@ -1248,7 +1248,7 @@ RevolutionCut RevolutionCut - RevolutionCut + Enlèvement de matière avec révolution Cuts a revolution from a solid @@ -1384,7 +1384,7 @@ RevolutionCut:sketch - Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it. + Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it. Sélectionnez : <br /> 1. Face plane d'un objet non esquissé ou d'un plan. La création de l’esquisse sera lancée. <br /> 2. Une face ou un contour d’esquisse existant. L'extrusion sera remplie par elle. <br /> 3. Une forme de résultat existante de type: contours / arête / sommets. L'extrusion sera remplie par elle. @@ -1394,7 +1394,7 @@ RevolutionFuse RevolutionFuse - RevolutionFuse + Bossage avec révolution Fuses a revolution with a solid @@ -1530,7 +1530,7 @@ RevolutionFuse:sketch - Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it. + Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it. Sélectionnez : <br /> 1. Face plane d'un objet non esquissé ou d'un plan. La création de l’esquisse sera lancée. <br /> 2. Une face ou un contour d’esquisse existant. L'extrusion sera remplie par elle. <br /> 3. Une forme de résultat existante de type: contours / arête / sommets. L'extrusion sera remplie par elle. @@ -1911,7 +1911,7 @@ Extrusion:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. Les objets de ce contour sont déjà sélectionnés. Ne pas autoriser à sélectionner cet objet. @@ -1953,7 +1953,7 @@ Extrusion: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 + 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 Le type de la forme sélectionnée n’est pas autorisé. Les types acceptables sont les suivants: faces ou contours sur l'esquisse, esquisse entière (si elle possède au moins une face) et objets entiers des types de forme: %1 @@ -2093,7 +2093,7 @@ Extrusion:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). Nombre incorrect d'arguments de validation dans XML (9 prévus). @@ -2346,7 +2346,7 @@ ExtrusionCut:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. Les objets de ce contour sont déjà sélectionnés. Ne pas autoriser à sélectionner cet objet. @@ -2388,7 +2388,7 @@ ExtrusionCut: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 + 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 Le type de la forme sélectionnée n’est pas autorisé. Les types acceptables sont les suivants: faces ou contours sur l'esquisse, esquisse entière (si elle possède au moins une face) et objets entiers des types de forme: %1 @@ -2577,7 +2577,7 @@ ExtrusionCut:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). Nombre incorrect d'arguments de validation dans XML (9 prévus). @@ -2640,7 +2640,7 @@ Revolution:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). Nombre incorrect d'arguments du validateur "GeomValidators_ZeroOffset" en XML (9 attendus). @@ -2801,7 +2801,7 @@ Revolution:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. Les objets de ce contour sont déjà sélectionnés. Ne pas autoriser à sélectionner cet objet. @@ -2843,7 +2843,7 @@ Revolution: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 + 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 Le type de la forme sélectionnée n’est pas autorisé. Les types acceptables sont les suivants: faces ou contours sur l'esquisse, esquisse entière (si elle possède au moins une face) et objets entiers des types de forme: %1 @@ -3032,7 +3032,7 @@ RevolutionCut:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). Nombre incorrect d'arguments du validateur "GeomValidators_ZeroOffset" en XML (9 attendus). @@ -3200,7 +3200,7 @@ RevolutionCut:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. Les objets de ce contour sont déjà sélectionnés. Ne pas autoriser à sélectionner cet objet. @@ -3242,7 +3242,7 @@ RevolutionCut: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 + 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 Le type de la forme sélectionnée n’est pas autorisé. Les types acceptables sont les suivants: faces ou contours sur l'esquisse, esquisse entière (si elle possède au moins une face) et objets entiers des types de forme: %1 @@ -3620,7 +3620,7 @@ ExtrusionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. Les objets de ce contour sont déjà sélectionnés. Ne pas autoriser à sélectionner cet objet. @@ -3662,7 +3662,7 @@ ExtrusionFuse: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 + 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 Le type de la forme sélectionnée n’est pas autorisé. Les types acceptables sont les suivants: faces ou contours sur l'esquisse, esquisse entière (si elle possède au moins une face) et objets entiers des types de forme: %1 @@ -3851,7 +3851,7 @@ ExtrusionFuse:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). Nombre incorrect d'arguments de validation dans XML (9 prévus). @@ -3942,7 +3942,7 @@ RevolutionFuse:GeomValidators_ZeroOffset - Wrong number of validator arguments in xml(expected 9). + Wrong number of validator arguments in xml (expected 9). Nombre incorrect d'arguments du validateur "GeomValidators_ZeroOffset" en XML (9 attendus). @@ -4110,7 +4110,7 @@ RevolutionFuse:base:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. Les objets de ce contour sont déjà sélectionnés. Ne pas autoriser à sélectionner cet objet. @@ -4152,7 +4152,7 @@ RevolutionFuse: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 + 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 Le type de la forme sélectionnée n’est pas autorisé. Les types acceptables sont les suivants: faces ou contours sur l'esquisse, esquisse entière (si elle possède au moins une face) et objets entiers des types de forme: %1 @@ -4656,7 +4656,7 @@ Pipe:base_objects:FeaturesPlugin_ValidatorBaseForGeneration - Error: Objects with such wire already selected. Don't allow to select this object. + Error: Objects with this wire already selected. Don't allow to select this object. Les objets de ce contour sont déjà sélectionnés. Ne pas autoriser à sélectionner cet objet. @@ -4698,7 +4698,7 @@ Pipe: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 + 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 Le type de la forme sélectionnée n’est pas autorisé. Les types acceptables sont les suivants: faces ou contours sur l'esquisse, esquisse entière (si elle possède au moins une face) et objets entiers des types de forme: %1 @@ -5583,8 +5583,8 @@ Longueur de bord - Radius of circular - Rayon circulaire + Radius of circular edge, cylindrical surface or sphere + Rayon du bord circulaire, de la surface cylindrique ou de la sphère diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml index 9ea0416c1..85ca64d71 100644 --- a/src/FeaturesPlugin/extrusion_widget.xml +++ b/src/FeaturesPlugin/extrusion_widget.xml @@ -4,7 +4,7 @@ label="Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> -3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it." +3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it." shape_types="vertices edges wires faces shells solids compsolids compounds"> diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml index dc6c9539e..c8561193e 100644 --- a/src/FeaturesPlugin/extrusioncut_widget.xml +++ b/src/FeaturesPlugin/extrusioncut_widget.xml @@ -5,7 +5,7 @@ label="Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> -3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it." +3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it." shape_types="wires faces shells"> diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml index c5bc4cf34..b0c18a5c4 100644 --- a/src/FeaturesPlugin/extrusionfuse_widget.xml +++ b/src/FeaturesPlugin/extrusionfuse_widget.xml @@ -5,7 +5,7 @@ label="Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> -3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it." +3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it." shape_types="vertices edges wires faces shells compounds"> diff --git a/src/FeaturesPlugin/intersection_widget.xml b/src/FeaturesPlugin/intersection_widget.xml index 5f09fb238..bc07db630 100644 --- a/src/FeaturesPlugin/intersection_widget.xml +++ b/src/FeaturesPlugin/intersection_widget.xml @@ -2,7 +2,7 @@ diff --git a/src/FeaturesPlugin/measurement_widget.xml b/src/FeaturesPlugin/measurement_widget.xml index 3f5ca15e7..2b72ece65 100644 --- a/src/FeaturesPlugin/measurement_widget.xml +++ b/src/FeaturesPlugin/measurement_widget.xml @@ -26,7 +26,7 @@ default=""> - + diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml index 217f4fb60..a8edd4a49 100644 --- a/src/FeaturesPlugin/revolutioncut_widget.xml +++ b/src/FeaturesPlugin/revolutioncut_widget.xml @@ -5,7 +5,7 @@ label="Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> -3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it." +3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it." shape_types="wires faces shells"> diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml index aa7acc60e..7981db76c 100644 --- a/src/FeaturesPlugin/revolutionfuse_widget.xml +++ b/src/FeaturesPlugin/revolutionfuse_widget.xml @@ -5,7 +5,7 @@ label="Select:<br /> 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br /> 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> -3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it." +3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it." shape_types="vertices edges wires faces shells compounds"> diff --git a/src/GeomValidators/GeomValidators_ZeroOffset.cpp b/src/GeomValidators/GeomValidators_ZeroOffset.cpp index 0b4217657..411a1a21e 100644 --- a/src/GeomValidators/GeomValidators_ZeroOffset.cpp +++ b/src/GeomValidators/GeomValidators_ZeroOffset.cpp @@ -41,7 +41,7 @@ bool GeomValidators_ZeroOffset::isValid(const std::shared_ptr& { // LCOV_EXCL_START if(theArguments.size() != 9) { - theError = "Wrong number of validator arguments in xml(expected 9)."; + theError = "Wrong number of validator arguments in xml (expected 9)."; return false; } // LCOV_EXCL_STOP diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp index 83d25c2ad..2d6e80670 100644 --- a/src/ModuleBase/ModuleBase_Tools.cpp +++ b/src/ModuleBase/ModuleBase_Tools.cpp @@ -939,7 +939,7 @@ bool askToDelete(const std::set theFeatures, if (!ModelAPI_Tools::allDocumentsActivated(aNotActivatedNames)) { if (ModuleBase_Tools::hasModuleDocumentFeature(theFeatures)) aNotActivatedDocWrn = - QObject::tr("Selected objects can be used in Part documents which are not loaded:%1.\n") + QObject::tr("Selected objects can be used in Part documents which are not loaded: %1.\n") .arg(aNotActivatedNames.c_str()); } diff --git a/src/ModuleBase/ModuleBase_msg_fr.ts b/src/ModuleBase/ModuleBase_msg_fr.ts index 15c3888a3..cf7e5f7b9 100644 --- a/src/ModuleBase/ModuleBase_msg_fr.ts +++ b/src/ModuleBase/ModuleBase_msg_fr.ts @@ -314,7 +314,7 @@ QObject - Selected objects can be used in Part documents which are not loaded:%1. + Selected objects can be used in Part documents which are not loaded: %1. Les objets sélectionnés peuvent être utilisés dans les documents de pièce non chargés : %1. diff --git a/src/PartSet/PartSet_SketcherReentrantMgr.h b/src/PartSet/PartSet_SketcherReentrantMgr.h index 91ab34ebc..046f45dba 100644 --- a/src/PartSet/PartSet_SketcherReentrantMgr.h +++ b/src/PartSet/PartSet_SketcherReentrantMgr.h @@ -197,7 +197,7 @@ private: /// \param theSourceFeature a source feature /// \param theNewFeature a new feature /// \param theSketch an active sketch - /// \param isTemporary is used to do not create additional features(e.g. coicidence for line) + /// \param isTemporary is used to do not create additional features(e.g. coincidence for line) /// \return true is something is copied static bool copyReetntrantAttributes(const FeaturePtr& theSourceFeature, const FeaturePtr& theNewFeature, diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp index bdee88f6c..8183806b9 100644 --- a/src/PartSet/PartSet_WidgetPoint2d.cpp +++ b/src/PartSet/PartSet_WidgetPoint2d.cpp @@ -520,7 +520,7 @@ bool PartSet_WidgetPoint2D::setConstraintToPoint(double theClickedX, double theC AttributePoint2DPtr aFeaturePoint; if (aFeature->isMacro()) { // the macro feature will be removed after the operation is stopped, so we need to build - // coicidence to possible sub-features + // coincidence to possible sub-features aFeaturePoint = findFirstEqualPointInArgumentFeatures(aFeature, aClickedPoint); } else { @@ -549,7 +549,7 @@ bool PartSet_WidgetPoint2D::setConstraintToObject(const ObjectPtr& theObject) AttributePoint2DPtr anAttrPoint = std::dynamic_pointer_cast(aThisAttr); if (anAttrPoint.get()) { // the macro feature will be removed after the operation is stopped, so we need to build - // coicidence to possible sub-features + // coincidence to possible sub-features aFeaturePoint = findFirstEqualPointInArgumentFeatures(feature(), anAttrPoint->pnt()); } diff --git a/src/SketchPlugin/SketchPlugin_Validators.cpp b/src/SketchPlugin/SketchPlugin_Validators.cpp index 1d5cc9c73..7f081fb0c 100644 --- a/src/SketchPlugin/SketchPlugin_Validators.cpp +++ b/src/SketchPlugin/SketchPlugin_Validators.cpp @@ -606,7 +606,7 @@ bool SketchPlugin_FilletVertexValidator::isValid(const AttributePtr& theAttribut } if(!aConstraintCoincidence.get()) { - theError = "Error: one of the selected point does not have coicidence."; + theError = "Error: one of the selected point does not have coincidence."; return false; } diff --git a/src/SketchPlugin/SketchPlugin_msg_en.ts b/src/SketchPlugin/SketchPlugin_msg_en.ts index da40a9716..3a5255ce5 100644 --- a/src/SketchPlugin/SketchPlugin_msg_en.ts +++ b/src/SketchPlugin/SketchPlugin_msg_en.ts @@ -1458,14 +1458,14 @@ SketchConstraintCoincidence:ConstraintEntityA:PartSet_DifferentObjects The feature uses one object in ConstraintEntityA and ConstraintEntityB attributes. - Diferent objects should be selected + Different objects should be selected SketchConstraintCoincidence:ConstraintEntityB:PartSet_DifferentObjects The feature uses one object in ConstraintEntityB and ConstraintEntityA attributes. - Diferent objects should be selected + Different objects should be selected @@ -1684,14 +1684,14 @@ SketchConstraintEqual:ConstraintEntityA:PartSet_DifferentObjects The feature uses one object in ConstraintEntityA and ConstraintEntityB attributes. - Diferent objects should be selected + Different objects should be selected SketchConstraintEqual:ConstraintEntityB:PartSet_DifferentObjects The feature uses one object in ConstraintEntityB and ConstraintEntityA attributes. - Diferent objects should be selected + Different objects should be selected @@ -1849,14 +1849,14 @@ SketchConstraintMiddle:ConstraintEntityA:PartSet_DifferentObjects The feature uses one object in ConstraintEntityA and ConstraintEntityB attributes. - Diferent objects should be selected + Different objects should be selected SketchConstraintMiddle:ConstraintEntityB:PartSet_DifferentObjects The feature uses one object in ConstraintEntityB and ConstraintEntityA attributes. - Diferent objects should be selected + Different objects should be selected @@ -2083,14 +2083,14 @@ SketchConstraintTangent:ConstraintEntityA:PartSet_DifferentObjects The feature uses one object in ConstraintEntityA and ConstraintEntityB attributes. - Diferent objects should be selected + Different objects should be selected SketchConstraintTangent:ConstraintEntityB:PartSet_DifferentObjects The feature uses one object in ConstraintEntityB and ConstraintEntityA attributes. - Diferent objects should be selected + Different objects should be selected @@ -2182,8 +2182,8 @@ SketchFillet:ConstraintEntityA:SketchPlugin_FilletVertexValidator - Error: one of the selected point does not have coicidence. - One of the selected point does not have coicidence + Error: one of the selected point does not have coincidence. + One of the selected point does not have coincidence diff --git a/src/SketchPlugin/SketchPlugin_msg_fr.ts b/src/SketchPlugin/SketchPlugin_msg_fr.ts index 01022494b..9717b2dcd 100644 --- a/src/SketchPlugin/SketchPlugin_msg_fr.ts +++ b/src/SketchPlugin/SketchPlugin_msg_fr.ts @@ -2158,7 +2158,7 @@ SketchFillet:ConstraintEntityA:SketchPlugin_FilletVertexValidator - Error: one of the selected point does not have coicidence. + Error: one of the selected point does not have coincidence. Un des points sélectionné n'a pas de coïncidence @@ -2737,7 +2737,7 @@ SketchConstraintEqual - Create constraint defining equal lengths of two lines or line and arc or equal radii of two arcs or two circles or arc and circle + Create constraint defining equal lengths of two lines or line and arc or equal radiuses of two arcs or two circles or arc and circle Créer une contrainte définissant des longueurs égales de deux lignes, ou une ligne et un arc, ou des rayons égaux de deux arcs ou de deux cercles ou d'un arc et d'un cercle diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml index f877ecd87..e57f5a3e8 100644 --- a/src/SketchPlugin/plugin-Sketch.xml +++ b/src/SketchPlugin/plugin-Sketch.xml @@ -1207,7 +1207,7 @@ There is a circular reference between copied sketch entities and their originals. To fix this, you can either undo your operation or remove wrong constraint. - Caution: SolveSpace crash! Constraints are wrong - Caution: SolveSpace crash! Constraints are wrong + Caution: SolveSpace crashed! Constraints are wrong + Caution: SolveSpace crashed! Constraints are wrong The set of constraints lead to degenerated geometry. To fix this, you can either undo your operation or remove a constraint or the degenerated geometry. diff --git a/src/SketchSolver/SketchSolver_msg_fr.ts b/src/SketchSolver/SketchSolver_msg_fr.ts index 16eaa0ecd..a69ecbefa 100644 --- a/src/SketchSolver/SketchSolver_msg_fr.ts +++ b/src/SketchSolver/SketchSolver_msg_fr.ts @@ -12,7 +12,7 @@ Il existe une référence circulaire entre les entités d'esquisse copiées et leurs originaux. Pour résoudre ce problème, vous pouvez annuler votre opération ou supprimer une contrainte incorrecte. - Caution: SolveSpace crash! Constraints are wrong + Caution: SolveSpace crashed! Constraints are wrong Attention : Plantage de SolveSpace ! Les contraintes sont fausses