From bee89d0447521910a09ecf1fde87477f1808e02a Mon Sep 17 00:00:00 2001 From: Max Wilfinger Date: Sun, 22 Jun 2025 15:09:10 +0200 Subject: [PATCH] PartDesign: Update UI strings for consistency and correct for new fuctions and typos Closes: #22128 --- src/Mod/PartDesign/App/AppPartDesign.cpp | 2 +- src/Mod/PartDesign/App/FeatureHole.cpp | 6 +- src/Mod/PartDesign/Gui/AppPartDesignGui.cpp | 2 +- src/Mod/PartDesign/Gui/Command.cpp | 136 +++++++++--------- src/Mod/PartDesign/Gui/CommandBody.cpp | 51 ++++--- src/Mod/PartDesign/Gui/CommandPrimitive.cpp | 40 +++--- src/Mod/PartDesign/Gui/DlgActiveBody.ui | 7 +- src/Mod/PartDesign/Gui/FeaturePickDialog.cpp | 4 +- src/Mod/PartDesign/Gui/SketchWorkflow.cpp | 16 +-- .../PartDesign/Gui/TaskBooleanParameters.cpp | 2 +- .../PartDesign/Gui/TaskBooleanParameters.ui | 4 +- .../PartDesign/Gui/TaskChamferParameters.ui | 7 +- .../PartDesign/Gui/TaskDatumParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskDraftParameters.ui | 7 +- .../PartDesign/Gui/TaskDressUpParameters.cpp | 4 +- .../PartDesign/Gui/TaskExtrudeParameters.cpp | 4 +- src/Mod/PartDesign/Gui/TaskFeaturePick.cpp | 2 +- src/Mod/PartDesign/Gui/TaskFeaturePick.ui | 2 +- .../PartDesign/Gui/TaskFilletParameters.ui | 7 +- .../PartDesign/Gui/TaskHelixParameters.cpp | 12 +- src/Mod/PartDesign/Gui/TaskHelixParameters.ui | 24 ++-- src/Mod/PartDesign/Gui/TaskHoleParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskHoleParameters.ui | 16 +-- .../Gui/TaskLinearPatternParameters.ui | 2 +- src/Mod/PartDesign/Gui/TaskLoftParameters.cpp | 2 +- .../Gui/TaskMultiTransformParameters.cpp | 30 ++-- src/Mod/PartDesign/Gui/TaskPadParameters.cpp | 4 +- .../PartDesign/Gui/TaskPadPocketParameters.ui | 19 ++- src/Mod/PartDesign/Gui/TaskPipeParameters.cpp | 6 +- src/Mod/PartDesign/Gui/TaskPipeParameters.ui | 12 +- .../PartDesign/Gui/TaskPocketParameters.cpp | 2 +- .../Gui/TaskPolarPatternParameters.ui | 4 +- .../Gui/TaskPrimitiveParameters.cpp | 2 +- .../PartDesign/Gui/TaskPrimitiveParameters.ui | 126 ++++++++-------- .../Gui/TaskRevolutionParameters.cpp | 16 +-- .../Gui/TaskRevolutionParameters.ui | 12 +- src/Mod/PartDesign/Gui/TaskShapeBinder.cpp | 2 +- .../Gui/TaskThicknessParameters.cpp | 2 +- .../PartDesign/Gui/TaskThicknessParameters.ui | 7 +- .../Gui/TaskTransformedMessages.cpp | 2 +- .../Gui/TaskTransformedParameters.cpp | 10 +- .../Gui/TaskTransformedParameters.ui | 4 +- src/Mod/PartDesign/Gui/Utils.cpp | 18 ++- src/Mod/PartDesign/Gui/ViewProvider.cpp | 5 +- src/Mod/PartDesign/Gui/ViewProviderBody.cpp | 2 +- .../PartDesign/Gui/ViewProviderBoolean.cpp | 4 +- .../PartDesign/Gui/ViewProviderChamfer.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderChamfer.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderDatum.cpp | 12 +- src/Mod/PartDesign/Gui/ViewProviderDraft.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderDraft.h | 2 +- .../PartDesign/Gui/ViewProviderDressUp.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderFillet.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderFillet.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderGroove.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderHelix.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderHole.cpp | 4 +- .../Gui/ViewProviderLinearPattern.cpp | 2 +- .../Gui/ViewProviderLinearPattern.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderLoft.cpp | 2 +- .../PartDesign/Gui/ViewProviderMirrored.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderMirrored.h | 2 +- .../Gui/ViewProviderMultiTransform.cpp | 2 +- .../Gui/ViewProviderMultiTransform.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderPad.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderPipe.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderPocket.cpp | 2 +- .../Gui/ViewProviderPolarPattern.cpp | 2 +- .../PartDesign/Gui/ViewProviderPolarPattern.h | 2 +- .../PartDesign/Gui/ViewProviderPrimitive.cpp | 4 +- .../PartDesign/Gui/ViewProviderRevolution.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderScaled.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderScaled.h | 2 +- .../Gui/ViewProviderShapeBinder.cpp | 6 +- .../PartDesign/Gui/ViewProviderThickness.cpp | 2 +- .../PartDesign/Gui/ViewProviderThickness.h | 2 +- src/Mod/PartDesign/Gui/Workbench.cpp | 73 +++++----- src/Mod/PartDesign/Gui/WorkflowManager.cpp | 10 +- src/Mod/PartDesign/InvoluteGearFeature.py | 4 +- src/Mod/PartDesign/InvoluteGearFeature.ui | 20 +-- src/Mod/PartDesign/Scripts/Gear.py | 2 +- src/Mod/PartDesign/SprocketFeature.py | 4 +- src/Mod/PartDesign/SprocketFeature.ui | 16 +-- src/Mod/PartDesign/WizardShaft/Shaft.py | 2 +- src/Mod/PartDesign/WizardShaft/WizardShaft.py | 8 +- .../WizardShaft/WizardShaftTable.py | 2 +- .../PartDesign/fcsprocket/fcsprocketdialog.py | 2 +- 87 files changed, 436 insertions(+), 437 deletions(-) diff --git a/src/Mod/PartDesign/App/AppPartDesign.cpp b/src/Mod/PartDesign/App/AppPartDesign.cpp index 56df444367..fcb4eb2cc9 100644 --- a/src/Mod/PartDesign/App/AppPartDesign.cpp +++ b/src/Mod/PartDesign/App/AppPartDesign.cpp @@ -78,7 +78,7 @@ PyMOD_INIT_FUNC(_PartDesign) } PyObject* mod = PartDesign::initModule(); - Base::Console().log("Loading PartDesign module... done\n"); + Base::Console().log("Loading Part Design module… done\n"); // NOTE: To finish the initialization of our own type objects we must diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index 058082c6f2..41365ee29e 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -2147,10 +2147,10 @@ App::DocumentObjectExecReturn* Hole::execute() retry = false; } catch (Standard_Failure & e) { FC_WARN(getFullName() << ": boolean operation with compound failed (" - << e.GetMessageString() << "), retry..."); + << e.GetMessageString() << "), retry…"); } catch (Base::Exception & e) { - FC_WARN(getFullName() << ": boolean operation with compound failed (" - << e.what() << "), retry..."); + FC_WARN(getFullName() << ": boolean operation with compound failed (" << e.what() + << "), retry…"); } if (retry) { diff --git a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp index e9e8a33985..994697683f 100644 --- a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp +++ b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp @@ -116,7 +116,7 @@ PyMOD_INIT_FUNC(PartDesignGui) } PyObject* mod = PartDesignGui::initModule(); - Base::Console().log("Loading GUI of PartDesign module... done\n"); + Base::Console().log("Loading GUI of Part Design module… done\n"); // instantiating the commands CreatePartDesignCommands(); diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index aa8ebd3ad9..eb0798af77 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -143,7 +143,7 @@ void UnifiedDatumCommand(Gui::Command &cmd, Base::Type type, std::string name) cmd.doCommand(Gui::Command::Doc,"App.activeDocument().recompute()"); // recompute the feature based on its references PartDesignGui::setEdit(Feat,pcActiveBody); } else { - QMessageBox::warning(Gui::getMainWindow(),QObject::tr("Error"), QObject::tr("There is no active body. Please make a body active before inserting a datum entity.")); + QMessageBox::warning(Gui::getMainWindow(),QObject::tr("Error"), QObject::tr("There is no active body. Please activate a body before inserting a datum entity.")); } } catch (Base::Exception &e) { QMessageBox::warning(Gui::getMainWindow(),QObject::tr("Error"),QApplication::translate("Exception", e.what())); @@ -161,8 +161,8 @@ CmdPartDesignPlane::CmdPartDesignPlane() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a datum plane"); - sToolTipText = QT_TR_NOOP("Create a new datum plane"); + sMenuText = QT_TR_NOOP("Datum Plane"); + sToolTipText = QT_TR_NOOP("Creates a new datum plane"); sWhatsThis = "PartDesign_Plane"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Plane"; @@ -189,8 +189,8 @@ CmdPartDesignLine::CmdPartDesignLine() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a datum line"); - sToolTipText = QT_TR_NOOP("Create a new datum line"); + sMenuText = QT_TR_NOOP("Datum Line"); + sToolTipText = QT_TR_NOOP("Creates a new datum line"); sWhatsThis = "PartDesign_Line"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Line"; @@ -217,8 +217,8 @@ CmdPartDesignPoint::CmdPartDesignPoint() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a datum point"); - sToolTipText = QT_TR_NOOP("Create a new datum point"); + sMenuText = QT_TR_NOOP("Datum Point"); + sToolTipText = QT_TR_NOOP("Creates a new datum point"); sWhatsThis = "PartDesign_Point"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Point"; @@ -245,8 +245,8 @@ CmdPartDesignCS::CmdPartDesignCS() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a local coordinate system"); - sToolTipText = QT_TR_NOOP("Create a new local coordinate system"); + sMenuText = QT_TR_NOOP("Local Coordinate System"); + sToolTipText = QT_TR_NOOP("Creates a new local coordinate system"); sWhatsThis = "PartDesign_CoordinateSystem"; sStatusTip = sToolTipText; sPixmap = "PartDesign_CoordinateSystem"; @@ -277,8 +277,8 @@ CmdPartDesignShapeBinder::CmdPartDesignShapeBinder() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a shape binder"); - sToolTipText = QT_TR_NOOP("Create a new shape binder"); + sMenuText = QT_TR_NOOP("Shape Binder"); + sToolTipText = QT_TR_NOOP("Creates a new shape binder"); sWhatsThis = "PartDesign_ShapeBinder"; sStatusTip = sToolTipText; sPixmap = "PartDesign_ShapeBinder"; @@ -297,7 +297,7 @@ void CmdPartDesignShapeBinder::activated(int iMsg) } if (bEditSelected) { - openCommand(QT_TRANSLATE_NOOP("Command", "Edit ShapeBinder")); + openCommand(QT_TRANSLATE_NOOP("Command", "Edit Shape Binder")); PartDesignGui::setEdit(support.getValue()); } else { PartDesign::Body *pcActiveBody = PartDesignGui::getBody(/*messageIfNot = */true); @@ -306,7 +306,7 @@ void CmdPartDesignShapeBinder::activated(int iMsg) std::string FeatName = getUniqueObjectName("ShapeBinder",pcActiveBody); - openCommand(QT_TRANSLATE_NOOP("Command", "Create ShapeBinder")); + openCommand(QT_TRANSLATE_NOOP("Command", "Create Shape Binder")); FCMD_OBJ_CMD(pcActiveBody,"newObject('PartDesign::ShapeBinder','" << FeatName << "')"); // remove the body from links in case it's selected as @@ -343,8 +343,8 @@ CmdPartDesignSubShapeBinder::CmdPartDesignSubShapeBinder() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a sub-object(s) shape binder"); - sToolTipText = QT_TR_NOOP("Create a reference to geometry from one or more objects, allowing it to be used inside or outside a PartDesign Body. It tracks relative placements, supports multiple geometry types (solids, faces, edges, vertices), and can work with objects in the same or external documents."); + sMenuText = QT_TR_NOOP("Sub-Shape Binder"); + sToolTipText = QT_TR_NOOP("Creates a reference to geometry from one or more objects, allowing it to be used inside or outside a body. It tracks relative placements, supports multiple geometry types (solids, faces, edges, vertices), and can work with objects in the same or external documents."); sWhatsThis = "PartDesign_SubShapeBinder"; sStatusTip = sToolTipText; sPixmap = "PartDesign_SubShapeBinder"; @@ -389,7 +389,7 @@ void CmdPartDesignSubShapeBinder::activated(int iMsg) PartDesign::SubShapeBinder *binder = nullptr; try { - openCommand(QT_TRANSLATE_NOOP("Command", "Create SubShapeBinder")); + openCommand(QT_TRANSLATE_NOOP("Command", "Create Sub-Shape Binder")); if (pcActiveBody) { FCMD_OBJ_CMD(pcActiveBody,"newObject('PartDesign::SubShapeBinder','" << FeatName << "')"); binder = dynamic_cast(pcActiveBody->getObject(FeatName.c_str())); @@ -407,7 +407,7 @@ void CmdPartDesignSubShapeBinder::activated(int iMsg) } catch (Base::Exception &e) { e.reportException(); QMessageBox::critical(Gui::getMainWindow(), - QObject::tr("Sub-Shape Binder"), QApplication::translate("Exception", e.what())); + QObject::tr("Sub-shape binder"), QApplication::translate("Exception", e.what())); abortCommand(); } } @@ -427,8 +427,8 @@ CmdPartDesignClone::CmdPartDesignClone() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a clone"); - sToolTipText = QT_TR_NOOP("Create a parametric copy of a solid object as the base feature of a new body"); + sMenuText = QT_TR_NOOP("Clone"); + sToolTipText = QT_TR_NOOP("Copies a solid object parametrically as the base feature of a new body"); sWhatsThis = "PartDesign_Clone"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Clone"; @@ -501,8 +501,8 @@ CmdPartDesignNewSketch::CmdPartDesignNewSketch() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create sketch"); - sToolTipText = QT_TR_NOOP("Create a new sketch"); + sMenuText = QT_TR_NOOP("New Sketch"); + sToolTipText = QT_TR_NOOP("Creates a new sketch"); sWhatsThis = "PartDesign_NewSketch"; sStatusTip = sToolTipText; sPixmap = "Sketcher_NewSketch"; @@ -914,7 +914,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons if (!onlyAllowed) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("Cannot use selected object. Selected object must belong to the active body")); - msgBox.setInformativeText(QObject::tr("Consider using a ShapeBinder or a BaseFeature to reference external geometry in a body.")); + msgBox.setInformativeText(QObject::tr("Consider using a sape binder or a base feature to reference external geometry in a body")); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok); msgBox.exec(); @@ -990,7 +990,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons return; if (!dlg.radioXRef->isChecked()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Make copy")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Make Copy")); auto copy = PartDesignGui::TaskFeaturePick::makeCopy(sketches[0], "", dlg.radioIndependent->isChecked()); auto oBody = PartDesignGui::getBodyFor(sketches[0], false); if (oBody) @@ -1012,7 +1012,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons if (dlg && !pickDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); @@ -1091,7 +1091,7 @@ CmdPartDesignPad::CmdPartDesignPad() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Pad"); - sToolTipText = QT_TR_NOOP("Pad a selected sketch"); + sToolTipText = QT_TR_NOOP("Extrudes the selected sketch or profile and adds it to the body"); sWhatsThis = "PartDesign_Pad"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Pad"; @@ -1120,7 +1120,7 @@ CmdPartDesignPocket::CmdPartDesignPocket() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Pocket"); - sToolTipText = QT_TR_NOOP("Create a pocket with the selected sketch"); + sToolTipText = QT_TR_NOOP("Extrudes the selected sketch or profile and removes it from the body"); sWhatsThis = "PartDesign_Pocket"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Pocket"; @@ -1149,7 +1149,7 @@ CmdPartDesignHole::CmdPartDesignHole() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Hole"); - sToolTipText = QT_TR_NOOP("Create a hole with the selected sketch"); + sToolTipText = QT_TR_NOOP("Creates holes in the active body at the center points of circles or arcs of the selected sketch or profile"); sWhatsThis = "PartDesign_Hole"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Hole"; @@ -1191,8 +1191,8 @@ CmdPartDesignRevolution::CmdPartDesignRevolution() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Revolution"); - sToolTipText = QT_TR_NOOP("Revolve a selected sketch"); + sMenuText = QT_TR_NOOP("Revolve"); + sToolTipText = QT_TR_NOOP("Revolves the selected sketch or profile around a line or axis and adds it to the body"); sWhatsThis = "PartDesign_Revolution"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Revolution"; @@ -1247,7 +1247,7 @@ CmdPartDesignGroove::CmdPartDesignGroove() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Groove"); - sToolTipText = QT_TR_NOOP("Groove a selected sketch"); + sToolTipText = QT_TR_NOOP("Revolves the sketch or profile around a line or axis and removes it from the body"); sWhatsThis = "PartDesign_Groove"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Groove"; @@ -1309,8 +1309,8 @@ CmdPartDesignAdditivePipe::CmdPartDesignAdditivePipe() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Additive pipe"); - sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a path or to other profiles"); + sMenuText = QT_TR_NOOP("Additive Pipe"); + sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a path and adds it to the body"); sWhatsThis = "PartDesign_AdditivePipe"; sStatusTip = sToolTipText; sPixmap = "PartDesign_AdditivePipe"; @@ -1356,8 +1356,8 @@ CmdPartDesignSubtractivePipe::CmdPartDesignSubtractivePipe() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Subtractive pipe"); - sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a path or to other profiles and remove it from the body"); + sMenuText = QT_TR_NOOP("Subtractive Pipe"); + sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a path and removes it from the body"); sWhatsThis = "PartDesign_SubtractivePipe"; sStatusTip = sToolTipText; sPixmap = "PartDesign_SubtractivePipe"; @@ -1403,8 +1403,8 @@ CmdPartDesignAdditiveLoft::CmdPartDesignAdditiveLoft() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Additive loft"); - sToolTipText = QT_TR_NOOP("Loft a selected profile through other profile sections"); + sMenuText = QT_TR_NOOP("Additive Loft"); + sToolTipText = QT_TR_NOOP("Lofts the selected sketch or profile along a path and adds it to the body"); sWhatsThis = "PartDesign_AdditiveLoft"; sStatusTip = sToolTipText; sPixmap = "PartDesign_AdditiveLoft"; @@ -1450,8 +1450,8 @@ CmdPartDesignSubtractiveLoft::CmdPartDesignSubtractiveLoft() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Subtractive loft"); - sToolTipText = QT_TR_NOOP("Loft a selected profile through other profile sections and remove it from the body"); + sMenuText = QT_TR_NOOP("Subtractive Loft"); + sToolTipText = QT_TR_NOOP("Lofts the selected sketch or profile along a path and removes it from the body"); sWhatsThis = "PartDesign_SubtractiveLoft"; sStatusTip = sToolTipText; sPixmap = "PartDesign_SubtractiveLoft"; @@ -1496,8 +1496,8 @@ CmdPartDesignAdditiveHelix::CmdPartDesignAdditiveHelix() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Additive helix"); - sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a helix"); + sMenuText = QT_TR_NOOP("Additive Helix"); + sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a helix and adds it to the body"); sWhatsThis = "PartDesign_AdditiveHelix"; sStatusTip = sToolTipText; sPixmap = "PartDesign_AdditiveHelix"; @@ -1568,8 +1568,8 @@ CmdPartDesignSubtractiveHelix::CmdPartDesignSubtractiveHelix() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Subtractive helix"); - sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a helix and remove it from the body"); + sMenuText = QT_TR_NOOP("Subtractive Helix"); + sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a helix and removes it from the body"); sWhatsThis = "PartDesign_SubtractiveHelix"; sStatusTip = sToolTipText; sPixmap = "PartDesign_SubtractiveHelix"; @@ -1635,7 +1635,7 @@ bool dressupGetSelected(Gui::Command* cmd, const std::string& which, return false; } else if (pcActiveBody != PartDesignGui::getBodyFor(selection[0].getObject(), false)) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in Active Body"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in the active body"), QObject::tr("Select an edge, face, or body from an active body.")); return false; } @@ -1657,7 +1657,7 @@ bool dressupGetSelected(Gui::Command* cmd, const std::string& which, if (TopShape.getShape().IsNull()){ QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Shape of the selected Part is empty")); + QObject::tr("Shape of the selected part is empty")); return false; } @@ -1749,7 +1749,7 @@ CmdPartDesignFillet::CmdPartDesignFillet() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Fillet"); - sToolTipText = QT_TR_NOOP("Make a fillet on an edge, face or body"); + sToolTipText = QT_TR_NOOP("Applies a fillet to the selected edges or faces"); sWhatsThis = "PartDesign_Fillet"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Fillet"; @@ -1777,7 +1777,7 @@ CmdPartDesignChamfer::CmdPartDesignChamfer() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Chamfer"); - sToolTipText = QT_TR_NOOP("Chamfer the selected edges of a shape"); + sToolTipText = QT_TR_NOOP("Applies a chamfer to the selected edges or faces"); sWhatsThis = "PartDesign_Chamfer"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Chamfer"; @@ -1806,7 +1806,7 @@ CmdPartDesignDraft::CmdPartDesignDraft() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Draft"); - sToolTipText = QT_TR_NOOP("Make a draft on a face"); + sToolTipText = QT_TR_NOOP("Applies a draft to the selected faces"); sWhatsThis = "PartDesign_Draft"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Draft"; @@ -1874,7 +1874,7 @@ CmdPartDesignThickness::CmdPartDesignThickness() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Thickness"); - sToolTipText = QT_TR_NOOP("Make a thick solid"); + sToolTipText = QT_TR_NOOP("Applies thickness and removes the selected faces"); sWhatsThis = "PartDesign_Thickness"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Thickness"; @@ -1967,7 +1967,7 @@ void prepareTransformed(PartDesign::Body *pcActiveBody, Gui::Command* cmd, const PartDesign::Body* activeBody = PartDesignGui::getBody(true); for (auto feature : features) { if (activeBody != PartDesignGui::getBodyFor(feature, false)) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in Active Body"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in the active body"), QObject::tr("Please select only one feature in an active body.")); return; } @@ -1990,8 +1990,8 @@ CmdPartDesignMirrored::CmdPartDesignMirrored() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Mirrored"); - sToolTipText = QT_TR_NOOP("Create a mirrored feature"); + sMenuText = QT_TR_NOOP("Mirror"); + sToolTipText = QT_TR_NOOP("Mirrors the selected features or active body"); sWhatsThis = "PartDesign_Mirrored"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Mirrored"; @@ -2023,7 +2023,7 @@ void CmdPartDesignMirrored::activated(int iMsg) finishTransformed(cmd, Feat); }; - prepareTransformed(pcActiveBody, this, "Mirrored", worker); + prepareTransformed(pcActiveBody, this, "Mirror", worker); } bool CmdPartDesignMirrored::isActive() @@ -2041,8 +2041,8 @@ CmdPartDesignLinearPattern::CmdPartDesignLinearPattern() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("LinearPattern"); - sToolTipText = QT_TR_NOOP("Create a linear pattern feature"); + sMenuText = QT_TR_NOOP("Linear Pattern"); + sToolTipText = QT_TR_NOOP("Duplicates the selected features or the active body in a linear pattern"); sWhatsThis = "PartDesign_LinearPattern"; sStatusTip = sToolTipText; sPixmap = "PartDesign_LinearPattern"; @@ -2094,8 +2094,8 @@ CmdPartDesignPolarPattern::CmdPartDesignPolarPattern() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("PolarPattern"); - sToolTipText = QT_TR_NOOP("Create a polar pattern feature"); + sMenuText = QT_TR_NOOP("Polar Pattern"); + sToolTipText = QT_TR_NOOP("Duplicates the selected features or the active body in a circular pattern"); sWhatsThis = "PartDesign_PolarPattern"; sStatusTip = sToolTipText; sPixmap = "PartDesign_PolarPattern"; @@ -2149,8 +2149,8 @@ CmdPartDesignScaled::CmdPartDesignScaled() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Scaled"); - sToolTipText = QT_TR_NOOP("Create a scaled feature"); + sMenuText = QT_TR_NOOP("Scale"); + sToolTipText = QT_TR_NOOP("Scales the selected features or the active body"); sWhatsThis = "PartDesign_Scaled"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Scaled"; @@ -2173,7 +2173,7 @@ void CmdPartDesignScaled::activated(int iMsg) finishTransformed(cmd, Feat); }; - prepareTransformed(pcActiveBody, this, "Scaled", worker); + prepareTransformed(pcActiveBody, this, "Scale", worker); } bool CmdPartDesignScaled::isActive() @@ -2191,8 +2191,8 @@ CmdPartDesignMultiTransform::CmdPartDesignMultiTransform() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create MultiTransform"); - sToolTipText = QT_TR_NOOP("Create a multitransform feature"); + sMenuText = QT_TR_NOOP("Multi-Transform"); + sToolTipText = QT_TR_NOOP("Applies multiple transformations to the selected features or active body"); sWhatsThis = "PartDesign_MultiTransform"; sStatusTip = sToolTipText; sPixmap = "PartDesign_MultiTransform"; @@ -2235,7 +2235,7 @@ void CmdPartDesignMultiTransform::activated(int iMsg) if (prevFeature) Gui::Selection().addSelection(prevFeature->getDocument()->getName(), prevFeature->getNameInDocument()); - openCommand(QT_TRANSLATE_NOOP("Command", "Convert to MultiTransform feature")); + openCommand(QT_TRANSLATE_NOOP("Command", "Convert to Multi-Transform feature")); Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.runCommandByName("PartDesign_MoveTip"); @@ -2306,8 +2306,8 @@ CmdPartDesignBoolean::CmdPartDesignBoolean() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Boolean operation"); - sToolTipText = QT_TR_NOOP("Boolean operation with two or more bodies"); + sMenuText = QT_TR_NOOP("Boolean Operation"); + sToolTipText = QT_TR_NOOP("Applies boolean operations with the selected objects and the active body"); sWhatsThis = "PartDesign_Boolean"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Boolean"; @@ -2368,8 +2368,8 @@ public: { sAppModule = "PartDesign"; sGroup = "PartDesign"; - sMenuText = QT_TR_NOOP("Create datum"); - sToolTipText = QT_TR_NOOP("Create a datum object or local coordinate system"); + sMenuText = QT_TR_NOOP("Create Datum"); + sToolTipText = QT_TR_NOOP("Creates a datum object or local coordinate system"); sWhatsThis = "PartDesign_CompDatums"; sStatusTip = sToolTipText; eType = ForEdit; @@ -2403,8 +2403,8 @@ public: { sAppModule = "PartDesign"; sGroup = "PartDesign"; - sMenuText = QT_TR_NOOP("Create datum"); - sToolTipText = QT_TR_NOOP("Create a datum object or local coordinate system"); + sMenuText = QT_TR_NOOP("Create Datum"); + sToolTipText = QT_TR_NOOP("Creates a datum object or local coordinate system"); sWhatsThis = "PartDesign_CompDatums"; sStatusTip = sToolTipText; eType = ForEdit; diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index db38c7915c..4973734f7c 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -85,8 +85,8 @@ CmdPartDesignBody::CmdPartDesignBody() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create body"); - sToolTipText = QT_TR_NOOP("Create a new body and make it active"); + sMenuText = QT_TR_NOOP("New Body"); + sToolTipText = QT_TR_NOOP("Creates a new body and activtes it"); sWhatsThis = "PartDesign_Body"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Body"; @@ -112,12 +112,12 @@ void CmdPartDesignBody::activated(int iMsg) PartDesign::Body::findBodyOf ( baseFeature ) ) { // Prevent creating bodies based on features already belonging to other bodies QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Bad base feature"), - QObject::tr("Body can't be based on a PartDesign feature.")); + QObject::tr("A body cannot be based on a Part Design feature.")); baseFeature = nullptr; } else if (PartDesign::Body::findBodyOf ( baseFeature )){ QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Bad base feature"), - QObject::tr("%1 already belongs to a body, can't use it as base feature for another body.") + QObject::tr("%1 already belongs to a body and cannot be used as a base feature for another body.") .arg(QString::fromUtf8(baseFeature->Label.getValue()))); baseFeature = nullptr; } @@ -313,7 +313,7 @@ CmdPartDesignMigrate::CmdPartDesignMigrate() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Migrate"); - sToolTipText = QT_TR_NOOP("Migrate document to the modern PartDesign workflow"); + sToolTipText = QT_TR_NOOP("Migrates the document to the modern Part Design workflow"); sWhatsThis = "PartDesign_Migrate"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Migrate"; @@ -343,7 +343,7 @@ void CmdPartDesignMigrate::activated(int iMsg) } else { // Huh? nothing to migrate? QMessageBox::warning ( nullptr, QObject::tr ( "Nothing to migrate" ), - QObject::tr ( "No PartDesign features found that don't belong to a body." + QObject::tr ( "No Part Design features found that do not belong to a body." " Nothing to migrate." ) ); } return; @@ -429,7 +429,7 @@ void CmdPartDesignMigrate::activated(int iMsg) } // do the actual migration - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy Part Design features to Bodies")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy Part Design features to bodies")); for ( auto chainIt = featureChains.begin(); !featureChains.empty(); featureChains.erase (chainIt), chainIt = featureChains.begin () ) { @@ -527,8 +527,8 @@ CmdPartDesignMoveTip::CmdPartDesignMoveTip() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Set tip"); - sToolTipText = QT_TR_NOOP("Move the tip of the body"); + sMenuText = QT_TR_NOOP("Set Tip"); + sToolTipText = QT_TR_NOOP("Moves the tip of the body to the selected feature"); sWhatsThis = "PartDesign_MoveTip"; sStatusTip = sToolTipText; sPixmap = "PartDesign_MoveTip"; @@ -555,11 +555,11 @@ void CmdPartDesignMoveTip::activated(int iMsg) if (!selFeature) { QMessageBox::warning (nullptr, QObject::tr( "Selection error" ), - QObject::tr( "Select exactly one PartDesign feature or a body." ) ); + QObject::tr( "Select exactly one Part Design feature or a body." ) ); return; } else if (!body) { QMessageBox::warning (nullptr, QObject::tr( "Selection error" ), - QObject::tr( "Couldn't determine a body for the selected feature '%s'.", selFeature->Label.getValue() ) ); + QObject::tr( "Could not determine a body for the selected feature '%s'.", selFeature->Label.getValue() ) ); return; } else if ( !selFeature->isDerivedFrom(PartDesign::Feature::getClassTypeId () ) && selFeature != body && body->BaseFeature.getValue() != selFeature ) { @@ -606,7 +606,7 @@ CmdPartDesignDuplicateSelection::CmdPartDesignDuplicateSelection() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Duplicate selected &object"); + sMenuText = QT_TR_NOOP("Duplicate &Object"); sToolTipText = QT_TR_NOOP("Duplicates the selected object and adds it to the active body"); sWhatsThis = "PartDesign_DuplicateSelection"; sStatusTip = sToolTipText; @@ -619,7 +619,7 @@ void CmdPartDesignDuplicateSelection::activated(int iMsg) std::vector beforeFeatures = getDocument()->getObjects(); - openCommand(QT_TRANSLATE_NOOP("Command", "Duplicate a PartDesign object")); + openCommand(QT_TRANSLATE_NOOP("Command", "Duplicate a Part Design object")); doCommand(Doc,"FreeCADGui.runCommand('Std_DuplicateSelection')"); if (pcActiveBody) { @@ -666,7 +666,7 @@ CmdPartDesignMoveFeature::CmdPartDesignMoveFeature() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Move object to other body"); + sMenuText = QT_TR_NOOP("Move Object To…"); sToolTipText = QT_TR_NOOP("Moves the selected object to another body"); sWhatsThis = "PartDesign_MoveFeature"; sStatusTip = sToolTipText; @@ -709,7 +709,7 @@ void CmdPartDesignMoveFeature::activated(int iMsg) if (source_bodies.size() != 1) { //show messagebox and cancel QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Features cannot be moved"), - QObject::tr("Only features of a single source Body can be moved")); + QObject::tr("Only features of a single source body can be moved")); return; } @@ -833,8 +833,8 @@ CmdPartDesignMoveFeatureInTree::CmdPartDesignMoveFeatureInTree() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Move object after other object"); - sToolTipText = QT_TR_NOOP("Moves the selected object and insert it after another object"); + sMenuText = QT_TR_NOOP("Move Feature After…"); + sToolTipText = QT_TR_NOOP("Moves the selected feature after another feature in the same body"); sWhatsThis = "PartDesign_MoveFeatureInTree"; sStatusTip = sToolTipText; sPixmap = "PartDesign_MoveFeatureInTree"; @@ -887,17 +887,22 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) items.push_back( QString::fromUtf8 ( feat->Label.getValue() ) ); } - QString text = QInputDialog::getItem(Gui::getMainWindow(), - qApp->translate("PartDesign_MoveFeatureInTree", "Select feature"), + QString text = QInputDialog::getItem( + Gui::getMainWindow(), + qApp->translate("PartDesign_MoveFeatureInTree", "Move Feature After…"), qApp->translate("PartDesign_MoveFeatureInTree", "Select a feature from the list"), - items, 0, false, &ok, Qt::MSWindowsFixedSizeDialogHint); + items, + 0, + false, + &ok, + Qt::MSWindowsFixedSizeDialogHint); if (!ok) return; int index = items.indexOf(text); // first object is the beginning of the body App::DocumentObject* target = index != 0 ? model[index-1] : nullptr; - openCommand(QT_TRANSLATE_NOOP("Command", "Move an object inside tree")); + openCommand(QT_TRANSLATE_NOOP("Command", "Move a feature inside body")); App::DocumentObject* lastObject = target; for ( auto feat: features ) { @@ -959,9 +964,9 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) && lastObject->isDerivedFrom() ) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setIcon(QMessageBox::Question); - msgBox.setWindowTitle(qApp->translate("PartDesign_MoveFeatureInTree", "Move tip")); + msgBox.setWindowTitle(qApp->translate("PartDesign_MoveFeatureInTree", "Move Tip")); msgBox.setText(qApp->translate("PartDesign_MoveFeatureInTree", "The moved feature appears after the currently set tip.")); - msgBox.setInformativeText(qApp->translate("PartDesign_MoveFeatureInTree", "Do you want the last feature to be the new tip?")); + msgBox.setInformativeText(qApp->translate("PartDesign_MoveFeatureInTree", "Set tip to last feature?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp index ba8e65ff50..422b7bbd50 100644 --- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp @@ -66,8 +66,8 @@ CmdPrimtiveCompAdditive::CmdPrimtiveCompAdditive() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create an additive primitive"); - sToolTipText = QT_TR_NOOP("Create an additive primitive"); + sMenuText = QT_TR_NOOP("Additive Primitive"); + sToolTipText = QT_TR_NOOP("Creates an additive primitive"); sWhatsThis = "PartDesign_CompPrimitiveAdditive"; sStatusTip = sToolTipText; eType = ForEdit; @@ -195,35 +195,35 @@ void CmdPrimtiveCompAdditive::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Box")); - arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive box by its width, height, and length")); + arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive box by its width, height, and length")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Cylinder")); - arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive cylinder by its radius, height, and angle")); + arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive cylinder by its radius, height, and angle")); arc2->setStatusTip(arc2->toolTip()); QAction* arc3 = a[2]; arc3->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Sphere")); - arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive sphere by its radius and various angles")); + arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive sphere by its radius and various angles")); arc3->setStatusTip(arc3->toolTip()); QAction* arc4 = a[3]; arc4->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Cone")); - arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive cone")); + arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive cone")); arc4->setStatusTip(arc4->toolTip()); QAction* arc5 = a[4]; arc5->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Ellipsoid")); - arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive ellipsoid")); + arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive ellipsoid")); arc5->setStatusTip(arc5->toolTip()); QAction* arc6 = a[5]; arc6->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Torus")); - arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive torus")); + arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive torus")); arc6->setStatusTip(arc6->toolTip()); QAction* arc7 = a[6]; arc7->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Prism")); - arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive prism")); + arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive prism")); arc7->setStatusTip(arc7->toolTip()); QAction* arc8 = a[7]; arc8->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Wedge")); - arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive wedge")); + arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive wedge")); arc8->setStatusTip(arc8->toolTip()); } @@ -239,8 +239,8 @@ CmdPrimtiveCompSubtractive::CmdPrimtiveCompSubtractive() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a subtractive primitive"); - sToolTipText = QT_TR_NOOP("Create a subtractive primitive"); + sMenuText = QT_TR_NOOP("Subtractive Primitive"); + sToolTipText = QT_TR_NOOP("Creates a subtractive primitive"); sWhatsThis = "PartDesign_CompPrimitiveSubtractive"; sStatusTip = sToolTipText; eType = ForEdit; @@ -347,35 +347,35 @@ void CmdPrimtiveCompSubtractive::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Box")); - arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive box by its width, height and length")); + arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive box by its width, height and length")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Cylinder")); - arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive cylinder by its radius, height and angle")); + arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive cylinder by its radius, height and angle")); arc2->setStatusTip(arc2->toolTip()); QAction* arc3 = a[2]; arc3->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Sphere")); - arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive sphere by its radius and various angles")); + arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive sphere by its radius and various angles")); arc3->setStatusTip(arc3->toolTip()); QAction* arc4 = a[3]; arc4->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Cone")); - arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive cone")); + arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive cone")); arc4->setStatusTip(arc4->toolTip()); QAction* arc5 = a[4]; arc5->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Ellipsoid")); - arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive ellipsoid")); + arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive ellipsoid")); arc5->setStatusTip(arc5->toolTip()); QAction* arc6 = a[5]; arc6->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Torus")); - arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive torus")); + arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive torus")); arc6->setStatusTip(arc6->toolTip()); QAction* arc7 = a[6]; arc7->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Prism")); - arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive prism")); + arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive prism")); arc7->setStatusTip(arc7->toolTip()); QAction* arc8 = a[7]; arc8->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Wedge")); - arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive wedge")); + arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive wedge")); arc8->setStatusTip(arc8->toolTip()); } diff --git a/src/Mod/PartDesign/Gui/DlgActiveBody.ui b/src/Mod/PartDesign/Gui/DlgActiveBody.ui index 84c6506a85..d279a6fba6 100644 --- a/src/Mod/PartDesign/Gui/DlgActiveBody.ui +++ b/src/Mod/PartDesign/Gui/DlgActiveBody.ui @@ -17,9 +17,8 @@ - To create a new PartDesign object, there must be an active Body object in the document. - -Please select a body from below, or create a new body. + To create a new Part Design object, there must be an active body object in the document. +Select a body from below, or create a new body. true @@ -33,7 +32,7 @@ Please select a body from below, or create a new body. - Create new body + Create New Body diff --git a/src/Mod/PartDesign/Gui/FeaturePickDialog.cpp b/src/Mod/PartDesign/Gui/FeaturePickDialog.cpp index a8fdc8da8c..68857f74d4 100644 --- a/src/Mod/PartDesign/Gui/FeaturePickDialog.cpp +++ b/src/Mod/PartDesign/Gui/FeaturePickDialog.cpp @@ -43,9 +43,9 @@ const QString FeaturePickDialog::getFeatureStatusString(const featureStatus st) case invalidShape: return tr("Invalid shape"); case noWire: return tr("No wire in sketch"); case isUsed: return tr("Sketch already used by other feature"); - case otherBody: return tr("Sketch belongs to another Body feature"); + case otherBody: return tr("Sketch belongs to another body feature"); case basePlane: return tr("Base plane"); - case afterTip: return tr("Feature is located after the Tip feature"); + case afterTip: return tr("Feature is located after the tip of the body"); } return tr(""); diff --git a/src/Mod/PartDesign/Gui/SketchWorkflow.cpp b/src/Mod/PartDesign/Gui/SketchWorkflow.cpp index acc06864be..19ef91df16 100644 --- a/src/Mod/PartDesign/Gui/SketchWorkflow.cpp +++ b/src/Mod/PartDesign/Gui/SketchWorkflow.cpp @@ -246,7 +246,7 @@ public: App::Document* appdocument = guidocument->getDocument(); std::string FeatName = appdocument->getUniqueObjectName("Sketch"); - guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "Create a Sketch on Face")); + guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "Sketch on Face")); FCMD_OBJ_CMD(activeBody, "newObject('Sketcher::SketchObject','" << FeatName << "')"); auto Feat = activeBody->getDocument()->getObject(FeatName.c_str()); FCMD_OBJ_CMD(Feat, "AttachmentSupport = " << supportString); @@ -492,7 +492,7 @@ public: { try { // Start command early, so undo will undo any Body creation - guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "Create a new Sketch")); + guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "New Sketch")); tryFindSupport(); } catch (const RejectException&) { @@ -659,7 +659,7 @@ private: if (dlg && !pickDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); @@ -698,7 +698,7 @@ private: App::Document* doc = partDesignBody->getDocument(); if (!doc->hasPendingTransaction()) { - doc->openTransaction(QT_TRANSLATE_NOOP("Command", "Create a new Sketch")); + doc->openTransaction(QT_TRANSLATE_NOOP("Command", "New Sketch")); } FCMD_OBJ_CMD(partDesignBody,"newObject('Sketcher::SketchObject','" << FeatName << "')"); @@ -732,19 +732,19 @@ void SketchWorkflow::createSketch() } catch (const WrongSelectionException&) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Several sub-elements selected"), - QObject::tr("You have to select a single face as support for a sketch!")); + QObject::tr("Select a single face as support for a sketch!")); } catch (const WrongSupportException&) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No support face selected"), - QObject::tr("You have to select a face as support for a sketch!")); + QObject::tr("Select a face as support for a sketch!")); } catch (const SupportNotPlanarException&) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No planar support"), - QObject::tr("You need a planar face as support for a sketch!")); + QObject::tr("Need a planar face as support for a sketch!")); } catch (const MissingPlanesException&) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No valid planes in this document"), - QObject::tr("Please create a plane first or select a face to sketch on")); + QObject::tr("Create a plane first or select a face to sketch on")); } } diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp index bfc43ff794..6af54e3ef7 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp @@ -51,7 +51,7 @@ using namespace Gui; TaskBooleanParameters::TaskBooleanParameters(ViewProviderBoolean* BooleanView, QWidget* parent) : TaskBox(Gui::BitmapFactory().pixmap("PartDesign_Boolean"), - tr("Boolean parameters"), + tr("Boolean Parameters"), true, parent) , ui(new Ui_TaskBooleanParameters) diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui b/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui index 0176226986..c74220cbba 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui @@ -19,7 +19,7 @@ - Add body + Add Body true @@ -29,7 +29,7 @@ - Remove body + Remove Body true diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.ui b/src/Mod/PartDesign/Gui/TaskChamferParameters.ui index a45878b4b2..d6759648aa 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.ui @@ -17,8 +17,7 @@ - Click button to enter selection mode, -click again to end selection + Toggles between selection and preview mode Select @@ -77,7 +76,7 @@ click again to end selection false - Flip direction + Flips the direction @@ -117,7 +116,7 @@ click again to end selection - Use All Edges + Use all edges diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp index 47839dc795..01fce8491e 100644 --- a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp @@ -98,7 +98,7 @@ bool TaskDlgDatumParameters::accept() { //see if we are able to assign a mode if (parameter->getActiveMapMode() == mmDeactivated) { QMessageBox msg(Gui::getMainWindow()); - msg.setWindowTitle(tr("Incompatible reference set")); + msg.setWindowTitle(tr("Incompatible Reference Set")); msg.setText(tr("There is no attachment mode that fits the current set" " of references. If you choose to continue, the feature will remain where" " it is now, and will not be moved as the references change." diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.ui b/src/Mod/PartDesign/Gui/TaskDraftParameters.ui index 288aceeb7f..3d2d38b1fe 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.ui @@ -17,8 +17,7 @@ - Click button to enter selection mode, -click again to end selection + Toggles between selection and preview mode Select @@ -77,7 +76,7 @@ click again to end selection - Neutral plane + Neutral Plane true @@ -94,7 +93,7 @@ click again to end selection - Pull direction + Pull Direction true diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp index 12bb0c3790..11247c81ef 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp @@ -291,12 +291,12 @@ void TaskDressUpParameters::createAddAllEdgesAction(QListWidget* parentList) { // creates a context menu, a shortcut for it and connects it to a slot function - addAllEdgesAction = new QAction(tr("Add all edges"), this); + addAllEdgesAction = new QAction(tr("Add All Edges"), this); addAllEdgesAction->setShortcut(QKeySequence(QStringLiteral("Ctrl+Shift+A"))); // display shortcut behind the context menu entry addAllEdgesAction->setShortcutVisibleInContextMenu(true); parentList->addAction(addAllEdgesAction); - addAllEdgesAction->setStatusTip(tr("Adds all edges to the list box (active only when in add selection mode).")); + addAllEdgesAction->setStatusTip(tr("Adds all edges to the list box (only when in add selection mode)")); parentList->setContextMenuPolicy(Qt::ActionsContextMenu); } diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp index 6257ab9392..cb9b734649 100644 --- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp @@ -264,7 +264,7 @@ void TaskExtrudeParameters::onSelectShapeFacesToggle(bool checked) } else { setSelectionMode(None); - ui->buttonShapeFace->setText(tr("Select faces")); + ui->buttonShapeFace->setText(tr("Select Faces")); } } @@ -602,7 +602,7 @@ void TaskExtrudeParameters::fillDirectionCombo() } // add the other entries - addAxisToCombo(nullptr, std::string(), tr("Select reference...")); + addAxisToCombo(nullptr, std::string(), tr("Select reference…")); // we start with the sketch normal as proposal for the custom direction if (pcSketch) { diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp index ad00474162..fdd75d8536 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp @@ -80,7 +80,7 @@ const QString TaskFeaturePick::getFeatureStatusString(const featureStatus st) case basePlane: return tr("Base plane"); case afterTip: - return tr("Feature is located after the tip feature"); + return tr("Feature is located after the tip of the body"); } return QString(); diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.ui b/src/Mod/PartDesign/Gui/TaskFeaturePick.ui index e53a139796..6d4a9f36b7 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.ui +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.ui @@ -27,7 +27,7 @@ - Allow external features + Allow External Features false diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.ui b/src/Mod/PartDesign/Gui/TaskFilletParameters.ui index 7843b56434..39a13b6c35 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.ui @@ -17,8 +17,7 @@ - Click button to enter selection mode, -click again to end selection + Toggles between selection and preview mode Select @@ -44,7 +43,7 @@ click again to end selection - Radius: + Radius @@ -60,7 +59,7 @@ click again to end selection - Use All Edges + Use all edges diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp index 980ec2ffaf..9e9d4ee584 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp @@ -53,7 +53,7 @@ TaskHelixParameters::TaskHelixParameters(PartDesignGui::ViewProviderHelix* Helix : TaskSketchBasedParameters(HelixView, parent, "PartDesign_AdditiveHelix", - tr("Helix parameters")) + tr("Helix Parameters")) , ui(new Ui_TaskHelixParameters) { // we need a separate container widget to add all controls to @@ -201,7 +201,7 @@ void TaskHelixParameters::fillAxisCombo(bool forceRefill) addPartAxes(); // add "Select reference" - addAxisToCombo(nullptr, std::string(), tr("Select reference...")); + addAxisToCombo(nullptr, std::string(), tr("Select reference…")); } // add current link, if not in list and highlight it @@ -234,9 +234,9 @@ void TaskHelixParameters::addPartAxes() if (PartDesign::Body* body = PartDesign::Body::findBodyOf(profile)) { try { App::Origin* orig = body->getOrigin(); - addAxisToCombo(orig->getX(), "", tr("Base X axis")); - addAxisToCombo(orig->getY(), "", tr("Base Y axis")); - addAxisToCombo(orig->getZ(), "", tr("Base Z axis")); + addAxisToCombo(orig->getX(), "", tr("Base x-axis")); + addAxisToCombo(orig->getY(), "", tr("Base y-axis")); + addAxisToCombo(orig->getZ(), "", tr("Base z-axis")); } catch (const Base::Exception& ex) { ex.reportException(); @@ -625,7 +625,7 @@ void TaskHelixParameters::getReferenceAxis(App::DocumentObject*& obj, const App::PropertyLinkSub& lnk = *(axesInList.at(num)); if (!lnk.getValue()) { throw Base::RuntimeError( - "Still in reference selection mode; reference wasn't selected yet"); + "Still in reference selection mode; reference was not selected yet"); } else { auto revolution = getObject(); diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.ui b/src/Mod/PartDesign/Gui/TaskHelixParameters.ui index 798d2e222a..e9a7c6c267 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.ui @@ -19,7 +19,7 @@ - Status: + Status @@ -37,7 +37,7 @@ - Axis: + Axis @@ -45,17 +45,17 @@ - Base X axis + Base x-axis - Base Y axis + Base y-axis - Base Z axis + Base z-axis @@ -75,7 +75,7 @@ - Select reference... + Select reference… @@ -87,7 +87,7 @@ - Mode: + Mode @@ -122,7 +122,7 @@ - Pitch: + Pitch @@ -149,7 +149,7 @@ - Height: + Height @@ -176,7 +176,7 @@ - Turns: + Turns @@ -200,7 +200,7 @@ - Cone angle: + Cone angle @@ -230,7 +230,7 @@ - Radial growth: + Radial growth diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp index eeb92b75e4..f17ae611f1 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp @@ -50,7 +50,7 @@ namespace sp = std::placeholders; #endif TaskHoleParameters::TaskHoleParameters(ViewProviderHole* HoleView, QWidget* parent) - : TaskSketchBasedParameters(HoleView, parent, "PartDesign_Hole", tr("Hole parameters")) + : TaskSketchBasedParameters(HoleView, parent, "PartDesign_Hole", tr("Hole Parameters")) , observer(new Observer(this, getObject())) , isApplying(false) , ui(new Ui_TaskHoleParameters) diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui index 0c2d83c201..a8b90b77b9 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui @@ -17,7 +17,7 @@ - Task Hole Parameters + Hole Parameters @@ -75,7 +75,7 @@ Qt::LayoutDirection::RightToLeft - Head Type + Head type @@ -114,7 +114,7 @@ Qt::LayoutDirection::LeftToRight - Depth Type + Depth type @@ -196,7 +196,7 @@ - Head Diameter + Head diameter @@ -244,7 +244,7 @@ - Head Depth + Head depth @@ -670,12 +670,12 @@ over 90: larger hole radius at the bottom - Tap Drill (To Be Threaded) + Tap drill (to be threaded) - Modeled Thread + Modeled thread @@ -683,7 +683,7 @@ over 90: larger hole radius at the bottom - Hole Type + Hole type diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui index 1c89aa967e..9390eb9fdc 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui @@ -60,7 +60,7 @@ - Overall Length + Overall length diff --git a/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp b/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp index 97810cf47d..bdcb1fbfb0 100644 --- a/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp @@ -48,7 +48,7 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskLoftParameters */ TaskLoftParameters::TaskLoftParameters(ViewProviderLoft* LoftView, bool /*newObj*/, QWidget* parent) - : TaskSketchBasedParameters(LoftView, parent, "PartDesign_AdditiveLoft", tr("Loft parameters")) + : TaskSketchBasedParameters(LoftView, parent, "PartDesign_AdditiveLoft", tr("Loft Parameters")) , ui(new Ui_TaskLoftParameters) { // we need a separate container widget to add all controls to diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index 6e79357ed2..240e307f1e 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -80,34 +80,34 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget) this, &TaskMultiTransformParameters::onTransformDelete); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Add mirrored transformation"), ui->listTransformFeatures); + action = new QAction(tr("Add Mirror Transformation"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformAddMirrored); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Add linear pattern"), ui->listTransformFeatures); + action = new QAction(tr("Add Linear Pattern"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformAddLinearPattern); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Add polar pattern"), ui->listTransformFeatures); + action = new QAction(tr("Add Polar Pattern"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformAddPolarPattern); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Add scaled transformation"), ui->listTransformFeatures); + action = new QAction(tr("Add Scale Transformation"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformAddScaled); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Move up"), ui->listTransformFeatures); + action = new QAction(tr("Move Up"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onMoveUp); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Move down"), ui->listTransformFeatures); + action = new QAction(tr("Move Down"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onMoveDown); ui->listTransformFeatures->addAction(action); ui->listTransformFeatures->setContextMenuPolicy(Qt::ActionsContextMenu); @@ -141,7 +141,7 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget) editHint = false; } else { - ui->listTransformFeatures->addItem(tr("Right-click to add")); + ui->listTransformFeatures->addItem(tr("Right-click to add a transformation")); editHint = true; } } @@ -257,14 +257,14 @@ void TaskMultiTransformParameters::onTransformActivated(const QModelIndex& index void TaskMultiTransformParameters::onTransformAddMirrored() { closeSubTask(); - std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Mirrored"); + std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Mirror"); auto pcBody = dynamic_cast(Part::BodyBase::findBodyOf(getTopTransformedObject())); if (!pcBody) { return; } if (isEnabledTransaction()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Mirrored")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Mirror")); } FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Mirrored','"<getObject()->getDocument()->getUniqueObjectName("LinearPattern"); + std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Linear Pattern"); auto pcBody = dynamic_cast(Part::BodyBase::findBodyOf(getTopTransformedObject())); if (!pcBody) { return; } if (isEnabledTransaction()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Make LinearPattern")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Linear Pattern")); } FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::LinearPattern','"<getObject()->getDocument()->getUniqueObjectName("PolarPattern"); + std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Polar Pattern"); auto pcBody = dynamic_cast(Part::BodyBase::findBodyOf(getTopTransformedObject())); if (!pcBody) { return; } if (isEnabledTransaction()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "PolarPattern")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Polar Pattern")); } FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::PolarPattern','"<getObject()->getDocument()->getUniqueObjectName("Scaled"); + std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Scale"); auto pcBody = dynamic_cast(Part::BodyBase::findBodyOf(getTopTransformedObject())); if (!pcBody) { return; } if (isEnabledTransaction()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Scaled")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Scale")); } FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Scaled','"<offsetEdit->setToolTip(tr("Offset from face at which pad will end")); + ui->offsetEdit->setToolTip(tr("Offsets the pad from the face at which the pad will end")); ui->checkBoxReversed->setToolTip(tr("Reverses pad direction")); // set the history path diff --git a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui index 9249302006..22d3dd492a 100644 --- a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui @@ -167,8 +167,7 @@ - Click button to enter selection mode, - click again to end selection + Toggles between selection and preview mode Select @@ -249,7 +248,7 @@ - Direction/edge: + Direction/edge @@ -266,7 +265,7 @@ from the model as reference - Select reference... + Select reference… @@ -304,14 +303,14 @@ the sketch plane's normal vector will be used - x + X - x-component of direction vector + X-component of direction vector false @@ -333,14 +332,14 @@ the sketch plane's normal vector will be used - y + Y - y-component of direction vector + Y-component of direction vector false @@ -362,14 +361,14 @@ the sketch plane's normal vector will be used - z + Z - z-component of direction vector + Z-component of direction vector false diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp index 9486bf6aec..e3e8ec9dd1 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp @@ -66,7 +66,7 @@ using namespace Gui; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskPipeParameters::TaskPipeParameters(ViewProviderPipe* PipeView, bool /*newObj*/, QWidget* parent) - : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", tr("Pipe parameters")) + : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", tr("Pipe Parameters")) , ui(new Ui_TaskPipeParameters) , stateHandler(nullptr) { @@ -577,7 +577,7 @@ TaskPipeOrientation::TaskPipeOrientation(ViewProviderPipe* PipeView, : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", - tr("Section orientation")) + tr("Section Orientation")) , ui(new Ui_TaskPipeOrientation) , stateHandler(nullptr) { @@ -876,7 +876,7 @@ TaskPipeScaling::TaskPipeScaling(ViewProviderPipe* PipeView, bool /*newObj*/, QW : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", - tr("Section transformation")) + tr("Section Transformation")) , ui(new Ui_TaskPipeScaling) , stateHandler(nullptr) { diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.ui b/src/Mod/PartDesign/Gui/TaskPipeParameters.ui index 9daa193d20..ecf9b05d67 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.ui @@ -48,7 +48,7 @@ - Corner Transition + Corner transition @@ -67,12 +67,12 @@ - Right Corner + Right corner - Round Corner + Round corner @@ -82,7 +82,7 @@ - Path to sweep along + Path to Sweep Along @@ -116,7 +116,7 @@ - Add Edge + Add edge true @@ -135,7 +135,7 @@ - Remove Edge + Remove edge true diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp index d005cfecfb..dee310c9f5 100644 --- a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp @@ -37,7 +37,7 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskPocketParameters */ TaskPocketParameters::TaskPocketParameters(ViewProviderPocket *PocketView,QWidget *parent, bool newObj) - : TaskExtrudeParameters(PocketView, parent, "PartDesign_Pocket", tr("Pocket parameters")) + : TaskExtrudeParameters(PocketView, parent, "PartDesign_Pocket", tr("Pocket Parameters")) , oldLength(0) { ui->offsetEdit->setToolTip(tr("Offset from face at which pocket will end")); diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui index aecc727b4f..ea1ba5896d 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui @@ -60,12 +60,12 @@ - Overall Angle + Overall angle - Offset Angle + Offset angle diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp index ebb5d0d8f6..73ffdfc834 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp @@ -48,7 +48,7 @@ using namespace PartDesignGui; // clang-format off TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent) - : TaskBox(QPixmap(),tr("Primitive parameters"), true, parent) + : TaskBox(QPixmap(),tr("Primitive Parameters"), true, parent) , ui(new Ui_DlgPrimitives) , vp(vp) { diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui index 5090ebb3dc..451e8af680 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui @@ -59,7 +59,7 @@ - Length: + Length @@ -79,7 +79,7 @@ - Width: + Width @@ -150,7 +150,7 @@ - Length: + Length @@ -170,7 +170,7 @@ - Width: + Width @@ -190,7 +190,7 @@ - Height: + Height @@ -264,7 +264,7 @@ - Radius: + Radius @@ -284,7 +284,7 @@ - Height: + Height @@ -304,7 +304,7 @@ - Angle in first direction: + Angle in first direction @@ -330,7 +330,7 @@ - Angle in second direction: + Angle in second direction @@ -388,7 +388,7 @@ - Rotation angle: + Rotation angle @@ -462,7 +462,7 @@ - Radius 1: + Radius 1 @@ -482,7 +482,7 @@ - Radius 2: + Radius 2 @@ -502,7 +502,7 @@ - Height: + Height @@ -548,7 +548,7 @@ - Angle: + Angle @@ -622,7 +622,7 @@ - Radius: + Radius @@ -671,7 +671,7 @@ - U parameter: + U parameter @@ -691,7 +691,7 @@ - V parameters: + V parameters @@ -794,7 +794,7 @@ - Radius 1: + Radius 1 @@ -817,7 +817,7 @@ - Radius 2: + Radius 2 @@ -840,7 +840,7 @@ - Radius 3: + Radius 3 @@ -893,7 +893,7 @@ If zero, it is equal to Radius2 - U parameter: + U parameter @@ -913,7 +913,7 @@ If zero, it is equal to Radius2 - V parameter: + V parameter @@ -1013,7 +1013,7 @@ If zero, it is equal to Radius2 - Radius 1: + Radius 1 @@ -1036,7 +1036,7 @@ If zero, it is equal to Radius2 - Radius 2: + Radius 2 @@ -1088,7 +1088,7 @@ If zero, it is equal to Radius2 - U Parameter: + U parameter @@ -1108,7 +1108,7 @@ If zero, it is equal to Radius2 - V parameter: + V parameter @@ -1211,7 +1211,7 @@ If zero, it is equal to Radius2 - Polygon: + Polygon @@ -1231,7 +1231,7 @@ If zero, it is equal to Radius2 - Circumradius: + Circumradius @@ -1251,7 +1251,7 @@ If zero, it is equal to Radius2 - Height: + Height @@ -1271,7 +1271,7 @@ If zero, it is equal to Radius2 - Angle in first direction: + Angle in first direction @@ -1297,7 +1297,7 @@ If zero, it is equal to Radius2 - Angle in second direction: + Angle in second direction @@ -1350,7 +1350,7 @@ If zero, it is equal to Radius2 - X min/max: + X min/max @@ -1380,7 +1380,7 @@ If zero, it is equal to Radius2 - Y min/max: + Y min/max @@ -1410,7 +1410,7 @@ If zero, it is equal to Radius2 - Z min/max: + Z min/max @@ -1440,7 +1440,7 @@ If zero, it is equal to Radius2 - X2 min/max: + X2 min/max @@ -1473,7 +1473,7 @@ If zero, it is equal to Radius2 - Z2 min/max: + Z2 min/max @@ -1557,7 +1557,7 @@ If zero, it is equal to Radius2 - Pitch: + Pitch @@ -1577,7 +1577,7 @@ If zero, it is equal to Radius2 - Height: + Height @@ -1597,7 +1597,7 @@ If zero, it is equal to Radius2 - Radius: + Radius @@ -1617,7 +1617,7 @@ If zero, it is equal to Radius2 - Angle: + Angle @@ -1634,7 +1634,7 @@ If zero, it is equal to Radius2 - Coordinate system: + Coordinate system @@ -1706,7 +1706,7 @@ If zero, it is equal to Radius2 - Growth: + Growth @@ -1726,7 +1726,7 @@ If zero, it is equal to Radius2 - Number of rotations: + Number of rotations @@ -1746,7 +1746,7 @@ If zero, it is equal to Radius2 - Radius: + Radius @@ -1802,7 +1802,7 @@ If zero, it is equal to Radius2 - Radius: + Radius @@ -1822,7 +1822,7 @@ If zero, it is equal to Radius2 - Angle 1: + Angle 1 @@ -1839,7 +1839,7 @@ If zero, it is equal to Radius2 - Angle 2: + Angle 2 @@ -1876,7 +1876,7 @@ If zero, it is equal to Radius2 - From three points + From 3 Points @@ -1904,7 +1904,7 @@ If zero, it is equal to Radius2 - Major radius: + Major radius @@ -1924,7 +1924,7 @@ If zero, it is equal to Radius2 - Minor radius: + Minor radius @@ -1944,7 +1944,7 @@ If zero, it is equal to Radius2 - Angle 1: + Angle 1 @@ -1961,7 +1961,7 @@ If zero, it is equal to Radius2 - Angle 2: + Angle 2 @@ -2002,7 +2002,7 @@ If zero, it is equal to Radius2 - X: + X Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2022,7 +2022,7 @@ If zero, it is equal to Radius2 - Y: + Y Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2042,7 +2042,7 @@ If zero, it is equal to Radius2 - Z: + Z Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2090,7 +2090,7 @@ If zero, it is equal to Radius2 - X: + X Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2110,7 +2110,7 @@ If zero, it is equal to Radius2 - Y: + Y Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2130,7 +2130,7 @@ If zero, it is equal to Radius2 - Z: + Z Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2167,7 +2167,7 @@ If zero, it is equal to Radius2 - X: + X Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2190,7 +2190,7 @@ If zero, it is equal to Radius2 - Y: + Y Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2213,7 +2213,7 @@ If zero, it is equal to Radius2 - Z: + Z Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2287,7 +2287,7 @@ If zero, it is equal to Radius2 - Polygon: + Polygon @@ -2310,7 +2310,7 @@ If zero, it is equal to Radius2 - Circumradius: + Circumradius diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp index 734c6fffc6..c3c8d711f7 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp @@ -86,7 +86,7 @@ TaskRevolutionParameters::TaskRevolutionParameters(PartDesignGui::ViewProvider* ui->revolveAngle2->bind(rev->Angle2); } else { - throw Base::TypeError("The object is neither a Groove nor a Revolution."); + throw Base::TypeError("The object is neither a groove nor a revolution."); } setupDialog(); @@ -213,7 +213,7 @@ void TaskRevolutionParameters::fillAxisCombo(bool forceRefill) auto *pcFeat = getObject(); if (!pcFeat) { - throw Base::TypeError("The object is not ProfileBased."); + throw Base::TypeError("The object is not profile-based."); } //add sketch axes @@ -232,16 +232,16 @@ void TaskRevolutionParameters::fillAxisCombo(bool forceRefill) if (PartDesign::Body * body = PartDesign::Body::findBodyOf(pcFeat)) { try { App::Origin* orig = body->getOrigin(); - addAxisToCombo(orig->getX(), std::string(), tr("Base X axis")); - addAxisToCombo(orig->getY(), std::string(), tr("Base Y axis")); - addAxisToCombo(orig->getZ(), std::string(), tr("Base Z axis")); + addAxisToCombo(orig->getX(), std::string(), tr("Base x-axis")); + addAxisToCombo(orig->getY(), std::string(), tr("Base y-axis")); + addAxisToCombo(orig->getZ(), std::string(), tr("Base z-axis")); } catch (const Base::Exception &ex) { ex.reportException(); } } //add "Select reference" - addAxisToCombo(nullptr, std::string(), tr("Select reference...")); + addAxisToCombo(nullptr, std::string(), tr("Select reference…")); }//endif forceRefill //add current link, if not in list @@ -712,14 +712,14 @@ TaskDlgRevolutionParameters::TaskDlgRevolutionParameters(ViewProviderRevolution : TaskDlgSketchBasedParameters(RevolutionView) { assert(RevolutionView); - Content.push_back(new TaskRevolutionParameters(RevolutionView, "PartDesign_Revolution", tr("Revolution parameters"))); + Content.push_back(new TaskRevolutionParameters(RevolutionView, "PartDesign_Revolution", tr("Revolution Parameters"))); } TaskDlgGrooveParameters::TaskDlgGrooveParameters(ViewProviderGroove *GrooveView) : TaskDlgSketchBasedParameters(GrooveView) { assert(GrooveView); - Content.push_back(new TaskRevolutionParameters(GrooveView, "PartDesign_Groove", tr("Groove parameters"))); + Content.push_back(new TaskRevolutionParameters(GrooveView, "PartDesign_Groove", tr("Groove Parameters"))); } diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui index 9d71865136..82cbbb0c57 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui @@ -39,7 +39,7 @@ - Axis: + Axis @@ -47,17 +47,17 @@ - Base X axis + Base x-axis - Base Y axis + Base y-axis - Base Z axis + Base z-xis @@ -72,7 +72,7 @@ - Select reference... + Select reference… @@ -84,7 +84,7 @@ - Angle: + Angle diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp index 50dd8664c1..b968e81ba2 100644 --- a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp @@ -58,7 +58,7 @@ using namespace Gui; TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder* view, bool newObj, QWidget* parent) : Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("PartDesign_ShapeBinder"), - tr("Datum shape parameters"), true, parent) + tr("Datum Shape Parameters"), true, parent) , SelectionObserver(view) , ui(new Ui_TaskShapeBinder) , vp(view) diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp index 732d541c07..b44add0142 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp @@ -257,7 +257,7 @@ void TaskThicknessParameters::apply() { // Alert user if he created an empty feature if (ui->listWidgetReferences->count() == 0) { - Base::Console().warning(tr("Empty thickness created !\n").toStdString().c_str()); + Base::Console().warning(tr("Empty thickness created!\n").toStdString().c_str()); } } diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui b/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui index 0568e31a4b..c64a4f992d 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui @@ -17,8 +17,7 @@ - Click button to enter selection mode, -click again to end selection + Toggles between selection and preview mode Select @@ -91,7 +90,7 @@ click again to end selection - Recto Verso + Recto verso @@ -99,7 +98,7 @@ click again to end selection - Join Type + Join type diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp index 7922507570..fe8a91283f 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp @@ -34,7 +34,7 @@ using namespace Gui::TaskView; namespace sp = std::placeholders; TaskTransformedMessages::TaskTransformedMessages(ViewProviderTransformed *transformedView_) - : TaskBox(Gui::BitmapFactory().pixmap("Part_Transformed_Copy"), tr("Transformed feature messages"), true, nullptr) + : TaskBox(Gui::BitmapFactory().pixmap("Part_Transformed_Copy"), tr("Transformed Feature Messages"), true, nullptr) , transformedView(transformedView_) , ui(new Ui_TaskTransformedMessages) { diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index 2ed2e16f28..0640e4b135 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -417,9 +417,9 @@ void TaskTransformedParameters::fillAxisCombo(ComboLinks& combolinks, Part::Part if (body) { try { App::Origin* orig = body->getOrigin(); - combolinks.addLink(orig->getX(), "", tr("Base X axis")); - combolinks.addLink(orig->getY(), "", tr("Base Y axis")); - combolinks.addLink(orig->getZ(), "", tr("Base Z axis")); + combolinks.addLink(orig->getX(), "", tr("Base x-axis")); + combolinks.addLink(orig->getY(), "", tr("Base y-axis")); + combolinks.addLink(orig->getZ(), "", tr("Base z-axis")); } catch (const Base::Exception& ex) { Base::Console().error("%s\n", ex.what()); @@ -427,7 +427,7 @@ void TaskTransformedParameters::fillAxisCombo(ComboLinks& combolinks, Part::Part } // add "Select reference" - combolinks.addLink(nullptr, std::string(), tr("Select reference...")); + combolinks.addLink(nullptr, std::string(), tr("Select reference…")); } void TaskTransformedParameters::fillPlanesCombo(ComboLinks& combolinks, Part::Part2DObject* sketch) @@ -463,7 +463,7 @@ void TaskTransformedParameters::fillPlanesCombo(ComboLinks& combolinks, Part::Pa } // add "Select reference" - combolinks.addLink(nullptr, std::string(), tr("Select reference...")); + combolinks.addLink(nullptr, std::string(), tr("Select reference…")); } void TaskTransformedParameters::recomputeFeature() diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui b/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui index 0535e4cc3f..a449d6cdc1 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui @@ -75,7 +75,7 @@ - Add feature + Add Feature true @@ -85,7 +85,7 @@ - Remove feature + Remove Feature true diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index e56b4d468f..6f05ff8619 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -137,11 +137,10 @@ PartDesign::Body *getBody(bool messageIfNot, bool autoActivate, bool assertModer DlgActiveBody dia( Gui::getMainWindow(), doc, - QObject::tr("In order to use PartDesign you need an active Body object in the document. " - "Please make one active (double click) or create one." - "\n\nIf you have a legacy document with PartDesign objects without Body, " - "use the migrate function in PartDesign to put them into a Body." - )); + QObject::tr("To use Part Design, an active body object is required in the document. " + "Activate a body (double-click) or create a new one." + "\n\nFor legacy documents with Part Design objects lacking a body, " + "use the migrate function in Part Design to place them into a body.")); if (dia.exec() == QDialog::DialogCode::Accepted) activeBody = dia.getActiveBody(); } @@ -186,9 +185,8 @@ void needActiveBodyError() { QMessageBox::warning( Gui::getMainWindow(), QObject::tr("Active Body Required"), - QObject::tr("To create a new PartDesign object, there must be " - "an active Body object in the document. Please make " - "one active (double click) or create a new Body.") ); + QObject::tr("To create a new Part Design object, an active body is required in the document. " + "Activate an existing body (double-click) or create a new one.")); } PartDesign::Body * makeBody(App::Document *doc) @@ -283,7 +281,7 @@ void fixSketchSupport (Sketcher::SketchObject* sketch) const App::Document* doc = sketch->getDocument(); PartDesign::Body *body = getBodyFor(sketch, /*messageIfNot*/ false); if (!body) { - throw Base::RuntimeError ("Couldn't find body for the sketch"); + throw Base::RuntimeError ("Could not find a body for the sketch"); } // Get the Origin for the body @@ -393,7 +391,7 @@ void relinkToBody (PartDesign::Feature *feature) { PartDesign::Body *body = PartDesign::Body::findBodyOf ( feature ); if (!body) { - throw Base::RuntimeError ("Couldn't find body for the feature"); + throw Base::RuntimeError ("Could not find a body for the feature"); } for ( const auto & obj: doc->getObjects () ) { diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp index 58ac6fce77..7b8d88fb3b 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.cpp +++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp @@ -74,7 +74,8 @@ bool ViewProvider::doubleClicked() void ViewProvider::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { QIcon iconObject = mergeGreyableOverlayIcons(Gui::BitmapFactory().pixmap("Part_ColorFace.svg")); - QAction* act = menu->addAction(iconObject, QObject::tr("Set colors..."), receiver, member); + QAction* act = menu->addAction(iconObject, QObject::tr("Set Face Colors"), receiver, member); + act->setData(QVariant((int)ViewProvider::Color)); // Call the extensions Gui::ViewProvider::setupContextMenu(menu, receiver, member); @@ -104,7 +105,7 @@ bool ViewProvider::setEdit(int ModNum) if (dlg && !featureDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp index 08a2d2a429..cbd9359127 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp @@ -118,7 +118,7 @@ void ViewProviderBody::setupContextMenu(QMenu* menu, QObject* receiver, const ch Q_UNUSED(member); Gui::ActionFunction* func = new Gui::ActionFunction(menu); - QAction* act = menu->addAction(tr("Active body")); + QAction* act = menu->addAction(tr("Active Body")); act->setCheckable(true); act->setChecked(isActiveBody()); func->trigger(act, [this]() { diff --git a/src/Mod/PartDesign/Gui/ViewProviderBoolean.cpp b/src/Mod/PartDesign/Gui/ViewProviderBoolean.cpp index 0bafeccfec..b5bd5a0938 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBoolean.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBoolean.cpp @@ -60,7 +60,7 @@ ViewProviderBoolean::~ViewProviderBoolean() = default; void ViewProviderBoolean::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit boolean")); + addDefaultAction(menu, QObject::tr("Edit Boolean")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } @@ -77,7 +77,7 @@ bool ViewProviderBoolean::setEdit(int ModNum) if (dlg && !booleanDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp b/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp index 72c9beb997..58487b2c27 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp @@ -38,7 +38,7 @@ const std::string & ViewProviderChamfer::featureName() const { void ViewProviderChamfer::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit chamfer")); + addDefaultAction(menu, QObject::tr("Edit Chamfer")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h index 490c12f3e4..4b2ee5d7f1 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h +++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h @@ -38,7 +38,7 @@ public: /// constructor ViewProviderChamfer() { sPixmap = "PartDesign_Chamfer.svg"; - menuName = tr("Chamfer parameters");} + menuName = tr("Chamfer Parameters");} /// return "Chamfer" const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp index 474dc3b9d0..d6e3262a77 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp @@ -112,22 +112,22 @@ void ViewProviderDatum::attach(App::DocumentObject *obj) if (o->is()) { datumType = QStringLiteral("Plane"); datumText = QObject::tr("Plane"); - datumMenuText = tr("Datum Plane parameters"); + datumMenuText = tr("Datum Plane Parameters"); } else if (o->is()) { datumType = QStringLiteral("Line"); datumText = QObject::tr("Line"); - datumMenuText = tr("Datum Line parameters"); + datumMenuText = tr("Datum Line Parameters"); } else if (o->is()) { datumType = QStringLiteral("Point"); datumText = QObject::tr("Point"); - datumMenuText = tr("Datum Point parameters"); + datumMenuText = tr("Datum Point Parameters"); } else if (o->is()) { datumType = QStringLiteral("CoordinateSystem"); datumText = QObject::tr("Coordinate System"); - datumMenuText = tr("Local Coordinate System parameters"); + datumMenuText = tr("Local Coordinate System Parameters"); } SoShapeHints* hints = new SoShapeHints(); @@ -226,7 +226,7 @@ bool ViewProviderDatum::isSelectable() const void ViewProviderDatum::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { QAction* act; - act = menu->addAction(QObject::tr("Edit datum"), receiver, member); + act = menu->addAction(QObject::tr("Edit Datum"), receiver, member); act->setData(QVariant((int)ViewProvider::Default)); // Call the extensions Gui::ViewProvider::setupContextMenu(menu, receiver, member); @@ -248,7 +248,7 @@ bool ViewProviderDatum::setEdit(int ModNum) if (dlg && !datumDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp b/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp index 2a9df97c34..a9dac19d63 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp @@ -39,7 +39,7 @@ const std::string & ViewProviderDraft::featureName() const { void ViewProviderDraft::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit draft")); + addDefaultAction(menu, QObject::tr("Edit Draft")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.h b/src/Mod/PartDesign/Gui/ViewProviderDraft.h index c1ae569e67..90aeae4c92 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDraft.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.h @@ -39,7 +39,7 @@ public: /// constructor ViewProviderDraft() { sPixmap = "PartDesign_Draft.svg"; - menuName = tr("Draft parameters"); } + menuName = tr("Draft Parameters"); } /// return "Draft" const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp index 7046c0a418..0e9f5c53b2 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp @@ -73,7 +73,7 @@ bool ViewProviderDressUp::setEdit(int ModNum) { } else { QMessageBox::warning ( nullptr, QObject::tr("Feature error"), QObject::tr("%1 misses a base feature.\n" - "This feature is broken and can't be edited.") + "This feature is broken and cannot be edited.") .arg( QString::fromLatin1(dressUp->getNameInDocument()) ) ); return false; diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp b/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp index 98eb04ae46..348dbcbc10 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp @@ -38,7 +38,7 @@ const std::string & ViewProviderFillet::featureName() const { void ViewProviderFillet::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit fillet")); + addDefaultAction(menu, QObject::tr("Edit Fillet")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.h b/src/Mod/PartDesign/Gui/ViewProviderFillet.h index c8fabd8ace..2ff681e3ad 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderFillet.h +++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.h @@ -38,7 +38,7 @@ public: /// constructor ViewProviderFillet() { sPixmap = "PartDesign_Fillet.svg"; - menuName = tr("Fillet parameters"); } + menuName = tr("Fillet Parameters"); } /// return "Fillet" const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp b/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp index f61857fa28..d6d498406e 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp @@ -43,7 +43,7 @@ ViewProviderGroove::~ViewProviderGroove() = default; void ViewProviderGroove::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit groove")); + addDefaultAction(menu, QObject::tr("Edit Groove")); PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp b/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp index 3bc6bf1f38..9d62d3b51c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp @@ -48,7 +48,7 @@ ViewProviderHelix::~ViewProviderHelix() = default; void ViewProviderHelix::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit helix")); + addDefaultAction(menu, QObject::tr("Edit Helix")); PartDesignGui::ViewProviderAddSub::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderHole.cpp b/src/Mod/PartDesign/Gui/ViewProviderHole.cpp index 9a1d48418e..2e5a011481 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHole.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderHole.cpp @@ -59,7 +59,7 @@ std::vector ViewProviderHole::claimChildren()const void ViewProviderHole::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit hole")); + addDefaultAction(menu, QObject::tr("Edit Hole")); PartGui::ViewProviderPart::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method } @@ -76,7 +76,7 @@ bool ViewProviderHole::setEdit(int ModNum) if (dlg && !holeDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp index 541eeda74c..49e311795f 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp @@ -36,7 +36,7 @@ TaskDlgFeatureParameters *ViewProviderLinearPattern::getEditDialog() { void ViewProviderLinearPattern::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit linear pattern")); + addDefaultAction(menu, QObject::tr("Edit Linear Pattern")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h index 96ad862036..eedbfb5e37 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderLinearPattern : public ViewProviderTransfo PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderLinearPattern); public: ViewProviderLinearPattern() - { menuName = tr("LinearPattern parameters"); + { menuName = tr("Linear Pattern Parameters"); sPixmap = "PartDesign_LinearPattern.svg"; } const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp index 6e11dbd4f3..792492eccb 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp @@ -63,7 +63,7 @@ std::vector ViewProviderLoft::claimChildren()const void ViewProviderLoft::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit loft")); + addDefaultAction(menu, QObject::tr("Edit Loft")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp index 26b2858bb8..804a005923 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp @@ -36,7 +36,7 @@ TaskDlgFeatureParameters *ViewProviderMirrored::getEditDialog() { void ViewProviderMirrored::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit mirrored")); + addDefaultAction(menu, QObject::tr("Edit Mirror")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h index cb6dd6a075..f0abf0e0a4 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderMirrored : public ViewProviderTransformed PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderMirrored); public: ViewProviderMirrored() { - menuName = tr("Mirrored parameters"); + menuName = tr("Mirror Parameters"); sPixmap = "PartDesign_Mirrored.svg"; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp index 19cc315638..2f9b6b3a11 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp @@ -45,7 +45,7 @@ const std::string & ViewProviderMultiTransform::featureName() const void ViewProviderMultiTransform::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit multi-transform")); + addDefaultAction(menu, QObject::tr("Edit Multi-Transform")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method } diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h index 1d6a532eea..1c1ce5c6a0 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderMultiTransform : public ViewProviderTransf PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderMultiTransform); public: ViewProviderMultiTransform() { - menuName = tr("MultiTransform parameters"); + menuName = tr("Multi-Transform Parameters"); sPixmap = "PartDesign_MultiTransform.svg"; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp index 8eb1955ebb..a3398d75a4 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp @@ -43,7 +43,7 @@ ViewProviderPad::~ViewProviderPad() = default; void ViewProviderPad::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit pad")); + addDefaultAction(menu, QObject::tr("Edit Pad")); PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp index 02bf485cd6..f8ffd26274 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp @@ -71,7 +71,7 @@ std::vector ViewProviderPipe::claimChildren()const void ViewProviderPipe::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit pipe")); + addDefaultAction(menu, QObject::tr("Edit Pipe")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp b/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp index 5114457c69..fa949627f1 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp @@ -45,7 +45,7 @@ ViewProviderPocket::~ViewProviderPocket() = default; void ViewProviderPocket::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit pocket")); + addDefaultAction(menu, QObject::tr("Edit Pocket")); PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp index 0cc0c85658..c94ad1ca6d 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp @@ -35,7 +35,7 @@ TaskDlgFeatureParameters *ViewProviderPolarPattern::getEditDialog() { void ViewProviderPolarPattern::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit polar pattern")); + addDefaultAction(menu, QObject::tr("Edit Polar Pattern")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h index 5d8a96769b..947eab2e13 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderPolarPattern : public ViewProviderTransfor PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderPolarPattern); public: ViewProviderPolarPattern() { - menuName = tr("PolarPattern parameters"); + menuName = tr("Polar Pattern Parameters"); sPixmap = "PartDesign_PolarPattern.svg"; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp index 2549e299b8..5fa3711bb3 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp @@ -52,7 +52,7 @@ void ViewProviderPrimitive::attach(App::DocumentObject* obj) { void ViewProviderPrimitive::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit primitive")); + addDefaultAction(menu, QObject::tr("Edit Primitive")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } @@ -67,7 +67,7 @@ bool ViewProviderPrimitive::setEdit(int ModNum) if (dlg && !primitiveDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp index 30cea1cf29..acd3c371eb 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp @@ -43,7 +43,7 @@ ViewProviderRevolution::~ViewProviderRevolution() = default; void ViewProviderRevolution::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit revolution")); + addDefaultAction(menu, QObject::tr("Edit Revolution")); PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp index 63b0158c8d..548ab64c94 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp @@ -36,7 +36,7 @@ TaskDlgFeatureParameters *ViewProviderScaled::getEditDialog() { void ViewProviderScaled::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit scaled")); + addDefaultAction(menu, QObject::tr("Edit Scale")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.h b/src/Mod/PartDesign/Gui/ViewProviderScaled.h index fe2628e81a..080a2cc4d3 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderScaled.h +++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderScaled : public ViewProviderTransformed PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderScaled); public: ViewProviderScaled() { - menuName = tr("Scaled parameters"); + menuName = tr("Scale Parameters"); sPixmap = "PartDesign_Scaled.svg"; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp index 58b27f7177..f331a37283 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp @@ -94,7 +94,7 @@ bool ViewProviderShapeBinder::setEdit(int ModNum) { if (dlg && !sbDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); @@ -202,7 +202,7 @@ void ViewProviderShapeBinder::setupContextMenu(QMenu* menu, QObject* receiver, c Q_UNUSED(member) QAction* act; - act = menu->addAction(QObject::tr("Edit shape binder")); + act = menu->addAction(QObject::tr("Edit Shape Binder")); act->setData(QVariant((int)ViewProvider::Default)); Gui::ActionFunction* func = new Gui::ActionFunction(menu); @@ -316,7 +316,7 @@ void ViewProviderSubShapeBinder::setupContextMenu(QMenu* menu, QObject* receiver QAction* act; act = menu->addAction(QObject::tr("Synchronize"), receiver, member); act->setData(QVariant((int)Synchronize)); - act = menu->addAction(QObject::tr("Select bound object"), receiver, member); + act = menu->addAction(QObject::tr("Select Bound Object"), receiver, member); act->setData(QVariant((int)SelectObject)); ViewProviderPart::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp b/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp index 5866a58f08..e0f56e2e3a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp @@ -38,7 +38,7 @@ const std::string & ViewProviderThickness::featureName() const { void ViewProviderThickness::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit thickness")); + addDefaultAction(menu, QObject::tr("Edit Thickness")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderThickness.h b/src/Mod/PartDesign/Gui/ViewProviderThickness.h index 177e7edeb5..d4e5e5d4b4 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderThickness.h +++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.h @@ -38,7 +38,7 @@ public: /// constructor ViewProviderThickness() { sPixmap = "PartDesign_Thickness.svg"; - menuName = tr("Thickness parameters"); } + menuName = tr("Thickness Parameters"); } /// return "Thickness" const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp index a29e63fdad..89763f4240 100644 --- a/src/Mod/PartDesign/Gui/Workbench.cpp +++ b/src/Mod/PartDesign/Gui/Workbench.cpp @@ -43,19 +43,20 @@ namespace sp = std::placeholders; qApp->translate("Workbench", "&Sketch"); // qApp->translate("Workbench", "&Part Design"); - qApp->translate("Workbench", "Create a datum"); - qApp->translate("Workbench", "Create an additive feature"); - qApp->translate("Workbench", "Create a subtractive feature"); - qApp->translate("Workbench", "Apply a pattern"); - qApp->translate("Workbench", "Apply a dress-up feature"); - qApp->translate("Workbench", "Sprocket..."); - qApp->translate("Workbench", "Involute gear..."); - qApp->translate("Workbench", "Shaft design wizard"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Face tools"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Edge tools"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Boolean tools"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Helper tools"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Modeling tools"); + qApp->translate("Workbench", "Datums"); + qApp->translate("Workbench", "Additive Features"); + qApp->translate("Workbench", "Subtractive Features"); + qApp->translate("Workbench", "Dress-Up Features"); + qApp->translate("Workbench", "Transformation Features"); + qApp->translate("Workbench", "Sprocket…"); + qApp->translate("Workbench", "Involute Gear"); + + qApp->translate("Workbench", "Shaft Design Wizard"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Face Tools"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Edge Tools"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Boolean Tools"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Helper Tools"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Modeling Tools"); qApp->translate("Gui::TaskView::TaskWatcherCommands", "Create Geometry"); // qApp->translate("Workbench", "Measure"); @@ -158,7 +159,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Part::Feature SUBELEMENT Vertex COUNT 1..", Vertex, - "Vertex tools", + "Vertex Tools", "PartDesign_Body" )); @@ -173,7 +174,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Part::Feature SUBELEMENT Edge COUNT 1..", Edge, - "Edge tools", + "Edge Tools", "PartDesign_Body" )); @@ -191,7 +192,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Part::Feature SUBELEMENT Face COUNT 1", Face, - "Face tools", + "Face Tools", "PartDesign_Body" )); @@ -201,7 +202,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Body COUNT 1", Body, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); @@ -211,7 +212,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Body COUNT 1..", Body2, - "Boolean tools", + "Boolean Tools", "PartDesign_Body" )); @@ -225,7 +226,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT App::Plane COUNT 1", Plane1, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); const char* Plane2[] = { @@ -238,7 +239,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Plane COUNT 1", Plane2, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); @@ -250,7 +251,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Line COUNT 1", Line, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); @@ -263,7 +264,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Point COUNT 1", Point, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); @@ -285,7 +286,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Part::Feature SUBELEMENT Face COUNT 2..", Faces, - "Face tools", + "Face Tools", "PartDesign_Body" )); @@ -306,7 +307,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Sketcher::SketchObject COUNT 1", Sketch, - "Modeling tools", + "Modeling Tools", "PartDesign_Body" )); @@ -319,7 +320,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::SketchBased", Transformed, - "Transformation tools", + "Transformation Tools", "PartDesign_MultiTransform" )); @@ -361,7 +362,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // additives Gui::MenuItem* additives = new Gui::MenuItem; - additives->setCommand("Create an additive feature"); + additives->setCommand("Additive Features"); *additives << "PartDesign_Pad" << "PartDesign_Revolution" @@ -371,7 +372,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // subtractives Gui::MenuItem* subtractives = new Gui::MenuItem; - subtractives->setCommand("Create a subtractive feature"); + subtractives->setCommand("Subtractive Features"); *subtractives << "PartDesign_Pocket" << "PartDesign_Hole" @@ -382,7 +383,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // transformations Gui::MenuItem* transformations = new Gui::MenuItem; - transformations->setCommand("Apply a pattern"); + transformations->setCommand("Transformation Features"); *transformations << "PartDesign_Mirrored" << "PartDesign_LinearPattern" @@ -391,7 +392,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // dressups Gui::MenuItem* dressups = new Gui::MenuItem; - dressups->setCommand("Apply a dress-up feature"); + dressups->setCommand("Dress-Up Features"); *dressups << "PartDesign_Fillet" << "PartDesign_Chamfer" @@ -410,15 +411,15 @@ Gui::MenuItem* Workbench::setupMenuBar() const << subtractives << "PartDesign_CompPrimitiveSubtractive" << "Separator" + << dressups + << "Separator" << transformations << "Separator" - << dressups + << "PartDesign_Boolean" << "Separator" << "Materials_InspectAppearance" << "Materials_InspectMaterial" << "Separator" - << "PartDesign_Boolean" - << "Separator" << "Part_CheckGeometry" << "Separator" << "PartDesign_InvoluteGear" @@ -452,7 +453,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const { Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* part = new Gui::ToolBarItem(root); - part->setCommand("Part Design Helper"); + part->setCommand("Part Design Helper Features"); *part << "PartDesign_Body" << "PartDesign_CompSketches" @@ -462,7 +463,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "PartDesign_Clone"; part = new Gui::ToolBarItem(root); - part->setCommand("Part Design Modeling"); + part->setCommand("Part Design Modeling Features"); *part << "PartDesign_Pad" << "PartDesign_Revolution" @@ -483,14 +484,14 @@ Gui::ToolBarItem* Workbench::setupToolBars() const part = new Gui::ToolBarItem(root); - part->setCommand("Part Design Dressup"); + part->setCommand("Part Design Dress-Up Features"); *part << "PartDesign_Fillet" << "PartDesign_Chamfer" << "PartDesign_Draft" << "PartDesign_Thickness"; part = new Gui::ToolBarItem(root); - part->setCommand("Part Design Patterns"); + part->setCommand("Part Design Transformation Features"); *part << "PartDesign_Mirrored" << "PartDesign_LinearPattern" diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.cpp b/src/Mod/PartDesign/Gui/WorkflowManager.cpp index 83ffff7592..443bb62a7b 100644 --- a/src/Mod/PartDesign/Gui/WorkflowManager.cpp +++ b/src/Mod/PartDesign/Gui/WorkflowManager.cpp @@ -138,16 +138,16 @@ Workflow WorkflowManager::determineWorkflow(App::Document *doc) { if ( rv == Workflow::Legacy ) { // legacy messages msgBox.setText( QObject::tr( "The document \"%1\" you are editing was designed with an old version of " - "PartDesign workbench." ).arg( QString::fromStdString ( doc->getName()) ) ); + "Part Design workbench." ).arg( QString::fromStdString ( doc->getName()) ) ); msgBox.setInformativeText ( - QObject::tr( "Do you want to migrate in order to use modern PartDesign features?" ) ); + QObject::tr( "Migrate in order to use modern Part Design features?" ) ); } else { // The document is already in the middle of migration msgBox.setText( QObject::tr( "The document \"%1\" seems to be either in the middle of" - " the migration process from legacy PartDesign or have a slightly broken structure." + " the migration process from legacy Part Design or have a slightly broken structure." ).arg( QString::fromStdString ( doc->getName()) ) ); msgBox.setInformativeText ( - QObject::tr( "Do you want to make the migration automatically?" ) ); + QObject::tr( "Make the migration automatically?" ) ); } msgBox.setDetailedText( QObject::tr( "Note: If you choose to migrate you won't be able to edit" " the file with an older FreeCAD version.\n" @@ -158,7 +158,7 @@ Workflow WorkflowManager::determineWorkflow(App::Document *doc) { msgBox.setIcon( QMessageBox::Question ); QPushButton * yesBtn = msgBox.addButton ( QMessageBox::Yes ); QPushButton * manuallyBtn = msgBox.addButton ( - QObject::tr ( "Migrate manually" ), QMessageBox::YesRole ); + QObject::tr ( "Migrate Manually" ), QMessageBox::YesRole ); // If it is already a document in the middle of the migration the user shouldn't refuse to migrate if ( rv != Workflow::Undetermined ) { diff --git a/src/Mod/PartDesign/InvoluteGearFeature.py b/src/Mod/PartDesign/InvoluteGearFeature.py index cd6f03d775..3a5a25e13a 100644 --- a/src/Mod/PartDesign/InvoluteGearFeature.py +++ b/src/Mod/PartDesign/InvoluteGearFeature.py @@ -55,9 +55,9 @@ class CommandInvoluteGear: "GUI command to create an InvoluteGear" def GetResources(self): return {'Pixmap' : 'PartDesign_InternalExternalGear', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Involute gear..."), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Involute Gear"), 'Accel': "", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Creates or edit the involute gear definition.")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Creates or edits the involute gear definition")} def Activated(self): FreeCAD.ActiveDocument.openTransaction("Create involute gear") diff --git a/src/Mod/PartDesign/InvoluteGearFeature.ui b/src/Mod/PartDesign/InvoluteGearFeature.ui index 91749efd95..dd57d50f88 100644 --- a/src/Mod/PartDesign/InvoluteGearFeature.ui +++ b/src/Mod/PartDesign/InvoluteGearFeature.ui @@ -11,13 +11,13 @@ - Involute parameter + Involute Parameter - Number of teeth: + Number of teeth @@ -37,7 +37,7 @@ - Module: + Module @@ -81,7 +81,7 @@ - Pressure angle: + Pressure angle @@ -122,7 +122,7 @@ - High precision: + High precision @@ -149,7 +149,7 @@ - External gear: + External gear @@ -176,7 +176,7 @@ - Addendum Coefficient + Addendum coefficient @@ -196,7 +196,7 @@ - Dedendum Coefficient + Dedendum coefficient @@ -216,7 +216,7 @@ - Root Fillet Coefficient + Root fillet coefficient @@ -236,7 +236,7 @@ - Profile Shift Coefficient + Profile shift coefficient diff --git a/src/Mod/PartDesign/Scripts/Gear.py b/src/Mod/PartDesign/Scripts/Gear.py index 8812757cf1..d357b52e34 100644 --- a/src/Mod/PartDesign/Scripts/Gear.py +++ b/src/Mod/PartDesign/Scripts/Gear.py @@ -42,7 +42,7 @@ def compute(): j = float(l6.text())*m # standard value 0,015 - 0,04*m width = float(l7.text()) # gear width except ValueError: - FreeCAD.Console.PrintError("Wrong input! Only numbers allowed...\n") + FreeCAD.Console.PrintError("Wrong input! Only numbers allowed.\n") # tooth height diff --git a/src/Mod/PartDesign/SprocketFeature.py b/src/Mod/PartDesign/SprocketFeature.py index 530b819403..35afaace08 100644 --- a/src/Mod/PartDesign/SprocketFeature.py +++ b/src/Mod/PartDesign/SprocketFeature.py @@ -59,9 +59,9 @@ class CommandSprocket: def GetResources(self): return {'Pixmap' : 'PartDesign_Sprocket', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Sprocket..."), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Sprocket"), 'Accel': "", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Creates or edit the sprocket definition.")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Creates or edits the sprocket definition.")} def Activated(self): diff --git a/src/Mod/PartDesign/SprocketFeature.ui b/src/Mod/PartDesign/SprocketFeature.ui index d33e4f37ec..99157c292e 100644 --- a/src/Mod/PartDesign/SprocketFeature.ui +++ b/src/Mod/PartDesign/SprocketFeature.ui @@ -11,7 +11,7 @@ - Sprocket parameters + Sprocket Parameters @@ -23,7 +23,7 @@ - Number of teeth: + Number of teeth @@ -49,7 +49,7 @@ - Sprocket Reference + Sprocket reference @@ -133,12 +133,12 @@ - Bicycle with Derailleur + Bicycle with derailleur - Bicycle without Derailleur + Bicycle without derailleur @@ -216,7 +216,7 @@ - Chain Pitch: + Chain pitch @@ -263,7 +263,7 @@ - Chain Roller Diameter: + Chain roller diameter @@ -307,7 +307,7 @@ - Tooth Width: + Tooth width diff --git a/src/Mod/PartDesign/WizardShaft/Shaft.py b/src/Mod/PartDesign/WizardShaft/Shaft.py index 14f50a0e2d..fc3be14aba 100644 --- a/src/Mod/PartDesign/WizardShaft/Shaft.py +++ b/src/Mod/PartDesign/WizardShaft/Shaft.py @@ -160,7 +160,7 @@ class Shaft: return self.segments[index].constraint def updateEdge(self, column, start): - App.Console.PrintMessage("Not implemented yet - waiting for robust references...") + App.Console.PrintMessage("Not implemented yet - waiting for robust references…") return """ if self.sketchClosed is not True: diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.py b/src/Mod/PartDesign/WizardShaft/WizardShaft.py index 412afe4d2c..2bdeca69bf 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaft.py +++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.py @@ -101,8 +101,8 @@ class TaskWizardShaft: except ImportError as e: msgBox = QtGui.QMessageBox() msgBox.setIcon(msgBox.Information) - msgBox.setWindowTitle(translate("TaskWizardShaft", "Missing module")) - msgBox.setText(translate("TaskWizardShaft", "You may have to install the Plot add-on")) + msgBox.setWindowTitle(translate("TaskWizardShaft", "Missing Module")) + msgBox.setText(translate("TaskWizardShaft", "The Plot add-on is not installed. Install it to enable this feature.")) msgBox.setDetailedText(traceback.format_exc()) msgBox.exec_() def slotAllx(self): @@ -185,8 +185,8 @@ class WizardShaftGui: def GetResources(self): IconPath = FreeCAD.ConfigGet("AppHomePath") + "Mod/PartDesign/WizardShaft/WizardShaft.svg" - MenuText = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Shaft design wizard...") - ToolTip = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Start the shaft design wizard") + MenuText = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Shaft Design Wizard") + ToolTip = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Starts the shaft design wizard") return {'Pixmap': IconPath, 'MenuText': MenuText, 'ToolTip': ToolTip} diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py index 991afd05e2..67916e5244 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py +++ b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py @@ -61,7 +61,7 @@ class WizardShaftTable: # Create table widget self.widget = QtGui.QTableWidget(len(self.rowDict), 0) self.widget.setObjectName("ShaftWizardTable") # Do not change or translate: Used in ViewProviderFemConstraintXXX - self.widget.setWindowTitle(translate("WizardShaftTable", "Shaft wizard")) + self.widget.setWindowTitle(translate("WizardShaftTable", "Shaft Wizard")) self.widget.resize(QtCore.QSize(300,200)) self.editedRow = None self.editedColumn = None diff --git a/src/Mod/PartDesign/fcsprocket/fcsprocketdialog.py b/src/Mod/PartDesign/fcsprocket/fcsprocketdialog.py index 18fcddf621..455ade00b1 100644 --- a/src/Mod/PartDesign/fcsprocket/fcsprocketdialog.py +++ b/src/Mod/PartDesign/fcsprocket/fcsprocketdialog.py @@ -44,7 +44,7 @@ class SprocketDialog(qt.QDialog): l = qt.QVBoxLayout(self) l.addWidget(self.gc) l.addWidget(buttonBox) - self.setWindowTitle('Sprocket creation dialog') + self.setWindowTitle('Sprocket Creation Dialog') def accept(self): if FreeCAD.ActiveDocument is None: