From 80b29d2dbfed242e7320d03a4c17464340b8d9a5 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Thu, 11 May 2023 18:31:34 -0500 Subject: [PATCH] Gui: Minor translation fixes --- src/Mod/Part/Gui/TaskCheckGeometry.cpp | 24 +++++++++---------- src/Mod/PartDesign/App/FeatureBoolean.cpp | 2 +- src/Mod/PartDesign/App/FeatureChamfer.cpp | 2 +- src/Mod/PartDesign/App/FeatureDraft.cpp | 2 +- src/Mod/PartDesign/App/FeatureFillet.cpp | 2 +- src/Mod/PartDesign/App/FeatureGroove.cpp | 2 +- src/Mod/PartDesign/App/FeatureHole.cpp | 4 ++-- src/Mod/PartDesign/App/FeatureLoft.cpp | 8 +++---- src/Mod/PartDesign/App/FeaturePad.cpp | 6 ++--- src/Mod/PartDesign/App/FeaturePipe.cpp | 4 ++-- src/Mod/PartDesign/App/FeaturePocket.cpp | 6 ++--- src/Mod/PartDesign/App/FeaturePrimitive.cpp | 4 ++-- src/Mod/PartDesign/App/FeatureTransformed.cpp | 2 +- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 4 ++-- .../Sketcher/Gui/CommandSketcherBSpline.cpp | 4 ++-- .../Gui/DrawSketchHandlerCarbonCopy.h | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp index 72601e22a6..d2c78e4bd7 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp +++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp @@ -156,18 +156,18 @@ QString checkStatusToString(const int &index) QVector buildBOPCheckResultVector() { QVector results; - results.push_back(QObject::tr("Boolean Op Check Unknown")); //BOPAlgo_CheckUnknown - results.push_back(QObject::tr("Boolean Op Bad Type")); //BOPAlgo_BadType - results.push_back(QObject::tr("Boolean Op Self Intersect")); //BOPAlgo_SelfIntersect - results.push_back(QObject::tr("Boolean Op Too Small Edge")); //BOPAlgo_TooSmallEdge - results.push_back(QObject::tr("Boolean Op Non-Recoverable Face")); //BOPAlgo_NonRecoverableFace - results.push_back(QObject::tr("Boolean Op Incompatibility Of Vertex")); //BOPAlgo_IncompatibilityOfVertex - results.push_back(QObject::tr("Boolean Op Incompatibility Of Edge")); //BOPAlgo_IncompatibilityOfEdge - results.push_back(QObject::tr("Boolean Op Incompatibility Of Face")); //BOPAlgo_IncompatibilityOfFace - results.push_back(QObject::tr("Boolean Op Operation Aborted")); //BOPAlgo_OperationAborted - results.push_back(QObject::tr("Boolean Op GeomAbs_C0")); //BOPAlgo_GeomAbs_C0 - results.push_back(QObject::tr("Boolean Op Invalid Curve On Surface")); //BOPAlgo_InvalidCurveOnSurface - results.push_back(QObject::tr("Boolean Op Not Valid")); //BOPAlgo_NotValid + results.push_back(QObject::tr("Boolean operation: Unknown check")); //BOPAlgo_CheckUnknown + results.push_back(QObject::tr("Boolean operation: Bad type")); //BOPAlgo_BadType + results.push_back(QObject::tr("Boolean operation: Self-intersection found")); //BOPAlgo_SelfIntersect + results.push_back(QObject::tr("Boolean operation: Edge too small")); //BOPAlgo_TooSmallEdge + results.push_back(QObject::tr("Boolean operation: Non-recoverable face")); //BOPAlgo_NonRecoverableFace + results.push_back(QObject::tr("Boolean operation: Incompatibility of vertex")); //BOPAlgo_IncompatibilityOfVertex + results.push_back(QObject::tr("Boolean operation: Incompatibility of edge")); //BOPAlgo_IncompatibilityOfEdge + results.push_back(QObject::tr("Boolean operation: Incompatibility of face")); //BOPAlgo_IncompatibilityOfFace + results.push_back(QObject::tr("Boolean operation: Aborted")); //BOPAlgo_OperationAborted + results.push_back(QObject::tr("Boolean operation: GeomAbs_C0")); //BOPAlgo_GeomAbs_C0 + results.push_back(QObject::tr("Boolean operation: Invalid curve on surface")); //BOPAlgo_InvalidCurveOnSurface + results.push_back(QObject::tr("Boolean operation: Not valid")); //BOPAlgo_NotValid return results; } diff --git a/src/Mod/PartDesign/App/FeatureBoolean.cpp b/src/Mod/PartDesign/App/FeatureBoolean.cpp index ea607e5240..098460c52d 100644 --- a/src/Mod/PartDesign/App/FeatureBoolean.cpp +++ b/src/Mod/PartDesign/App/FeatureBoolean.cpp @@ -149,7 +149,7 @@ App::DocumentObjectExecReturn *Boolean::execute() int solidCount = countSolids(result); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Boolean: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } this->Shape.setValue(getSolid(result)); diff --git a/src/Mod/PartDesign/App/FeatureChamfer.cpp b/src/Mod/PartDesign/App/FeatureChamfer.cpp index 4e56815100..cd7ddd61c8 100644 --- a/src/Mod/PartDesign/App/FeatureChamfer.cpp +++ b/src/Mod/PartDesign/App/FeatureChamfer.cpp @@ -220,7 +220,7 @@ App::DocumentObjectExecReturn *Chamfer::execute() } int solidCount = countSolids(shape); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Chamfer: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } shape = refineShapeIfActive(shape); this->Shape.setValue(getSolid(shape)); diff --git a/src/Mod/PartDesign/App/FeatureDraft.cpp b/src/Mod/PartDesign/App/FeatureDraft.cpp index 7245f48d86..143aac8209 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.cpp +++ b/src/Mod/PartDesign/App/FeatureDraft.cpp @@ -320,7 +320,7 @@ App::DocumentObjectExecReturn *Draft::execute() int solidCount = countSolids(shape); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Fuse: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } this->Shape.setValue(getSolid(shape)); diff --git a/src/Mod/PartDesign/App/FeatureFillet.cpp b/src/Mod/PartDesign/App/FeatureFillet.cpp index d73575f386..9417fa7398 100644 --- a/src/Mod/PartDesign/App/FeatureFillet.cpp +++ b/src/Mod/PartDesign/App/FeatureFillet.cpp @@ -134,7 +134,7 @@ App::DocumentObjectExecReturn *Fillet::execute() int solidCount = countSolids(shape); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Fillet: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } shape = refineShapeIfActive(shape); diff --git a/src/Mod/PartDesign/App/FeatureGroove.cpp b/src/Mod/PartDesign/App/FeatureGroove.cpp index 4da68d78f2..0370343b5e 100644 --- a/src/Mod/PartDesign/App/FeatureGroove.cpp +++ b/src/Mod/PartDesign/App/FeatureGroove.cpp @@ -165,7 +165,7 @@ App::DocumentObjectExecReturn *Groove::execute() int solidCount = countSolids(solRes); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Groove: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } } diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index 94c0987f48..ec0b981e3c 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -1897,7 +1897,7 @@ App::DocumentObjectExecReturn* Hole::execute() // We have to get the solids (fuse sometimes creates compounds) base = getSolid(result); if (base.IsNull()) - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Hole: Resulting shape is not a solid")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Resulting shape is not a solid")); base = refineShapeIfActive(base); @@ -1905,7 +1905,7 @@ App::DocumentObjectExecReturn* Hole::execute() int solidCount = countSolids(base); if (solidCount > 1) { return new App::DocumentObjectExecReturn( - QT_TRANSLATE_NOOP("Exception", "Hole: Result has multiple solids. This is not supported at this time.")); + QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } this->Shape.setValue(base); diff --git a/src/Mod/PartDesign/App/FeatureLoft.cpp b/src/Mod/PartDesign/App/FeatureLoft.cpp index 07f2f3d631..8e9811f354 100644 --- a/src/Mod/PartDesign/App/FeatureLoft.cpp +++ b/src/Mod/PartDesign/App/FeatureLoft.cpp @@ -290,10 +290,10 @@ App::DocumentObjectExecReturn *Loft::execute() TopoDS_Shape boolOp = this->getSolid(mkFuse.Shape()); // lets check if the result is a solid if (boolOp.IsNull()) - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Loft: Resulting shape is not a solid")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Resulting shape is not a solid")); int solidCount = countSolids(boolOp); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Loft: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } boolOp = refineShapeIfActive(boolOp); @@ -308,10 +308,10 @@ App::DocumentObjectExecReturn *Loft::execute() TopoDS_Shape boolOp = this->getSolid(mkCut.Shape()); // lets check if the result is a solid if (boolOp.IsNull()) - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Loft: Resulting shape is not a solid")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Resulting shape is not a solid")); int solidCount = countSolids(boolOp); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Loft: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } boolOp = refineShapeIfActive(boolOp); diff --git a/src/Mod/PartDesign/App/FeaturePad.cpp b/src/Mod/PartDesign/App/FeaturePad.cpp index f8215f9209..95f0fc6ffa 100644 --- a/src/Mod/PartDesign/App/FeaturePad.cpp +++ b/src/Mod/PartDesign/App/FeaturePad.cpp @@ -219,11 +219,11 @@ App::DocumentObjectExecReturn *Pad::execute() TopoDS_Shape solRes = this->getSolid(result); // lets check if the result is a solid if (solRes.IsNull()) - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Pad: Resulting shape is not a solid")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Resulting shape is not a solid")); int solidCount = countSolids(result); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Pad: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } solRes = refineShapeIfActive(solRes); @@ -232,7 +232,7 @@ App::DocumentObjectExecReturn *Pad::execute() else { int solidCount = countSolids(prism); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Pad: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } this->Shape.setValue(getSolid(prism)); diff --git a/src/Mod/PartDesign/App/FeaturePipe.cpp b/src/Mod/PartDesign/App/FeaturePipe.cpp index 683666adfb..8276aac692 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.cpp +++ b/src/Mod/PartDesign/App/FeaturePipe.cpp @@ -396,7 +396,7 @@ App::DocumentObjectExecReturn *Pipe::execute() int solidCount = countSolids(boolOp); if (solidCount > 1) { return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", - "Pipe: Result has multiple solids. This is not supported at this time.")); + "Result has multiple solids: that is not currently supported.")); } boolOp = refineShapeIfActive(boolOp); @@ -416,7 +416,7 @@ App::DocumentObjectExecReturn *Pipe::execute() int solidCount = countSolids(boolOp); if (solidCount > 1) { return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", - "Pipe: Result has multiple solids. This is not supported at this time.")); + "Result has multiple solids: that is not currently supported.")); } boolOp = refineShapeIfActive(boolOp); diff --git a/src/Mod/PartDesign/App/FeaturePocket.cpp b/src/Mod/PartDesign/App/FeaturePocket.cpp index 28f78c55ac..193cfab2a1 100644 --- a/src/Mod/PartDesign/App/FeaturePocket.cpp +++ b/src/Mod/PartDesign/App/FeaturePocket.cpp @@ -194,7 +194,7 @@ App::DocumentObjectExecReturn *Pocket::execute() int prismCount = countSolids(prism); if (prismCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Pocket: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } this->Shape.setValue(getSolid(prism)); @@ -225,11 +225,11 @@ App::DocumentObjectExecReturn *Pocket::execute() // we have to get the solids (fuse sometimes creates compounds) TopoDS_Shape solRes = this->getSolid(result); if (solRes.IsNull()) - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Pocket: Resulting shape is not a solid")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Resulting shape is not a solid")); int solidCount = countSolids(result); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Pocket: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } solRes = refineShapeIfActive(solRes); diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.cpp b/src/Mod/PartDesign/App/FeaturePrimitive.cpp index deb5b427ad..ee8fa5cecc 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.cpp +++ b/src/Mod/PartDesign/App/FeaturePrimitive.cpp @@ -105,7 +105,7 @@ App::DocumentObjectExecReturn* FeaturePrimitive::execute(const TopoDS_Shape& pri int solidCount = countSolids(boolOp); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Additive: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } boolOp = refineShapeIfActive(boolOp); @@ -125,7 +125,7 @@ App::DocumentObjectExecReturn* FeaturePrimitive::execute(const TopoDS_Shape& pri int solidCount = countSolids(boolOp); if (solidCount > 1) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Subtractive: Result has multiple solids. This is not supported at this time.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: that is not currently supported.")); } boolOp = refineShapeIfActive(boolOp); diff --git a/src/Mod/PartDesign/App/FeatureTransformed.cpp b/src/Mod/PartDesign/App/FeatureTransformed.cpp index 9238d55c27..b5175c7f3d 100644 --- a/src/Mod/PartDesign/App/FeatureTransformed.cpp +++ b/src/Mod/PartDesign/App/FeatureTransformed.cpp @@ -258,7 +258,7 @@ App::DocumentObjectExecReturn *Transformed::execute() PartDesign::FeatureAddSub* feature = static_cast(*o); feature->getAddSubShape(fuseShape, cutShape); if (fuseShape.isNull() && cutShape.isNull()) - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Shape of addsub feature is empty")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Shape of additive/subtractive feature is empty")); gp_Trsf trsf = feature->getLocation().Transformation().Multiplied(trsfInv); if (!fuseShape.isNull()) fuseShape = fuseShape.makeTransform(trsf); diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index be09c0aa01..850db37cfc 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -1537,7 +1537,7 @@ CmdSketcherExternal::CmdSketcherExternal() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("External geometry"); + sMenuText = QT_TR_NOOP("Create an external geometry"); sToolTipText = QT_TR_NOOP("Create an edge linked to an external geometry"); sWhatsThis = "Sketcher_External"; sStatusTip = sToolTipText; @@ -1566,7 +1566,7 @@ CmdSketcherCarbonCopy::CmdSketcherCarbonCopy() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Carbon copy"); + sMenuText = QT_TR_NOOP("Create a carbon copy"); sToolTipText = QT_TR_NOOP("Copy the geometry of another sketch"); sWhatsThis = "Sketcher_CarbonCopy"; sStatusTip = sToolTipText; diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp index b524e60f11..cb5193ebc0 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp @@ -1258,7 +1258,7 @@ void CmdSketcherJoinCurves::activated(int iMsg) else { QMessageBox::warning( Gui::getMainWindow(), QObject::tr("Too many curves on point"), - QObject::tr("Exactly two curve should end at the selected point to be able to join them.")); + QObject::tr("Exactly two curves should end at the selected point to be able to join them.")); return; } } @@ -1266,7 +1266,7 @@ void CmdSketcherJoinCurves::activated(int iMsg) if (j < 2) { QMessageBox::warning( Gui::getMainWindow(), QObject::tr("Too few curves on point"), - QObject::tr("Exactly two curve should end at the selected point to be able to join them.")); + QObject::tr("Exactly two curves should end at the selected point to be able to join them.")); return; } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h index c21307267f..1f5d700e0a 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h @@ -128,7 +128,7 @@ public: if (obj->getTypeId() == Sketcher::SketchObject::getClassTypeId()) { try { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add carbon copy")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create a carbon copy")); Gui::cmdAppObjectArgs(sketchgui->getObject(), "carbonCopy(\"%s\",%s)", msg.pObjectName, geometryCreationMode==Construction?"True":"False");