diff --git a/src/Mod/Sketcher/App/AppSketcher.cpp b/src/Mod/Sketcher/App/AppSketcher.cpp index 97766496eb..042fd33c2e 100644 --- a/src/Mod/Sketcher/App/AppSketcher.cpp +++ b/src/Mod/Sketcher/App/AppSketcher.cpp @@ -99,7 +99,7 @@ PyMOD_INIT_FUNC(Sketcher) Sketcher::Measure ::initialize(); - Base::Console().log("Loading Sketcher module... done\n"); + Base::Console().log("Loading Sketcher module… done\n"); PyMOD_Return(sketcherModule); } diff --git a/src/Mod/Sketcher/App/Sketch.cpp b/src/Mod/Sketcher/App/Sketch.cpp index 97d001c03d..7120cd2fad 100644 --- a/src/Mod/Sketcher/App/Sketch.cpp +++ b/src/Mod/Sketcher/App/Sketch.cpp @@ -2966,8 +2966,8 @@ int Sketch::addTangentLineAtBSplineKnotConstraint(int checkedlinegeoId, // For now we just throw an error. Base::Console().error( - "addTangentLineAtBSplineKnotConstraint: This method cannot set tangent constraint " - "at end knots of a B-spline. Please constrain the start/end points instead.\n"); + "addTangentLineAtBSplineKnotConstraint: This method cannot set tangent constraints " + "at end knots of a B-spline. Constrain the start/end points instead.\n"); return -1; } } @@ -3020,7 +3020,7 @@ int Sketch::addTangentLineEndpointAtBSplineKnotConstraint(int checkedlinegeoId, // For now we just throw an error. Base::Console().error("addTangentLineEndpointAtBSplineKnotConstraint: This method " "cannot set tangent constraint at end knots of a B-spline. " - "Please constrain the start/end points instead.\n"); + "Constrain the start/end points instead.\n"); return -1; } } diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 1102153654..b1a7433052 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -3821,7 +3821,7 @@ int SketchObject::join(int geoId1, Sketcher::PointPos posId1, int geoId2, Sketch if (Sketcher::PointPos::start != posId1 && Sketcher::PointPos::end != posId1 && Sketcher::PointPos::start != posId2 && Sketcher::PointPos::end != posId2) { - THROWM(ValueError, "Invalid position(s): points must be start or end points of a curve."); + THROWM(ValueError, "Invalid positions: points must be start or end points of a curve."); return -1; } @@ -9445,16 +9445,16 @@ void SketchObject::getConstraintIndices(int GeoId, std::vector& constraintL void SketchObject::appendConflictMsg(const std::vector& conflicting, std::string& msg) { appendConstraintsMsg(conflicting, - "Please remove the following conflicting constraint:\n", - "Please remove at least one of the following conflicting constraints:\n", + "Remove the following conflicting constraint:", + "Remove at least one of the following conflicting constraints:", msg); } void SketchObject::appendRedundantMsg(const std::vector& redundant, std::string& msg) { appendConstraintsMsg(redundant, - "Please remove the following redundant constraint:", - "Please remove the following redundant constraints:", + "Remove the following redundant constraint:", + "Remove the following redundant constraints:", msg); } @@ -9462,8 +9462,8 @@ void SketchObject::appendMalformedConstraintsMsg(const std::vector& malform std::string& msg) { appendConstraintsMsg(malformed, - "Please remove the following malformed constraint:", - "Please remove the following malformed constraints:", + "Remove the following malformed constraint:", + "Remove the following malformed constraints:", msg); } diff --git a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp index 2fdb7597d0..e27a0eb2e9 100644 --- a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp +++ b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp @@ -99,7 +99,7 @@ PyMOD_INIT_FUNC(SketcherGui) } PyObject* sketcherGuiModule = SketcherGui::initModule(); - Base::Console().log("Loading GUI of Sketcher module... done\n"); + Base::Console().log("Loading GUI of Sketcher module… done\n"); Gui::BitmapFactory().addPath(QStringLiteral(":/icons/constraints")); Gui::BitmapFactory().addPath(QStringLiteral(":/icons/elements")); diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 4a1478d339..661321d07b 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -152,8 +152,8 @@ CmdSketcherNewSketch::CmdSketcherNewSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - 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 = "Sketcher_NewSketch"; sStatusTip = sToolTipText; sPixmap = "Sketcher_NewSketch"; @@ -191,14 +191,14 @@ void CmdSketcherNewSketch::activated(int iMsg) Gui::TranslatedUserWarning( getActiveGuiDocument(), QObject::tr("Sketch mapping"), - QObject::tr("Can't map the sketch to selected object. %1.").arg(msg_str)); + QObject::tr("Cannot map the sketch to the selected object. %1.").arg(msg_str)); return; } if (validModes.size() > 1) { validModes.insert(validModes.begin(), Attacher::mmDeactivated); bool ok; QStringList items; - items.push_back(QObject::tr("Don't attach")); + items.push_back(QObject::tr("Do not attach")); int iSugg = 0;// index of the auto-suggested mode in the list of valid modes for (size_t i = 0; i < validModes.size(); ++i) { auto uiStrings = @@ -331,8 +331,8 @@ CmdSketcherEditSketch::CmdSketcherEditSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Edit sketch"); - sToolTipText = QT_TR_NOOP("Edit the selected sketch."); + sMenuText = QT_TR_NOOP("Edit Sketch"); + sToolTipText = QT_TR_NOOP("Opens the selected sketch for editing"); sWhatsThis = "Sketcher_EditSketch"; sStatusTip = sToolTipText; sPixmap = "Sketcher_EditSketch"; @@ -362,8 +362,8 @@ CmdSketcherLeaveSketch::CmdSketcherLeaveSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Leave sketch"); - sToolTipText = QT_TR_NOOP("Finish editing the active sketch."); + sMenuText = QT_TR_NOOP("Leave Sketch"); + sToolTipText = QT_TR_NOOP("Exits the active sketch"); sWhatsThis = "Sketcher_LeaveSketch"; sStatusTip = sToolTipText; sPixmap = "Sketcher_LeaveSketch"; @@ -400,10 +400,10 @@ CmdSketcherStopOperation::CmdSketcherStopOperation() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Stop operation"); - sToolTipText = QT_TR_NOOP("When in edit mode, " - "stop the active operation " - "(drawing, constraining, etc.)."); + sMenuText = QT_TR_NOOP("Stop Operation"); + sToolTipText = QT_TR_NOOP("Stops the active operation while in edit mode"); + + sWhatsThis = "Sketcher_StopOperation"; sStatusTip = sToolTipText; sPixmap = "process-stop"; @@ -436,9 +436,9 @@ CmdSketcherReorientSketch::CmdSketcherReorientSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Reorient sketch..."); - sToolTipText = QT_TR_NOOP("Place the selected sketch on one of the global coordinate planes.\n" - "This will clear the 'AttachmentSupport' property, if any."); + sMenuText = QT_TR_NOOP("Reorient Sketch…"); + sToolTipText = QT_TR_NOOP("Places the selected sketch on one of the global coordinate planes.\n" + "This will clear the AttachmentSupport property."); sWhatsThis = "Sketcher_ReorientSketch"; sStatusTip = sToolTipText; sPixmap = "Sketcher_ReorientSketch"; @@ -455,7 +455,7 @@ void CmdSketcherReorientSketch::activated(int iMsg) qApp->translate("Sketcher_ReorientSketch", "Sketch has support"), qApp->translate("Sketcher_ReorientSketch", "Sketch with a support face cannot be reoriented.\n" - "Do you want to detach it from the support?"), + "Detach it from the support?"), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::No) return; @@ -573,11 +573,9 @@ CmdSketcherMapSketch::CmdSketcherMapSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Attach sketch..."); + sMenuText = QT_TR_NOOP("Attach Sketch…"); sToolTipText = QT_TR_NOOP( - "Set the 'AttachmentSupport' of a sketch.\n" - "First select the supporting geometry, for example, a face or an edge of a solid object,\n" - "then call this command, then choose the desired sketch."); + "Attaches a sketch to the selected geometry element"); sWhatsThis = "Sketcher_MapSketch"; sStatusTip = sToolTipText; sPixmap = "Sketcher_MapSketch"; @@ -624,7 +622,7 @@ void CmdSketcherMapSketch::activated(int iMsg) qApp->translate("Sketcher_MapSketch", "No sketch found"), sketchInSelection ? qApp->translate("Sketcher_MapSketch", "Cannot attach sketch to itself!") - : qApp->translate("Sketcher_MapSketch", "The document doesn't have a sketch")); + : qApp->translate("Sketcher_MapSketch", "The document does not contain a sketch")); return; } @@ -797,9 +795,8 @@ CmdSketcherViewSketch::CmdSketcherViewSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("View sketch"); - sToolTipText = QT_TR_NOOP("When in edit mode, " - "set the camera orientation perpendicular to the sketch plane."); + sMenuText = QT_TR_NOOP("Align View to Sketch"); + sToolTipText = QT_TR_NOOP("Aligns the camera orientation perpendicular to the active sketch plane"); sWhatsThis = "Sketcher_ViewSketch"; sStatusTip = sToolTipText; sPixmap = "Sketcher_ViewSketch"; @@ -832,9 +829,9 @@ CmdSketcherValidateSketch::CmdSketcherValidateSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Validate sketch..."); - sToolTipText = QT_TR_NOOP("Validates a sketch by looking at missing coincidences,\n" - "invalid constraints, degenerated geometry, etc."); + sMenuText = QT_TR_NOOP("Validate Sketch…"); + sToolTipText = QT_TR_NOOP("Validates a sketch by checking for missing coincidences,\n" + "invalid constraints, and degenerate geometry"); sWhatsThis = "Sketcher_ValidateSketch"; sStatusTip = sToolTipText; eType = 0; @@ -850,7 +847,7 @@ void CmdSketcherValidateSketch::activated(int iMsg) Gui::TranslatedUserWarning( getActiveGuiDocument(), qApp->translate("CmdSketcherValidateSketch", "Wrong selection"), - qApp->translate("CmdSketcherValidateSketch", "Select only one sketch.")); + qApp->translate("CmdSketcherValidateSketch", "Select only 1 sketch.")); return; } @@ -872,10 +869,10 @@ CmdSketcherMirrorSketch::CmdSketcherMirrorSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Mirror sketch"); + sMenuText = QT_TR_NOOP("Mirror Sketch"); sToolTipText = QT_TR_NOOP("Creates a new mirrored sketch for each selected sketch\n" "by using the X or Y axes, or the origin point,\n" - "as mirroring reference."); + "as mirroring reference"); sWhatsThis = "Sketcher_MirrorSketch"; sStatusTip = sToolTipText; eType = 0; @@ -891,7 +888,7 @@ void CmdSketcherMirrorSketch::activated(int iMsg) Gui::TranslatedUserWarning( getActiveGuiDocument(), qApp->translate("CmdSketcherMirrorSketch", "Wrong selection"), - qApp->translate("CmdSketcherMirrorSketch", "Select one or more sketches.")); + qApp->translate("CmdSketcherMirrorSketch", "Select at least 1 sketch")); return; } @@ -999,8 +996,8 @@ CmdSketcherMergeSketches::CmdSketcherMergeSketches() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Merge sketches"); - sToolTipText = QT_TR_NOOP("Create a new sketch from merging two or more selected sketches."); + sMenuText = QT_TR_NOOP("Merge Sketches"); + sToolTipText = QT_TR_NOOP("Creates a new sketch by merging at least 2 selected sketches"); sWhatsThis = "Sketcher_MergeSketches"; sStatusTip = sToolTipText; eType = 0; @@ -1016,7 +1013,7 @@ void CmdSketcherMergeSketches::activated(int iMsg) Gui::TranslatedUserWarning( getActiveGuiDocument(), qApp->translate("CmdSketcherMergeSketches", "Wrong selection"), - qApp->translate("CmdSketcherMergeSketches", "Select at least two sketches.")); + qApp->translate("CmdSketcherMergeSketches", "Select at least 2 sketches")); return; } @@ -1099,9 +1096,8 @@ CmdSketcherViewSection::CmdSketcherViewSection() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("View section"); - sToolTipText = QT_TR_NOOP("When in edit mode, " - "switch between section view and full view."); + sMenuText = QT_TR_NOOP("Toggle Section View"); + sToolTipText = QT_TR_NOOP("Toggles between section view and full view"); sWhatsThis = "Sketcher_ViewSection"; sStatusTip = sToolTipText; sPixmap = "Sketcher_ViewSection"; @@ -1175,11 +1171,11 @@ public: void languageChange() { gridAutoSpacing->setText(tr("Grid auto spacing")); - gridAutoSpacing->setToolTip(tr("Resize grid automatically depending on zoom.")); + gridAutoSpacing->setToolTip(tr("Automatically adjusts the grid spacing based on the zoom level")); gridAutoSpacing->setStatusTip(gridAutoSpacing->toolTip()); sizeLabel->setText(tr("Spacing")); - gridSizeBox->setToolTip(tr("Distance between two subsequent grid lines.")); + gridSizeBox->setToolTip(tr("Distance between two subsequent grid lines")); } protected: @@ -1279,9 +1275,9 @@ CmdSketcherGrid::CmdSketcherGrid() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Toggle grid"); + sMenuText = QT_TR_NOOP("Toggle Grid"); sToolTipText = - QT_TR_NOOP("Toggle the grid in the sketch. In the menu you can change grid settings."); + QT_TR_NOOP("Toggles the grid display in the active sketch"); sWhatsThis = "Sketcher_Grid"; sStatusTip = sToolTipText; eType = 0; @@ -1435,8 +1431,8 @@ public: angleLabel->setText(tr("Snap angle")); snapAngle->setToolTip( - tr("Angular step for tools that use 'Snap at Angle' (line for instance). Hold CTRL to " - "enable 'Snap at Angle'. The angle starts from the positive X axis of the sketch.")); + tr("Sets the angular step for tools using 'Snap at angle' (e.g., line). Hold Ctrl to " + "enable 'Snap at angle'. The angle starts from the positive X-axis of the sketch.")); } protected: @@ -1542,10 +1538,9 @@ CmdSketcherSnap::CmdSketcherSnap() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Toggle snap"); + sMenuText = QT_TR_NOOP("Toggle Snap"); sToolTipText = - QT_TR_NOOP("Toggle all snap functionality. In the menu you can toggle 'Snap to grid' and " - "'Snap to objects' individually, and change further snap settings."); + QT_TR_NOOP("Toggles snapping"); sWhatsThis = "Sketcher_Snap"; sStatusTip = sToolTipText; eType = 0; @@ -1802,8 +1797,8 @@ CmdRenderingOrder::CmdRenderingOrder() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Configure rendering order"); - sToolTipText = QT_TR_NOOP("Reorder the items in the list to configure rendering order."); + sMenuText = QT_TR_NOOP("Rendering Order"); + sToolTipText = QT_TR_NOOP("Reorders items in the rendering order"); sWhatsThis = "Sketcher_RenderingOrder"; sStatusTip = sToolTipText; eType = 0; diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp index 8b6b16d565..1d0ae479e7 100644 --- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp +++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp @@ -70,8 +70,8 @@ CmdSketcherToggleConstruction::CmdSketcherToggleConstruction() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Toggle construction geometry"); - sToolTipText = QT_TR_NOOP("Toggles the toolbar or selected geometry to/from construction mode"); + sMenuText = QT_TR_NOOP("Construction Geometry"); + sToolTipText = QT_TR_NOOP("Toggles between defining geometry and construction geometry modes"); sWhatsThis = "Sketcher_ToggleConstruction"; sStatusTip = sToolTipText; sPixmap = "Sketcher_ToggleConstruction"; @@ -167,7 +167,7 @@ void CmdSketcherToggleConstruction::activated(int iMsg) if (selection.size() != 1) { Gui::TranslatedUserWarning(Obj, QObject::tr("Wrong selection"), - QObject::tr("Select edge(s) from the sketch.")); + QObject::tr("Select edges from the sketch")); return; } @@ -176,12 +176,12 @@ void CmdSketcherToggleConstruction::activated(int iMsg) if (SubNames.empty()) { Gui::TranslatedUserWarning(Obj, QObject::tr("Wrong selection"), - QObject::tr("Select edge(s) from the sketch.")); + QObject::tr("Select edges from the sketch")); return; } // undo command open - openCommand(QT_TRANSLATE_NOOP("Command", "Toggle draft from/to draft")); + openCommand(QT_TRANSLATE_NOOP("Command", "Toggle construction geometry")); // go through the selected subelements bool verticesonly = true; diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 0d43068a92..833d9a0d0d 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -226,7 +226,7 @@ bool removeRedundantPointOnObject(SketchObject* Obj, int GeoId1, int GeoId2, int // at this point it is already solved. tryAutoRecomputeIfNotSolve(Obj); - notifyConstraintSubstitutions(QObject::tr("One or two point on object constraint(s) was/were deleted, " + notifyConstraintSubstitutions(QObject::tr("One or two point-on-object constraints were deleted, " "since the latest constraint being applied internally applies point-on-object as well.")); // TODO: find way to get selection here, or clear elsewhere @@ -758,7 +758,7 @@ void SketcherGui::notifyConstraintSubstitutions(const QString& message) QLatin1String("NotifyConstraintSubstitutions"), true,// Default ParamEntry true,// checkbox state - QObject::tr("Keep notifying me of constraint substitutions")); + QObject::tr("Keep notifying about constraint substitutions")); } // returns true if successful, false otherwise @@ -772,7 +772,7 @@ bool addConstraintSafely(SketchObject* obj, std::function constraintaddi // Untranslated developer intended messages (i.e. to the Report View) // Example of exception carrying a static string with a pair in the "Notifications" context Gui::NotifyUserError(obj, - QT_TRANSLATE_NOOP("Notifications", "Invalid Constraint"), + QT_TRANSLATE_NOOP("Notifications", "Invalid constraint"), e.what()); Gui::Command::abortCommand(); @@ -784,7 +784,7 @@ bool addConstraintSafely(SketchObject* obj, std::function constraintaddi Gui::TranslatedUserError( obj, QObject::tr("Error"), - QObject::tr("Unexpected error. More information may be available in the Report View.")); + QObject::tr("Unexpected error. More information may be available in the report view.")); Gui::Command::abortCommand(); @@ -836,7 +836,7 @@ int SketchSelection::setUp() if (selection.size() == 1) { // if one selectetd, only sketch allowed. should be done by activity of command if (!selection[0].getObject()->isDerivedFrom()) { - ErrorMsg = QObject::tr("Only sketch and its support are allowed to be selected."); + ErrorMsg = QObject::tr("Only the sketch and its support are allowed to be selected"); return -1; } @@ -847,7 +847,7 @@ int SketchSelection::setUp() SketchObj = static_cast(selection[0].getObject()); // check if the none sketch object is the support of the sketch if (selection[1].getObject() != SketchObj->AttachmentSupport.getValue()) { - ErrorMsg = QObject::tr("Only sketch and its support are allowed to be selected."); + ErrorMsg = QObject::tr("Only the sketch and its support may be selected"); return -1; } // assume always a Part::Feature derived object as support @@ -859,7 +859,7 @@ int SketchSelection::setUp() SketchObj = static_cast(selection[1].getObject()); // check if the none sketch object is the support of the sketch if (selection[0].getObject() != SketchObj->AttachmentSupport.getValue()) { - ErrorMsg = QObject::tr("Only sketch and its support are allowed to be selected."); + ErrorMsg = QObject::tr("Only the sketch and its support may be selected"); return -1; } // assume always a Part::Feature derived object as support @@ -1402,7 +1402,7 @@ public: sAppModule = "Sketcher"; sGroup = "Sketcher"; sMenuText = QT_TR_NOOP("Dimension"); - sToolTipText = QT_TR_NOOP("Dimension tools."); + sToolTipText = QT_TR_NOOP("Dimension tools"); sWhatsThis = "Sketcher_CompDimensionTools"; sStatusTip = sToolTipText; eType = ForEdit; @@ -1475,7 +1475,7 @@ public: sAppModule = "Sketcher"; sGroup = "Sketcher"; sMenuText = QT_TR_NOOP("Constrain"); - sToolTipText = QT_TR_NOOP("Constrain tools."); + sToolTipText = QT_TR_NOOP("Constrain tools"); sWhatsThis = "Sketcher_CompConstrainTools"; sStatusTip = sToolTipText; eType = ForEdit; @@ -1505,8 +1505,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Toggle constraints"); - sToolTipText = QT_TR_NOOP("Toggle constrain tools."); + sMenuText = QT_TR_NOOP("Toggle Constraints"); + sToolTipText = QT_TR_NOOP("Toggle constrain tools"); sWhatsThis = "Sketcher_CompToggleConstraints"; sStatusTip = sToolTipText; eType = ForEdit; @@ -2295,23 +2295,23 @@ protected: createArcLengthConstrain(geoId, onSketchPos); } if (availableConstraint == AvailableConstraint::THIRD) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Radius constraint")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add radius constraint")); createRadiusDiameterConstrain(geoId, onSketchPos, true); } if (availableConstraint == AvailableConstraint::FOURTH) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Radius constraint")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add radius constraint")); createRadiusDiameterConstrain(geoId, onSketchPos, false); availableConstraint = AvailableConstraint::RESET; } } else { if (availableConstraint == AvailableConstraint::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Radius constraint")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add radius constraint")); createRadiusDiameterConstrain(geoId, onSketchPos, true); selAllowed = true; } if (availableConstraint == AvailableConstraint::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Radius constraint")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add radius constraint")); createRadiusDiameterConstrain(geoId, onSketchPos, false); if (!isArcOfCircle(*Obj->getGeometry(geoId))) { //This way if key is pressed again it goes back to FIRST @@ -2984,9 +2984,7 @@ CmdSketcherDimension::CmdSketcherDimension() sAppModule = "Sketcher"; sGroup = "Sketcher"; sMenuText = QT_TR_NOOP("Dimension"); - sToolTipText = QT_TR_NOOP("Constrain contextually based on your selection.\n" - "Depending on your selection you might have several constraints available. You can cycle through them using M key.\n" - "Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel."); + sToolTipText = QT_TR_NOOP("Constrains contextually based on the selection. The type can be changed with the M key."); sWhatsThis = "Sketcher_Dimension"; sStatusTip = sToolTipText; sPixmap = "Constraint_Dimension"; @@ -3040,8 +3038,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain horizontal/vertical"); - sToolTipText = QT_TR_NOOP("Constrains a single line to either horizontal or vertical."); + sMenuText = QT_TR_NOOP("Horizontal/Vertical Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected elements either horizontally or vertically"); sWhatsThis = "Sketcher_CompHorVer"; sStatusTip = sToolTipText; eType = ForEdit; @@ -3094,7 +3092,7 @@ bool canHorVerBlock(Sketcher::SketchObject* Obj, int geoId) Gui::TranslatedUserWarning( Obj, QObject::tr("Impossible constraint"), - QObject::tr("The selected edge already has a Block constraint!")); + QObject::tr("The selected edge already has a block constraint!")); return false; } } @@ -3170,7 +3168,7 @@ void horVerActivated(CmdSketcherConstraint* cmd, std::string type) Gui::TranslatedUserWarning( Obj, QObject::tr("Impossible constraint"), - QObject::tr("The selected item(s) can't accept a horizontal or vertical constraint!")); + QObject::tr("The selected items cannot be constrained horizontally or vertically!")); return; } @@ -3358,8 +3356,8 @@ CmdSketcherConstrainHorVer::CmdSketcherConstrainHorVer() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain horizontal/vertical"); - sToolTipText = QT_TR_NOOP("Constrains a single line to either horizontal or vertical, whichever is closer to current alignment."); + sMenuText = QT_TR_NOOP("Horizontal/Vertical Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected elements either horizontally or vertically, based on their closest alignment"); sWhatsThis = "Sketcher_ConstrainHorVer"; sStatusTip = sToolTipText; sPixmap = "Constraint_HorVer"; @@ -3404,8 +3402,8 @@ CmdSketcherConstrainHorizontal::CmdSketcherConstrainHorizontal() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain horizontal"); - sToolTipText = QT_TR_NOOP("Create a horizontal constraint on the selected item"); + sMenuText = QT_TR_NOOP("Horizontal Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected elements horizontally"); sWhatsThis = "Sketcher_ConstrainHorizontal"; sStatusTip = sToolTipText; sPixmap = "Constraint_Horizontal"; @@ -3449,8 +3447,8 @@ CmdSketcherConstrainVertical::CmdSketcherConstrainVertical() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain vertical"); - sToolTipText = QT_TR_NOOP("Create a vertical constraint on the selected item"); + sMenuText = QT_TR_NOOP("Vertical Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected elements vertically"); sWhatsThis = "Sketcher_ConstrainVertical"; sStatusTip = sToolTipText; sPixmap = "Constraint_Vertical"; @@ -3495,10 +3493,8 @@ CmdSketcherConstrainLock::CmdSketcherConstrainLock() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain lock"); - sToolTipText = QT_TR_NOOP("Create both a horizontal " - "and a vertical distance constraint\n" - "on the selected vertex"); + sMenuText = QT_TR_NOOP("Lock Position"); + sToolTipText = QT_TR_NOOP("Constrains the selected vertices by adding horizontal and vertical distance constraints"); sWhatsThis = "Sketcher_ConstrainLock"; sStatusTip = sToolTipText; sPixmap = "Constraint_Lock"; @@ -3782,8 +3778,8 @@ CmdSketcherConstrainBlock::CmdSketcherConstrainBlock() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain block"); - sToolTipText = QT_TR_NOOP("Block the selected edge from moving"); + sMenuText = QT_TR_NOOP("Block Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected edges as fixed"); sWhatsThis = "Sketcher_ConstrainBlock"; sStatusTip = sToolTipText; sPixmap = "Constraint_Block"; @@ -3828,7 +3824,7 @@ void CmdSketcherConstrainBlock::activated(int iMsg) || Obj->getLastHasRedundancies()) { Gui::TranslatedUserWarning(Obj, QObject::tr("Wrong solver status"), - QObject::tr("A Block constraint cannot be added " + QObject::tr("A block constraint cannot be added " "if the sketch is unsolved " "or there are redundant and " "conflicting constraints.")); @@ -3864,7 +3860,7 @@ void CmdSketcherConstrainBlock::activated(int iMsg) Gui::TranslatedUserWarning( Obj, QObject::tr("Double constraint"), - QObject::tr("The selected edge already has a Block constraint!")); + QObject::tr("The selected edge already has a block constraint!")); return; } @@ -3917,7 +3913,7 @@ void CmdSketcherConstrainBlock::applyConstraint(std::vector& selSeq, Gui::TranslatedUserWarning( Obj, QObject::tr("Double constraint"), - QObject::tr("The selected edge already has a Block constraint!")); + QObject::tr("The selected edge already has a block constraint!")); return; } @@ -3982,9 +3978,8 @@ CmdSketcherConstrainCoincidentUnified::CmdSketcherConstrainCoincidentUnified(con { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain coincident"); - sToolTipText = QT_TR_NOOP("Create a coincident constraint between points, or fix a point on an edge, " - "or a concentric constraint between circles, arcs, and ellipses"); + sMenuText = QT_TR_NOOP("Coincident Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected elements to be coincident"); sWhatsThis = "Sketcher_ConstrainCoincidentUnified"; sStatusTip = sToolTipText; sPixmap = "Constraint_Coincident"; @@ -4495,9 +4490,8 @@ CmdSketcherConstrainCoincident::CmdSketcherConstrainCoincident() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain coincident"); - sToolTipText = QT_TR_NOOP("Create a coincident constraint between points, or a concentric " - "constraint between circles, arcs, and ellipses"); + sMenuText = QT_TR_NOOP("Coincident Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected elements to be coincident"); sWhatsThis = "Sketcher_ConstrainCoincident"; sStatusTip = sToolTipText; sPixmap = "Constraint_PointOnPoint"; @@ -4546,8 +4540,8 @@ CmdSketcherConstrainPointOnObject::CmdSketcherConstrainPointOnObject() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain point on object"); - sToolTipText = QT_TR_NOOP("Fix a point onto an object"); + sMenuText = QT_TR_NOOP("Point-On-Object Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected point onto the selected object"); sWhatsThis = "Sketcher_ConstrainPointOnObject"; sStatusTip = sToolTipText; sPixmap = "Constraint_PointOnObject"; @@ -4598,9 +4592,8 @@ CmdSketcherConstrainDistance::CmdSketcherConstrainDistance() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain distance"); - sToolTipText = QT_TR_NOOP("Fix a length of a line or the distance between a line and a vertex " - "or between two circles"); + sMenuText = QT_TR_NOOP("Distance Dimension"); + sToolTipText = QT_TR_NOOP("Constrains the vertical distance between two points, or from a point to the origin if one is selected"); sWhatsThis = "Sketcher_ConstrainDistance"; sStatusTip = sToolTipText; sPixmap = "Constraint_Length"; @@ -4746,7 +4739,7 @@ void CmdSketcherConstrainDistance::activated(int iMsg) std::abs(-pnt.x * d.y + pnt.y * d.x + pnt1.x * pnt2.y - pnt2.x * pnt1.y) / d.Length(); - openCommand(QT_TRANSLATE_NOOP("Command", "Add point to line Distance constraint")); + openCommand(QT_TRANSLATE_NOOP("Command", "Add point to line distance constraint")); Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('Distance',%d,%d,%d,%f))", GeoId1, @@ -4776,7 +4769,7 @@ void CmdSketcherConstrainDistance::activated(int iMsg) Base::Vector3d d = center - pnt; double ActDist = std::abs(d.Length() - radius); - openCommand(QT_TRANSLATE_NOOP("Command", "Add point to circle Distance constraint")); + openCommand(QT_TRANSLATE_NOOP("Command", "Add point to circle distance constraint")); Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('Distance',%d,%d,%d,%f))", GeoId1, @@ -5116,7 +5109,7 @@ void CmdSketcherConstrainDistance::applyConstraint(std::vector& selSe std::abs(-pnt.x * d.y + pnt.y * d.x + pnt1.x * pnt2.y - pnt2.x * pnt1.y) / d.Length(); - openCommand(QT_TRANSLATE_NOOP("Command", "Add point to line Distance constraint")); + openCommand(QT_TRANSLATE_NOOP("Command", "Add point to line distance constraint")); Gui::cmdAppObjectArgs(Obj, "addConstraint(Sketcher.Constraint('Distance',%d,%d,%d,%f))", GeoId1, @@ -5246,9 +5239,8 @@ CmdSketcherConstrainDistanceX::CmdSketcherConstrainDistanceX() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain horizontal distance"); - sToolTipText = QT_TR_NOOP("Fix the horizontal distance " - "between two points or line ends"); + sMenuText = QT_TR_NOOP("Horizontal Dimension"); + sToolTipText = QT_TR_NOOP("Constrains the horizontal distance between two points, or from a point to the origin if one is selected"); sWhatsThis = "Sketcher_ConstrainDistanceX"; sStatusTip = sToolTipText; sPixmap = "Constraint_HorizontalDistance"; @@ -5548,8 +5540,8 @@ CmdSketcherConstrainDistanceY::CmdSketcherConstrainDistanceY() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain vertical distance"); - sToolTipText = QT_TR_NOOP("Fix the vertical distance between two points or line ends"); + sMenuText = QT_TR_NOOP("Vertical Dimension"); + sToolTipText = QT_TR_NOOP("Constrains the vertical distance between the selected elements"); sWhatsThis = "Sketcher_ConstrainDistanceY"; sStatusTip = sToolTipText; sPixmap = "Constraint_VerticalDistance"; @@ -5844,8 +5836,8 @@ CmdSketcherConstrainParallel::CmdSketcherConstrainParallel() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain parallel"); - sToolTipText = QT_TR_NOOP("Create a parallel constraint between two lines"); + sMenuText = QT_TR_NOOP("Parallel Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected lines to be parallel"); sWhatsThis = "Sketcher_ConstrainParallel"; sStatusTip = sToolTipText; sPixmap = "Constraint_Parallel"; @@ -6007,8 +5999,8 @@ CmdSketcherConstrainPerpendicular::CmdSketcherConstrainPerpendicular() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain perpendicular"); - sToolTipText = QT_TR_NOOP("Create a perpendicular constraint between two lines"); + sMenuText = QT_TR_NOOP("Perpendicular Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected lines to be perpendicular"); sWhatsThis = "Sketcher_ConstrainPerpendicular"; sStatusTip = sToolTipText; sPixmap = "Constraint_Perpendicular"; @@ -6772,8 +6764,8 @@ CmdSketcherConstrainTangent::CmdSketcherConstrainTangent() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain tangent or collinear"); - sToolTipText = QT_TR_NOOP("Create a tangent or collinear constraint between two entities"); + sMenuText = QT_TR_NOOP("Tangent/Collinear Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected elements to be tangent or collinear"); sWhatsThis = "Sketcher_ConstrainTangent"; sStatusTip = sToolTipText; sPixmap = "Constraint_Tangent"; @@ -7647,8 +7639,8 @@ CmdSketcherConstrainRadius::CmdSketcherConstrainRadius() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain radius"); - sToolTipText = QT_TR_NOOP("Fix the radius of a circle or an arc"); + sMenuText = QT_TR_NOOP("Radius Dimension"); + sToolTipText = QT_TR_NOOP("Constrains the radius of the selected circle or arc"); sWhatsThis = "Sketcher_ConstrainRadius"; sStatusTip = sToolTipText; sPixmap = "Constraint_Radius"; @@ -8010,8 +8002,8 @@ CmdSketcherConstrainDiameter::CmdSketcherConstrainDiameter() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain diameter"); - sToolTipText = QT_TR_NOOP("Fix the diameter of a circle or an arc"); + sMenuText = QT_TR_NOOP("Diameter Dimension"); + sToolTipText = QT_TR_NOOP("Constrains the diameter of the selected circle or arc"); sWhatsThis = "Sketcher_ConstrainDiameter"; sStatusTip = sToolTipText; sPixmap = "Constraint_Diameter"; @@ -8328,9 +8320,8 @@ CmdSketcherConstrainRadiam::CmdSketcherConstrainRadiam() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain auto radius/diameter"); - sToolTipText = QT_TR_NOOP( - "Fix the diameter if a circle is chosen, or the radius if an arc/spline pole is chosen"); + sMenuText = QT_TR_NOOP("Radius/Diameter Dimension"); + sToolTipText = QT_TR_NOOP("Constrains the radius of the selected arc or the diameter of the selected circle"); sWhatsThis = "Sketcher_ConstrainRadiam"; sStatusTip = sToolTipText; sPixmap = "Constraint_Radiam"; @@ -8697,8 +8688,8 @@ CmdSketcherCompConstrainRadDia::CmdSketcherCompConstrainRadDia() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain arc or circle"); - sToolTipText = QT_TR_NOOP("Constrain an arc or a circle"); + sMenuText = QT_TR_NOOP("Radius/Diameter Dimension"); + sToolTipText = QT_TR_NOOP("Constrains the radius or diameter of an arc or a circle"); sWhatsThis = "Sketcher_CompConstrainRadDia"; sStatusTip = sToolTipText; sAccel = "R"; @@ -8857,8 +8848,8 @@ CmdSketcherConstrainAngle::CmdSketcherConstrainAngle() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain angle"); - sToolTipText = QT_TR_NOOP("Fix the angle of a line or the angle between two lines"); + sMenuText = QT_TR_NOOP("Angle Dimension"); + sToolTipText = QT_TR_NOOP("Constrains the angle of the selected elements"); sWhatsThis = "Sketcher_ConstrainAngle"; sStatusTip = sToolTipText; sPixmap = "Constraint_InternalAngle"; @@ -9310,9 +9301,9 @@ CmdSketcherConstrainEqual::CmdSketcherConstrainEqual() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain equal"); + sMenuText = QT_TR_NOOP("Equal Constraint"); sToolTipText = - QT_TR_NOOP("Create an equality constraint between two lines or between circles and arcs"); + QT_TR_NOOP("Constrains the selected edges or circles to be equal"); sWhatsThis = "Sketcher_ConstrainEqual"; sStatusTip = sToolTipText; sPixmap = "Constraint_EqualLength"; @@ -9552,10 +9543,8 @@ CmdSketcherConstrainSymmetric::CmdSketcherConstrainSymmetric() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain symmetric"); - sToolTipText = QT_TR_NOOP("Create a symmetry constraint " - "between two points\n" - "with respect to a line or a third point"); + sMenuText = QT_TR_NOOP("Symmetric Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected elements to be symmetric"); sWhatsThis = "Sketcher_ConstrainSymmetric"; sStatusTip = sToolTipText; sPixmap = "Constraint_Symmetric"; @@ -9897,10 +9886,8 @@ CmdSketcherConstrainSnellsLaw::CmdSketcherConstrainSnellsLaw() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Constrain refraction (Snell's law)"); - sToolTipText = QT_TR_NOOP("Create a refraction law (Snell's law)" - "constraint between two endpoints of rays\n" - "and an edge as an interface."); + sMenuText = QT_TR_NOOP("Refraction Constraint"); + sToolTipText = QT_TR_NOOP("Constrains the selected elements based on the refraction law (Snell's Law)"); sWhatsThis = "Sketcher_ConstrainSnellsLaw"; sStatusTip = sToolTipText; sPixmap = "Constraint_SnellsLaw"; @@ -10008,7 +9995,7 @@ void CmdSketcherConstrainSnellsLaw::activated(int iMsg) QDialog dlg(Gui::getMainWindow()); Ui::InsertDatum ui_Datum; ui_Datum.setupUi(&dlg); - dlg.setWindowTitle(EditDatumDialog::tr("Refractive index ratio")); + dlg.setWindowTitle(EditDatumDialog::tr("Refractive Index Ratio")); ui_Datum.label->setText(EditDatumDialog::tr("Ratio n2/n1:")); Base::Quantity init_val; init_val.setUnit(Base::Unit()); @@ -10096,8 +10083,8 @@ CmdSketcherChangeDimensionConstraint::CmdSketcherChangeDimensionConstraint() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Change value"); - sToolTipText = QT_TR_NOOP("Change the value of a dimensional constraint"); + sMenuText = QT_TR_NOOP("Edit Value"); + sToolTipText = QT_TR_NOOP("Edits the value of a dimensional constraint"); sWhatsThis = "Sketcher_ChangeDimensionConstraint"; sStatusTip = sToolTipText; eType = ForEdit; @@ -10150,10 +10137,8 @@ CmdSketcherToggleDrivingConstraint::CmdSketcherToggleDrivingConstraint() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Toggle driving/reference constraint"); - sToolTipText = QT_TR_NOOP("Set the toolbar, " - "or the selected constraints,\n" - "into driving or reference mode"); + sMenuText = QT_TR_NOOP("Toggle Driving/Reference Constraints"); + sToolTipText = QT_TR_NOOP("Toggles between driving and reference mode of the selected constraints and commands"); sWhatsThis = "Sketcher_ToggleDrivingConstraint"; sStatusTip = sToolTipText; sPixmap = "Sketcher_ToggleConstraint"; @@ -10307,9 +10292,8 @@ CmdSketcherToggleActiveConstraint::CmdSketcherToggleActiveConstraint() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Activate/deactivate constraint"); - sToolTipText = QT_TR_NOOP("Activates or deactivates " - "the selected constraints"); + sMenuText = QT_TR_NOOP("Toggle Constraints"); + sToolTipText = QT_TR_NOOP("Toggles the state of the selected constraints"); sWhatsThis = "Sketcher_ToggleActiveConstraint"; sStatusTip = sToolTipText; sPixmap = "Sketcher_ToggleActiveConstraint"; diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 45c92e6a17..fb7564fa73 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -111,8 +111,8 @@ CmdSketcherCreatePoint::CmdSketcherCreatePoint() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create point"); - sToolTipText = QT_TR_NOOP("Create a point in the sketch"); + sMenuText = QT_TR_NOOP("Point"); + sToolTipText = QT_TR_NOOP("Creates a point"); sWhatsThis = "Sketcher_CreatePoint"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreatePoint"; @@ -142,8 +142,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create polyline"); - sToolTipText = QT_TR_NOOP("Create a polyline in the sketch. 'M' Key cycles behaviour"); + sMenuText = QT_TR_NOOP("Polyline"); + sToolTipText = QT_TR_NOOP("Creates a continuous polyline"); sWhatsThis = "Sketcher_CompLine"; sStatusTip = sToolTipText; sAccel = "G, M"; @@ -199,8 +199,8 @@ CmdSketcherCreateLine::CmdSketcherCreateLine() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create line"); - sToolTipText = QT_TR_NOOP("Create a line in the sketch"); + sMenuText = QT_TR_NOOP("Line"); + sToolTipText = QT_TR_NOOP("Creates a line"); sWhatsThis = "Sketcher_CreateLine"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateLine"; @@ -230,8 +230,9 @@ CmdSketcherCreatePolyline::CmdSketcherCreatePolyline() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create polyline"); - sToolTipText = QT_TR_NOOP("Create a polyline in the sketch. 'M' Key cycles behaviour"); + sMenuText = QT_TR_NOOP("Polyline"); + sToolTipText = + QT_TR_NOOP("Creates a continuous polyline. Press the 'M' key to switch segment modes"); sWhatsThis = "Sketcher_CreatePolyline"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreatePolyline"; @@ -263,8 +264,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create arc"); - sToolTipText = QT_TR_NOOP("Create an arc in the sketch"); + sMenuText = QT_TR_NOOP("Arc"); + sToolTipText = QT_TR_NOOP("Creates an arc"); sWhatsThis = "Sketcher_CompCreateArc"; sStatusTip = sToolTipText; sAccel = "G, A"; @@ -331,8 +332,8 @@ CmdSketcherCreateArc::CmdSketcherCreateArc() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create arc by center"); - sToolTipText = QT_TR_NOOP("Create an arc by its center and by its end points"); + sMenuText = QT_TR_NOOP("Arc From Center"); + sToolTipText = QT_TR_NOOP("Creates an arc defined by a center point and an end point"); sWhatsThis = "Sketcher_CreateArc"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateArc"; @@ -363,8 +364,8 @@ CmdSketcherCreate3PointArc::CmdSketcherCreate3PointArc() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create arc by 3 points"); - sToolTipText = QT_TR_NOOP("Create an arc by its end points and a point along the arc"); + sMenuText = QT_TR_NOOP("Arc From 3 Points"); + sToolTipText = QT_TR_NOOP("Creates an arc defined by 2 end points and 1 point on the arc"); sWhatsThis = "Sketcher_Create3PointArc"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Create3PointArc"; @@ -396,8 +397,8 @@ CmdSketcherCreateArcOfEllipse::CmdSketcherCreateArcOfEllipse() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create arc of ellipse"); - sToolTipText = QT_TR_NOOP("Create an arc of ellipse in the sketch"); + sMenuText = QT_TR_NOOP("Elliptical Arc"); + sToolTipText = QT_TR_NOOP("Creates an elliptical arc"); sWhatsThis = "Sketcher_CreateArcOfEllipse"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateElliptical_Arc"; @@ -427,8 +428,8 @@ CmdSketcherCreateArcOfHyperbola::CmdSketcherCreateArcOfHyperbola() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create arc of hyperbola"); - sToolTipText = QT_TR_NOOP("Create an arc of hyperbola in the sketch"); + sMenuText = QT_TR_NOOP("Hyperbolic Arc"); + sToolTipText = QT_TR_NOOP("Creates a hyperbolic arc"); sWhatsThis = "Sketcher_CreateArcOfHyperbola"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateHyperbolic_Arc"; @@ -457,8 +458,8 @@ CmdSketcherCreateArcOfParabola::CmdSketcherCreateArcOfParabola() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create arc of parabola"); - sToolTipText = QT_TR_NOOP("Create an arc of parabola in the sketch"); + sMenuText = QT_TR_NOOP("Parabolic Arc"); + sToolTipText = QT_TR_NOOP("Creates a parabolic arc"); sWhatsThis = "Sketcher_CreateArcOfParabola"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateParabolic_Arc"; @@ -489,8 +490,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create conic"); - sToolTipText = QT_TR_NOOP("Create a conic in the sketch"); + sMenuText = QT_TR_NOOP("Conic"); + sToolTipText = QT_TR_NOOP("Creates a conic"); sWhatsThis = "Sketcher_CompCreateConic"; sStatusTip = sToolTipText; sAccel = "G, C"; @@ -555,8 +556,8 @@ CmdSketcherCreateCircle::CmdSketcherCreateCircle() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create circle by center"); - sToolTipText = QT_TR_NOOP("Create a circle in the sketch"); + sMenuText = QT_TR_NOOP("Circle From Center"); + sToolTipText = QT_TR_NOOP("Creates a circle from a center and rim point"); sWhatsThis = "Sketcher_CreateCircle"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateCircle"; @@ -586,8 +587,8 @@ CmdSketcherCreate3PointCircle::CmdSketcherCreate3PointCircle() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create circle by 3 points"); - sToolTipText = QT_TR_NOOP("Create a circle by 3 perimeter points"); + sMenuText = QT_TR_NOOP("Circle From 3 Points"); + sToolTipText = QT_TR_NOOP("Creates a circle from 3 perimeter points"); sWhatsThis = "Sketcher_Create3PointCircle"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Create3PointCircle"; @@ -623,8 +624,8 @@ CmdSketcherCreateEllipseByCenter::CmdSketcherCreateEllipseByCenter() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create ellipse by center"); - sToolTipText = QT_TR_NOOP("Create an ellipse by center in the sketch"); + sMenuText = QT_TR_NOOP("Ellipse From Center"); + sToolTipText = QT_TR_NOOP("Creates an ellipse from a center and rim point"); sWhatsThis = "Sketcher_CreateEllipseByCenter"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateEllipseByCenter"; @@ -658,8 +659,8 @@ CmdSketcherCreateEllipseBy3Points::CmdSketcherCreateEllipseBy3Points() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create ellipse by 3 points"); - sToolTipText = QT_TR_NOOP("Create an ellipse by 3 points in the sketch"); + sMenuText = QT_TR_NOOP("Ellipse From 3 Points"); + sToolTipText = QT_TR_NOOP("Creates an ellipse from 3 points on its perimeter"); sWhatsThis = "Sketcher_CreateEllipseBy3Points"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateEllipse_3points"; @@ -693,8 +694,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create rectangle"); - sToolTipText = QT_TR_NOOP("Creates a rectangle in the sketch"); + sMenuText = QT_TR_NOOP("Rectangle"); + sToolTipText = QT_TR_NOOP("Creates a rectangle"); sWhatsThis = "Sketcher_CompCreateRectangles"; sStatusTip = sToolTipText; sAccel = "G, R"; @@ -754,8 +755,8 @@ CmdSketcherCreateRectangle::CmdSketcherCreateRectangle() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create rectangle"); - sToolTipText = QT_TR_NOOP("Create a rectangle in the sketch"); + sMenuText = QT_TR_NOOP("Rectangle"); + sToolTipText = QT_TR_NOOP("Creates a rectangle from 2 corner points"); sWhatsThis = "Sketcher_CreateRectangle"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateRectangle"; @@ -787,8 +788,8 @@ CmdSketcherCreateRectangleCenter::CmdSketcherCreateRectangleCenter() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create centered rectangle"); - sToolTipText = QT_TR_NOOP("Create a centered rectangle in the sketch"); + sMenuText = QT_TR_NOOP("Centered Rectangle"); + sToolTipText = QT_TR_NOOP("Creates a centered rectangle from a center and a corner point"); sWhatsThis = "Sketcher_CreateRectangle_Center"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateRectangle_Center"; @@ -821,8 +822,8 @@ CmdSketcherCreateOblong::CmdSketcherCreateOblong() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create rounded rectangle"); - sToolTipText = QT_TR_NOOP("Create a rounded rectangle in the sketch"); + sMenuText = QT_TR_NOOP("Rounded Rectangle"); + sToolTipText = QT_TR_NOOP("Creates a rounded rectangle from 2 corner points"); sWhatsThis = "Sketcher_CreateOblong"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateOblong"; @@ -857,8 +858,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create regular polygon"); - sToolTipText = QT_TR_NOOP("Create a regular polygon in the sketcher"); + sMenuText = QT_TR_NOOP("Polygon"); + sToolTipText = QT_TR_NOOP("Creates a regular polygon from a center and corner point"); sWhatsThis = "Sketcher_CompCreateRegularPolygon"; sStatusTip = sToolTipText; sAccel = "G, P, 3"; @@ -931,8 +932,8 @@ CmdSketcherCreateTriangle::CmdSketcherCreateTriangle() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create equilateral triangle"); - sToolTipText = QT_TR_NOOP("Create an equilateral triangle in the sketch"); + sMenuText = QT_TR_NOOP("Triangle"); + sToolTipText = QT_TR_NOOP("Creates an equilateral triangle from a center and corner point"); sWhatsThis = "Sketcher_CreateTriangle"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateTriangle"; @@ -962,8 +963,8 @@ CmdSketcherCreateSquare::CmdSketcherCreateSquare() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create square"); - sToolTipText = QT_TR_NOOP("Create a square in the sketch"); + sMenuText = QT_TR_NOOP("Square"); + sToolTipText = QT_TR_NOOP("Creates a square from a center and corner point"); sWhatsThis = "Sketcher_CreateSquare"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateSquare"; @@ -993,8 +994,8 @@ CmdSketcherCreatePentagon::CmdSketcherCreatePentagon() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create pentagon"); - sToolTipText = QT_TR_NOOP("Create a pentagon in the sketch"); + sMenuText = QT_TR_NOOP("Pentagon"); + sToolTipText = QT_TR_NOOP("Creates a pentagon from a center and corner point"); sWhatsThis = "Sketcher_CreatePentagon"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreatePentagon"; @@ -1024,8 +1025,8 @@ CmdSketcherCreateHexagon::CmdSketcherCreateHexagon() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create hexagon"); - sToolTipText = QT_TR_NOOP("Create a hexagon in the sketch"); + sMenuText = QT_TR_NOOP("Hexagon"); + sToolTipText = QT_TR_NOOP("Creates a hexagon from a center and corner point"); sWhatsThis = "Sketcher_CreateHexagon"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateHexagon"; @@ -1055,8 +1056,8 @@ CmdSketcherCreateHeptagon::CmdSketcherCreateHeptagon() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create heptagon"); - sToolTipText = QT_TR_NOOP("Create a heptagon in the sketch"); + sMenuText = QT_TR_NOOP("Heptagon"); + sToolTipText = QT_TR_NOOP("Creates a heptagon from a center and corner point"); sWhatsThis = "Sketcher_CreateHeptagon"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateHeptagon"; @@ -1086,8 +1087,8 @@ CmdSketcherCreateOctagon::CmdSketcherCreateOctagon() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create octagon"); - sToolTipText = QT_TR_NOOP("Create an octagon in the sketch"); + sMenuText = QT_TR_NOOP("Octagon"); + sToolTipText = QT_TR_NOOP("Creates an octagon from a center and corner point"); sWhatsThis = "Sketcher_CreateOctagon"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateOctagon"; @@ -1117,8 +1118,8 @@ CmdSketcherCreateRegularPolygon::CmdSketcherCreateRegularPolygon() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create regular polygon"); - sToolTipText = QT_TR_NOOP("Create a regular polygon in the sketch"); + sMenuText = QT_TR_NOOP("Polygon"); + sToolTipText = QT_TR_NOOP("Creates a regular polygon from a center and corner point"); sWhatsThis = "Sketcher_CreateRegularPolygon"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateRegularPolygon"; @@ -1156,8 +1157,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Slots"); - sToolTipText = QT_TR_NOOP("Slot tools."); + sMenuText = QT_TR_NOOP("Slot"); + sToolTipText = QT_TR_NOOP("Slot tools"); sWhatsThis = "Sketcher_CompSlot"; sStatusTip = sToolTipText; sAccel = "G, S"; @@ -1212,8 +1213,8 @@ CmdSketcherCreateSlot::CmdSketcherCreateSlot() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create slot"); - sToolTipText = QT_TR_NOOP("Create a slot in the sketch"); + sMenuText = QT_TR_NOOP("Slot"); + sToolTipText = QT_TR_NOOP("Creates a slot"); sWhatsThis = "Sketcher_CreateSlot"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateSlot"; @@ -1243,8 +1244,8 @@ CmdSketcherCreateArcSlot::CmdSketcherCreateArcSlot() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create arc slot"); - sToolTipText = QT_TR_NOOP("Create an arc slot in the sketch"); + sMenuText = QT_TR_NOOP("Arc Slot"); + sToolTipText = QT_TR_NOOP("Creates an arc slot"); sWhatsThis = "Sketcher_CreateArcSlot"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateArcSlot"; @@ -1276,8 +1277,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create B-spline"); - sToolTipText = QT_TR_NOOP("Create a B-spline in the sketch"); + sMenuText = QT_TR_NOOP("B-Spline"); + sToolTipText = QT_TR_NOOP("Creates a B-spline curve defined by control points"); sWhatsThis = "Sketcher_CompCreateBSpline"; sStatusTip = sToolTipText; sAccel = "G, B, B"; @@ -1342,8 +1343,8 @@ CmdSketcherCreateBSpline::CmdSketcherCreateBSpline() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create B-spline"); - sToolTipText = QT_TR_NOOP("Create a B-spline by control points in the sketch."); + sMenuText = QT_TR_NOOP("B-Spline"); + sToolTipText = QT_TR_NOOP("Creates a B-spline curve defined by control points"); sWhatsThis = "Sketcher_CreateBSpline"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateBSpline"; @@ -1379,8 +1380,8 @@ CmdSketcherCreatePeriodicBSpline::CmdSketcherCreatePeriodicBSpline() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create periodic B-spline"); - sToolTipText = QT_TR_NOOP("Create a periodic B-spline by control points in the sketch."); + sMenuText = QT_TR_NOOP("Periodic B-Spline"); + sToolTipText = QT_TR_NOOP("Creates a periodic B-spline curve defined by control points"); sWhatsThis = "Sketcher_CreatePeriodicBSpline"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Create_Periodic_BSpline"; @@ -1415,8 +1416,8 @@ CmdSketcherCreateBSplineByInterpolation::CmdSketcherCreateBSplineByInterpolation { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create B-spline by knots"); - sToolTipText = QT_TR_NOOP("Create a B-spline by knots, i.e. by interpolation, in the sketch."); + sMenuText = QT_TR_NOOP("B-Spline From Knots"); + sToolTipText = QT_TR_NOOP("Creates a B-spline from knots, i.e. from interpolation"); sWhatsThis = "Sketcher_CreateBSplineByInterpolation"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateBSplineByInterpolation"; @@ -1452,9 +1453,8 @@ CmdSketcherCreatePeriodicBSplineByInterpolation::CmdSketcherCreatePeriodicBSplin { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create periodic B-spline by knots"); - sToolTipText = - QT_TR_NOOP("Create a periodic B-spline by knots, i.e. by interpolation, in the sketch."); + sMenuText = QT_TR_NOOP("Periodic B-Spline From Knots"); + sToolTipText = QT_TR_NOOP("Creates a periodic B-spline defined by knots using interpolation"); sWhatsThis = "Sketcher_CreatePeriodicBSplineByInterpolation"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreatePeriodicBSplineByInterpolation"; @@ -1491,8 +1491,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create fillet or chamfer"); - sToolTipText = QT_TR_NOOP("Create a fillet or chamfer between two lines"); + sMenuText = QT_TR_NOOP("Fillet/Chamfer"); + sToolTipText = QT_TR_NOOP("Creates a fillet or chamfer between 2 lines"); sWhatsThis = "Sketcher_CompCreateFillets"; sStatusTip = sToolTipText; sAccel = "G, F, F"; @@ -1525,8 +1525,8 @@ CmdSketcherCreateFillet::CmdSketcherCreateFillet() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create fillet"); - sToolTipText = QT_TR_NOOP("Create a fillet between two lines or at a coincident point"); + sMenuText = QT_TR_NOOP("Fillet"); + sToolTipText = QT_TR_NOOP("Creates a fillet between 2 selected lines or 1 coincident point"); sWhatsThis = "Sketcher_CreateFillet"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateFillet"; @@ -1556,8 +1556,8 @@ CmdSketcherCreateChamfer::CmdSketcherCreateChamfer() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create chamfer"); - sToolTipText = QT_TR_NOOP("Create a chamfer between two lines or at a coincident point"); + sMenuText = QT_TR_NOOP("Chamfer"); + sToolTipText = QT_TR_NOOP("Creates a chamfer between 2 selected lines or 1 coincident point"); sWhatsThis = "Sketcher_CreateChamfer"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CreateChamfer"; @@ -1589,8 +1589,8 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Curve Edition"); - sToolTipText = QT_TR_NOOP("Curve Edition tools."); + sMenuText = QT_TR_NOOP("Edit Edges"); + sToolTipText = QT_TR_NOOP("Edge editing tools"); sWhatsThis = "Sketcher_CompCurveEdition"; sStatusTip = sToolTipText; sAccel = "G, T"; @@ -1623,8 +1623,8 @@ CmdSketcherTrimming::CmdSketcherTrimming() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Trim edge"); - sToolTipText = QT_TR_NOOP("Trim an edge with respect to the picked position"); + sMenuText = QT_TR_NOOP("Trim Edge"); + sToolTipText = QT_TR_NOOP("Trims an edge with respect to the selected position"); sWhatsThis = "Sketcher_Trimming"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Trimming"; @@ -1653,8 +1653,8 @@ CmdSketcherExtend::CmdSketcherExtend() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Extend edge"); - sToolTipText = QT_TR_NOOP("Extend an edge with respect to the picked position"); + sMenuText = QT_TR_NOOP("Extend Edge"); + sToolTipText = QT_TR_NOOP("Extends an edge with respect to the selected position"); sWhatsThis = "Sketcher_Extend"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Extend"; @@ -1683,8 +1683,8 @@ CmdSketcherSplit::CmdSketcherSplit() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Split edge"); - sToolTipText = QT_TR_NOOP("Splits an edge into two while preserving constraints"); + sMenuText = QT_TR_NOOP("Split Edge"); + sToolTipText = QT_TR_NOOP("Splits an edge into 2 segements while preserving constraints"); sWhatsThis = "Sketcher_Split"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Split"; @@ -1714,8 +1714,9 @@ public: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create external"); - sToolTipText = QT_TR_NOOP("Create external edges linked to external geometries."); + sMenuText = QT_TR_NOOP("External Geometry"); + sToolTipText = + QT_TR_NOOP("Creates sketch elements linked to geometry defined outside the sketch"); sWhatsThis = "Sketcher_CompExternal"; sStatusTip = sToolTipText; sAccel = "G, X"; @@ -1770,10 +1771,8 @@ CmdSketcherProjection::CmdSketcherProjection() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create external projection geometry"); - sToolTipText = QT_TR_NOOP("Create the projection edges of an external geometry.\n" - "External edges can be either defining or construction geometries.\n" - "You can use the toggle construction tool."); + sMenuText = QT_TR_NOOP("External Projection"); + sToolTipText = QT_TR_NOOP("Creates the projection of external geometry in the sketch plane"); sWhatsThis = "Sketcher_Projection"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Projection"; @@ -1807,11 +1806,9 @@ CmdSketcherIntersection::CmdSketcherIntersection() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create external intersection geometry"); + sMenuText = QT_TR_NOOP("External Intersection"); sToolTipText = - QT_TR_NOOP("Create the intersection edges of an external geometry with the sketch plane.\n" - "External edges can be either defining or construction geometries.\n" - "You can use the toggle construction tool."); + QT_TR_NOOP("Creates the intersection of external geometry with the sketch plane"); sWhatsThis = "Sketcher_Intersection"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Intersection"; @@ -1846,8 +1843,8 @@ CmdSketcherCarbonCopy::CmdSketcherCarbonCopy() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Create carbon copy"); - sToolTipText = QT_TR_NOOP("Copy the geometry of another sketch"); + sMenuText = QT_TR_NOOP("Carbon Copy"); + sToolTipText = QT_TR_NOOP("Copies the geometry of another sketch"); sWhatsThis = "Sketcher_CarbonCopy"; sStatusTip = sToolTipText; sPixmap = "Sketcher_CarbonCopy"; diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp index 81da9dd727..8bc5e61a9d 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp @@ -111,7 +111,7 @@ CmdSketcherConvertToNURBS::CmdSketcherConvertToNURBS() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Convert geometry to B-spline"); + sMenuText = QT_TR_NOOP("Geometry to B-Spline"); sToolTipText = QT_TR_NOOP("Converts the selected geometry to a B-spline"); sWhatsThis = "Sketcher_BSplineConvertToNURBS"; sStatusTip = sToolTipText; @@ -187,7 +187,7 @@ CmdSketcherIncreaseDegree::CmdSketcherIncreaseDegree() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Increase B-spline degree"); + sMenuText = QT_TR_NOOP("Increase B-Spline Degree"); sToolTipText = QT_TR_NOOP("Increases the degree of the B-spline"); sWhatsThis = "Sketcher_BSplineIncreaseDegree"; sStatusTip = sToolTipText; @@ -264,7 +264,7 @@ CmdSketcherDecreaseDegree::CmdSketcherDecreaseDegree() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Decrease B-spline degree"); + sMenuText = QT_TR_NOOP("Decrease B-Spline Degree"); sToolTipText = QT_TR_NOOP("Decreases the degree of the B-spline"); sWhatsThis = "Sketcher_BSplineDecreaseDegree"; sStatusTip = sToolTipText; @@ -346,7 +346,7 @@ CmdSketcherIncreaseKnotMultiplicity::CmdSketcherIncreaseKnotMultiplicity() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Increase knot multiplicity"); + sMenuText = QT_TR_NOOP("Increase Knot Multiplicity"); sToolTipText = QT_TR_NOOP("Increases the multiplicity of the selected knot of a B-spline"); sWhatsThis = "Sketcher_BSplineIncreaseKnotMultiplicity"; sStatusTip = sToolTipText; @@ -377,8 +377,7 @@ void CmdSketcherIncreaseKnotMultiplicity::activated(int iMsg) Gui::TranslatedUserWarning( getActiveGuiDocument()->getDocument(), QObject::tr("Wrong selection"), - QObject::tr( - "The selection comprises more than one item. Please select just one knot.")); + QObject::tr("The selection comprises more than one item. Select just one knot.")); return; } @@ -494,7 +493,7 @@ CmdSketcherDecreaseKnotMultiplicity::CmdSketcherDecreaseKnotMultiplicity() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Decrease knot multiplicity"); + sMenuText = QT_TR_NOOP("Decrease Knot Multiplicity"); sToolTipText = QT_TR_NOOP("Decreases the multiplicity of the selected knot of a B-spline"); sWhatsThis = "Sketcher_BSplineDecreaseKnotMultiplicity"; sStatusTip = sToolTipText; @@ -525,8 +524,7 @@ void CmdSketcherDecreaseKnotMultiplicity::activated(int iMsg) Gui::TranslatedUserWarning( getActiveGuiDocument()->getDocument(), QObject::tr("Wrong selection"), - QObject::tr( - "The selection comprises more than one item. Please select just one knot.")); + QObject::tr("The selection comprises more than one item. Select just one knot.")); return; } @@ -632,7 +630,7 @@ CmdSketcherCompModifyKnotMultiplicity::CmdSketcherCompModifyKnotMultiplicity() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Modify knot multiplicity"); + sMenuText = QT_TR_NOOP("Modify Knot Multiplicity"); sToolTipText = QT_TR_NOOP("Modifies the multiplicity of the selected knot of a B-spline"); sWhatsThis = "Sketcher_CompModifyKnotMultiplicity"; sStatusTip = sToolTipText; @@ -886,9 +884,10 @@ CmdSketcherInsertKnot::CmdSketcherInsertKnot() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Insert knot"); - sToolTipText = QT_TR_NOOP("Inserts knot at given parameter. If a knot already exists at that " - "parameter, it's multiplicity is increased by one."); + sMenuText = QT_TR_NOOP("Insert Knot"); + sToolTipText = + QT_TR_NOOP("Inserts a knot at a given parameter. If a knot already exists at that " + "parameter, its multiplicity is increased by 1."); sWhatsThis = "Sketcher_BSplineInsertKnot"; sStatusTip = sToolTipText; sPixmap = "Sketcher_BSplineInsertKnot"; @@ -917,7 +916,7 @@ void CmdSketcherInsertKnot::activated(int iMsg) // as we need only one object to get the new GeoId after multiplicity change Gui::TranslatedUserWarning(getActiveGuiDocument()->getDocument(), QObject::tr("Selection is empty"), - QObject::tr("Nothing is selected. Please select a B-spline.")); + QObject::tr("Nothing is selected. Select a B-spline.")); return; } @@ -935,8 +934,8 @@ void CmdSketcherInsertKnot::activated(int iMsg) Gui::TranslatedUserWarning( Obj, QObject::tr("Wrong selection"), - QObject::tr("Please select a B-spline to insert a knot (not a knot on it). " - "If the curve is not a B-spline, please convert it into one first.")); + QObject::tr("Select a B-spline to insert a knot (not a knot on it). " + "If the curve is not a B-spline, convert it into one first.")); } getSelection().clearSelection(); @@ -954,8 +953,8 @@ CmdSketcherJoinCurves::CmdSketcherJoinCurves() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Join curves"); - sToolTipText = QT_TR_NOOP("Join two curves at selected end points"); + sMenuText = QT_TR_NOOP("Join Curves"); + sToolTipText = QT_TR_NOOP("Joins 2 curves at selected end points"); sWhatsThis = "Sketcher_JoinCurves"; sStatusTip = sToolTipText; sPixmap = "Sketcher_JoinCurves"; @@ -990,7 +989,7 @@ void CmdSketcherJoinCurves::activated(int iMsg) Gui::TranslatedUserWarning( Obj, QObject::tr("Selection is empty"), - QObject::tr("Nothing is selected. Please select end points of curves.")); + QObject::tr("Nothing is selected. Select end points of curves.")); return; } case 1: { diff --git a/src/Mod/Sketcher/Gui/CommandSketcherOverlay.cpp b/src/Mod/Sketcher/Gui/CommandSketcherOverlay.cpp index 0e0158f73e..a9c46f6582 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherOverlay.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherOverlay.cpp @@ -64,8 +64,8 @@ CmdSketcherBSplineDegree::CmdSketcherBSplineDegree() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Show/hide B-spline degree"); - sToolTipText = QT_TR_NOOP("Switches between showing and hiding the degree for all B-splines"); + sMenuText = QT_TR_NOOP("Toggle B-Spline Degree"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the degree for all B-splines"); sWhatsThis = "Sketcher_BSplineDegree"; sStatusTip = sToolTipText; sPixmap = "Sketcher_BSplineDegree"; @@ -93,9 +93,8 @@ CmdSketcherBSplinePolygon::CmdSketcherBSplinePolygon() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Show/hide B-spline control polygon"); - sToolTipText = - QT_TR_NOOP("Switches between showing and hiding the control polygons for all B-splines"); + sMenuText = QT_TR_NOOP("Toggle B-Spline Control Polygon"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the control polygons for all B-splines"); sWhatsThis = "Sketcher_BSplinePolygon"; sStatusTip = sToolTipText; sPixmap = "Sketcher_BSplinePolygon"; @@ -123,9 +122,8 @@ CmdSketcherBSplineComb::CmdSketcherBSplineComb() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Show/hide B-spline curvature comb"); - sToolTipText = - QT_TR_NOOP("Switches between showing and hiding the curvature comb for all B-splines"); + sMenuText = QT_TR_NOOP("Toggle B-Spline Curvature Comb"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the curvature comb for all B-splines"); sWhatsThis = "Sketcher_BSplineComb"; sStatusTip = sToolTipText; sPixmap = "Sketcher_BSplineComb"; @@ -153,9 +151,8 @@ CmdSketcherBSplineKnotMultiplicity::CmdSketcherBSplineKnotMultiplicity() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Show/hide B-spline knot multiplicity"); - sToolTipText = - QT_TR_NOOP("Switches between showing and hiding the knot multiplicity for all B-splines"); + sMenuText = QT_TR_NOOP("Toggle B-spline knot multiplicity"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the knot multiplicity for all B-splines"); sWhatsThis = "Sketcher_BSplineKnotMultiplicity"; sStatusTip = sToolTipText; sPixmap = "Sketcher_BSplineKnotMultiplicity"; @@ -183,9 +180,8 @@ CmdSketcherBSplinePoleWeight::CmdSketcherBSplinePoleWeight() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Show/hide B-spline control point weight"); - sToolTipText = QT_TR_NOOP( - "Switches between showing and hiding the control point weight for all B-splines"); + sMenuText = QT_TR_NOOP("Toggle B-Spline Control Point Weight"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of control point weights for all B-splines"); sWhatsThis = "Sketcher_BSplinePoleWeight"; sStatusTip = sToolTipText; sPixmap = "Sketcher_BSplinePoleWeight"; @@ -214,8 +210,8 @@ CmdSketcherCompBSplineShowHideGeometryInformation:: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Show/hide B-spline information layer"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Toggle B-Spline Information Layer"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the information layer for all B-splines"); sWhatsThis = "Sketcher_CompBSplineShowHideGeometryInformation"; sStatusTip = sToolTipText; eType = ForEdit; @@ -359,9 +355,8 @@ CmdSketcherArcOverlay::CmdSketcherArcOverlay() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Show/hide circular helper for arcs"); - sToolTipText = - QT_TR_NOOP("Switches between showing and hiding the circular helper for all arcs"); + sMenuText = QT_TR_NOOP("Toggle Circular Helper for Arcs"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the circular helpers for all arcs"); sWhatsThis = "Sketcher_ArcOverlay"; sStatusTip = sToolTipText; sPixmap = "Sketcher_ArcOverlay"; diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp index 13ccbea6cd..554c87eb35 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp @@ -222,8 +222,8 @@ CmdSketcherCopyClipboard::CmdSketcherCopyClipboard() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("C&opy in sketcher"); - sToolTipText = QT_TR_NOOP("Copy selected geometries and constraints to the clipboard"); + sMenuText = QT_TR_NOOP("C&opy Elements"); + sToolTipText = QT_TR_NOOP("Copies the selected geometries and constraints to the clipboard"); sWhatsThis = "Sketcher_CopyClipboard"; sStatusTip = sToolTipText; sPixmap = "edit-copy"; @@ -253,8 +253,8 @@ CmdSketcherCut::CmdSketcherCut() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("C&ut in sketcher"); - sToolTipText = QT_TR_NOOP("Cut selected geometries and constraints to the clipboard"); + sMenuText = QT_TR_NOOP("C&ut Elements"); + sToolTipText = QT_TR_NOOP("Cuts the selected geometries and constraints to the clipboard"); sWhatsThis = "Sketcher_Cut"; sStatusTip = sToolTipText; sPixmap = "edit-cut"; @@ -293,8 +293,8 @@ CmdSketcherPaste::CmdSketcherPaste() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("P&aste in sketcher"); - sToolTipText = QT_TR_NOOP("Paste selected geometries and constraints from the clipboard"); + sMenuText = QT_TR_NOOP("P&aste Elements"); + sToolTipText = QT_TR_NOOP("Pastes the geometries and constraints from the clipboard into the sketch"); sWhatsThis = "Sketcher_Paste"; sStatusTip = sToolTipText; sPixmap = "edit-paste"; @@ -341,9 +341,9 @@ CmdSketcherSelectConstraints::CmdSketcherSelectConstraints() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select associated constraints"); + sMenuText = QT_TR_NOOP("Select Associated Constraints"); sToolTipText = - QT_TR_NOOP("Select the constraints associated with the selected geometrical elements"); + QT_TR_NOOP("Selects the constraints associated with the selected geometrical elements"); sWhatsThis = "Sketcher_SelectConstraints"; sStatusTip = sToolTipText; sPixmap = "Sketcher_SelectConstraints"; @@ -425,8 +425,8 @@ CmdSketcherSelectOrigin::CmdSketcherSelectOrigin() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select origin"); - sToolTipText = QT_TR_NOOP("Select the local origin point of the sketch"); + sMenuText = QT_TR_NOOP("Select Origin"); + sToolTipText = QT_TR_NOOP("Selects the local origin point of the sketch"); sWhatsThis = "Sketcher_SelectOrigin"; sStatusTip = sToolTipText; sPixmap = "Sketcher_SelectOrigin"; @@ -469,8 +469,8 @@ CmdSketcherSelectVerticalAxis::CmdSketcherSelectVerticalAxis() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select vertical axis"); - sToolTipText = QT_TR_NOOP("Select the local vertical axis of the sketch"); + sMenuText = QT_TR_NOOP("Select Vertical Axis"); + sToolTipText = QT_TR_NOOP("Selects the local vertical axis of the sketch"); sWhatsThis = "Sketcher_SelectVerticalAxis"; sStatusTip = sToolTipText; sPixmap = "Sketcher_SelectVerticalAxis"; @@ -510,8 +510,8 @@ CmdSketcherSelectHorizontalAxis::CmdSketcherSelectHorizontalAxis() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select horizontal axis"); - sToolTipText = QT_TR_NOOP("Select the local horizontal axis of the sketch"); + sMenuText = QT_TR_NOOP("Select Horizontal Axis"); + sToolTipText = QT_TR_NOOP("Selects the local horizontal axis of the sketch"); sWhatsThis = "Sketcher_SelectHorizontalAxis"; sStatusTip = sToolTipText; sPixmap = "Sketcher_SelectHorizontalAxis"; @@ -550,8 +550,8 @@ CmdSketcherSelectRedundantConstraints::CmdSketcherSelectRedundantConstraints() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select redundant constraints"); - sToolTipText = QT_TR_NOOP("Select redundant constraints"); + sMenuText = QT_TR_NOOP("Select Redundant Constraints"); + sToolTipText = QT_TR_NOOP("Selects all redundant constraints"); sWhatsThis = "Sketcher_SelectRedundantConstraints"; sStatusTip = sToolTipText; sPixmap = "Sketcher_SelectRedundantConstraints"; @@ -608,8 +608,8 @@ CmdSketcherSelectMalformedConstraints::CmdSketcherSelectMalformedConstraints() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select malformed constraints"); - sToolTipText = QT_TR_NOOP("Select malformed constraints"); + sMenuText = QT_TR_NOOP("Select Malformed Constraints"); + sToolTipText = QT_TR_NOOP("Selects all malformed constraints"); sWhatsThis = "Sketcher_SelectMalformedConstraints"; sStatusTip = sToolTipText; eType = ForEdit; @@ -663,8 +663,8 @@ CmdSketcherSelectPartiallyRedundantConstraints::CmdSketcherSelectPartiallyRedund { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select partially redundant constraints"); - sToolTipText = QT_TR_NOOP("Select partially redundant constraints"); + sMenuText = QT_TR_NOOP("Select Partially Redundant Constraints"); + sToolTipText = QT_TR_NOOP("Selects all partially redundant constraints"); sWhatsThis = "Sketcher_SelectPartiallyRedundantConstraints"; sStatusTip = sToolTipText; eType = ForEdit; @@ -719,8 +719,8 @@ CmdSketcherSelectConflictingConstraints::CmdSketcherSelectConflictingConstraints { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select conflicting constraints"); - sToolTipText = QT_TR_NOOP("Select conflicting constraints"); + sMenuText = QT_TR_NOOP("Select Conflicting Constraints"); + sToolTipText = QT_TR_NOOP("Selects all conflicting constraints"); sWhatsThis = "Sketcher_SelectConflictingConstraints"; sStatusTip = sToolTipText; sPixmap = "Sketcher_SelectConflictingConstraints"; @@ -777,9 +777,9 @@ CmdSketcherSelectElementsAssociatedWithConstraints:: { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select associated geometry"); + sMenuText = QT_TR_NOOP("Select Associated Geometry"); sToolTipText = - QT_TR_NOOP("Select the geometrical elements associated with the selected constraints"); + QT_TR_NOOP("Selects the geometrical elements associated with the selected constraints"); sWhatsThis = "Sketcher_SelectElementsAssociatedWithConstraints"; sStatusTip = sToolTipText; sPixmap = "Sketcher_SelectElementsAssociatedWithConstraints"; @@ -897,9 +897,9 @@ CmdSketcherSelectElementsWithDoFs::CmdSketcherSelectElementsWithDoFs() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select under-constrained elements"); - sToolTipText = QT_TR_NOOP("Select geometrical elements where the solver still detects " - "unconstrained degrees of freedom."); + sMenuText = QT_TR_NOOP("Select Under-Constrained Elements"); + sToolTipText = QT_TR_NOOP("Selects geometrical elements where the solver still detects " + "unconstrained degrees of freedom"); sWhatsThis = "Sketcher_SelectElementsWithDoFs"; sStatusTip = sToolTipText; sPixmap = "Sketcher_SelectElementsWithDoFs"; @@ -986,8 +986,8 @@ CmdSketcherRestoreInternalAlignmentGeometry::CmdSketcherRestoreInternalAlignment { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Show/hide internal geometry"); - sToolTipText = QT_TR_NOOP("Show all internal geometry or hide unused internal geometry"); + sMenuText = QT_TR_NOOP("Toggle Internal Geometry"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of all internal geometry"); sWhatsThis = "Sketcher_RestoreInternalAlignmentGeometry"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Element_Ellipse_All"; @@ -1101,9 +1101,9 @@ CmdSketcherSymmetry::CmdSketcherSymmetry() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Symmetry"); + sMenuText = QT_TR_NOOP("Mirror"); sToolTipText = - QT_TR_NOOP("Creates symmetric of selected geometry. After starting the tool select the reference line or point."); + QT_TR_NOOP("Creates a mirrored copy of the selected geometry"); sWhatsThis = "Sketcher_Symmetry"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Symmetry"; @@ -1919,7 +1919,7 @@ CmdSketcherRectangularArray::CmdSketcherRectangularArray() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Rectangular array"); + sMenuText = QT_TR_NOOP("Rectangular Array"); sToolTipText = QT_TR_NOOP("Creates a rectangular array pattern of the geometry taking as " "reference the last selected point"); sWhatsThis = "Sketcher_RectangularArray"; @@ -2071,8 +2071,8 @@ CmdSketcherDeleteAllGeometry::CmdSketcherDeleteAllGeometry() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Delete all geometry"); - sToolTipText = QT_TR_NOOP("Delete all geometry and constraints in the current sketch, " + sMenuText = QT_TR_NOOP("Delete All Geometry"); + sToolTipText = QT_TR_NOOP("Deletes all geometry and their constraints in the current sketch, " "with the exception of external geometry"); sWhatsThis = "Sketcher_DeleteAllGeometry"; sStatusTip = sToolTipText; @@ -2087,8 +2087,8 @@ void CmdSketcherDeleteAllGeometry::activated(int iMsg) int ret = QMessageBox::question( Gui::getMainWindow(), - QObject::tr("Delete All Geometry"), - QObject::tr("Are you really sure you want to delete all geometry and constraints?"), + QObject::tr("Delete all geometry"), + QObject::tr("Delete all geometry and constraints?"), QMessageBox::Yes, QMessageBox::Cancel); // use an equality constraint @@ -2136,8 +2136,8 @@ CmdSketcherDeleteAllConstraints::CmdSketcherDeleteAllConstraints() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Delete all constraints"); - sToolTipText = QT_TR_NOOP("Delete all constraints in the sketch"); + sMenuText = QT_TR_NOOP("Delete All Constraints"); + sToolTipText = QT_TR_NOOP("Deletes all constraints in the sketch"); sWhatsThis = "Sketcher_DeleteAllConstraints"; sStatusTip = sToolTipText; sPixmap = "Sketcher_DeleteConstraints"; @@ -2151,8 +2151,8 @@ void CmdSketcherDeleteAllConstraints::activated(int iMsg) int ret = QMessageBox::question( Gui::getMainWindow(), - QObject::tr("Delete All Constraints"), - QObject::tr("Are you really sure you want to delete all the constraints?"), + QObject::tr("Delete all constraints"), + QObject::tr("Delete all the constraints in the sketch?"), QMessageBox::Yes, QMessageBox::Cancel); @@ -2161,7 +2161,7 @@ void CmdSketcherDeleteAllConstraints::activated(int iMsg) Sketcher::SketchObject* Obj = getSketchObject(); try { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Delete All Constraints")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Delete all constraints")); Gui::cmdAppObjectArgs(Obj, "deleteAllConstraints()"); Gui::Command::commitCommand(); } @@ -2203,8 +2203,8 @@ CmdSketcherRemoveAxesAlignment::CmdSketcherRemoveAxesAlignment() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Remove axes alignment"); - sToolTipText = QT_TR_NOOP("Modifies constraints to remove axes alignment while trying to " + sMenuText = QT_TR_NOOP("Remove Axes Alignment"); + sToolTipText = QT_TR_NOOP("Modifies the constraints to remove axes alignment while trying to " "preserve the constraint relationship of the selection"); sWhatsThis = "Sketcher_RemoveAxesAlignment"; sStatusTip = sToolTipText; @@ -2323,8 +2323,8 @@ CmdSketcherOffset::CmdSketcherOffset() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Offset geometry"); - sToolTipText = QT_TR_NOOP("Offset selected geometries. A positive offset length makes the offset go outward, a negative length inward."); + sMenuText = QT_TR_NOOP("Offset"); + sToolTipText = QT_TR_NOOP("Offsets the selected geometry: positive values offset outward, negative values inward"); sWhatsThis = "Sketcher_Offset"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Offset"; @@ -2406,8 +2406,8 @@ CmdSketcherRotate::CmdSketcherRotate() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Rotate / Polar transform"); - sToolTipText = QT_TR_NOOP("Rotate selected geometries, making n copies, enable creation of circular patterns."); + sMenuText = QT_TR_NOOP("Rotate/Polar Transform"); + sToolTipText = QT_TR_NOOP("Rotates the selected geometry by creating 'n' copies, enabling circular pattern creation"); sWhatsThis = "Sketcher_Rotate"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Rotate"; @@ -2440,8 +2440,8 @@ CmdSketcherScale::CmdSketcherScale() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Scale transform"); - sToolTipText = QT_TR_NOOP("Scale selected geometries. After selecting the center point you can either enter the scale factor, or select two reference points then scale factor = length(p2-center) / length(p1-center)."); + sMenuText = QT_TR_NOOP("Scale"); + sToolTipText = QT_TR_NOOP("Scales the selected geometries"); sWhatsThis = "Sketcher_Scale"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Scale"; @@ -2474,8 +2474,8 @@ CmdSketcherTranslate::CmdSketcherTranslate() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Move / Array transform"); - sToolTipText = QT_TR_NOOP("Translate selected geometries. Enable creation of i * j copies."); + sMenuText = QT_TR_NOOP("Move / Array Transform"); + sToolTipText = QT_TR_NOOP("Translates the selected geometries and enables the creation of 'i' * 'j' copies"); sWhatsThis = "Sketcher_Translate"; sStatusTip = sToolTipText; sPixmap = "Sketcher_Translate"; diff --git a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp index 4af8107eb2..9e04753465 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp @@ -91,7 +91,7 @@ CmdSketcherSwitchVirtualSpace::CmdSketcherSwitchVirtualSpace() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Switch virtual space"); + sMenuText = QT_TR_NOOP("Switch Virtual Space"); sToolTipText = QT_TR_NOOP("Switches the selected constraints or the view to the other virtual space"); sWhatsThis = "Sketcher_SwitchVirtualSpace"; @@ -117,7 +117,7 @@ void CmdSketcherSwitchVirtualSpace::activated(int iMsg) || !selection[0].isObjectTypeOf(Sketcher::SketchObject::getClassTypeId())) { Gui::TranslatedUserWarning(getActiveGuiDocument(), QObject::tr("Wrong selection"), - QObject::tr("Select constraint(s) from the sketch.")); + QObject::tr("Select constraints from the sketch.")); return; } @@ -126,7 +126,7 @@ void CmdSketcherSwitchVirtualSpace::activated(int iMsg) if (SubNames.empty()) { Gui::TranslatedUserWarning(getActiveGuiDocument(), QObject::tr("Wrong selection"), - QObject::tr("Select constraint(s) from the sketch.")); + QObject::tr("Select constraints from the sketch.")); return; } @@ -153,7 +153,7 @@ void CmdSketcherSwitchVirtualSpace::activated(int iMsg) if (SubNames.empty()) { Gui::TranslatedUserWarning(getActiveGuiDocument(), QObject::tr("Wrong selection"), - QObject::tr("Select constraint(s) from the sketch.")); + QObject::tr("Select constraints from the sketch.")); return; } diff --git a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp index d3f8ac32b7..b2278d8530 100644 --- a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp +++ b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp @@ -118,41 +118,41 @@ int EditDatumDialog::exec(bool atCursor) ui_ins_datum->labelEdit->setEntryName(QByteArray("DatumValue")); if (Constr->Type == Sketcher::Angle) { datum = Base::toDegrees(datum); - dlg.setWindowTitle(tr("Insert angle")); + dlg.setWindowTitle(tr("Insert Angle")); init_val.setUnit(Base::Unit::Angle); ui_ins_datum->label->setText(tr("Angle:")); ui_ins_datum->labelEdit->setParamGrpPath( QByteArray("User parameter:BaseApp/History/SketcherAngle")); } else if (Constr->Type == Sketcher::Radius) { - dlg.setWindowTitle(tr("Insert radius")); + dlg.setWindowTitle(tr("Insert Radius")); init_val.setUnit(Base::Unit::Length); ui_ins_datum->label->setText(tr("Radius:")); ui_ins_datum->labelEdit->setParamGrpPath( QByteArray("User parameter:BaseApp/History/SketcherLength")); } else if (Constr->Type == Sketcher::Diameter) { - dlg.setWindowTitle(tr("Insert diameter")); + dlg.setWindowTitle(tr("Insert Diameter")); init_val.setUnit(Base::Unit::Length); ui_ins_datum->label->setText(tr("Diameter:")); ui_ins_datum->labelEdit->setParamGrpPath( QByteArray("User parameter:BaseApp/History/SketcherLength")); } else if (Constr->Type == Sketcher::Weight) { - dlg.setWindowTitle(tr("Insert weight")); + dlg.setWindowTitle(tr("Insert Weight")); ui_ins_datum->label->setText(tr("Weight:")); ui_ins_datum->labelEdit->setParamGrpPath( QByteArray("User parameter:BaseApp/History/SketcherWeight")); } else if (Constr->Type == Sketcher::SnellsLaw) { - dlg.setWindowTitle(tr("Refractive index ratio", "Constraint_SnellsLaw")); + dlg.setWindowTitle(tr("Refractive Index Ratio", "Constraint_SnellsLaw")); ui_ins_datum->label->setText(tr("Ratio n2/n1:", "Constraint_SnellsLaw")); ui_ins_datum->labelEdit->setParamGrpPath( QByteArray("User parameter:BaseApp/History/SketcherRefrIndexRatio")); ui_ins_datum->labelEdit->setSingleStep(0.05); } else { - dlg.setWindowTitle(tr("Insert length")); + dlg.setWindowTitle(tr("Insert Length")); init_val.setUnit(Base::Unit::Length); ui_ins_datum->label->setText(tr("Length:")); ui_ins_datum->labelEdit->setParamGrpPath( diff --git a/src/Mod/Sketcher/Gui/InsertDatum.ui b/src/Mod/Sketcher/Gui/InsertDatum.ui index fa0ee8964a..aaa343ff36 100644 --- a/src/Mod/Sketcher/Gui/InsertDatum.ui +++ b/src/Mod/Sketcher/Gui/InsertDatum.ui @@ -20,7 +20,7 @@ - Insert datum + Insert Datum @@ -28,7 +28,7 @@ - datum: + Datum @@ -45,7 +45,7 @@ - Name (optional) + Name diff --git a/src/Mod/Sketcher/Gui/SketchMirrorDialog.ui b/src/Mod/Sketcher/Gui/SketchMirrorDialog.ui index 0b46c3f993..dad737dc1e 100644 --- a/src/Mod/Sketcher/Gui/SketchMirrorDialog.ui +++ b/src/Mod/Sketcher/Gui/SketchMirrorDialog.ui @@ -11,19 +11,19 @@ - Select Mirror Axis/Point + Select Mirror Axis or Point - Select Mirror Axis/Point + Select Mirror Axis or Point - X-Axis + X-axis true @@ -33,7 +33,7 @@ - Y-Axis + Y-axis diff --git a/src/Mod/Sketcher/Gui/SketchOrientationDialog.ui b/src/Mod/Sketcher/Gui/SketchOrientationDialog.ui index 748322e657..e0efce274e 100644 --- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.ui +++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.ui @@ -11,19 +11,19 @@ - Choose orientation + Choose Orientation - Sketch orientation + Sketch Orientation - XY-Plane + XY-plane true @@ -33,14 +33,14 @@ - XZ-Plane + XZ-plane - YZ-Plane + YZ-plane @@ -78,7 +78,7 @@ - Offset: + Offset diff --git a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.ui b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.ui index cf6c11c4d2..70ea10b4c9 100644 --- a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.ui +++ b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.ui @@ -14,7 +14,7 @@ - Create array + Create Array @@ -22,7 +22,7 @@ - Columns: + Columns @@ -49,7 +49,7 @@ - Rows: + Rows @@ -90,8 +90,7 @@ - If selected, each element in the array is constrained -with respect to the others using construction lines + Constrains each element in the array with respect to the others using construction lines Qt::LeftToRight @@ -113,9 +112,8 @@ with respect to the others using construction lines - If selected, it substitutes dimensional constraints by geometric constraints -in the copies, so that a change in the original element is directly -reflected on copies + Substitutes dimensional constraints by geometric constraints +in the copies, so that a change in the original element is reflected on copies Clone diff --git a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.ui b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.ui index e28f7f4b70..75dbd21310 100644 --- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.ui +++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.ui @@ -14,7 +14,7 @@ - Create regular polygon + Create Regular Polygon @@ -22,7 +22,7 @@ - Number of sides: + Number of sides diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.ui b/src/Mod/Sketcher/Gui/SketcherSettings.ui index 6c3a0dc52d..ca3ef8bc83 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettings.ui @@ -17,14 +17,13 @@ - Task panel widgets + Task Panel Widgets - Sketcher dialog will have additional section -'Advanced solver control' to adjust solver settings + Displays the additional section 'Advanced solver control' to adjust solver settings in the task view Show section 'Advanced solver control' @@ -43,7 +42,7 @@ - Dragging performance + Dragging Performance @@ -105,10 +104,10 @@ Requires to re-enter edit mode to take effect. - New constraints that would be redundant will automatically be removed + Automatically removes newly added redundant constraints - Auto remove redundants + Auto remove redundant constraints false @@ -124,7 +123,7 @@ Requires to re-enter edit mode to take effect. - Allow leaving sketch edit mode when pressing Esc button + Allows to leave the sketch edit mode by pressing the Esc key Esc can leave sketch edit mode @@ -162,10 +161,10 @@ Requires to re-enter edit mode to take effect. - Unify Coincident and PointOnObject in a single tool. + Unifies the coincident and point-on-object constraints in a single tool - Unify Coincident and PointOnObject + Unify coincident and point-on-object constraints true @@ -181,10 +180,10 @@ Requires to re-enter edit mode to take effect. - Use the automatic horizontal/vertical constraint tool. This create a command group in which you have the auto tool, horizontal and vertical. + Unifies the horizontal and vertical constraints to an automatic command - Auto tool for Horizontal/Vertical + Auto tool for horizontal/vertical constraints true @@ -200,7 +199,7 @@ Requires to re-enter edit mode to take effect. - If checked, show a command group button that contains both the polyline and line commands. Otherwise, each command has its own separate button. + Shows a command group button that contains both the polyline and line commands. Otherwise, each command has its own separate button. Group the polyline and line commands @@ -219,7 +218,7 @@ Requires to re-enter edit mode to take effect. - If checked then external geometry is always added as reference, otherwise it's added according to the current construction mode. + Always adds external geometry as construction geometry. Otherwise, it is added according to the current construction mode. Always add external geometry as reference @@ -247,7 +246,7 @@ Requires to re-enter edit mode to take effect. - Dimension constraint + Dimension Constraint @@ -274,14 +273,14 @@ This setting is only for the toolbar. Whichever you choose, all tools are always - Dimension tool diameter/radius mode: + Dimension tool diameter/radius mode - Dimensioning constraints: + Dimensioning constraints @@ -323,13 +322,13 @@ This setting is only for the toolbar. Whichever you choose, all tools are always - Tool parameters + Tool Parameters - On-View-Parameters: + On-view-parameters (OVP) diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui b/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui index f279c9ee5c..8cdf655e67 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui @@ -17,7 +17,7 @@ - Working colors + Working Colors @@ -111,8 +111,7 @@ - Color of crosshair cursor. -(The one you get when creating a new sketch element.) + Color of the crosshair cursor @@ -137,7 +136,7 @@ - Geometric element colors + Geometric Element Colors @@ -255,7 +254,7 @@ - Line pattern of normal edges. + Line pattern of normal edges -1 @@ -265,7 +264,7 @@ - Width of normal edges. + Width of normal edges px @@ -352,7 +351,7 @@ - Line pattern of construction edges. + Line pattern of construction edges -1 @@ -362,7 +361,7 @@ - Width of construction edges. + Width of construction edges px @@ -449,7 +448,7 @@ - Line pattern of internal aligned edges. + Line pattern of internal aligned edges -1 @@ -459,7 +458,7 @@ - Width of internal aligned edges. + Width of internal aligned edges px @@ -520,7 +519,7 @@ - Line pattern of external edges. + Line pattern of external edges -1 @@ -530,7 +529,7 @@ - Width of external edges. + Width of external edges px @@ -591,7 +590,7 @@ - Line pattern of external defining edges. + Line pattern of external defining edges -1 @@ -601,7 +600,7 @@ - Width of external defining edges. + Width of external defining edges px @@ -704,7 +703,7 @@ - Constraint colors + Constraint Colors @@ -745,7 +744,7 @@ - Dimensional constraint + Dimensional constraints @@ -772,7 +771,7 @@ - Reference constraint + Reference constraints @@ -826,7 +825,7 @@ - Deactivated constraint + Deactivated constraints @@ -871,7 +870,7 @@ - Colors outside Sketcher + Colors Outside Sketcher diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsDisplay.ui b/src/Mod/Sketcher/Gui/SketcherSettingsDisplay.ui index d01fd62539..553096f918 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsDisplay.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsDisplay.ui @@ -17,7 +17,7 @@ - Sketch editing + Sketch Editing @@ -39,7 +39,7 @@ - The 3D view is scaled based on this factor. + Scales the 3D view based on this factor Qt::ImhPreferNumbers @@ -70,7 +70,7 @@ - The number of polygons used for geometry approximation. + The number of polygons used for geometry approximation 50 @@ -89,7 +89,7 @@ - If checked, displays the name on dimensional constraints (if exists). + Displays names of dimensional constraints, if they exist Show dimensional constraint name with format @@ -141,7 +141,7 @@ Defaults to: %N = %V - The current sketcher creation tool will remain active after creation. + Keeps the current Sketcher tool active after creating geometry Geometry creation "Continue Mode" @@ -160,7 +160,7 @@ Defaults to: %N = %V - Font size used for labels and constraints. + Font size used for labels and constraints px @@ -218,7 +218,7 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - The current constraint creation tool will remain active after creation. + Keeps the current Sketcher constraint tool active after creating geometry Constraint creation "Continue Mode" @@ -237,10 +237,10 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - Cursor position coordinates will be displayed beside cursor while editing sketch. + Displays cursor position coordinates next to the cursor while editing a sketch - Show coordinates beside cursor while editing + Displays coordinates next to the cursor while editing true @@ -256,7 +256,7 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - A dialog will pop up to input a value for new dimensional constraints. + Opens a dialog to input a value for new dimensional constraints after creation Ask for value after creating a dimensional constraint @@ -275,7 +275,7 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - Cursor coordinates will use the system decimals setting instead of the short form. + Cursor coordinates will use the system decimals setting instead of the short form Use system decimals setting for cursor coordinates @@ -321,13 +321,13 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - Visibility automation + Visibility Automation - When opening a sketch, hide all features that depend on it. + Hides all object features that depend on the opened sketch Hide all objects that depend on the sketch @@ -346,7 +346,7 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - When opening a sketch, show sources for external geometry links. + Shows source objects which are used for external geometry in the opened sketch Show objects used for external geometry @@ -365,7 +365,7 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - When opening a sketch, show objects the sketch is attached to. + Shows objects the opened sketch is attached to Show objects that the sketch is attached to @@ -384,7 +384,7 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - When closing a sketch, move camera back to where it was before the sketch was opened. + Restores the camera position after closing the sketch Restore camera position after editing @@ -403,7 +403,7 @@ Supports all unit systems except 'US customary' and 'Building US/Euro'. - When entering edit mode, force orthographic view of camera. + Forces the camera to an orthographic view when editing a sketch. Works only when "Restore camera position after editing" is enabled. @@ -423,11 +423,10 @@ Works only when "Restore camera position after editing" is enabled. - Open a sketch in Section View mode by default. -Then objects are only visible behind the sketch plane. + Opens a sketch in section view mode, showing only objects behind the sketch plane - Open sketch in Section View mode + Open sketch in section view mode false @@ -468,10 +467,10 @@ Then objects are only visible behind the sketch plane. - Applies current visibility automation settings to all sketches in open documents. + Applies current visibility automation settings to all sketches in the open documents - Apply to existing sketches + Apply to Existing Sketches diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui b/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui index 6d671fcb0e..0692d0395a 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui @@ -17,7 +17,7 @@ - Grid settings + Grid Settings @@ -32,7 +32,7 @@ true - A grid will be shown + Displays a grid in the active sketch Grid @@ -54,10 +54,10 @@ true - Automatically adapt grid spacing based on the viewer dimensions. + Automatically adapts grid spacing based on the viewer dimensions - Grid Auto Spacing + Grid auto-spacing GridAuto @@ -81,7 +81,7 @@ Distance between two subsequent grid lines. -If 'Grid Auto Spacing' is enabled, will be used as base value. +If 'Grid auto-apacing' is enabled, it will be used as the base value mm @@ -122,8 +122,8 @@ If 'Grid Auto Spacing' is enabled, will be used as base value. - While using 'Grid Auto Spacing' this sets a threshold in pixel to the grid spacing. -The grid spacing change if it becomes smaller than this number of pixel. + While using 'Grid auto-spacing', this sets a pixel threshold for grid spacing. +The grid spacing changes if it becomes smaller than the specified pixel size. px @@ -151,7 +151,7 @@ The grid spacing change if it becomes smaller than this number of pixel. - Grid display + Grid Display @@ -163,7 +163,7 @@ The grid spacing change if it becomes smaller than this number of pixel. - Minor grid lines + Minor Grid Lines @@ -185,7 +185,7 @@ The grid spacing change if it becomes smaller than this number of pixel. - Line pattern used for grid lines. + Line pattern used for grid lines -1 @@ -269,7 +269,7 @@ The grid spacing change if it becomes smaller than this number of pixel. - Major grid lines + Major Grid Lines @@ -281,7 +281,7 @@ The grid spacing change if it becomes smaller than this number of pixel. - Major grid line every: + Major grid line interval gridNumberSubdivision @@ -291,7 +291,7 @@ The grid spacing change if it becomes smaller than this number of pixel. - Every N lines there will be a major line. Set to 1 to disable major lines. + Displays a major grid line every 'n' minor lines. Enter 1 to disable major lines 1 @@ -323,7 +323,7 @@ The grid spacing change if it becomes smaller than this number of pixel. - Line pattern used for grid division. + Line pattern used for grid division -1 diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp index b7fa77f62c..e57ad24140 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp @@ -560,12 +560,12 @@ void ConstraintView::contextMenuEvent(QContextMenuEvent* event) // This does the same as a double-click and thus it should be the first action and with bold // text - QAction* change = menu.addAction(tr("Change value"), this, &ConstraintView::modifyCurrentItem); + QAction* change = menu.addAction(tr("Change Value"), this, &ConstraintView::modifyCurrentItem); change->setEnabled(isQuantity); menu.setDefaultAction(change); QAction* driven = - menu.addAction(tr("Toggle to/from reference"), this, &ConstraintView::updateDrivingStatus); + menu.addAction(tr("Toggle Driving/Reference"), this, &ConstraintView::updateDrivingStatus); driven->setEnabled(isToggleDriving); QAction* activate = menu.addAction( @@ -573,9 +573,9 @@ void ConstraintView::contextMenuEvent(QContextMenuEvent* event) activate->setEnabled(!items.isEmpty()); menu.addSeparator(); - QAction* show = menu.addAction(tr("Show constraints"), this, &ConstraintView::showConstraints); + QAction* show = menu.addAction(tr("Show Constraints"), this, &ConstraintView::showConstraints); show->setEnabled(!items.isEmpty()); - QAction* hide = menu.addAction(tr("Hide constraints"), this, &ConstraintView::hideConstraints); + QAction* hide = menu.addAction(tr("Hide Constraints"), this, &ConstraintView::hideConstraints); hide->setEnabled(!items.isEmpty()); menu.addSeparator(); @@ -592,7 +592,7 @@ void ConstraintView::contextMenuEvent(QContextMenuEvent* event) rename->setEnabled(item != nullptr); QAction* center = - menu.addAction(tr("Center sketch"), this, &ConstraintView::centerSelectedItems); + menu.addAction(tr("Center Sketch"), this, &ConstraintView::centerSelectedItems); center->setEnabled(item != nullptr); QAction* remove = menu.addAction(tr("Delete"), this, &ConstraintView::deleteSelectedItems); @@ -600,7 +600,7 @@ void ConstraintView::contextMenuEvent(QContextMenuEvent* event) remove->setEnabled(!items.isEmpty()); QAction* swap = menu.addAction( - tr("Swap constraint names"), this, &ConstraintView::swapNamedOfSelectedItems); + tr("Swap Constraint Names"), this, &ConstraintView::swapNamedOfSelectedItems); swap->setEnabled(items.size() == 2); menu.exec(event->globalPos()); @@ -843,8 +843,8 @@ TaskSketcherConstraints::TaskSketcherConstraints(ViewProviderSketch* sketchView) // FIXME there is probably a smarter way to handle this menu // FIXME translations aren't updated automatically at language change QAction* action1 = new QAction(tr("Auto constraints"), this); - QAction* action2 = new QAction(tr("Auto remove redundants"), this); - QAction* action3 = new QAction(tr("Show only filtered Constraints"), this); + QAction* action2 = new QAction(tr("Auto remove redundant constraints"), this); + QAction* action3 = new QAction(tr("Display only filtered constraints"), this); QAction* action4 = new QAction(tr("Extended information (in widget)"), this); QAction* action5 = new QAction(tr("Hide internal alignment (in widget)"), this); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.ui b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.ui index 0e322aa4f9..5d1c975c2b 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.ui @@ -37,7 +37,7 @@ - Check to toggle filters + Toggles the chosen constraint filters padding-right: 0px; margin-right: 0px @@ -56,13 +56,13 @@ - Click to show filters + Filters constraints by type padding-left: 0px; margin-left: 0px - Filters + Filter QToolButton::MenuButtonPopup @@ -84,7 +84,7 @@ - Show/hide all listed constraints from 3D view. (same as ticking/unticking all listed constraints in list below) + Toggles the visibility of all listed constraints from the 3D view diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index c649182d5c..b7f03f3ee6 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -62,28 +62,51 @@ using namespace Gui::TaskView; // Translation block for context menu: do not remove #if 0 QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Point Coincidence"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Point on Object"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Vertical Constraint"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Horizontal Constraint"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Parallel Constraint"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Perpendicular Constraint"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Tangent Constraint"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Equal Length"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Symmetric"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Equal Constraint"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Symmetric Constraint"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Block Constraint"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Lock Constraint"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Horizontal Distance"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Vertical Distance"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Length Constraint"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Radius Constraint"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Diameter Constraint"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Radiam Constraint"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Angle Constraint"); -QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Toggle construction geometry"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Lock Position"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Horizontal Dimension"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Vertical Dimension"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Length Dimension"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Radius Dimension"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Diameter Dimension"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Radius or Diameter Dimension"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Angle Dimension"); + +QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Construction Geometry"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Select Constraints"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Select Origin"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Select Horizontal Axis"); + QT_TRANSLATE_NOOP("SketcherGui::ElementView", "Select Vertical Axis"); + #endif /// Inserts a QAction into an existing menu @@ -667,90 +690,90 @@ void ElementView::contextMenuEvent(QContextMenuEvent* event) // CONTEXT_ITEM(ICONSTR,NAMESTR,CMDSTR,FUNC,ACTSONSELECTION) CONTEXT_ITEM("Constraint_PointOnPoint", - "Point Coincidence", + "Point coincidence", "Sketcher_ConstrainCoincident", doPointCoincidence, true) CONTEXT_ITEM("Constraint_PointOnObject", - "Point on Object", + "Point on object", "Sketcher_ConstrainPointOnObject", doPointOnObjectConstraint, true) CONTEXT_ITEM("Constraint_Horizontal", - "Horizontal Constraint", + "Horizontal constraint", "Sketcher_ConstrainHorizontal", doHorizontalConstraint, true) CONTEXT_ITEM("Constraint_Vertical", - "Vertical Constraint", + "Vertical constraint", "Sketcher_ConstrainVertical", doVerticalConstraint, true) CONTEXT_ITEM("Constraint_Parallel", - "Parallel Constraint", + "Parallel constraint", "Sketcher_ConstrainParallel", doParallelConstraint, true) CONTEXT_ITEM("Constraint_Perpendicular", - "Perpendicular Constraint", + "Perpendicular constraint", "Sketcher_ConstrainPerpendicular", doPerpendicularConstraint, true) CONTEXT_ITEM("Constraint_Tangent", - "Tangent Constraint", + "Tangent constraint", "Sketcher_ConstrainTangent", doTangentConstraint, true) CONTEXT_ITEM("Constraint_EqualLength", - "Equal Length", + "Equal constraint", "Sketcher_ConstrainEqual", doEqualConstraint, true) CONTEXT_ITEM("Constraint_Symmetric", - "Symmetric", + "Symmetric constraint", "Sketcher_ConstrainSymmetric", doSymmetricConstraint, true) CONTEXT_ITEM( - "Constraint_Block", "Block Constraint", "Sketcher_ConstrainBlock", doBlockConstraint, true) + "Constraint_Block", "Block constraint", "Sketcher_ConstrainBlock", doBlockConstraint, true) CONTEXT_ITEM("Constraint_HorizontalDistance", - "Horizontal Distance", + "Horizontal dimension", "Sketcher_ConstrainDistanceX", doHorizontalDistance, true) CONTEXT_ITEM("Constraint_VerticalDistance", - "Vertical Distance", + "Vertical dimension", "Sketcher_ConstrainDistanceY", doVerticalDistance, true) CONTEXT_ITEM("Constraint_Length", - "Length Constraint", + "Length dimension", "Sketcher_ConstrainDistance", doLengthConstraint, true) CONTEXT_ITEM("Constraint_Radiam", - "Radiam Constraint", + "Radius or diameter", "Sketcher_ConstrainRadiam", doRadiamConstraint, true) CONTEXT_ITEM("Constraint_Radius", - "Radius Constraint", + "Radius", "Sketcher_ConstrainRadius", doRadiusConstraint, true) CONTEXT_ITEM("Constraint_Diameter", - "Diameter Constraint", + "Diameter", "Sketcher_ConstrainDiameter", doDiameterConstraint, true) CONTEXT_ITEM("Constraint_InternalAngle", - "Angle Constraint", + "Angle", "Sketcher_ConstrainAngle", doAngleConstraint, true) CONTEXT_ITEM( - "Constraint_Lock", "Lock Constraint", "Sketcher_ConstrainLock", doLockConstraint, true) + "Constraint_Lock", "Lock", "Sketcher_ConstrainLock", doLockConstraint, true) menu.addSeparator(); @@ -763,19 +786,19 @@ void ElementView::contextMenuEvent(QContextMenuEvent* event) menu.addSeparator(); CONTEXT_ITEM("Sketcher_SelectConstraints", - "Select Constraints", + "Select constraints", "Sketcher_SelectConstraints", doSelectConstraints, true) CONTEXT_ITEM( "Sketcher_SelectOrigin", "Select Origin", "Sketcher_SelectOrigin", doSelectOrigin, false) CONTEXT_ITEM("Sketcher_SelectHorizontalAxis", - "Select Horizontal Axis", + "Select horizontal axis", "Sketcher_SelectHorizontalAxis", doSelectHAxis, false) CONTEXT_ITEM("Sketcher_SelectVerticalAxis", - "Select Vertical Axis", + "Select vertical axis", "Sketcher_SelectVerticalAxis", doSelectVAxis, false) @@ -1898,21 +1921,21 @@ void TaskSketcherElements::slotElementsChanged() ? (QStringLiteral("-") + tr("Construction")) : (internalAligned ? (QStringLiteral("-") + tr("Internal")) : QStringLiteral(""))) - : (QStringLiteral("%1-").arg(i) + tr("Elliptical Arc"))) + : (QStringLiteral("%1-").arg(i) + tr("Elliptical arc"))) : type == Part::GeomArcOfHyperbola::getClassTypeId() ? (isNamingBoxChecked ? (tr("Hyperbolic Arc") + IdInformation()) + (construction ? (QStringLiteral("-") + tr("Construction")) : (internalAligned ? (QStringLiteral("-") + tr("Internal")) : QStringLiteral(""))) - : (QStringLiteral("%1-").arg(i) + tr("Hyperbolic Arc"))) + : (QStringLiteral("%1-").arg(i) + tr("Hyperbolic arc"))) : type == Part::GeomArcOfParabola::getClassTypeId() ? (isNamingBoxChecked ? (tr("Parabolic Arc") + IdInformation()) + (construction ? (QStringLiteral("-") + tr("Construction")) : (internalAligned ? (QStringLiteral("-") + tr("Internal")) : QStringLiteral(""))) - : (QStringLiteral("%1-").arg(i) + tr("Parabolic Arc"))) + : (QStringLiteral("%1-").arg(i) + tr("Parabolic arc"))) : type == Part::GeomBSplineCurve::getClassTypeId() ? (isNamingBoxChecked ? (tr("B-spline") + IdInformation()) + (construction @@ -2016,15 +2039,15 @@ void TaskSketcherElements::slotElementsChanged() : type == Part::GeomArcOfEllipse::getClassTypeId() ? (isNamingBoxChecked ? (tr("Elliptical Arc") + linkname) - : (QStringLiteral("%1-").arg(i - 2) + tr("Elliptical Arc"))) + : (QStringLiteral("%1-").arg(i - 2) + tr("Elliptical arc"))) : type == Part::GeomArcOfHyperbola::getClassTypeId() ? (isNamingBoxChecked ? (tr("Hyperbolic Arc") + linkname) - : (QStringLiteral("%1-").arg(i - 2) + tr("Hyperbolic Arc"))) + : (QStringLiteral("%1-").arg(i - 2) + tr("Hyperbolic arc"))) : type == Part::GeomArcOfParabola::getClassTypeId() ? (isNamingBoxChecked ? (tr("Parabolic Arc") + linkname) - : (QStringLiteral("%1-").arg(i - 2) + tr("Parabolic Arc"))) + : (QStringLiteral("%1-").arg(i - 2) + tr("Parabolic arc"))) : type == Part::GeomBSplineCurve::getClassTypeId() ? (isNamingBoxChecked ? (tr("B-spline") + linkname) : (QStringLiteral("%1-").arg(i - 2) + tr("B-spline"))) diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.ui b/src/Mod/Sketcher/Gui/TaskSketcherElements.ui index 4ff1609321..f29e3d8b60 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.ui @@ -37,7 +37,7 @@ - Check to toggle filters + Toggles the chosen element filters padding-right: 0px; margin-right: 0px @@ -56,13 +56,13 @@ - Click to show filters + Filters elements by type padding-left: 0px; margin-left: 0px - Filters + Filter QToolButton::MenuButtonPopup diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui.autosave b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui.autosave index 3b73e8be00..c8e320f693 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui.autosave +++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui.autosave @@ -54,7 +54,7 @@ - Auto Recompute + Auto recompute diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp index 2a7f2e908c..945d83dfef 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp @@ -96,7 +96,7 @@ TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch* sketchView) sketchView->getSketchObject()->noRecomputes = !state; - QAction* action = new QAction(tr("Auto update"), this); + QAction* action = new QAction(tr("Auto Update"), this); action->setToolTip(tr("Executes a recomputation of active document after every sketch action")); action->setCheckable(true); action->setChecked(state); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.ui b/src/Mod/Sketcher/Gui/TaskSketcherMessages.ui index fb9d04e8e5..b46c8b6e35 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.ui @@ -37,7 +37,7 @@ - Forces recomputation of active document + Forces the recomputation of the active document diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui index 764858ba02..ffbabb9a5e 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui @@ -19,17 +19,17 @@ - Default algorithm used for Sketch solving + Default algorithm used for solving the sketch - Default solver: + Default solver - Solver is used for solving the geometry. + Solver used for solving the geometry. LevenbergMarquardt and DogLeg are trust region optimization algorithms. BFGS solver uses the Broyden–Fletcher–Goldfarb–Shanno algorithm. @@ -69,7 +69,7 @@ BFGS solver uses the Broyden–Fletcher–Goldfarb–Shanno algorithm. Type of function to apply in DogLeg for the Gauss step - DogLeg Gauss step: + DogLeg Gauss step @@ -114,7 +114,7 @@ BFGS solver uses the Broyden–Fletcher–Goldfarb–Shanno algorithm. Maximum number of iterations of the default algorithm - Maximum iterations: + Maximum iterations @@ -147,10 +147,10 @@ BFGS solver uses the Broyden–Fletcher–Goldfarb–Shanno algorithm. - If selected, the Maximum iterations value is multiplied by the sketch size + Scales the maximum iteration count based on the sketch size - Sketch size multiplier: + Sketch size multiplier @@ -163,7 +163,7 @@ BFGS solver uses the Broyden–Fletcher–Goldfarb–Shanno algorithm. - Maximum iterations will be multiplied by number of parameters + Scales the maximum iteration count based on the number of parameters Qt::RightToLeft @@ -189,7 +189,7 @@ BFGS solver uses the Broyden–Fletcher–Goldfarb–Shanno algorithm. Error threshold under which convergence is reached - Convergence: + Convergence @@ -298,7 +298,7 @@ to determine whether a solution converges or not Algorithm used for the rank revealing QR decomposition - QR algorithm: + QR algorithm @@ -367,10 +367,10 @@ Eigen Sparse QR algorithm is optimized for sparse matrices; usually faster - Solving algorithm used for determination of Redundant constraints + Solving algorithm used to detect redundant constraints - Redundant solver: + Redundant solver @@ -412,10 +412,10 @@ Eigen Sparse QR algorithm is optimized for sparse matrices; usually faster - Maximum number of iterations of the solver used for determination of Redundant constraints + Maximum number of iterations of the solver used to detect redundant constraints - Redundant max. iterations: + Maximum redundant solver iterations @@ -448,10 +448,10 @@ Eigen Sparse QR algorithm is optimized for sparse matrices; usually faster - If selected, the Maximum iterations value for the redundant algorithm is multiplied by the sketch size + Multiplies the maximum iterations value for the redundant algorithm by the sketch size - Redundant sketch size multiplier: + Redundant sketch size multiplier @@ -589,7 +589,7 @@ Eigen Sparse QR algorithm is optimized for sparse matrices; usually fasterDegree of verbosity of the debug output to the console - Console debug mode: + Console debug mode diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp index 95a5bac2ac..ea07d60487 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp @@ -286,10 +286,10 @@ void SketcherValidation::onFindReversedClicked() Gui::TranslatedUserWarning( *sketch, tr("Reversed external geometry"), - tr("%1 reversed external-geometry arcs were found. Their endpoints are" - " encircled in 3D view.\n\n" + tr("%1 reversed external geometry arcs were found. Their endpoints are" + " encircled in the 3D view.\n\n" "%2 constraints are linking to the endpoints. The constraints have" - " been listed in Report view (menu View -> Panels -> Report view).\n\n" + " been listed in the report view (menu View -> Panels -> Report view).\n\n" "Click \"Swap endpoints in constraints\" button to reassign endpoints." " Do this only once to sketches created in FreeCAD older than v0.15") .arg(points.size() / 2) @@ -301,8 +301,8 @@ void SketcherValidation::onFindReversedClicked() Gui::TranslatedUserWarning( *sketch, tr("Reversed external geometry"), - tr("%1 reversed external-geometry arcs were found. Their endpoints are " - "encircled in 3D view.\n\n" + tr("%1 reversed external geometry arcs were found. Their endpoints are " + "encircled in the 3D view.\n\n" "However, no constraints linking to the endpoints were found.") .arg(points.size() / 2)); @@ -312,7 +312,7 @@ void SketcherValidation::onFindReversedClicked() else { Gui::TranslatedNotification(*sketch, tr("Reversed external geometry"), - tr("No reversed external-geometry arcs were found.")); + tr("No reversed external geometry arcs were found.")); } } @@ -351,7 +351,7 @@ void SketcherValidation::onOrientLockEnableClicked() *sketch, tr("Constraint orientation locking"), tr("Orientation locking was enabled and recomputed for %1 constraints. The" - " constraints have been listed in Report view (menu View -> Panels ->" + " constraints have been listed in the report view (menu View -> Panels ->" " Report view).") .arg(n)); @@ -372,7 +372,7 @@ void SketcherValidation::onOrientLockDisableClicked() *sketch, tr("Constraint orientation locking"), tr("Orientation locking was disabled for %1 constraints. The" - " constraints have been listed in Report view (menu View -> Panels ->" + " constraints have been listed in the report view (menu View -> Panels ->" " Report view). Note that for all future constraints, the locking still" " defaults to ON.") .arg(n)); @@ -389,9 +389,9 @@ void SketcherValidation::onDelConstrExtrClicked() int reply = QMessageBox::question( this, tr("Delete constraints to external geom."), - tr("You are about to delete ALL constraints that deal with external geometry. This is " - "useful to rescue a sketch with broken/changed links to external geometry. Are you sure " - "you want to delete the constraints?"), + tr("This will delete all constraints that deal with external geometry. This is " + "useful to rescue a sketch with broken or changed links to external geometry. Delete " + "the constraints?"), QMessageBox::No | QMessageBox::Yes, QMessageBox::No); if (reply != QMessageBox::Yes) { diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui b/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui index 4376b79207..efbe91d8e4 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui @@ -11,13 +11,13 @@ - Sketcher validation + Sketch Validation - Open and non-manifold vertexes + Open and Non-Manifold Vertices @@ -35,11 +35,10 @@ - Highlights open and non-manifold vertexes that could lead to error if sketch is used to generate solids -This is purely based on topological shape of the sketch and not on its geometry/constrain set. + Highlights open and non-manifold vertices that could lead to errors if the sketch is used to generate solids. This is purely based on the topological shape of the sketch and not on its geometry/constraint set. - Highlight troublesome vertexes + Highlight Troublesome Vertices @@ -49,30 +48,30 @@ This is purely based on topological shape of the sketch and not on its geometry/ - Fixes found missing coincidences by adding extra coincident constrains + Fixes missing coincidences by adding extra coincident constraints - Missing coincidences + Missing Coincidences - Tolerance: + Tolerance - Defines the X/Y tolerance inside which missing coincidences are searched. + Defines the X/Y tolerance within which missing coincidences are detected - If checked, construction geometries are ignored in the search + Ignores construction geometry in the search Ignore construction geometry @@ -106,7 +105,7 @@ This is done by analyzing the sketch geometries and constraints. - Invalid constraints + Invalid Constraints @@ -135,7 +134,7 @@ This is done by analyzing the sketch geometries and constraints. Deletes constraints referring to external geometry - Delete constraints to external geom. + Delete Constraints Linked to External Geometry @@ -145,7 +144,7 @@ This is done by analyzing the sketch geometries and constraints. - Degenerated geometry + Degenerate Geometry @@ -174,7 +173,7 @@ This is done by analyzing the sketch geometries and constraints. - Reversed external geometry + Reversed External Geometry @@ -193,7 +192,7 @@ This is done by analyzing the sketch geometries and constraints. Fixes found reversed external geometries by swapping their endpoints - Swap endpoints in constraints + Swap Endpoints in Constraints @@ -203,7 +202,7 @@ This is done by analyzing the sketch geometries and constraints. - Constraint orientation locking + Constraint Orientation Locking diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 317ca5ea1b..2cd9a5eed3 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -2965,7 +2965,7 @@ void ViewProviderSketch::attach(App::DocumentObject* pcFeat) void ViewProviderSketch::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - menu->addAction(tr("Edit sketch"), receiver, member); + menu->addAction(tr("Edit Sketch"), receiver, member); // Call the extensions ViewProvider::setupContextMenu(menu, receiver, member); } @@ -2983,7 +2983,7 @@ bool ViewProviderSketch::setEdit(int ModNum) if (dlg && !sketchDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(tr("Do you want to close this dialog?")); + msgBox.setInformativeText(tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); @@ -3002,8 +3002,8 @@ bool ViewProviderSketch::setEdit(int ModNum) if (!sketch->evaluateConstraints()) { QMessageBox box(Gui::getMainWindow()); box.setIcon(QMessageBox::Critical); - box.setWindowTitle(tr("Invalid sketch")); - box.setText(tr("Do you want to open the sketch validation tool?")); + box.setWindowTitle(tr("Invalid Sketch")); + box.setText(tr("Open the sketch validation tool?")); box.setInformativeText(tr("The sketch is invalid and cannot be edited.")); box.setStandardButtons(QMessageBox::Yes | QMessageBox::No); box.setDefaultButton(QMessageBox::Yes); @@ -3148,15 +3148,15 @@ bool ViewProviderSketch::setEdit(int ModNum) QString ViewProviderSketch::appendConflictMsg(const std::vector& conflicting) { - return appendConstraintMsg(tr("Please remove the following constraint:"), - tr("Please remove at least one of the following constraints:"), + return appendConstraintMsg(tr("Remove the following constraint:"), + tr("Remove at least one of the following constraints:"), conflicting); } QString ViewProviderSketch::appendRedundantMsg(const std::vector& redundant) { - return appendConstraintMsg(tr("Please remove the following redundant constraint:"), - tr("Please remove the following redundant constraints:"), + return appendConstraintMsg(tr("Remove the following redundant constraint:"), + tr("Remove the following redundant constraints:"), redundant); } @@ -3169,8 +3169,8 @@ QString ViewProviderSketch::appendPartiallyRedundantMsg(const std::vector& QString ViewProviderSketch::appendMalformedMsg(const std::vector& malformed) { - return appendConstraintMsg(tr("Please remove the following malformed constraint:"), - tr("Please remove the following malformed constraints:"), + return appendConstraintMsg(tr("Remove the following malformed constraint:"), + tr("Remove the following malformed constraints:"), malformed); } @@ -3268,7 +3268,7 @@ void ViewProviderSketch::UpdateSolverInformation() signalSetUp(QStringLiteral("under_constrained"), tr("Under-constrained:") + QLatin1String(" "), QStringLiteral("#dofs"), - tr("%n DoF(s)", "", dofs)); + tr("%n Degrees of Freedom", "", dofs)); } else { signalSetUp( @@ -4095,7 +4095,7 @@ void ViewProviderSketch::generateContextMenu() bool onlyOrigin = false; Gui::MenuItem menu; - menu.setCommand("Sketcher context"); + menu.setCommand("Sketcher Context"); std::vector selection = Gui::Selection().getSelectionEx(0, Sketcher::SketchObject::getClassTypeId()); diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index 12440499ce..27f4760869 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -37,14 +37,15 @@ using namespace SketcherGui; qApp->translate("Workbench","P&rofiles"); qApp->translate("Workbench","S&ketch"); qApp->translate("Workbench", "Sketcher"); - qApp->translate("Workbench", "Sketcher edit mode"); - qApp->translate("Workbench", "Sketcher geometries"); - qApp->translate("Workbench", "Sketcher constraints"); - qApp->translate("Workbench", "Sketcher tools"); - qApp->translate("Workbench", "Sketcher B-spline tools"); - qApp->translate("Workbench", "Sketcher visual"); - qApp->translate("Workbench", "Sketcher virtual space"); - qApp->translate("Workbench", "Sketcher edit tools"); + qApp->translate("Workbench", "Sketcher Edit Mode"); + + qApp->translate("Workbench", "Geometries"); + qApp->translate("Workbench", "Constraints"); + qApp->translate("Workbench", "Sketcher Helpers"); + qApp->translate("Workbench", "B-Spline Tools"); + qApp->translate("Workbench", "Visual Tools"); + qApp->translate("Workbench", "Virtual Space"); + qApp->translate("Workbench", "Sketcher Edit Tools"); #endif /// @namespace SketcherGui @class Workbench @@ -73,23 +74,23 @@ Gui::MenuItem* Workbench::setupMenuBar() const // == Sketcher menu ========================================== Gui::MenuItem* geom = new Gui::MenuItem(); - geom->setCommand("Sketcher geometries"); + geom->setCommand("Geometries"); addSketcherWorkbenchGeometries(*geom); Gui::MenuItem* cons = new Gui::MenuItem(); - cons->setCommand("Sketcher constraints"); + cons->setCommand("Constraints"); addSketcherWorkbenchConstraints(*cons); Gui::MenuItem* consaccel = new Gui::MenuItem(); - consaccel->setCommand("Sketcher tools"); + consaccel->setCommand("Sketcher Tools"); addSketcherWorkbenchTools(*consaccel); Gui::MenuItem* bsplines = new Gui::MenuItem(); - bsplines->setCommand("Sketcher B-spline tools"); + bsplines->setCommand("B-Spline Tools"); addSketcherWorkbenchBSplines(*bsplines); Gui::MenuItem* visual = new Gui::MenuItem(); - visual->setCommand("Sketcher visual"); + visual->setCommand("Visual Helpers"); addSketcherWorkbenchVisual(*visual); Gui::MenuItem* sketch = new Gui::MenuItem; @@ -112,37 +113,37 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* sketcherEditMode = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); - sketcherEditMode->setCommand("Sketcher edit mode"); + sketcherEditMode->setCommand("Sketcher Edit Mode"); addSketcherWorkbenchSketchEditModeActions(*sketcherEditMode); Gui::ToolBarItem* geom = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); - geom->setCommand("Sketcher geometries"); + geom->setCommand("Geometries"); addSketcherWorkbenchGeometries(*geom); Gui::ToolBarItem* cons = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); - cons->setCommand("Sketcher constraints"); + cons->setCommand("Constraints"); addSketcherWorkbenchConstraints(*cons); Gui::ToolBarItem* consaccel = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); - consaccel->setCommand("Sketcher tools"); + consaccel->setCommand("Sketcher Tools"); addSketcherWorkbenchTools(*consaccel); Gui::ToolBarItem* bspline = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); - bspline->setCommand("Sketcher B-spline tools"); + bspline->setCommand("B-Spline Tools"); addSketcherWorkbenchBSplines(*bspline); Gui::ToolBarItem* visual = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); - visual->setCommand("Sketcher visual"); + visual->setCommand("Visual Helpers"); addSketcherWorkbenchVisual(*visual); Gui::ToolBarItem* edittools = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); - edittools->setCommand("Sketcher edit tools"); + edittools->setCommand("Sketcher Edit Tools"); addSketcherWorkbenchEditTools(*edittools); return root; @@ -160,13 +161,13 @@ namespace { inline const QStringList editModeToolbarNames() { - return QStringList {QStringLiteral("Sketcher edit mode"), - QStringLiteral("Sketcher geometries"), - QStringLiteral("Sketcher constraints"), - QStringLiteral("Sketcher tools"), - QStringLiteral("Sketcher B-spline tools"), - QStringLiteral("Sketcher visual"), - QStringLiteral("Sketcher edit tools")}; + return QStringList {QStringLiteral("Edit Mode"), + QStringLiteral("Geometries"), + QStringLiteral("Constraints"), + QStringLiteral("Sketcher Tools"), + QStringLiteral("B-Spline Tools"), + QStringLiteral("Visual Helpers"), + QStringLiteral("Sketcher Edit Tools")}; } inline const QStringList nonEditModeToolbarNames()