From 47f98403f3d0353bbabb040eb4a9a4c5c39de41a Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Mon, 31 Dec 2018 16:21:49 -0200 Subject: [PATCH] Fixed wording as notifed on crowdin --- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 10 +++++----- src/Mod/Sketcher/Gui/SketcherSettings.ui | 2 +- src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp | 6 +++--- src/Mod/Start/Gui/DlgStartPreferences.ui | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index e674731549..3422d848eb 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -1995,7 +1995,7 @@ void CmdSketcherConstrainBlock::activated(int iMsg) // Check that the solver does not report redundant/conflicting constraints if(Obj->getLastSolverStatus()!=GCS::Success || Obj->getLastHasConflicts() || Obj->getLastHasRedundancies()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong solver status"), - QObject::tr("A Block constraint can not be added if the sketch is unsolved or there are redundant and/or conflicting constraints.")); + QObject::tr("A Block constraint cannot be added if the sketch is unsolved or there are redundant and/or conflicting constraints.")); return; } @@ -7092,7 +7092,7 @@ void CmdSketcherConstrainSnellsLaw::activated(int iMsg) //a bunch of validity checks if (areAllPointsOrSegmentsFixed(Obj, GeoId1, GeoId2, GeoId3) ) { - strError = QObject::tr("Can not create constraint with external geometry only!!", dmbg); + strError = QObject::tr("Cannot create constraint with external geometry only!!", dmbg); throw Base::ValueError(""); } @@ -7281,7 +7281,7 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg) if(ellipseids.size()>1){ QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("You can not internally constraint an ellipse on other ellipse. Select only one ellipse.")); + QObject::tr("You cannot internally constraint an ellipse on other ellipse. Select only one ellipse.")); return; } @@ -7434,13 +7434,13 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg) if(arcsofellipseids.size()>1){ QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("You can not internally constraint an arc of ellipse on other arc of ellipse. Select only one arc of ellipse.")); + QObject::tr("You cannot internally constraint an arc of ellipse on other arc of ellipse. Select only one arc of ellipse.")); return; } if(ellipseids.size()>0){ QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("You can not internally constraint an ellipse on an arc of ellipse. Select only one ellipse or arc of ellipse.")); + QObject::tr("You cannot internally constraint an ellipse on an arc of ellipse. Select only one ellipse or arc of ellipse.")); return; } diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.ui b/src/Mod/Sketcher/Gui/SketcherSettings.ui index df46ca7ea2..51874aeada 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettings.ui @@ -120,7 +120,7 @@ - Ask for value after creating a distance constraint + Ask for value after creating a dimensional constraint true diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp index 26a67e773c..ff41749321 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp @@ -220,7 +220,7 @@ void SketcherValidation::on_findReversed_clicked() tr("%1 reversed external-geometry arcs were found. Their endpoints are" " encircled in 3d view.\n\n" "%2 constraints are linking to the endpoints. The constraints have" - " been listed in Report view (menu View -> Views -> Report view).\n\n" + " been listed in 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).arg(nc) @@ -261,7 +261,7 @@ void SketcherValidation::on_orientLockEnable_clicked() int n = sketch->changeConstraintsLocking(/*bLock=*/true); QMessageBox::warning(this, tr("Constraint orientation locking"), tr("Orientation locking was enabled and recomputed for %1 constraints. The" - " constraints have been listed in Report view (menu View -> Views ->" + " constraints have been listed in Report view (menu View -> Panels ->" " Report view).").arg(n)); doc->commitTransaction(); @@ -275,7 +275,7 @@ void SketcherValidation::on_orientLockDisable_clicked() int n = sketch->changeConstraintsLocking(/*bLock=*/false); QMessageBox::warning(this, tr("Constraint orientation locking"), tr("Orientation locking was disabled for %1 constraints. The" - " constraints have been listed in Report view (menu View -> Views ->" + " constraints have been listed in Report view (menu View -> Panels ->" " Report view). Note that for all future constraints, the locking still" " defaults to ON.").arg(n)); diff --git a/src/Mod/Start/Gui/DlgStartPreferences.ui b/src/Mod/Start/Gui/DlgStartPreferences.ui index 216c32cea9..f429e074ce 100644 --- a/src/Mod/Start/Gui/DlgStartPreferences.ui +++ b/src/Mod/Start/Gui/DlgStartPreferences.ui @@ -233,7 +233,7 @@ false - Background color gradient down + Background color down gradient @@ -286,7 +286,7 @@ - If this is checked, if a style sheet is specified in General preferences, it will be used and override the colors below + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Qt::RightToLeft