kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fixed wording as notifed on crowdin

Browse Source
This commit is contained in:
Yorik van Havre
2018-12-31 16:21:49 -02:00
parent 2888ff2557
commit 47f98403f3
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@@ -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;
}

2
src/Mod/Sketcher/Gui/SketcherSettings.ui
View File

@@ -120,7 +120,7 @@
<item row="3" column="0" colspan="2">
<widget class="Gui::PrefCheckBox" name="dialogOnDistanceConstraint">
<property name="text">
<string>Ask for value after creating a distance constraint</string>
<string>Ask for value after creating a dimensional constraint</string>
</property>
<property name="checked">
<bool>true</bool>

6
src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
View File

@@ -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));

4
src/Mod/Start/Gui/DlgStartPreferences.ui
View File

@@ -233,7 +233,7 @@
<bool>false</bool>
</property>
<property name="text">
<string>Background color gradient down</string>
<string>Background color down gradient</string>
</property>
</widget>
</item>
@@ -286,7 +286,7 @@
<item row="0" column="1">
<widget class="Gui::PrefCheckBox" name="checkBox_5">
<property name="toolTip">
<string>If this is checked, if a style sheet is specified in General preferences, it will be used and override the colors below</string>
<string>If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below</string>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>