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

Part: Update UI strings for consistency

Browse Source 
Closes: #22133
This commit is contained in:
Max Wilfinger
2025-06-22 18:36:18 +02:00
committed by Kacper Donat
parent ecf02b7878
commit 1f35b9d7fe
72 changed files with 574 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Part/App/TopoShapeFace.pyi
View File

@@ -31,7 +31,7 @@ class TopoShapeFace(TopoShape):
Wire: Final[object] = ...
"""
The outer wire of this face
deprecated -- please use OuterWire
deprecated -- use OuterWire
"""
OuterWire: Final[object] = ...

2
src/Mod/Part/App/TopoShapeFacePyImp.cpp
View File

@@ -973,7 +973,7 @@ Py::Object TopoShapeFacePy::getWire() const
Py::Object sys_out(PySys_GetObject("stdout"));
Py::Callable write(sys_out.getAttr("write"));
Py::Tuple arg(1);
arg.setItem(0, Py::String("Warning: Wire is deprecated, please use OuterWire\n"));
arg.setItem(0, Py::String("Warning: Wire is deprecated, use OuterWire\n"));
write.apply(arg);
}
catch (const Py::Exception&) {

4
src/Mod/Part/AttachmentEditor/Commands.py
View File

@@ -76,9 +76,9 @@ class CommandEditAttachment:
'Command to edit attachment'
def GetResources(self):
return {'Pixmap': 'Part_Attachment',
'MenuText': QT_TRANSLATE_NOOP("Part_EditAttachment","Attachment..."),
'MenuText': QT_TRANSLATE_NOOP("Part_EditAttachment","Attachment"),
'Accel': "",
'ToolTip': QT_TRANSLATE_NOOP("Part_EditAttachment","Edit attachment of selected object.")}
'ToolTip': QT_TRANSLATE_NOOP("Part_EditAttachment","Opens the attachment editor to change the attachment of the selected object")}
def Activated(self):
try:

4
src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py
View File

@@ -209,7 +209,7 @@ class AttachmentEditorTaskPanel(FrozenClass):
mb = QtGui.QMessageBox()
mb.setIcon(mb.Icon.Warning)
mb.setText(translate('AttachmentEditor',
"{} is not attachable. You can still use attachment editor dialog to align the object, but the attachment won't be parametric."
"{} is not attachable. The attachment editor can still be used to align the object, but the attachment will not be parametric."
,None)
.format(obj_to_attach.Label))
mb.setWindowTitle(translate('AttachmentEditor',"Attachment",None))
@@ -554,7 +554,7 @@ class AttachmentEditorTaskPanel(FrozenClass):
typestr = self.last_sugr['references_Types']
if i < len(typestr):
typ = self.attacher.getRefTypeInfo(typestr[i])['UserFriendlyName']
btn.setText(translate('AttachmentEditor',"Selecting...",None) if self.i_active_ref == i else typ)
btn.setText(translate('AttachmentEditor',"Selecting…",None) if self.i_active_ref == i else typ)
finally:
self.block = old_selfblock

16
src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui
View File

@@ -98,7 +98,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Attachment mode:</string>
<string>Attachment mode</string>
</property>
</widget>
</item>
@@ -121,7 +121,7 @@
<string/>
</property>
<property name="title">
<string>Attachment Offset (in local coordinates):</string>
<string>Attachment Offset in its Local Coordinate System</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
@@ -133,7 +133,7 @@
</sizepolicy>
</property>
<property name="text">
<string>In x-direction:</string>
<string>In x-direction</string>
</property>
<property name="buddy">
<cstring>labelOffset</cstring>
@@ -168,7 +168,7 @@
</sizepolicy>
</property>
<property name="text">
<string>In y-direction:</string>
<string>In y-direction</string>
</property>
</widget>
</item>
@@ -200,7 +200,7 @@
</sizepolicy>
</property>
<property name="text">
<string>In z-direction:</string>
<string>In z-direction</string>
</property>
</widget>
</item>
@@ -232,7 +232,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Around x-axis:</string>
<string>Around x-axis</string>
</property>
</widget>
</item>
@@ -277,7 +277,7 @@ Note: The placement is expressed in local space of object being attached.</strin
</sizepolicy>
</property>
<property name="text">
<string>Around y-axis:</string>
<string>Around y-axis</string>
</property>
</widget>
</item>
@@ -322,7 +322,7 @@ Note: The placement is expressed in local space of object being attached.</strin
</sizepolicy>
</property>
<property name="text">
<string>Around z-axis:</string>
<string>Around z-axis</string>
</property>
</widget>
</item>

20
src/Mod/Part/BOPTools/JoinFeatures.py
View File

@@ -77,7 +77,7 @@ def cmdCreateJoinFeature(name, mode):
error_text1 = translate("Part_JoinFeatures", "Computing the result failed with an error:")
error_text2 = translate("Part_JoinFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.")
mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2)
mb.setWindowTitle(translate("Part_JoinFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_JoinFeatures","Bad Selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(translate("Part_JoinFeatures","Continue",None),
QtGui.QMessageBox.ButtonRole.ActionRole)
@@ -183,10 +183,10 @@ class CommandConnect:
def GetResources(self):
return {'Pixmap': getIconPath("Part_JoinConnect.svg"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinConnect","Connect objects"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinConnect","Connect Shapes"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_JoinConnect",
"Fuses objects, taking care to preserve voids.")}
"Fuses shapes, taking care to preserve voids")}
def Activated(self):
if len(FreeCADGui.Selection.getSelectionEx()) >= 1:
@@ -196,7 +196,7 @@ class CommandConnect:
mb.setIcon(mb.Icon.Warning)
mb.setText(translate("Part_JoinFeatures",
"Select at least two objects, or one or more compounds", None))
mb.setWindowTitle(translate("Part_JoinFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_JoinFeatures","Bad Selection", None))
mb.exec_()
def IsActive(self):
@@ -279,10 +279,10 @@ class CommandEmbed:
def GetResources(self):
return {'Pixmap': getIconPath("Part_JoinEmbed.svg"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinEmbed","Embed object"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinEmbed","Embed Shapes"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_JoinEmbed",
"Fuses one object into another, taking care to preserve voids.")}
"Fuses one shape into another, taking care to preserve voids")}
def Activated(self):
if len(FreeCADGui.Selection.getSelectionEx()) == 2:
@@ -292,7 +292,7 @@ class CommandEmbed:
mb.setIcon(mb.Icon.Warning)
mb.setText(translate("Part_JoinFeatures",
"Select base object, then the object to embed, and then invoke this tool.", None))
mb.setWindowTitle(translate("Part_JoinFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_JoinFeatures","Bad Selection", None))
mb.exec_()
def IsActive(self):
@@ -373,10 +373,10 @@ class CommandCutout:
def GetResources(self):
return {'Pixmap': getIconPath("Part_JoinCutout.svg"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinCutout","Cutout for object"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinCutout","Cutout Shape"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_JoinCutout",
"Makes a cutout in one object to fit another object.")}
"Creates a cutout in the selected shape to fit another shape")}
def Activated(self):
if len(FreeCADGui.Selection.getSelectionEx()) == 2:
@@ -386,7 +386,7 @@ class CommandCutout:
mb.setIcon(mb.Icon.Warning)
mb.setText(translate("Part_JoinFeatures",
"Select the object to make a cutout in, then the object that should fit into the cutout, and then invoke this tool.", None))
mb.setWindowTitle(translate("Part_JoinFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_JoinFeatures","Bad Selection", None))
mb.exec_()
def IsActive(self):

38
src/Mod/Part/BOPTools/SplitFeatures.py
View File

@@ -154,7 +154,7 @@ def cmdCreateBooleanFragmentsFeature(name, mode):
error_text1 = translate("Part_SplitFeatures", "Computing the result failed with an error:")
error_text2 = translate("Part_SplitFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.")
mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2)
mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(translate("Part_SplitFeatures","Continue",None),
QtGui.QMessageBox.ButtonRole.ActionRole)
@@ -177,14 +177,10 @@ class CommandBooleanFragments:
def GetResources(self):
return {'Pixmap': getIconPath("Part_BooleanFragments.svg"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_BooleanFragments","Boolean fragments"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_BooleanFragments","Boolean Fragments"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_BooleanFragments",
"Create a 'Boolean Fragments' object from two or more selected objects,\n"
"or from the shapes inside a compound.\n"
"This is a boolean union which is then sliced at the intersections\n"
"of the original shapes.\n"
"A 'Compound Filter' can be used to extract the individual slices.")}
"Creates a boolean union which is sliced at the intersections of the selected shapes")}
def Activated(self):
if len(FreeCADGui.Selection.getSelectionEx()) >= 1:
@@ -196,7 +192,7 @@ class CommandBooleanFragments:
"Select at least two objects, or one or more compounds. "
"If only one compound is selected, the compounded shapes will be intersected between each other "
"(otherwise, compounds with self-intersections are invalid).", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None))
mb.exec_()
def IsActive(self):
@@ -297,7 +293,7 @@ def cmdCreateSliceFeature(name, mode, transaction=True):
error_text1 = translate("Part_SplitFeatures", "Computing the result failed with an error:")
error_text2 = translate("Part_SplitFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.")
mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2)
mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(translate("Part_SplitFeatures","Continue",None),
QtGui.QMessageBox.ButtonRole.ActionRole)
@@ -334,12 +330,10 @@ class CommandSlice:
def GetResources(self):
return {'Pixmap': getIconPath("Part_Slice.svg"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_Slice","Slice to compound"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_Slice","Slice to Compound"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_Slice",
"Slice a selected object by using other objects as cutting tools.\n"
"The resulting pieces will be stored in a compound.\n"
"A 'Compound Filter' can be used to extract the individual slices.")}
"Slices the selected object by using other objects as cutting tools and storing the results in one compound")}
def Activated(self):
if len(FreeCADGui.Selection.getSelectionEx()) > 1:
@@ -351,7 +345,7 @@ class CommandSlice:
"Select at least two objects. "
"The first one is the object to be sliced; "
"the rest are objects to slice with.", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None))
mb.exec_()
def IsActive(self):
@@ -366,11 +360,10 @@ class CommandSliceApart:
def GetResources(self):
return {'Pixmap': getIconPath("Part_SliceApart.svg"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_SliceApart","Slice apart"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_SliceApart","Slice Apart"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_SliceApart",
"Slice a selected object by other objects, and split it apart.\n"
"It will create a 'Compound Filter' for each slice.")}
"Slices the selected object by other objects, and splits it apart, creating a compound filter for each slide")}
def Activated(self):
if len(FreeCADGui.Selection.getSelectionEx()) > 1:
@@ -382,7 +375,7 @@ class CommandSliceApart:
"Select at least two objects. "
"The first one is the object to be sliced; "
"the rest are objects to slice with.", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None))
mb.exec_()
def IsActive(self):
@@ -491,7 +484,7 @@ def cmdCreateXORFeature(name):
error_text1 = translate("Part_SplitFeatures", "Computing the result failed with an error:")
error_text2 = translate("Part_SplitFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.")
mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2)
mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(translate("Part_SplitFeatures","Continue",None),
QtGui.QMessageBox.ButtonRole.ActionRole)
@@ -517,10 +510,9 @@ class CommandXOR:
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_XOR","Boolean XOR"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_XOR",
"Perform an 'exclusive OR' boolean operation with two or more selected objects,\n"
"Performs an 'exclusive OR' boolean operation with two or more selected objects,\n"
"or with the shapes inside a compound.\n"
"This means the overlapping volumes of the shapes will be removed.\n"
"A 'Compound Filter' can be used to extract the remaining pieces.")}
"Overlapping volumes of the shapes will be removed.")}
def Activated(self):
if len(FreeCADGui.Selection.getSelectionEx()) >= 1:
@@ -532,7 +524,7 @@ class CommandXOR:
"Select at least two objects, or one or more compounds. "
"If only one compound is selected, the compounded shapes will be intersected between each other "
"(otherwise, compounds with self-intersections are invalid).", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None))
mb.exec_()
def IsActive(self):

6
src/Mod/Part/BOPTools/ToleranceFeatures.py
View File

@@ -69,7 +69,7 @@ def cmdCreateToleranceSetFeature(name, minTolerance=1e-7, maxTolerance=0):
error_text1 = translate("Part_ToleranceFeatures", "Computing the result failed with an error:")
error_text2 = translate("Part_ToleranceFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.")
mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2)
mb.setWindowTitle(translate("Part_ToleranceFeatures","Bad selection", None))
mb.setWindowTitle(translate("Part_ToleranceFeatures","Bad Selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(translate("Part_ToleranceFeatures","Continue",None),
QtGui.QMessageBox.ButtonRole.ActionRole)
@@ -192,7 +192,7 @@ class CommandToleranceSet:
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_ToleranceSet","Set Tolerance"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_ToleranceSet",
"Set Tolerance for selected objects.")}
"Creates a parametric copy of the selected object with all contained tolerances set to at least a certain minimum value")}
def Activated(self):
if len(FreeCADGui.Selection.getSelectionEx()) >= 1:
@@ -202,7 +202,7 @@ class CommandToleranceSet:
mb.setIcon(mb.Icon.Warning)
mb.setText(translate("Part_ToleranceSet",
"Select at least one object or compounds", None))
mb.setWindowTitle(translate("Part_ToleranceSet","Bad selection", None))
mb.setWindowTitle(translate("Part_ToleranceSet","Bad Selection", None))
mb.exec_()
def IsActive(self):

2
src/Mod/Part/BasicShapes/TaskTube.ui
View File

@@ -89,7 +89,7 @@
<item row="2" column="0">
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>

6
src/Mod/Part/CompoundTools/_CommandCompoundFilter.py
View File

@@ -51,7 +51,7 @@ class _CommandCompoundFilter:
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_CompoundFilter", "Compound Filter"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_CompoundFilter",
"Filter out objects from a selected compound "
"Filters out objects from the selected compound "
"by characteristics like volume,\n"
"area, or length, or by choosing specific items.\n"
"If a second object is selected, it will be used "
@@ -68,7 +68,7 @@ class _CommandCompoundFilter:
"First select a shape that is a compound. "
"If a second object is selected (optional) "
"it will be treated as a stencil.", None))
mb.setWindowTitle(translate("Part_CompoundFilter", "Bad selection", None))
mb.setWindowTitle(translate("Part_CompoundFilter", "Bad Selection", None))
mb.exec_()
def IsActive(self):
@@ -109,7 +109,7 @@ def cmdCreateCompoundFilter(name):
error_text1 = translate("Part_CompoundFilter", "Computing the result failed with an error:")
error_text2 = translate("Part_CompoundFilter", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.")
mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2)
mb.setWindowTitle(translate("Part_CompoundFilter","Bad selection", None))
mb.setWindowTitle(translate("Part_CompoundFilter","Bad Selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(translate("Part_SplitFeatures", "Continue", None), QtGui.QMessageBox.ButtonRole.ActionRole)
mb.setDefaultButton(btnOK)

7
src/Mod/Part/CompoundTools/_CommandExplodeCompound.py
View File

@@ -47,11 +47,10 @@ class _CommandExplodeCompound:
"Command to explode a compound"
def GetResources(self):
return {'Pixmap': "Part_ExplodeCompound",
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_ExplodeCompound", "Explode compound"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_ExplodeCompound", "Explode Compound"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_ExplodeCompound",
"Split up a compound of shapes into separate objects.\n"
"It will create a 'Compound Filter' for each shape.")}
"Splits up a compound of shapes into separate objects, creating a compound filter for each shape")}
def Activated(self):
if len(FreeCADGui.Selection.getSelection()) == 1:
@@ -60,7 +59,7 @@ class _CommandExplodeCompound:
mb = QtGui.QMessageBox()
mb.setIcon(mb.Icon.Warning)
mb.setText(translate("Part_ExplodeCompound", "First select a shape that is a compound.", None))
mb.setWindowTitle(translate("Part_ExplodeCompound", "Bad selection", None))
mb.setWindowTitle(translate("Part_ExplodeCompound", "Bad Selection", None))
mb.exec_()
def IsActive(self):

2
src/Mod/Part/Gui/AppPartGui.cpp
View File

@@ -133,7 +133,7 @@ PyMOD_INIT_FUNC(PartGui)
PyObject* partGuiModule = PartGui::initModule();
Base::Console().log("Loading GUI of Part module... done\n");
Base::Console().log("Loading GUI of Part module… done\n");
Gui::BitmapFactory().addPath(QStringLiteral(":/icons/booleans"));
Gui::BitmapFactory().addPath(QStringLiteral(":/icons/create"));

206
src/Mod/Part/Gui/Command.cpp
View File

@@ -84,8 +84,8 @@ CmdPartPickCurveNet::CmdPartPickCurveNet()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Pick curve network");
sToolTipText = QT_TR_NOOP("Pick a curve network");
sMenuText = QT_TR_NOOP("Pick Curve Network");
sToolTipText = QT_TR_NOOP("Picks a curve network");
sWhatsThis = "Part_PickCurveNet";
sStatusTip = sToolTipText;
sPixmap = "Test1";
@@ -106,8 +106,8 @@ CmdPartNewDoc::CmdPartNewDoc()
{
sAppModule = "Part";
sGroup = "Part";
sMenuText = "New document";
sToolTipText = "Create an empty part document";
sMenuText = "New Document";
sToolTipText = "Creates an Empty Part Document";
sWhatsThis = "Part_NewDoc";
sStatusTip = sToolTipText;
sPixmap = "New";
@@ -130,8 +130,8 @@ CmdPartBox2::CmdPartBox2()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Box fix 1");
sToolTipText = QT_TR_NOOP("Create a box solid without dialog");
sMenuText = QT_TR_NOOP("Box Fix 1");
sToolTipText = QT_TR_NOOP("Creates a solid box");
sWhatsThis = "Part_Box2";
sStatusTip = sToolTipText;
sPixmap = "Part_Box_Parametric";
@@ -171,8 +171,8 @@ CmdPartBox3::CmdPartBox3()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Box fix 2");
sToolTipText = QT_TR_NOOP("Create a box solid without dialog");
sMenuText = QT_TR_NOOP("Box Fix 2");
sToolTipText = QT_TR_NOOP("Creates a solid box");
sWhatsThis = "Part_Box3";
sStatusTip = sToolTipText;
sPixmap = "Part_Box_Parametric";
@@ -212,8 +212,9 @@ CmdPartPrimitives::CmdPartPrimitives()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create primitives...");
sToolTipText = QT_TR_NOOP("Creation of parametrized geometric primitives");
sMenuText = QT_TR_NOOP("Primitive");
sToolTipText = QT_TR_NOOP("Creates solid geometric primitives parametrically");
sWhatsThis = "Part_Primitives";
sStatusTip = sToolTipText;
sPixmap = "Part_Primitives";
@@ -299,7 +300,7 @@ CmdPartCut::CmdPartCut()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Cut");
sToolTipText = QT_TR_NOOP("Make a cut of two shapes");
sToolTipText = QT_TR_NOOP("Cuts 2 selected shapes");
sWhatsThis = "Part_Cut";
sStatusTip = sToolTipText;
sPixmap = "Part_Cut";
@@ -312,7 +313,7 @@ void CmdPartCut::activated(int iMsg)
getSelection().getSelectionEx(nullptr, App::DocumentObject::getClassTypeId(), Gui::ResolveMode::FollowLink);
if (Sel.size() != 2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two shapes please."));
QObject::tr("Select 2 shapes"));
return;
}
@@ -324,7 +325,7 @@ void CmdPartCut::activated(int iMsg)
if (!PartGui::checkForSolids(shape) && !askUser) {
int ret = QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Non-solids selected"),
QObject::tr("The use of non-solids for boolean operations may lead to unexpected results.\n"
"Do you want to continue?"), QMessageBox::Yes, QMessageBox::No);
"Continue?"), QMessageBox::Yes, QMessageBox::No);
if (ret == QMessageBox::No)
return;
askUser = true;
@@ -357,7 +358,7 @@ CmdPartCommon::CmdPartCommon()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Intersection");
sToolTipText = QT_TR_NOOP("Make an intersection of two shapes");
sToolTipText = QT_TR_NOOP("Intersects the selected shapes");
sWhatsThis = "Part_Common";
sStatusTip = sToolTipText;
sPixmap = "Part_Common";
@@ -371,7 +372,7 @@ void CmdPartCommon::activated(int iMsg)
if (Sel.empty()) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Please select two shapes or more. Or, select one compound containing two or more shapes to compute the intersection between."));
QObject::tr("Select at least 2 shapes. Alternatively, select 1 compound containing 2 or more shapes to compute the intersection between."));
return;
}
@@ -383,7 +384,7 @@ void CmdPartCommon::activated(int iMsg)
if (!PartGui::checkForSolids(shape) && !askUser) {
int ret = QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Non-solids selected"),
QObject::tr("The use of non-solids for boolean operations may lead to unexpected results.\n"
"Do you want to continue?"), QMessageBox::Yes, QMessageBox::No);
"Continue?"), QMessageBox::Yes, QMessageBox::No);
if (ret == QMessageBox::No)
return;
askUser = true;
@@ -416,7 +417,7 @@ CmdPartFuse::CmdPartFuse()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Union");
sToolTipText = QT_TR_NOOP("Make a union of several shapes");
sToolTipText = QT_TR_NOOP("Unites the selected shapes");
sWhatsThis = "Part_Fuse";
sStatusTip = sToolTipText;
sPixmap = "Part_Fuse";
@@ -449,7 +450,7 @@ void CmdPartFuse::activated(int iMsg)
}
if (numShapes < 2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Please select two shapes or more. Or, select one compound containing two or more shapes to be fused."));
QObject::tr("Select at least 2 shapes. Alternatively, select 1 compound containing 2 or more shapes to be fused."));
return;
}
@@ -461,7 +462,7 @@ void CmdPartFuse::activated(int iMsg)
if (!PartGui::checkForSolids(shape) && !askUser) {
int ret = QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Non-solids selected"),
QObject::tr("The use of non-solids for boolean operations may lead to unexpected results.\n"
"Do you want to continue?"), QMessageBox::Yes, QMessageBox::No);
"Continue?"), QMessageBox::Yes, QMessageBox::No);
if (ret == QMessageBox::No)
return;
askUser = true;
@@ -494,8 +495,9 @@ CmdPartCompJoinFeatures::CmdPartCompJoinFeatures()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Join objects...");
sToolTipText = QT_TR_NOOP("Join walled objects");
sMenuText = QT_TR_NOOP("Join Shapes");
sToolTipText = QT_TR_NOOP("Joins the selected walled shapes");
sWhatsThis = "Part_CompJoinFeatures";
sStatusTip = sToolTipText;
}
@@ -600,8 +602,9 @@ CmdPartCompSplitFeatures::CmdPartCompSplitFeatures()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Split objects...");
sToolTipText = QT_TR_NOOP("Shape splitting and Compsolid creation tools.");
sMenuText = QT_TR_NOOP("Split Shapes");
sToolTipText = QT_TR_NOOP("Shape splitting and compsolid creation tools");
sWhatsThis = "Part_CompSplitFeatures";
sStatusTip = sToolTipText;
}
@@ -718,8 +721,8 @@ CmdPartCompCompoundTools::CmdPartCompCompoundTools()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Compound tools");
sToolTipText = QT_TR_NOOP("Compound tools: working with lists of shapes.");
sMenuText = QT_TR_NOOP("Compound Tools");
sToolTipText = QT_TR_NOOP("Compound tools for working with multiple shapes");
sWhatsThis = "Part_CompCompoundTools";
sStatusTip = sToolTipText;
}
@@ -825,8 +828,8 @@ CmdPartCompound::CmdPartCompound()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Make compound");
sToolTipText = QT_TR_NOOP("Make a compound of several shapes");
sMenuText = QT_TR_NOOP("Compound");
sToolTipText = QT_TR_NOOP("Compounds the selected shapes");
sWhatsThis = "Part_Compound";
sStatusTip = sToolTipText;
sPixmap = "Part_Compound";
@@ -838,7 +841,7 @@ void CmdPartCompound::activated(int iMsg)
unsigned int n = getSelection().countObjectsOfType<App::DocumentObject>(nullptr, Gui::ResolveMode::FollowLink);
if (n < 1) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select one shape or more, please."));
QObject::tr("Select at least one shape"));
return;
}
@@ -881,7 +884,7 @@ CmdPartSection::CmdPartSection()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Section");
sToolTipText = QT_TR_NOOP("Make a section of two shapes");
sToolTipText = QT_TR_NOOP("Sections 2 selected shapes");
sWhatsThis = "Part_Section";
sStatusTip = sToolTipText;
sPixmap = "Part_Section";
@@ -894,7 +897,7 @@ void CmdPartSection::activated(int iMsg)
getSelection().getSelectionEx(nullptr, App::DocumentObject::getClassTypeId(), Gui::ResolveMode::FollowLink);
if (Sel.size() != 2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two shapes please."));
QObject::tr("Select 2 shapes"));
return;
}
@@ -928,7 +931,8 @@ CmdPartImport::CmdPartImport()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Import CAD file...");
sMenuText = QT_TR_NOOP("Import CAD File");
sToolTipText = QT_TR_NOOP("Imports a CAD file");
sWhatsThis = "Part_Import";
sStatusTip = sToolTipText;
@@ -991,7 +995,8 @@ CmdPartExport::CmdPartExport()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Export CAD file...");
sMenuText = QT_TR_NOOP("Export CAD File");
sToolTipText = QT_TR_NOOP("Exports to a CAD file");
sWhatsThis = "Part_Export";
sStatusTip = sToolTipText;
@@ -1039,8 +1044,9 @@ CmdPartImportCurveNet::CmdPartImportCurveNet()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Import curve network...");
sToolTipText= QT_TR_NOOP("Import a curve network");
sMenuText = QT_TR_NOOP("Import Curve Network");
sToolTipText= QT_TR_NOOP("Imports a curve network");
sWhatsThis = "Part_ImportCurveNet";
sStatusTip = sToolTipText;
sPixmap = "Part_Box_Parametric";
@@ -1087,8 +1093,8 @@ CmdPartMakeSolid::CmdPartMakeSolid()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Convert to solid");
sToolTipText = QT_TR_NOOP("Create solid from a shell or compound");
sMenuText = QT_TR_NOOP("Convert to Solid");
sToolTipText = QT_TR_NOOP("Converts the selected shell or compound to a solid");
sWhatsThis = "Part_MakeSolid";
sStatusTip = sToolTipText;
sPixmap = "Part_MakeSolid";
@@ -1165,8 +1171,8 @@ CmdPartReverseShape::CmdPartReverseShape()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Reverse shapes");
sToolTipText = QT_TR_NOOP("Reverse orientation of shapes");
sMenuText = QT_TR_NOOP("Reverse Shapes");
sToolTipText = QT_TR_NOOP("Reverses the orientation of the selected shapes");
sWhatsThis = "Part_ReverseShape";
sStatusTip = sToolTipText;
sPixmap = "Part_Reverse_Shape";
@@ -1227,8 +1233,8 @@ CmdPartBoolean::CmdPartBoolean()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Boolean...");
sToolTipText = QT_TR_NOOP("Run a boolean operation with two shapes selected");
sMenuText = QT_TR_NOOP("Boolean Operation");
sToolTipText = QT_TR_NOOP("Applies a boolean operations with the selected shapes");
sWhatsThis = "Part_Boolean";
sStatusTip = sToolTipText;
sPixmap = "Part_Booleans";
@@ -1258,8 +1264,8 @@ CmdPartExtrude::CmdPartExtrude()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Extrude...");
sToolTipText = QT_TR_NOOP("Extrude a selected sketch");
sMenuText = QT_TR_NOOP("Extrude");
sToolTipText = QT_TR_NOOP("Extrudes the selected sketch or profile");
sWhatsThis = "Part_Extrude";
sStatusTip = sToolTipText;
sPixmap = "Part_Extrude";
@@ -1286,8 +1292,8 @@ CmdPartScale::CmdPartScale()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Scale...");
sToolTipText = QT_TR_NOOP("Scale a selected shape");
sMenuText = QT_TR_NOOP("Scale");
sToolTipText = QT_TR_NOOP("Scales the selected shape");
sWhatsThis = "Part_Scale";
sStatusTip = sToolTipText;
sPixmap = "Part_Scale";
@@ -1315,8 +1321,8 @@ CmdPartMakeFace::CmdPartMakeFace()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Make face from wires");
sToolTipText = QT_TR_NOOP("Make face from set of wires (e.g. from a sketch)");
sMenuText = QT_TR_NOOP("Face From Wires");
sToolTipText = QT_TR_NOOP("Creates a face from the selected wires (e.g. from a sketch)");
sWhatsThis = "Part_MakeFace";
sStatusTip = sToolTipText;
sPixmap = "Part_MakeFace";
@@ -1367,8 +1373,8 @@ CmdPartRevolve::CmdPartRevolve()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Revolve...");
sToolTipText = QT_TR_NOOP("Revolve a selected shape");
sMenuText = QT_TR_NOOP("Revolve");
sToolTipText = QT_TR_NOOP("Revolves the selected shape");
sWhatsThis = "Part_Revolve";
sStatusTip = sToolTipText;
sPixmap = "Part_Revolve";
@@ -1395,8 +1401,8 @@ CmdPartFillet::CmdPartFillet()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Fillet...");
sToolTipText = QT_TR_NOOP("Fillet the selected edges of a shape");
sMenuText = QT_TR_NOOP("Fillet");
sToolTipText = QT_TR_NOOP("Fillets the selected edges of a shape");
sWhatsThis = "Part_Fillet";
sStatusTip = sToolTipText;
sPixmap = "Part_Fillet";
@@ -1423,8 +1429,8 @@ CmdPartChamfer::CmdPartChamfer()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Chamfer...");
sToolTipText = QT_TR_NOOP("Chamfer the selected edges of a shape");
sMenuText = QT_TR_NOOP("Chamfer");
sToolTipText = QT_TR_NOOP("Chamfers the selected edges of a shape");
sWhatsThis = "Part_Chamfer";
sStatusTip = sToolTipText;
sPixmap = "Part_Chamfer";
@@ -1451,8 +1457,8 @@ CmdPartMirror::CmdPartMirror()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Mirroring...");
sToolTipText = QT_TR_NOOP("Mirroring a selected shape");
sMenuText = QT_TR_NOOP("Mirror");
sToolTipText = QT_TR_NOOP("Mirrors the selected shape");
sWhatsThis = "Part_Mirror";
sStatusTip = sToolTipText;
sPixmap = "Part_Mirror";
@@ -1479,8 +1485,8 @@ CmdPartCrossSections::CmdPartCrossSections()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Cross-sections...");
sToolTipText = QT_TR_NOOP("Cross-sections");
sMenuText = QT_TR_NOOP("Cross-Sections");
sToolTipText = QT_TR_NOOP("Creates cross-sections");
sWhatsThis = "Part_CrossSections";
sStatusTip = sToolTipText;
sPixmap = "Part_CrossSections";
@@ -1518,7 +1524,8 @@ CmdPartBuilder::CmdPartBuilder()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Shape builder...");
sMenuText = QT_TR_NOOP("Shape Builder");
sToolTipText = QT_TR_NOOP("Advanced utility to create shapes");
sWhatsThis = "Part_Builder";
sStatusTip = sToolTipText;
@@ -1547,8 +1554,8 @@ CmdPartLoft::CmdPartLoft()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Loft...");
sToolTipText = QT_TR_NOOP("Utility to loft");
sMenuText = QT_TR_NOOP("Loft");
sToolTipText = QT_TR_NOOP("Lofts the selected profiles");
sWhatsThis = "Part_Loft";
sStatusTip = sToolTipText;
sPixmap = "Part_Loft";
@@ -1576,8 +1583,8 @@ CmdPartSweep::CmdPartSweep()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Sweep...");
sToolTipText = QT_TR_NOOP("Utility to sweep");
sMenuText = QT_TR_NOOP("Sweep");
sToolTipText = QT_TR_NOOP("Sweeps profiles along a wire");
sWhatsThis = "Part_Sweep";
sStatusTip = sToolTipText;
sPixmap = "Part_Sweep";
@@ -1605,8 +1612,8 @@ CmdPartOffset::CmdPartOffset()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("3D Offset...");
sToolTipText = QT_TR_NOOP("Utility to offset in 3D");
sMenuText = QT_TR_NOOP("3D Offset");
sToolTipText = QT_TR_NOOP("Offsets shapes in 3D");
sWhatsThis = "Part_Offset";
sStatusTip = sToolTipText;
sPixmap = "Part_Offset";
@@ -1660,8 +1667,8 @@ CmdPartOffset2D::CmdPartOffset2D()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("2D Offset...");
sToolTipText = QT_TR_NOOP("Utility to offset planar shapes");
sMenuText = QT_TR_NOOP("2D Offset");
sToolTipText = QT_TR_NOOP("Offsets planar shapes in 2D");
sWhatsThis = "Part_Offset2D";
sStatusTip = sToolTipText;
sPixmap = "Part_Offset2D";
@@ -1714,7 +1721,7 @@ CmdPartCompOffset::CmdPartCompOffset()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Offset:");
sMenuText = QT_TR_NOOP("Offset");
sToolTipText = QT_TR_NOOP("Tools to offset shapes (construct parallel shapes)");
sWhatsThis = "Part_CompOffset";
sStatusTip = sToolTipText;
@@ -1806,8 +1813,8 @@ CmdPartThickness::CmdPartThickness()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Thickness...");
sToolTipText = QT_TR_NOOP("Utility to apply a thickness");
sMenuText = QT_TR_NOOP("Thickness");
sToolTipText = QT_TR_NOOP("Removes the selected faces and offsets the remaining shape outward to add thickness");
sWhatsThis = "Part_Thickness";
sStatusTip = sToolTipText;
sPixmap = "Part_Thickness";
@@ -1896,8 +1903,9 @@ CmdShapeInfo::CmdShapeInfo()
{
sAppModule = "Part";
sGroup = "Part";
sMenuText = "Shape info...";
sToolTipText = "Info about shape";
sMenuText = "Shape Info";
sToolTipText = "Displays information about the selected shape";
sWhatsThis = "Part_ShapeInfo";
sStatusTip = sToolTipText;
sPixmap = "Part_ShapeInfo";
@@ -1934,8 +1942,8 @@ CmdPartRuledSurface::CmdPartRuledSurface()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create ruled surface");
sToolTipText = QT_TR_NOOP("Create a ruled surface from either two Edges or two wires");
sMenuText = QT_TR_NOOP("Ruled Surface");
sToolTipText = QT_TR_NOOP("Creates a ruled surface between 2 selected wires");
sWhatsThis = "Part_RuledSurface";
sStatusTip = sToolTipText;
sPixmap = "Part_RuledSurface";
@@ -2023,7 +2031,7 @@ void CmdPartRuledSurface::activated(int iMsg)
if (!ok) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("You have to select either two edges or two wires."));
QObject::tr("Select either 2 edges or 2 wires."));
return;
}
@@ -2054,7 +2062,7 @@ CmdCheckGeometry::CmdCheckGeometry()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Check Geometry");
sToolTipText = QT_TR_NOOP("Analyzes Geometry For Errors");
sToolTipText = QT_TR_NOOP("Analyzes the selected shapes for errors");
sWhatsThis = "Part_CheckGeometry";
sStatusTip = sToolTipText;
sPixmap = "Part_CheckGeometry";
@@ -2086,9 +2094,8 @@ CmdColorPerFace::CmdColorPerFace()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Appearance per &face");
sToolTipText = QT_TR_NOOP("Set the appearance of each individual face "
"of the selected object.");
sMenuText = QT_TR_NOOP("Appearance per &Face");
sToolTipText = QT_TR_NOOP("Sets the appearance of individual faces of the selected object");
sStatusTip = sToolTipText;
sWhatsThis = "Part_ColorPerFace";
sPixmap = "Part_ColorFace";
@@ -2124,8 +2131,8 @@ CmdBoxSelection::CmdBoxSelection()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Box selection");
sToolTipText = QT_TR_NOOP("Box selection");
sMenuText = QT_TR_NOOP("Box Selection");
sToolTipText = QT_TR_NOOP("Selects elements in the 3D view using a box selection");
sWhatsThis = "Part_BoxSelection";
sStatusTip = QT_TR_NOOP("Box selection");
sPixmap = "Part_BoxSelection";
@@ -2154,11 +2161,11 @@ CmdPartProjectionOnSurface::CmdPartProjectionOnSurface()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create projection on surface...");
sToolTipText = QT_TR_NOOP("Project edges, wires, or faces of one object\n"
"onto a face of another object.\n"
sMenuText = QT_TR_NOOP("Project on Surface");
sToolTipText = QT_TR_NOOP("Projects edges, wires, or faces of one shape\n"
"onto a face of another shape.\n"
"The camera view determines the direction\n"
"of projection.");
"of the projection.");
sWhatsThis = "Part_ProjectionOnSurface";
sStatusTip = sToolTipText;
sPixmap = "Part_ProjectionOnSurface";
@@ -2187,8 +2194,9 @@ CmdPartSectionCut::CmdPartSectionCut()
{
sAppModule = "Part";
sGroup = "View";
sMenuText = QT_TR_NOOP("Persiste&nt section cut");
sToolTipText = QT_TR_NOOP("Creates a persistent section cut of visible part objects");
sMenuText = QT_TR_NOOP("Persiste&nt Section Cut");
sToolTipText = QT_TR_NOOP("Creates a new object as a boolean intersection of all visible "
"shapes and the selected axis planes");
sWhatsThis = "Part_SectionCut";
sStatusTip = sToolTipText;
sPixmap = "Part_SectionCut";
@@ -2244,8 +2252,8 @@ CmdPartCoordinateSystem::CmdPartCoordinateSystem()
: Command("Part_CoordinateSystem")
{
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create coordinate system");
sToolTipText = QT_TR_NOOP("Create a coordinate system object that can be attached to other objects.");
sMenuText = QT_TR_NOOP("Coordinate System");
sToolTipText = QT_TR_NOOP("Creates a coordinate system that can be attached to other objects");
sWhatsThis = "Part_CoordinateSystem";
sStatusTip = sToolTipText;
sPixmap = "Std_CoordinateSystem";
@@ -2255,7 +2263,7 @@ void CmdPartCoordinateSystem::activated(int iMsg)
{
Q_UNUSED(iMsg);
openCommand(QT_TRANSLATE_NOOP("Command", "Add a coordinate system"));
openCommand(QT_TRANSLATE_NOOP("Command", "Add coordinate system"));
std::string name = getUniqueObjectName("LCS");
doCommand(Doc, "obj = App.activeDocument().addObject('Part::LocalCoordinateSystem','%s')", name.c_str());
@@ -2278,8 +2286,8 @@ CmdPartDatumPlane::CmdPartDatumPlane()
: Command("Part_DatumPlane")
{
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create datum plane");
sToolTipText = QT_TR_NOOP("Create a datum plane object that can be attached to other objects.");
sMenuText = QT_TR_NOOP("Datum Plane");
sToolTipText = QT_TR_NOOP("Creates a datum plane that can be attached to other objects");
sWhatsThis = "Part_DatumPlane";
sStatusTip = sToolTipText;
sPixmap = "Std_Plane";
@@ -2289,7 +2297,7 @@ void CmdPartDatumPlane::activated(int iMsg)
{
Q_UNUSED(iMsg);
openCommand(QT_TRANSLATE_NOOP("Command", "Add a datum plane"));
openCommand(QT_TRANSLATE_NOOP("Command", "Add datum plane"));
std::string name = getUniqueObjectName("DatumPlane");
doCommand(Doc, "obj = App.activeDocument().addObject('Part::DatumPlane','%s')", name.c_str());
@@ -2311,8 +2319,8 @@ CmdPartDatumLine::CmdPartDatumLine()
: Command("Part_DatumLine")
{
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create datum line");
sToolTipText = QT_TR_NOOP("Create a datum line object that can be attached to other objects.");
sMenuText = QT_TR_NOOP("Datum Line");
sToolTipText = QT_TR_NOOP("Creates a datum line that can be attached to other objects");
sWhatsThis = "Part_DatumLine";
sStatusTip = sToolTipText;
sPixmap = "Std_Axis";
@@ -2322,7 +2330,7 @@ void CmdPartDatumLine::activated(int iMsg)
{
Q_UNUSED(iMsg);
openCommand(QT_TRANSLATE_NOOP("Command", "Add a datum line"));
openCommand(QT_TRANSLATE_NOOP("Command", "Add datum line"));
std::string name = getUniqueObjectName("DatumLine");
doCommand(Doc, "obj = App.activeDocument().addObject('Part::DatumLine','%s')", name.c_str());
@@ -2344,8 +2352,8 @@ CmdPartDatumPoint::CmdPartDatumPoint()
: Command("Part_DatumPoint")
{
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create datum point");
sToolTipText = QT_TR_NOOP("Create a datum point object that can be attached to other objects.");
sMenuText = QT_TR_NOOP("Datum Point");
sToolTipText = QT_TR_NOOP("Creates a datum point that can be attached to other objects");
sWhatsThis = "Part_DatumPoint";
sStatusTip = sToolTipText;
sPixmap = "Std_Point";
@@ -2355,7 +2363,7 @@ void CmdPartDatumPoint::activated(int iMsg)
{
Q_UNUSED(iMsg);
openCommand(QT_TRANSLATE_NOOP("Command", "Add a datum point"));
openCommand(QT_TRANSLATE_NOOP("Command", "Add datum point"));
std::string name = getUniqueObjectName("DatumPoint");
doCommand(Doc, "obj = App.activeDocument().addObject('Part::DatumPoint','%s')", name.c_str());
@@ -2379,8 +2387,8 @@ public:
: GroupCommand("Part_Datums")
{
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create datum");
sToolTipText = QT_TR_NOOP("Create a datum object (coordinate system, plane, line, point) that can be attached to other objects.");
sMenuText = QT_TR_NOOP("Datums");
sToolTipText = QT_TR_NOOP("Creates a datum object (coordinate system, plane, line, or point) that can be attached to other objects");
sWhatsThis = "Part_Datums";
sStatusTip = sToolTipText;

30
src/Mod/Part/Gui/CommandFilter.cpp
View File

@@ -43,9 +43,9 @@ PartCmdSelectFilter::PartCmdSelectFilter()
: Command("Part_SelectFilter")
{
sGroup = "Standard-View";
sMenuText = QT_TR_NOOP("Selection filter");
sToolTipText = QT_TR_NOOP("Change the selection filter");
sStatusTip = QT_TR_NOOP("Change the selection filter");
sMenuText = QT_TR_NOOP("Selection Filter");
sToolTipText = QT_TR_NOOP("Changes the selection filter");
sStatusTip = sToolTipText;
sWhatsThis = "Part_SelectFilter";
sPixmap = "clear-selection";
eType = Alter3DView;
@@ -170,10 +170,10 @@ PartCmdVertexSelection::PartCmdVertexSelection()
: Command("Part_VertexSelection")
{
sGroup = "Standard-View";
sMenuText = QT_TR_NOOP("Vertex selection");
sToolTipText = QT_TR_NOOP("Only allow the selection of vertices");
sMenuText = QT_TR_NOOP("Vertex Selection");
sToolTipText = QT_TR_NOOP("Only allows the selection of vertices");
sWhatsThis = "Part_VertexSelection";
sStatusTip = QT_TR_NOOP("Only allow the selection of vertices");
sStatusTip = sToolTipText;
sPixmap = "vertex-selection";
sAccel = "X, S";
eType = Alter3DView;
@@ -195,10 +195,10 @@ PartCmdEdgeSelection::PartCmdEdgeSelection()
: Command("Part_EdgeSelection")
{
sGroup = "Standard-View";
sMenuText = QT_TR_NOOP("Edge selection");
sToolTipText = QT_TR_NOOP("Only allow the selection of edges");
sMenuText = QT_TR_NOOP("Edge Selection");
sToolTipText = QT_TR_NOOP("Only allows the selection of edges");
sWhatsThis = "Part_EdgeSelection";
sStatusTip = QT_TR_NOOP("Only allow the selection of edges");
sStatusTip = sToolTipText;
sPixmap = "edge-selection";
sAccel = "E, S";
eType = Alter3DView;
@@ -220,10 +220,10 @@ PartCmdFaceSelection::PartCmdFaceSelection()
: Command("Part_FaceSelection")
{
sGroup = "Standard-View";
sMenuText = QT_TR_NOOP("Face selection");
sToolTipText = QT_TR_NOOP("Only allow the selection of faces");
sMenuText = QT_TR_NOOP("Face Selection");
sToolTipText = QT_TR_NOOP("Only allows the selection of faces");
sWhatsThis = "Part_FaceSelection";
sStatusTip = QT_TR_NOOP("Only allow the selection of faces");
sStatusTip = sToolTipText;
sPixmap = "face-selection";
sAccel = "F, S";
eType = Alter3DView;
@@ -245,10 +245,10 @@ PartCmdRemoveSelectionGate::PartCmdRemoveSelectionGate()
: Command("Part_RemoveSelectionGate")
{
sGroup = "Standard-View";
sMenuText = QT_TR_NOOP("All selection filters cleared");
sToolTipText = QT_TR_NOOP("All selection filters cleared");
sMenuText = QT_TR_NOOP("No Selection Filters");
sToolTipText = QT_TR_NOOP("Clears all selection filters");
sWhatsThis = "Part_RemoveSelectionGate";
sStatusTip = QT_TR_NOOP("All selection filters cleared");
sStatusTip = sToolTipText;
sPixmap = "clear-selection";
sAccel = "C, S";
eType = Alter3DView;

10
src/Mod/Part/Gui/CommandParametric.cpp
View File

@@ -63,7 +63,7 @@ CmdPartCylinder::CmdPartCylinder()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Cylinder");
sToolTipText = QT_TR_NOOP("Create a Cylinder");
sToolTipText = QT_TR_NOOP("Creates a solid cylinder");
sWhatsThis = "Part_Cylinder";
sStatusTip = sToolTipText;
sPixmap = "Part_Cylinder_Parametric";
@@ -105,7 +105,7 @@ CmdPartBox::CmdPartBox()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Cube");
sToolTipText = QT_TR_NOOP("Create a cube solid");
sToolTipText = QT_TR_NOOP("Creates a solid cube");
sWhatsThis = "Part_Box";
sStatusTip = sToolTipText;
sPixmap = "Part_Box_Parametric";
@@ -147,7 +147,7 @@ CmdPartSphere::CmdPartSphere()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Sphere");
sToolTipText = QT_TR_NOOP("Create a sphere solid");
sToolTipText = QT_TR_NOOP("Creates a solid sphere");
sWhatsThis = "Part_Sphere";
sStatusTip = sToolTipText;
sPixmap = "Part_Sphere_Parametric";
@@ -189,7 +189,7 @@ CmdPartCone::CmdPartCone()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Cone");
sToolTipText = QT_TR_NOOP("Create a cone solid");
sToolTipText = QT_TR_NOOP("Creates a solid cone");
sWhatsThis = "Part_Cone";
sStatusTip = sToolTipText;
sPixmap = "Part_Cone_Parametric";
@@ -231,7 +231,7 @@ CmdPartTorus::CmdPartTorus()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Torus");
sToolTipText = QT_TR_NOOP("Create a torus solid");
sToolTipText = QT_TR_NOOP("Creates a solid torus");
sWhatsThis = "Part_Torus";
sStatusTip = sToolTipText;
sPixmap = "Part_Torus_Parametric";

30
src/Mod/Part/Gui/CommandSimple.cpp
View File

@@ -53,8 +53,8 @@ CmdPartSimpleCylinder::CmdPartSimpleCylinder()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create Cylinder...");
sToolTipText = QT_TR_NOOP("Create a Cylinder");
sMenuText = QT_TR_NOOP("Cylinder");
sToolTipText = QT_TR_NOOP("Creates a solid cylinder");
sWhatsThis = "Part_SimpleCylinder";
sStatusTip = sToolTipText;
sPixmap = "Part_Cylinder_Parametric";
@@ -103,8 +103,8 @@ CmdPartShapeFromMesh::CmdPartShapeFromMesh()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create shape from mesh...");
sToolTipText = QT_TR_NOOP("Create shape from selected mesh object");
sMenuText = QT_TR_NOOP("Shape From Mesh");
sToolTipText = QT_TR_NOOP("Creates a shape from the selected mesh");
sWhatsThis = "Part_ShapeFromMesh";
sStatusTip = sToolTipText;
sPixmap = "Part_Shape_from_Mesh";
@@ -131,8 +131,8 @@ CmdPartPointsFromMesh::CmdPartPointsFromMesh()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create points object from geometry");
sToolTipText = QT_TR_NOOP("Create selectable points object from selected geometric object");
sMenuText = QT_TR_NOOP("Points From Shape");
sToolTipText = QT_TR_NOOP("Creates distributed points from the selected shape");
sWhatsThis = "Part_PointsFromMesh";
sStatusTip = sToolTipText;
sPixmap = "Part_PointsFromMesh";
@@ -217,8 +217,8 @@ CmdPartSimpleCopy::CmdPartSimpleCopy()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create simple copy");
sToolTipText = QT_TR_NOOP("Create a simple non-parametric copy");
sMenuText = QT_TR_NOOP("Simple Copy");
sToolTipText = QT_TR_NOOP("Creates a simple non-parametric copy of the selected shapes");
sWhatsThis = "Part_SimpleCopy";
sStatusTip = sToolTipText;
sPixmap = "Part_3D_object";
@@ -292,8 +292,8 @@ CmdPartTransformedCopy::CmdPartTransformedCopy()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create transformed copy");
sToolTipText = QT_TR_NOOP("Create a non-parametric copy with transformed placement");
sMenuText = QT_TR_NOOP("Transformed Copy");
sToolTipText = QT_TR_NOOP("Creates a non-parametric copy with transformed placement of the selected shapes");
sWhatsThis = "Part_TransformCopy";
sStatusTip = sToolTipText;
sPixmap = "Part_Transformed_Copy.svg";
@@ -320,8 +320,8 @@ CmdPartElementCopy::CmdPartElementCopy()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Create shape element copy");
sToolTipText = QT_TR_NOOP("Create a non-parametric copy of the selected shape element");
sMenuText = QT_TR_NOOP("Shape Element Copy");
sToolTipText = QT_TR_NOOP("Creates a non-parametric copy of the selected shape element");
sWhatsThis = "Part_ElementCopy";
sStatusTip = sToolTipText;
sPixmap = "Part_Element_Copy.svg";
@@ -348,8 +348,8 @@ CmdPartRefineShape::CmdPartRefineShape()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Refine shape");
sToolTipText = QT_TR_NOOP("Refine the copy of a shape");
sMenuText = QT_TR_NOOP("Refine Shape");
sToolTipText = QT_TR_NOOP("Creates a refined copy of the selected shapes");
sWhatsThis = "Part_RefineShape";
sStatusTip = sToolTipText;
sPixmap = "Part_Refine_Shape";
@@ -409,7 +409,7 @@ CmdPartDefeaturing::CmdPartDefeaturing()
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Defeaturing");
sToolTipText = QT_TR_NOOP("Remove feature from a shape");
sToolTipText = QT_TR_NOOP("Removes the selected features from a shape");
sWhatsThis = "Part_Defeaturing";
sStatusTip = sToolTipText;
sPixmap = "Part_Defeaturing";

2
src/Mod/Part/Gui/CrossSections.cpp
View File

@@ -266,7 +266,7 @@ void CrossSections::apply()
section->purgeTouched();
}
#else
Base::SequencerLauncher seq("Cross-sections...", obj.size() * (d.size() +1));
Base::SequencerLauncher seq("Cross-sections…", obj.size() * (d.size() + 1));
Gui::Command::runCommand(Gui::Command::App, "import Part\n");
Gui::Command::runCommand(Gui::Command::App, "from FreeCAD import Base\n");
for (auto it : obj) {

8
src/Mod/Part/Gui/CrossSections.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Cross sections</string>
<string>Cross Sections</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QGroupBox" name="planeBox">
<property name="title">
<string>Guiding plane</string>
<string>Guiding Plane</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -49,7 +49,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Position:</string>
<string>Position</string>
</property>
</widget>
</item>
@@ -106,7 +106,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Distance:</string>
<string>Distance</string>
</property>
</widget>
</item>

20
src/Mod/Part/Gui/DlgBlock.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Block definition</string>
<string>Block Definition</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>First limit</string>
<string>First Limit</string>
</property>
<layout class="QGridLayout">
<property name="margin">
@@ -37,7 +37,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="text">
<string>Type:</string>
<string>Type</string>
</property>
</widget>
</item>
@@ -73,7 +73,7 @@
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Length:</string>
<string>Length</string>
</property>
</widget>
</item>
@@ -90,7 +90,7 @@
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Limit:</string>
<string>Limit</string>
</property>
</widget>
</item>
@@ -132,7 +132,7 @@
<item>
<widget class="QLabel" name="TextLabel4">
<property name="text">
<string>Selection:</string>
<string>Selection</string>
</property>
</widget>
</item>
@@ -178,7 +178,7 @@
<bool>false</bool>
</property>
<property name="title">
<string>Second limit</string>
<string>Second Limit</string>
</property>
<layout class="QGridLayout">
<property name="margin">
@@ -198,7 +198,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
<string>Type:</string>
<string>Type</string>
</property>
</widget>
</item>
@@ -234,7 +234,7 @@
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2_2">
<property name="text">
<string>Length:</string>
<string>Length</string>
</property>
</widget>
</item>
@@ -251,7 +251,7 @@
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3_2">
<property name="text">
<string>Limit:</string>
<string>Limit</string>
</property>
</widget>
</item>

6
src/Mod/Part/Gui/DlgBooleanOperation.cpp
View File

@@ -383,12 +383,12 @@ void DlgBooleanOperation::accept()
if (!litem || !indexOfCurrentItem(litem,ltop,lchild)) {
QMessageBox::critical(this, windowTitle(),
tr("Select a shape on the left side, first"));
tr("First, select a shape on the left side"));
return;
}
if (!ritem || !indexOfCurrentItem(ritem,rtop,rchild)) {
QMessageBox::critical(this, windowTitle(),
tr("Select a shape on the right side, first"));
tr("First, select a shape on the right side"));
return;
}
if (ltop == rtop && lchild == rchild) {
@@ -413,7 +413,7 @@ void DlgBooleanOperation::accept()
if (!obj1 || !obj2) {
// objects don't exists (anymore)
QMessageBox::critical(this, windowTitle(),
tr("One of the selected objects doesn't exist anymore"));
tr("One of the selected objects does not exist anymore"));
return;
}

4
src/Mod/Part/Gui/DlgBooleanOperation.ui
View File

@@ -17,7 +17,7 @@
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Boolean operation</string>
<string>Boolean Operation</string>
</property>
<layout class="QGridLayout">
<property name="margin">
@@ -152,7 +152,7 @@
<item row="2" column="1">
<widget class="QPushButton" name="swapButton">
<property name="text">
<string>Swap selection</string>
<string>Swap Selection</string>
</property>
</widget>
</item>

2
src/Mod/Part/Gui/DlgExportHeaderStep.ui
View File

@@ -20,7 +20,7 @@
<item row="1" column="0">
<widget class="QGroupBox" name="groupBoxHeader">
<property name="toolTip">
<string>If not empty, field contents will be used in the STEP file header.</string>
<string>If not empty, field contents will be used in the STEP file header</string>
</property>
<property name="title">
<string>Header</string>

2
src/Mod/Part/Gui/DlgExportStep.cpp
View File

@@ -205,7 +205,7 @@ TaskExportStep::TaskExportStep(QWidget* parent)
setLayout(layout);
showThis = new QCheckBox(this);
showThis->setText(tr("Don't show this dialog again"));
showThis->setText(tr("Do not show this dialog again"));
layout->addWidget(showThis);
QDialogButtonBox* buttonBox = new QDialogButtonBox(this);

6
src/Mod/Part/Gui/DlgExportStep.ui
View File

@@ -101,10 +101,10 @@
<item row="3" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxKeepPlacement">
<property name="toolTip">
<string>Check this option to keep the placement information when exporting
a single object. Please note that when importing back the STEP file, the
<string>Keeps the placement information when exporting
a single object. When importing back the STEP file, the
placement will be encoded into the shape geometry, instead of keeping
it inside the Placement property.</string>
it inside the placement property.</string>
</property>
<property name="text">
<string>Export single object placement</string>

11
src/Mod/Part/Gui/DlgExtrusion.cpp
View File

@@ -211,7 +211,7 @@ void DlgExtrusion::onSelectEdgeClicked()
if (!filter) {
filter = new EdgeSelection();
Gui::Selection().addSelectionGate(filter);
ui->btnSelectEdge->setText(tr("Selecting..."));
ui->btnSelectEdge->setText(tr("Selecting…"));
//visibility automation
try{
@@ -474,7 +474,8 @@ void DlgExtrusion::apply()
if (Part::Feature::getTopoShape(sourceObj, Part::ShapeOption::ResolveLink | Part::ShapeOption::Transform).isNull()){
FC_ERR("Object " << sourceObj->getFullName()
<< " is not Part object (has no OCC shape). Can't extrude it.");
<< " is not a Part object because it has no OCC shape. Extrusion is not possible.");
continue;
}
@@ -507,7 +508,7 @@ void DlgExtrusion::apply()
catch (Base::Exception &err){
QMessageBox::critical(this,
windowTitle(),
tr("Creating Extrusion failed.\n%1")
tr("Creating extrusion failed.\n%1")
.arg(QCoreApplication::translate("Exception", err.what())));
return;
}
@@ -642,7 +643,7 @@ bool DlgExtrusion::validate()
//check source shapes
if (ui->treeWidget->selectedItems().isEmpty()) {
QMessageBox::critical(this, windowTitle(),
tr("No shapes selected for extrusion. Select some, first."));
tr("No shapes selected for extrusion."));
return false;
}
@@ -688,7 +689,7 @@ bool DlgExtrusion::validate()
errmsg = QStringLiteral("Unknown error");
}
if (errmsg.length() > 0){
QMessageBox::critical(this, windowTitle(), tr("Can't determine normal vector of shape to be extruded. Please use other mode. \n\n(%1)").arg(errmsg));
QMessageBox::critical(this, windowTitle(), tr("Cannot determine normal vector of shape to be extruded. Use other mode. \n\n(%1)").arg(errmsg));
ui->rbDirModeNormal->setFocus();
return false;
}

28
src/Mod/Part/Gui/DlgExtrusion.ui
View File

@@ -29,7 +29,7 @@
<item row="3" column="0">
<widget class="QRadioButton" name="rbDirModeNormal">
<property name="toolTip">
<string>Extrude perpendicularly to plane of input shape.</string>
<string>Extrudes perpendicularly to the plane of the input shape</string>
</property>
<property name="text">
<string>Along normal</string>
@@ -45,14 +45,14 @@
<string>Set direction to match a direction of straight edge. Hint: to account for length of the edge too, set both lengths to zero.</string>
</property>
<property name="text">
<string>Along edge:</string>
<string>Along edge</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QCheckBox" name="chkReversed">
<property name="toolTip">
<string>If checked, direction of extrusion is reversed.</string>
<string>Reverses the direction of the extrusion</string>
</property>
<property name="text">
<string>Reversed</string>
@@ -65,7 +65,7 @@
<item row="5" column="2">
<widget class="QPushButton" name="btnSelectEdge">
<property name="toolTip">
<string>Click to start selecting an edge in 3D view.</string>
<string>Starts the selection of edges in the 3D view</string>
</property>
<property name="text">
<string>Select</string>
@@ -75,10 +75,10 @@
<item row="6" column="0">
<widget class="QRadioButton" name="rbDirModeCustom">
<property name="toolTip">
<string>Specify direction manually using X,Y,Z values.</string>
<string>Specify direction manually using X, Y, Z values</string>
</property>
<property name="text">
<string>Custom direction:</string>
<string>Custom direction</string>
</property>
</widget>
</item>
@@ -96,7 +96,7 @@
<string/>
</property>
<property name="text">
<string>X:</string>
<string>X</string>
</property>
</widget>
</item>
@@ -119,7 +119,7 @@
<item row="1" column="0">
<widget class="QPushButton" name="btnY">
<property name="text">
<string>Y:</string>
<string>Y</string>
</property>
</widget>
</item>
@@ -142,7 +142,7 @@
<item row="2" column="0">
<widget class="QPushButton" name="btnZ">
<property name="text">
<string>Z:</string>
<string>Z</string>
</property>
</widget>
</item>
@@ -182,7 +182,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Along:</string>
<string>Along</string>
</property>
</widget>
</item>
@@ -221,7 +221,7 @@ If both lengths are zero, magnitude of direction is used.</string>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Against:</string>
<string>Against</string>
</property>
</widget>
</item>
@@ -240,7 +240,7 @@ If both lengths are zero, magnitude of direction is used.</string>
</size>
</property>
<property name="toolTip">
<string>Length to extrude against the direction (can be negative).</string>
<string>Length to extrude against the direction (can be negative)</string>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
@@ -259,7 +259,7 @@ If both lengths are zero, magnitude of direction is used.</string>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="chkSymmetric">
<property name="toolTip">
<string>Distribute extrusion length equally to both sides.</string>
<string>Distributes the extrusion length equally to both sides</string>
</property>
<property name="text">
<string>Symmetric</string>
@@ -334,7 +334,7 @@ If both lengths are zero, magnitude of direction is used.</string>
<item>
<widget class="QCheckBox" name="chkSolid">
<property name="toolTip">
<string>If checked, extruding closed wires will give solids, not shells.</string>
<string>Results in solids if wires are closed, otherwise in shells</string>
</property>
<property name="text">
<string>Create solid</string>

8
src/Mod/Part/Gui/DlgFilletEdges.cpp
View File

@@ -267,7 +267,7 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge
d->filletType = type;
if (d->filletType == DlgFilletEdges::CHAMFER) {
ui->parameterName->setTitle(tr("Chamfer Parameters"));
ui->parameterName->setTitle(tr("Chamfer parameters"));
ui->labelfillet->setText(tr("Chamfer type"));
ui->labelRadius->setText(tr("Length:"));
ui->filletType->setItemText(0, tr("Equal distance"));
@@ -278,7 +278,7 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge
model->setHeaderData(2, Qt::Horizontal, tr("Size2"), Qt::DisplayRole);
}
else {
ui->parameterName->setTitle(tr("Fillet Parameter"));
ui->parameterName->setTitle(tr("Fillet parameter"));
ui->labelfillet->setText(tr("Fillet type"));
model->setHeaderData(0, Qt::Horizontal, tr("Edges to fillet"), Qt::DisplayRole);
model->setHeaderData(1, Qt::Horizontal, tr("Start radius"), Qt::DisplayRole);
@@ -961,7 +961,7 @@ bool DlgFilletEdges::accept()
if (!d->object) {
QMessageBox::warning(this, tr("No shape selected"),
tr("No valid shape is selected.\n"
"Please select a valid shape in the drop-down box first."));
"Select a valid shape in the drop-down box first."));
return false;
}
App::Document* activeDoc = App::GetApplication().getActiveDocument();
@@ -1013,7 +1013,7 @@ bool DlgFilletEdges::accept()
if (!todo) {
QMessageBox::warning(this, tr("No edge selected"),
tr("No edge entity is checked to fillet.\n"
"Please check one or more edge entities first."));
"Check one or more edge entities first."));
return false;
}

6
src/Mod/Part/Gui/DlgFilletEdges.ui
View File

@@ -29,7 +29,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Selected shape:</string>
<string>Selected shape</string>
</property>
</widget>
</item>
@@ -107,7 +107,7 @@
<item row="1" column="0">
<widget class="QLabel" name="labelfillet">
<property name="text">
<string>Type:</string>
<string>Type</string>
</property>
</widget>
</item>
@@ -139,7 +139,7 @@
<item>
<widget class="QLabel" name="labelRadius">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>

6
src/Mod/Part/Gui/DlgImportExportIges.ui
View File

@@ -62,7 +62,7 @@
<item row="1" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Export solids and shells as</string>
<string>Export Solids and Shells As</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -81,10 +81,10 @@
<item row="1" column="0">
<widget class="QRadioButton" name="radioButtonBRepOn">
<property name="toolTip">
<string>Solids will be exported as manifold solid B-Rep object, shells as shell</string>
<string>Solids will be exported as manifold solid B-rep object, shells as shell</string>
</property>
<property name="text">
<string>Solids (type 186) and Shells (type 514) / B-REP mode</string>
<string>Solids (type 186) and shells (type 514) / B-rep mode</string>
</property>
</widget>
</item>

2
src/Mod/Part/Gui/DlgImportStep.cpp
View File

@@ -146,7 +146,7 @@ TaskImportStep::TaskImportStep(QWidget* parent)
setLayout(layout);
showThis = new QCheckBox(this);
showThis->setText(tr("Don't show this dialog again"));
showThis->setText(tr("Do not show this dialog again"));
layout->addWidget(showThis);
QDialogButtonBox* buttonBox = new QDialogButtonBox(this);

9
src/Mod/Part/Gui/DlgImportStep.ui
View File

@@ -26,11 +26,10 @@
<item>
<widget class="Gui::PrefCheckBox" name="checkBoxMergeCompound">
<property name="toolTip">
<string>If checked, Compound merge will be done
during file reading (slower but higher details).</string>
<string>Merges compounds during file reading (slower but higher details)</string>
</property>
<property name="text">
<string>Enable STEP Compound merge</string>
<string>Enable STEP compound merge</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ReadShapeCompoundMode</cstring>
@@ -43,7 +42,7 @@ during file reading (slower but higher details).</string>
<item>
<widget class="Gui::PrefCheckBox" name="checkBoxUseLinkGroup">
<property name="toolTip">
<string>Select this to use App::LinkGroup as group container, or else use App::Part.</string>
<string>Select this to use App::LinkGroup as group container, or else use App::Part</string>
</property>
<property name="text">
<string>Use LinkGroup</string>
@@ -59,7 +58,7 @@ during file reading (slower but higher details).</string>
<item>
<widget class="Gui::PrefCheckBox" name="checkBoxImportHiddenObj">
<property name="toolTip">
<string>Select this to import invisible objects.</string>
<string>Select this to import invisible objects</string>
</property>
<property name="text">
<string>Import invisible objects</string>

20
src/Mod/Part/Gui/DlgPartBox.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Box definition</string>
<string>Box Definition</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5">
<property name="title">
<string>Position:</string>
<string>Position</string>
</property>
<layout class="QGridLayout">
<property name="margin">
@@ -29,7 +29,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="text">
<string>X:</string>
<string>X</string>
</property>
</widget>
</item>
@@ -49,7 +49,7 @@
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Y:</string>
<string>Y</string>
</property>
</widget>
</item>
@@ -69,7 +69,7 @@
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Z:</string>
<string>Z</string>
</property>
</widget>
</item>
@@ -89,7 +89,7 @@
<item row="3" column="0">
<widget class="QLabel" name="TextLabel1_3">
<property name="text">
<string>Direction:</string>
<string>Direction</string>
</property>
</widget>
</item>
@@ -106,7 +106,7 @@
<item row="1" column="0">
<widget class="QGroupBox" name="GroupBox5_2">
<property name="title">
<string>Size:</string>
<string>Size</string>
</property>
<layout class="QGridLayout">
<property name="margin">
@@ -118,7 +118,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
<string>Length:</string>
<string>Length</string>
</property>
</widget>
</item>
@@ -138,7 +138,7 @@
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2_2">
<property name="text">
<string>Width:</string>
<string>Width</string>
</property>
</widget>
</item>
@@ -158,7 +158,7 @@
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3_2">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>

16
src/Mod/Part/Gui/DlgPartCylinder.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Cylinder definition</string>
<string>Cylinder Definition</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5">
<property name="title">
<string>Position:</string>
<string>Position</string>
</property>
<layout class="QGridLayout">
<property name="margin">
@@ -29,7 +29,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="text">
<string>X:</string>
<string>X</string>
</property>
</widget>
</item>
@@ -49,7 +49,7 @@
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Y:</string>
<string>Y</string>
</property>
</widget>
</item>
@@ -69,7 +69,7 @@
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Z:</string>
<string>Z</string>
</property>
</widget>
</item>
@@ -89,7 +89,7 @@
<item row="3" column="0">
<widget class="QLabel" name="TextLabel1_3">
<property name="text">
<string>Direction:</string>
<string>Direction</string>
</property>
</widget>
</item>
@@ -118,7 +118,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -138,7 +138,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>

4
src/Mod/Part/Gui/DlgPartImportIges.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>IGES input file</string>
<string>IGES Input File</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
@@ -51,7 +51,7 @@
</size>
</property>
<property name="text">
<string notr="true">...</string>
<string>Search File</string>
</property>
</widget>
</item>

4
src/Mod/Part/Gui/DlgPartImportStep.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>STEP input file</string>
<string>STEP Input File</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -51,7 +51,7 @@
</size>
</property>
<property name="text">
<string notr="true">...</string>
<string>Search File</string>
</property>
</widget>
</item>

120
src/Mod/Part/Gui/DlgPrimitives.ui
View File

@@ -237,7 +237,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel2_2">
<property name="text">
<string>Length:</string>
<string>Length</string>
</property>
</widget>
</item>
@@ -257,7 +257,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel3_2">
<property name="text">
<string>Width:</string>
<string>Width</string>
</property>
</widget>
</item>
@@ -328,7 +328,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>Length:</string>
<string>Length</string>
</property>
</widget>
</item>
@@ -348,7 +348,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>Width:</string>
<string>Width</string>
</property>
</widget>
</item>
@@ -368,7 +368,7 @@
<item row="2" column="0">
<widget class="QLabel" name="textLabel4">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -442,7 +442,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel5">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -462,7 +462,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel6">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -482,7 +482,7 @@
<item row="2" column="0">
<widget class="QLabel" name="labelCylinderXSkew">
<property name="text">
<string>Angle in first direction:</string>
<string>Angle in first direction</string>
</property>
</widget>
</item>
@@ -508,7 +508,7 @@
<item row="3" column="0">
<widget class="QLabel" name="labelCylinderYSkew">
<property name="text">
<string>Angle in second direction:</string>
<string>Angle in second direction</string>
</property>
</widget>
</item>
@@ -566,7 +566,7 @@
</size>
</property>
<property name="text">
<string>Rotation angle:</string>
<string>Rotation angle</string>
</property>
</widget>
</item>
@@ -640,7 +640,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel9">
<property name="text">
<string>Radius 1:</string>
<string>Radius 1</string>
</property>
</widget>
</item>
@@ -660,7 +660,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel10">
<property name="text">
<string>Radius 2:</string>
<string>Radius 2</string>
</property>
</widget>
</item>
@@ -680,7 +680,7 @@
<item row="2" column="0" rowspan="2">
<widget class="QLabel" name="textLabel11">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -726,7 +726,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Angle:</string>
<string>Angle</string>
</property>
</widget>
</item>
@@ -800,7 +800,7 @@
<item>
<widget class="QLabel" name="textLabel14">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -849,7 +849,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>U parameter:</string>
<string>U parameter</string>
</property>
</widget>
</item>
@@ -869,7 +869,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>V parameters:</string>
<string>V parameters</string>
</property>
</widget>
</item>
@@ -972,7 +972,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel21">
<property name="text">
<string>Radius 1:</string>
<string>Radius 1</string>
</property>
</widget>
</item>
@@ -992,7 +992,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel22">
<property name="text">
<string>Radius 2:</string>
<string>Radius 2</string>
</property>
</widget>
</item>
@@ -1012,7 +1012,7 @@
<item row="2" column="0">
<widget class="QLabel" name="textLabel23">
<property name="text">
<string>Radius 3:</string>
<string>Radius 3</string>
</property>
</widget>
</item>
@@ -1061,7 +1061,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label23">
<property name="text">
<string>U parameter:</string>
<string>U parameter</string>
</property>
</widget>
</item>
@@ -1081,7 +1081,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label24">
<property name="text">
<string>V parameter:</string>
<string>V parameter</string>
</property>
</widget>
</item>
@@ -1181,7 +1181,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel19">
<property name="text">
<string>Radius 1:</string>
<string>Radius 1</string>
</property>
</widget>
</item>
@@ -1201,7 +1201,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel20">
<property name="text">
<string>Radius 2:</string>
<string>Radius 2</string>
</property>
</widget>
</item>
@@ -1250,7 +1250,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>U Parameter:</string>
<string>U parameter</string>
</property>
</widget>
</item>
@@ -1270,7 +1270,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>V parameter:</string>
<string>V parameter</string>
</property>
</widget>
</item>
@@ -1373,7 +1373,7 @@
<item row="0" column="0">
<widget class="QLabel" name="labelPrismPolygon">
<property name="text">
<string>Polygon:</string>
<string>Polygon</string>
</property>
</widget>
</item>
@@ -1396,7 +1396,7 @@
<item row="1" column="0">
<widget class="QLabel" name="labelPrismCircumradius">
<property name="text">
<string>Circumradius:</string>
<string>Circumradius</string>
</property>
</widget>
</item>
@@ -1416,7 +1416,7 @@
<item row="2" column="0">
<widget class="QLabel" name="labelPrismHeight">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -1436,7 +1436,7 @@
<item row="3" column="0">
<widget class="QLabel" name="labelPrismXSkew">
<property name="text">
<string>Angle in first direction:</string>
<string>Angle in first direction</string>
</property>
</widget>
</item>
@@ -1462,7 +1462,7 @@
<item row="4" column="0">
<widget class="QLabel" name="labelPrismYSkew">
<property name="text">
<string>Angle in second direction:</string>
<string>Angle in second direction</string>
</property>
</widget>
</item>
@@ -1515,7 +1515,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>X min/max:</string>
<string>X min/max</string>
</property>
</widget>
</item>
@@ -1545,7 +1545,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Y min/max:</string>
<string>Y min/max</string>
</property>
</widget>
</item>
@@ -1575,7 +1575,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Z min/max:</string>
<string>Z min/max</string>
</property>
</widget>
</item>
@@ -1605,7 +1605,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>X2 min/max:</string>
<string>X2 min/max</string>
</property>
</widget>
</item>
@@ -1638,7 +1638,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Z2 min/max:</string>
<string>Z2 min/max</string>
</property>
</widget>
</item>
@@ -1722,7 +1722,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Pitch:</string>
<string>Pitch</string>
</property>
</widget>
</item>
@@ -1742,7 +1742,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -1762,7 +1762,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -1782,7 +1782,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>Angle:</string>
<string>Angle</string>
</property>
</widget>
</item>
@@ -1799,7 +1799,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Coordinate system:</string>
<string>Coordinate system</string>
</property>
</widget>
</item>
@@ -1871,7 +1871,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_spiral_growth">
<property name="text">
<string>Growth:</string>
<string>Growth</string>
</property>
</widget>
</item>
@@ -1891,7 +1891,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_spiral_rotation">
<property name="text">
<string>Number of rotations:</string>
<string>Number of rotations</string>
</property>
</widget>
</item>
@@ -1911,7 +1911,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_spiral_radius">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -1967,7 +1967,7 @@
<item row="0" column="0">
<widget class="QLabel" name="Radius">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -1987,7 +1987,7 @@
<item row="1" column="0">
<widget class="QLabel" name="Angle1">
<property name="text">
<string>Angle 1:</string>
<string>Angle 1</string>
</property>
</widget>
</item>
@@ -2004,7 +2004,7 @@
<item row="2" column="0">
<widget class="QLabel" name="Angle2">
<property name="text">
<string>Angle 2:</string>
<string>Angle 2</string>
</property>
</widget>
</item>
@@ -2041,7 +2041,7 @@
<item>
<widget class="QPushButton" name="buttonCircleFromThreePoints">
<property name="text">
<string>From three points</string>
<string>From 3 Points</string>
</property>
</widget>
</item>
@@ -2069,7 +2069,7 @@
<item row="0" column="0">
<widget class="QLabel" name="labelEllMajorRadius">
<property name="text">
<string>Major radius:</string>
<string>Major radius</string>
</property>
</widget>
</item>
@@ -2089,7 +2089,7 @@
<item row="1" column="0">
<widget class="QLabel" name="labelEllMinorRadius">
<property name="text">
<string>Minor radius:</string>
<string>Minor radius</string>
</property>
</widget>
</item>
@@ -2109,7 +2109,7 @@
<item row="2" column="0">
<widget class="QLabel" name="labelEllAngle1">
<property name="text">
<string>Angle 1:</string>
<string>Angle 1</string>
</property>
</widget>
</item>
@@ -2126,7 +2126,7 @@
<item row="3" column="0">
<widget class="QLabel" name="labelEllAngle2">
<property name="text">
<string>Angle 2:</string>
<string>Angle 2</string>
</property>
</widget>
</item>
@@ -2167,7 +2167,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_X_Axis">
<property name="text">
<string>X:</string>
<string>X</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2187,7 +2187,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_Y_Axis">
<property name="text">
<string>Y:</string>
<string>Y</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2207,7 +2207,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_Z_Axis">
<property name="text">
<string>Z:</string>
<string>Z</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2265,7 +2265,7 @@
<item row="1" column="0">
<widget class="QLabel" name="X1">
<property name="text">
<string>X:</string>
<string>X</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2298,7 +2298,7 @@
<item row="2" column="0">
<widget class="QLabel" name="Y1">
<property name="text">
<string>Y:</string>
<string>Y</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2331,7 +2331,7 @@
<item row="3" column="0">
<widget class="QLabel" name="Z1">
<property name="text">
<string>Z:</string>
<string>Z</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2415,7 +2415,7 @@
<item row="0" column="0">
<widget class="QLabel" name="labelRegularPolygonPolygon">
<property name="text">
<string>Polygon:</string>
<string>Polygon</string>
</property>
</widget>
</item>
@@ -2438,7 +2438,7 @@
<item row="1" column="0">
<widget class="QLabel" name="labelRegularPolygonCircumradius">
<property name="text">
<string>Circumradius:</string>
<string>Circumradius</string>
</property>
</widget>
</item>

6
src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
View File

@@ -133,7 +133,7 @@ public:
DlgProjectionOnSurface::DlgProjectionOnSurface(QWidget* parent)
: QWidget(parent)
, ui(new Ui::DlgProjectionOnSurface)
, m_projectionObjectName(tr("Projection Object"))
, m_projectionObjectName(tr("Projection object"))
, filterEdge(nullptr)
, filterFace(nullptr)
{
@@ -162,13 +162,13 @@ DlgProjectionOnSurface::DlgProjectionOnSurface(QWidget* parent)
m_partDocument = App::GetApplication().getActiveDocument();
if (!m_partDocument) {
throw Base::ValueError(tr("Have no active document!!!").toStdString());
throw Base::ValueError(tr("No active document").toStdString());
}
this->attachDocument(m_partDocument);
m_partDocument->openTransaction("Project on surface");
m_projectionObject = m_partDocument->addObject<Part::Feature>("Projection Object");
if (!m_projectionObject) {
throw Base::ValueError(tr("Can not create a projection object!!!").toStdString());
throw Base::ValueError(tr("Cannot create a projection object").toStdString());
}
m_projectionObject->Label.setValue(std::string(m_projectionObjectName.toUtf8()).c_str());
onRadioButtonShowAllClicked();

20
src/Mod/Part/Gui/DlgProjectionOnSurface.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Projection on surface</string>
<string>Project on Surface</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPushButton" name="pushButtonAddProjFace">
<property name="text">
<string>Select projection surface</string>
<string>Select Projection Surface</string>
</property>
</widget>
</item>
@@ -28,21 +28,21 @@
<item>
<widget class="QPushButton" name="pushButtonAddFace">
<property name="text">
<string>Add face</string>
<string>Add Face</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonAddWire">
<property name="text">
<string>Add wire</string>
<string>Add Wire</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonAddEdge">
<property name="text">
<string>Add edge</string>
<string>Add Edge</string>
</property>
</widget>
</item>
@@ -73,7 +73,7 @@
<item>
<widget class="QRadioButton" name="radioButtonEdges">
<property name="text">
<string>Show Edges</string>
<string>Show edges</string>
</property>
<property name="checked">
<bool>false</bool>
@@ -144,7 +144,7 @@
<item>
<widget class="QPushButton" name="pushButtonGetCurrentCamDir">
<property name="text">
<string>Get current camera direction</string>
<string>Get Current Camera Direction</string>
</property>
</widget>
</item>
@@ -153,7 +153,7 @@
<item>
<widget class="QPushButton" name="pushButtonDirX">
<property name="text">
<string>X:</string>
<string>X</string>
</property>
</widget>
</item>
@@ -183,7 +183,7 @@
<item>
<widget class="QPushButton" name="pushButtonDirY">
<property name="text">
<string>Y:</string>
<string>Y</string>
</property>
</widget>
</item>
@@ -210,7 +210,7 @@
<item>
<widget class="QPushButton" name="pushButtonDirZ">
<property name="text">
<string>Z:</string>
<string>Z</string>
</property>
</widget>
</item>

4
src/Mod/Part/Gui/DlgRevolution.cpp
View File

@@ -266,7 +266,7 @@ bool DlgRevolution::validate()
//check source shapes
if (ui->treeWidget->selectedItems().isEmpty()) {
QMessageBox::critical(this, windowTitle(),
tr("Select a shape for revolution, first."));
tr("Select a shape for revolution."));
return false;
}
@@ -461,7 +461,7 @@ void DlgRevolution::onSelectLineClicked()
if (!filter) {
filter = new EdgeSelection();
Gui::Selection().addSelectionGate(filter);
ui->selectLine->setText(tr("Selecting... (line or arc)"));
ui->selectLine->setText(tr("Selecting… (line or arc)"));
} else {
Gui::Selection().rmvSelectionGate();
filter = nullptr;

28
src/Mod/Part/Gui/DlgRevolution.ui
View File

@@ -53,7 +53,7 @@
</size>
</property>
<property name="title">
<string>Revolution axis</string>
<string>Revolution Axis</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -61,7 +61,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Center X:</string>
<string>Center X</string>
</property>
</widget>
</item>
@@ -81,7 +81,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Center Y:</string>
<string>Center Y</string>
</property>
</widget>
</item>
@@ -101,7 +101,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Center Z:</string>
<string>Center Z</string>
</property>
</widget>
</item>
@@ -143,10 +143,10 @@
</size>
</property>
<property name="toolTip">
<string>Click to set this as axis</string>
<string>Sets this as axis</string>
</property>
<property name="text">
<string>Dir. X:</string>
<string>X Direction</string>
</property>
</widget>
</item>
@@ -184,10 +184,10 @@
</size>
</property>
<property name="toolTip">
<string>Click to set this as axis</string>
<string>Sets this as axis</string>
</property>
<property name="text">
<string>Dir. Y:</string>
<string>Y Direction</string>
</property>
</widget>
</item>
@@ -225,7 +225,7 @@
</size>
</property>
<property name="text">
<string>Dir. Z:</string>
<string>Z Direction</string>
</property>
</widget>
</item>
@@ -247,7 +247,7 @@
<item>
<widget class="QPushButton" name="selectLine">
<property name="text">
<string>Select reference</string>
<string>Select Reference</string>
</property>
</widget>
</item>
@@ -278,7 +278,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Angle:</string>
<string>Angle</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -312,7 +312,7 @@
<item row="4" column="3">
<widget class="QCheckBox" name="checkSymmetric">
<property name="toolTip">
<string>If checked, revolution will extend forwards and backwards by half the angle.</string>
<string>Extends the revolution forwards and backwards by half the angle</string>
</property>
<property name="text">
<string>Symmetric angle</string>
@@ -322,10 +322,10 @@
<item row="5" column="3">
<widget class="QCheckBox" name="checkSolid">
<property name="toolTip">
<string>If checked, revolving wires will produce solids. If not, revolving a wire yields a shell.</string>
<string>Creates a solid. Otherwise it results in a shell.</string>
</property>
<property name="text">
<string>Create Solid</string>
<string>Create solid</string>
</property>
</widget>
</item>

6
src/Mod/Part/Gui/DlgScale.cpp
View File

@@ -218,7 +218,7 @@ void DlgScale::apply()
if (Part::Feature::getTopoShape(sourceObj, Part::ShapeOption::ResolveLink | Part::ShapeOption::Transform).isNull()){
FC_ERR("Object " << sourceObj->getFullName()
<< " is not Part object (has no OCC shape). Can't scale it.");
<< " is not a shape object. Scaling is not possible.");
continue;
}
@@ -251,13 +251,13 @@ void DlgScale::apply()
catch (Base::Exception &err){
QMessageBox::critical(this,
windowTitle(),
tr("Creating Scale failed.\n%1")
tr("Creating scale failed.\n%1")
.arg(QCoreApplication::translate("Exception", err.what())));
return;
}
catch(...) {
QMessageBox::critical(this, windowTitle(),
tr("Creating Scale failed.\n%1").arg(QStringLiteral("Unknown error")));
tr("Creating scale failed.\n%1").arg(QStringLiteral("Unknown error")));
return;
}
}

12
src/Mod/Part/Gui/DlgScale.ui
View File

@@ -19,7 +19,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>X Factor</string>
<string>X factor</string>
</property>
</widget>
</item>
@@ -61,7 +61,7 @@
<item row="5" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Z Factor</string>
<string>Z factor</string>
</property>
</widget>
</item>
@@ -109,17 +109,17 @@
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Y Factor</string>
<string>Y factor</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="rbNonUniform">
<property name="toolTip">
<string>Specify a different scale factor for each cardinal direction.</string>
<string>Specify a different scale factor for each cardinal direction</string>
</property>
<property name="text">
<string>Non-Uniform Scaling</string>
<string>Non-uniform scaling</string>
</property>
</widget>
</item>
@@ -192,7 +192,7 @@
<item>
<widget class="QTreeWidget" name="treeWidget">
<property name="toolTip">
<string>Select shape(s) that should be scaled</string>
<string>Select shapes to be scaled</string>
</property>
<column>
<property name="text">

2
src/Mod/Part/Gui/DlgSettings3DViewPart.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Shape view</string>
<string>Shape View</string>
</property>
<layout class="QGridLayout">
<property name="margin">

2
src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp
View File

@@ -101,7 +101,7 @@ void DlgSettings3DViewPart::onMaxAngularDeflectionValueChanged(double vMaxAngle)
checkValue = true;
QMessageBox::warning(
this,
tr("Angle Deflection"),
tr("Angle deflection"),
tr("Setting a too small angle deviation causes the tessellation to take longer"
" and thus freezes or slows down the GUI."));
}

12
src/Mod/Part/Gui/DlgSettingsGeneral.ui
View File

@@ -17,7 +17,7 @@
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Model settings</string>
<string>Model Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -55,7 +55,7 @@
<item row="2" column="0">
<widget class="Gui::PrefCheckBox" name="checkSketchBaseRefine" native="true">
<property name="text" stdset="0">
<string>Automatically refine model after sketch-based operation</string>
<string>Automatically refine model after applying operations</string>
</property>
<property name="checked" stdset="0">
<bool>true</bool>
@@ -80,7 +80,7 @@
<bool>false</bool>
</property>
<property name="title">
<string>Object naming</string>
<string>Object Naming</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
@@ -108,7 +108,7 @@
</size>
</property>
<property name="title">
<string>Features settings</string>
<string>Features Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
@@ -187,7 +187,7 @@
<item>
<widget class="QLabel" name="warningLabel">
<property name="text">
<string>These settings are experimental and may result in decreased stability, more problems and undefined behaviors.</string>
<string>These settings are experimental and may result in decreased stability, problems and undefined behaviors</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -197,7 +197,7 @@
<item>
<widget class="Gui::PrefCheckBox" name="checkAllowCompoundBody">
<property name="text">
<string>Allow multiple solids in Part Design Body by default (experimental)</string>
<string>Allow multiple solids in Part Design bodies by default</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>AllowCompoundDefault</cstring>

6
src/Mod/Part/Gui/DlgSettingsObjectColor.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Shape appearance</string>
<string>Shape Appearance</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBoxDefaultColors">
<property name="title">
<string>Default Shape view properties</string>
<string>Default Shape Appearance Properties</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@@ -502,7 +502,7 @@ will be used or black.</string>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Default Annotation color</string>
<string>Default Annotation Color</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>

16
src/Mod/Part/Gui/Location.ui
View File

@@ -87,7 +87,7 @@
<item>
<widget class="QPushButton" name="viewPositionButton">
<property name="text">
<string>3D view</string>
<string>3D View</string>
</property>
</widget>
</item>
@@ -107,7 +107,7 @@
the sketch plane's normal vector will be used</string>
</property>
<property name="title">
<string>Rotation axis</string>
<string>Rotation Axis</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
@@ -115,14 +115,14 @@ the sketch plane's normal vector will be used</string>
<item row="0" column="0">
<widget class="QLabel" name="labelXSkew">
<property name="text">
<string>x</string>
<string>X</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::DoubleSpinBox" name="XDirectionEdit">
<property name="toolTip">
<string>x-component of direction vector</string>
<string>X-component of direction vector</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
@@ -144,14 +144,14 @@ the sketch plane's normal vector will be used</string>
<item row="1" column="0">
<widget class="QLabel" name="labelYSkew">
<property name="text">
<string>y</string>
<string>Y</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::DoubleSpinBox" name="YDirectionEdit">
<property name="toolTip">
<string>y-component of direction vector</string>
<string>Y-component of direction vector</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
@@ -173,14 +173,14 @@ the sketch plane's normal vector will be used</string>
<item row="2" column="0">
<widget class="QLabel" name="labelZSkew">
<property name="text">
<string>z</string>
<string>Z</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::DoubleSpinBox" name="ZDirectionEdit">
<property name="toolTip">
<string>z-component of direction vector</string>
<string>Z-component of direction vector</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>

2
src/Mod/Part/Gui/Mirroring.cpp
View File

@@ -282,7 +282,7 @@ bool Mirroring::accept()
{
if (ui->shapes->selectedItems().isEmpty()) {
QMessageBox::critical(this, windowTitle(),
tr("Select a shape for mirroring, first."));
tr("Select a shape for mirroring."));
return false;
}

18
src/Mod/Part/Gui/Mirroring.ui
View File

@@ -11,19 +11,19 @@
</rect>
</property>
<property name="windowTitle">
<string>Mirroring</string>
<string>Mirror</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Base point</string>
<string>Base Point</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>x</string>
<string>X</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -46,7 +46,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>y</string>
<string>Y</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -69,7 +69,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>z</string>
<string>Z</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -95,7 +95,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Mirror plane:</string>
<string>Mirror plane</string>
</property>
</widget>
</item>
@@ -103,17 +103,17 @@
<widget class="QComboBox" name="comboBox">
<item>
<property name="text">
<string>XY plane</string>
<string>XY-plane</string>
</property>
</item>
<item>
<property name="text">
<string>XZ plane</string>
<string>XZ-plane</string>
</property>
</item>
<item>
<property name="text">
<string>YZ plane</string>
<string>YZ-plane</string>
</property>
</item>
<item>

56
src/Mod/Part/Gui/SectionCutting.cpp
View File

@@ -97,16 +97,16 @@ SectionCut::SectionCut(QWidget* parent)
// get all objects in the document
auto docGui = Gui::Application::Instance->activeDocument();
if (!docGui) {
throw Base::RuntimeError("SectionCut error: there is no document");
throw Base::RuntimeError("Section cut error: there is no document");
}
doc = docGui->getDocument();
if (!doc) {
throw Base::RuntimeError("SectionCut error: there is no document");
throw Base::RuntimeError("Section cut error: there is no document");
}
std::vector<App::DocumentObject*> ObjectsList = doc->getObjects();
if (ObjectsList.empty()) {
throw Base::RuntimeError("SectionCut error: there are no objects in the document");
throw Base::RuntimeError("Section cut error: there are no objects in the document");
}
// now store those that are currently visible
@@ -550,7 +550,7 @@ void SectionCut::deleteCompound()
pcCompoundDelBF = Gui::Application::Instance->getViewProvider(compoundObject);
if (!pcCompoundDelBF) {
Base::Console().error(
"SectionCut error: compound is incorrectly named, cannot proceed\n");
"Section cut error: compound is incorrectly named, cannot proceed\n");
return;
}
compoundChilds = pcCompoundDelBF->claimChildren();
@@ -606,7 +606,7 @@ Part::Box* SectionCut::createBox(const char* name, const Base::Vector3f& size)
// create a box
auto pcBox = doc->addObject<Part::Box>(name);
if (!pcBox) {
throw Base::RuntimeError(std::string("SectionCut error: ")
throw Base::RuntimeError(std::string("Section cut error: ")
+ std::string(name) + std::string(" could not be added\n"));
}
@@ -785,7 +785,7 @@ Part::Cut* SectionCut::createCut(const char* name)
{
auto pcCut = doc->addObject<Part::Cut>(name);
if (!pcCut) {
throw Base::RuntimeError(std::string("SectionCut error: ")
throw Base::RuntimeError(std::string("Section cut error: ")
+ std::string(name) + std::string(" could not be added\n"));
}
@@ -1126,7 +1126,7 @@ std::tuple<Base::Vector3f, Base::Vector3f> SectionCut::adjustRanges()
// we get its size by its bounding box
SbBox3f CompoundBoundingBox = getViewBoundingBox();
if (CompoundBoundingBox.isEmpty()) { // NOLINT
throw Base::RuntimeError("SectionCut error: the CompoundBoundingBox is empty");
throw Base::RuntimeError("Section cut error: the CompoundBoundingBox is empty");
}
// refresh all cut limits according to the new bounding box
@@ -1392,7 +1392,7 @@ SectionCut* SectionCut::makeDockWidget(QWidget* parent)
Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance();
// the dialog is designed that you can see the tree, thus put it to the right side
QDockWidget *dw =
pDockMgr->addDockWindow("Section Cutting", sectionCut, Qt::RightDockWidgetArea);
pDockMgr->addDockWindow("Section cutting", sectionCut, Qt::RightDockWidgetArea);
dw->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
//dw->setFloating(true);
dw->show();
@@ -1567,7 +1567,7 @@ void SectionCut::onCutXvalueChanged(double val)
}
auto pcBox = dynamic_cast<Part::Box*>(CutBox);
if (!pcBox) {
Base::Console().error((std::string("SectionCut error: ") + std::string(BoxXName)
Base::Console().error((std::string("Section cut error: ") + std::string(BoxXName)
+ std::string(" is no Part::Box object. Cannot proceed.\n")).c_str());
return;
}
@@ -1644,7 +1644,7 @@ void SectionCut::onCutXvalueChanged(double val)
// recompute the cut
auto pcCut = dynamic_cast<Part::Cut*>(CutObject);
if (!pcCut) {
Base::Console().error((std::string("SectionCut error: ") + std::string(CutZName)
Base::Console().error((std::string("Section cut error: ") + std::string(CutZName)
+ std::string(" is no Part::Cut object. Cannot proceed.\n")).c_str());
return;
}
@@ -1688,7 +1688,7 @@ void SectionCut::onCutYvalueChanged(double val)
}
auto pcBox = dynamic_cast<Part::Box*>(CutBox);
if (!pcBox) {
Base::Console().error((std::string("SectionCut error: ") + std::string(BoxYName)
Base::Console().error((std::string("Section cut error: ") + std::string(BoxYName)
+ std::string(" is no Part::Box object. Cannot proceed.\n")).c_str());
return;
}
@@ -1710,7 +1710,7 @@ void SectionCut::onCutYvalueChanged(double val)
if (hasBoxZ) {
auto CutFeatureZ = findObject(CutZName);
if (!CutFeatureZ) {
Base::Console().error((std::string("SectionCut error: there is no ")
Base::Console().error((std::string("Section cut error: there is no ")
+ std::string(CutZName) + std::string("\n")).c_str());
return;
}
@@ -1746,7 +1746,7 @@ void SectionCut::onCutYvalueChanged(double val)
// recompute the cut
auto pcCut = dynamic_cast<Part::Cut*>(CutObject);
if (!pcCut) {
Base::Console().error((std::string("SectionCut error: ") + std::string(CutZName)
Base::Console().error((std::string("Section cut error: ") + std::string(CutZName)
+ std::string(" is no Part::Cut object. Cannot proceed.\n")).c_str());
return;
}
@@ -1810,7 +1810,7 @@ void SectionCut::onCutZvalueChanged(double val)
}
auto pcBox = dynamic_cast<Part::Box*>(CutBox);
if (!pcBox) {
Base::Console().error((std::string("SectionCut error: ") + std::string(BoxZName)
Base::Console().error((std::string("Section cut error: ") + std::string(BoxZName)
+ std::string(" is no Part::Box object. Cannot proceed.\n")).c_str());
return;
}
@@ -1827,7 +1827,7 @@ void SectionCut::onCutZvalueChanged(double val)
}
auto pcCut = dynamic_cast<Part::Cut*>(CutObject);
if (!pcCut) {
Base::Console().error((std::string("SectionCut error: ") + std::string(CutZName)
Base::Console().error((std::string("Section cut error: ") + std::string(CutZName)
+ std::string(" is no Part::Cut object. Cannot proceed.\n")).c_str());
return;
}
@@ -1916,7 +1916,7 @@ void SectionCut::FlipClickedHelper(const char* BoxName)
}
auto pcBox = dynamic_cast<Part::Box*>(CutBox);
if (!pcBox) {
Base::Console().error((std::string("SectionCut error: ") + std::string(BoxName)
Base::Console().error((std::string("Section cut error: ") + std::string(BoxName)
+ std::string(" is no Part::Box object. Cannot proceed.\n")).c_str());
return;
}
@@ -2007,7 +2007,7 @@ Part::Box* SectionCut::findCutBox(const char* name) const
if (auto obj = doc->getObject(name)) {
auto pcBox = dynamic_cast<Part::Box*>(obj);
if (!pcBox) {
throw Base::RuntimeError("SectionCut error: cut box is incorrectly named, cannot proceed");
throw Base::RuntimeError("Section cut error: cut box is incorrectly named, cannot proceed");
}
return pcBox;
@@ -2025,7 +2025,7 @@ App::DocumentObject* SectionCut::findOrCreateObject(const char* objName)
{
auto object = findObject(objName);
if (!object) {
Base::Console().warning((std::string("SectionCut warning: there is no ")
Base::Console().warning((std::string("Section cut warning: there is no ")
+ std::string(objName) + std::string(", trying to recreate it\n")).c_str());
startCutting();
return nullptr;
@@ -2144,7 +2144,7 @@ void SectionCut::setBooleanFragmentsColor()
compoundObject = doc->getObject(CompoundName);
}
else {
Base::Console().error("SectionCut error: compound is incorrectly named, cannot proceed\n");
Base::Console().error("Section cut error: compound is incorrectly named, cannot proceed\n");
return;
}
// assure it is not a Part::Compound
@@ -2153,7 +2153,7 @@ void SectionCut::setBooleanFragmentsColor()
// check for valid BooleanFragments by accessing its ViewProvider
auto CompoundBFVP = Gui::Application::Instance->getViewProvider(compoundObject);
if (!CompoundBFVP) {
Base::Console().error("SectionCut error: cannot access ViewProvider of cut compound\n");
Base::Console().error("Section cut error: cannot access ViewProvider of cut compound\n");
return;
}
auto CutCompoundBFGeom = dynamic_cast<Gui::ViewProviderGeometryObject*>(CompoundBFVP);
@@ -2175,7 +2175,7 @@ void SectionCut::onBFragTransparencyHSMoved(int val)
Gui::ViewProvider* CutVP = Gui::Application::Instance->getViewProvider(cutObject);
if (!CutVP) {
Base::Console().error(
"SectionCut error: cannot access ViewProvider of cut object\n");
"Section cut error: cannot access ViewProvider of cut object\n");
return;
}
auto CutVPGeom = dynamic_cast<Gui::ViewProviderGeometryObject*>(CutVP);
@@ -2227,14 +2227,14 @@ void SectionCut::onRefreshCutPBclicked()
// get document
auto docGui = Gui::Application::Instance->activeDocument();
if (!docGui) {
Base::Console().error("SectionCut error: there is no document\n");
Base::Console().error("Section cut error: there is no document\n");
return;
}
doc = docGui->getDocument();
// get all objects in the document
std::vector<App::DocumentObject*> ObjectsList = doc->getObjects();
if (ObjectsList.empty()) {
Base::Console().error("SectionCut error: there are no objects in the document\n");
Base::Console().error("Section cut error: there are no objects in the document\n");
return;
}
// empty the ObjectsListVisible
@@ -2281,12 +2281,12 @@ SbBox3f SectionCut::getViewBoundingBox()
SbBox3f Box;
auto docGui = Gui::Application::Instance->activeDocument();
if (!docGui) {
Base::Console().error("SectionCut error: there is no active document\n");
Base::Console().error("Section cut error: there is no active document\n");
return Box; // return an empty box
}
auto view = dynamic_cast<Gui::View3DInventor*>(docGui->getActiveView());
if (!view) {
Base::Console().error("SectionCut error: could not get the active view\n");
Base::Console().error("Section cut error: could not get the active view\n");
return Box; // return an empty box
}
Gui::View3DInventorViewer* viewer = view->getViewer();
@@ -2376,7 +2376,7 @@ App::DocumentObject* SectionCut::CreateBooleanFragments(App::Document* doc)
// check for success
App::DocumentObject* object = doc->getObject(CompoundName);
if (!object) {
Base::Console().error((std::string("SectionCut error: ") + std::string(CompoundName)
Base::Console().error((std::string("Section cut error: ") + std::string(CompoundName)
+ std::string(" could not be added\n")).c_str());
return nullptr;
}
@@ -2394,7 +2394,7 @@ App::DocumentObject* SectionCut::createBooleanFragments(
auto CutLinkList = dynamic_cast<App::PropertyLinkList*>(
CutCompoundBF ? CutCompoundBF->getPropertyByName("Objects") : nullptr);
if (!CutLinkList) {
throw Base::RuntimeError((std::string("SectionCut error: ") + std::string(CompoundName)
throw Base::RuntimeError((std::string("Section cut error: ") + std::string(CompoundName)
+ std::string(" could not be added\n")).c_str());
}
CutLinkList->setValue(links);
@@ -2418,7 +2418,7 @@ Part::Compound* SectionCut::createCompound(const std::vector<App::DocumentObject
{
auto CutCompoundPart = doc->addObject<Part::Compound>(CompoundName);
if (!CutCompoundPart) {
throw Base::RuntimeError((std::string("SectionCut error: ") + std::string(CompoundName)
throw Base::RuntimeError((std::string("Section cut error: ") + std::string(CompoundName)
+ std::string(" could not be added\n")).c_str());
}

24
src/Mod/Part/Gui/SectionCutting.ui
View File

@@ -17,7 +17,7 @@
</size>
</property>
<property name="windowTitle">
<string>Persistent Section Cutting</string>
<string>Persistent Section Cut</string>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0" colspan="3">
@@ -239,7 +239,7 @@
<item row="3" column="0" colspan="3">
<widget class="QGroupBox" name="CutfaceGB">
<property name="title">
<string>Cut face</string>
<string>Cut Face</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@@ -251,7 +251,7 @@
</size>
</property>
<property name="toolTip">
<string>Color of cut face</string>
<string>Color of the cut face</string>
</property>
<property name="text">
<string>Color</string>
@@ -299,8 +299,8 @@
</size>
</property>
<property name="toolTip">
<string>If checked, the color and transparency
will be taken from the cut objects.
<string>Takes the color and transparency
from the cut objects.
Works only properly if all objects
have the same values.</string>
</property>
@@ -327,7 +327,7 @@ have the same values.</string>
</size>
</property>
<property name="toolTip">
<string>Transparency of cut face</string>
<string>Transparency of the cut face</string>
</property>
<property name="text">
<string>Transparency</string>
@@ -373,7 +373,7 @@ for the price that all cut objects
will get the same color</string>
</property>
<property name="title">
<string>Cut intersecting objects</string>
<string>Cut Intersecting Objects</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -391,7 +391,7 @@ will get the same color</string>
</size>
</property>
<property name="toolTip">
<string>Color of cut face</string>
<string>Color of the cut face</string>
</property>
<property name="text">
<string>Color</string>
@@ -442,8 +442,8 @@ will get the same color</string>
</size>
</property>
<property name="toolTip">
<string>If checked, the color and transparency
will be taken from the cut objects.
<string>Takes the color and transparency
from the cut objects.
Works only properly if all objects
have the same values.</string>
</property>
@@ -470,7 +470,7 @@ have the same values.</string>
</size>
</property>
<property name="toolTip">
<string>Transparency of cut face</string>
<string>Transparency of the cut face</string>
</property>
<property name="text">
<string>Transparency</string>
@@ -511,7 +511,7 @@ have the same values.</string>
<string>Refreshes the list of visible objects</string>
</property>
<property name="text">
<string>Refresh view</string>
<string>Refresh View</string>
</property>
</widget>
</item>

6
src/Mod/Part/Gui/ShapeFromMesh.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Shape from mesh</string>
<string>Shape From Mesh</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBoxSew">
<property name="title">
<string>Sew shape</string>
<string>Sew Shape</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -29,7 +29,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Enter tolerance for sewing shape:</string>
<string>Tolerance for sewing the shape</string>
</property>
</widget>
</item>

6
src/Mod/Part/Gui/TaskAttacher.cpp
View File

@@ -341,7 +341,7 @@ bool TaskAttacher::updatePreview()
ui->message->setStyleSheet(QStringLiteral("QLabel{color: green;}"));
}
}
QString splmLabelText = attached ? tr("Attachment Offset (in local coordinates):") : tr("Attachment Offset (inactive - not attached):");
QString splmLabelText = attached ? tr("Attachment offset (in its local coordinate system):") : tr("Attachment offset (inactive - not attached):");
ui->groupBox_AttachmentOffset->setTitle(splmLabelText);
ui->groupBox_AttachmentOffset->setEnabled(attached);
@@ -876,7 +876,7 @@ void TaskAttacher::updateRefButton(int idx)
b->setChecked(iActiveRef == idx);
if (iActiveRef == idx) {
b->setText(tr("Selecting..."));
b->setText(tr("Selecting…"));
}
else if (idx < static_cast<int>(this->lastSuggestResult.references_Types.size())) {
b->setText(AttacherGui::getShapeTypeText(this->lastSuggestResult.references_Types[idx]));
@@ -1293,7 +1293,7 @@ bool TaskDlgAttacher::accept()
Gui::Command::commitCommand();
}
catch (const Base::Exception& e) {
QMessageBox::warning(parameter, tr("Datum dialog: Input error"), QCoreApplication::translate("Exception", e.what()));
QMessageBox::warning(parameter, tr("Datum dialog: input error"), QCoreApplication::translate("Exception", e.what()));
return false;
}

43
src/Mod/Part/Gui/TaskAttacher.ui
View File

@@ -98,7 +98,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Attachment mode:</string>
<string>Attachment mode</string>
</property>
</widget>
</item>
@@ -121,7 +121,7 @@
<string/>
</property>
<property name="title">
<string>Attachment Offset (in local coordinates):</string>
<string>Attachment Offset in its Local Coordinate System</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
@@ -133,7 +133,7 @@
</sizepolicy>
</property>
<property name="text">
<string>In x-direction:</string>
<string>In x-direction</string>
</property>
</widget>
</item>
@@ -152,8 +152,8 @@
</size>
</property>
<property name="toolTip">
<string>Note: The placement is expressed in local coordinate system
of object being attached.</string>
<string>The offset is expressed in the local coordinate system
of the object being attached</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
@@ -169,7 +169,7 @@ of object being attached.</string>
</sizepolicy>
</property>
<property name="text">
<string>In y-direction:</string>
<string>In y-direction</string>
</property>
</widget>
</item>
@@ -188,8 +188,8 @@ of object being attached.</string>
</size>
</property>
<property name="toolTip">
<string>Note: The placement is expressed in local coordinate system
of object being attached.</string>
<string>The offset is expressed in the local coordinate system
of the object being attached</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
@@ -205,7 +205,7 @@ of object being attached.</string>
</sizepolicy>
</property>
<property name="text">
<string>In z-direction:</string>
<string>In z-direction</string>
</property>
</widget>
</item>
@@ -224,8 +224,8 @@ of object being attached.</string>
</size>
</property>
<property name="toolTip">
<string>Note: The placement is expressed in local coordinate system
of object being attached.</string>
<string>The offset is expressed in the local coordinate system
of the object being attached</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
@@ -241,7 +241,7 @@ of object being attached.</string>
</sizepolicy>
</property>
<property name="text">
<string>Around x-axis:</string>
<string>Around x-axis</string>
</property>
</widget>
</item>
@@ -254,9 +254,8 @@ of object being attached.</string>
</sizepolicy>
</property>
<property name="toolTip">
<string>Rotation around the x-axis
Note: The placement is expressed in local coordinate system
of object being attached.</string>
<string>Rotation around the local x-axis. The offset is expressed in the local coordinate system
of the object being attached.</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
@@ -281,7 +280,7 @@ of object being attached.</string>
</sizepolicy>
</property>
<property name="text">
<string>Around y-axis:</string>
<string>Around y-axis</string>
</property>
</widget>
</item>
@@ -294,9 +293,8 @@ of object being attached.</string>
</sizepolicy>
</property>
<property name="toolTip">
<string>Rotation around the y-axis
Note: The placement is expressed in local coordinate system
of object being attached.</string>
<string>Rotation around the local y-axis. The offset is expressed in the local coordinate system
of the object being attached.</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
@@ -321,7 +319,7 @@ of object being attached.</string>
</sizepolicy>
</property>
<property name="text">
<string>Around z-axis:</string>
<string>Around z-axis</string>
</property>
</widget>
</item>
@@ -334,9 +332,8 @@ of object being attached.</string>
</sizepolicy>
</property>
<property name="toolTip">
<string>Rotation around the z-axis
Note: The placement is expressed in local coordinate system
of object being attached.</string>
<string>Rotation around the local z-axis. The offset is expressed in the local coordinate system
of the object being attached.</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>

112
src/Mod/Part/Gui/TaskCheckGeometry.cpp
View File

@@ -76,7 +76,7 @@ QVector<QString> buildShapeEnumVector()
{
QVector<QString>names;
names.push_back(QObject::tr("Compound")); //TopAbs_COMPOUND
names.push_back(QObject::tr("Compound Solid")); //TopAbs_COMPSOLID
names.push_back(QObject::tr("Compound solid")); //TopAbs_COMPSOLID
names.push_back(QObject::tr("Solid")); //TopAbs_SOLID
names.push_back(QObject::tr("Shell")); //TopAbs_SHELL
names.push_back(QObject::tr("Face")); //TopAbs_FACE
@@ -98,40 +98,40 @@ QString shapeEnumToString(const int &index)
QVector<QString> buildCheckStatusStringVector()
{
QVector<QString>names;
names.push_back(QObject::tr("No Error")); // BRepCheck_NoError
names.push_back(QObject::tr("Invalid Point On Curve")); // BRepCheck_InvalidPointOnCurve
names.push_back(QObject::tr("Invalid Point On Curve On Surface")); // BRepCheck_InvalidPointOnCurveOnSurface
names.push_back(QObject::tr("Invalid Point On Surface")); // BRepCheck_InvalidPointOnSurface
names.push_back(QObject::tr("No 3D Curve")); // BRepCheck_No3DCurve
names.push_back(QObject::tr("Multiple 3D Curve")); // BRepCheck_Multiple3DCurve
names.push_back(QObject::tr("Invalid 3D Curve")); // BRepCheck_Invalid3DCurve
names.push_back(QObject::tr("No Curve On Surface")); // BRepCheck_NoCurveOnSurface
names.push_back(QObject::tr("Invalid Curve On Surface")); // BRepCheck_InvalidCurveOnSurface
names.push_back(QObject::tr("Invalid Curve On Closed Surface")); // BRepCheck_InvalidCurveOnClosedSurface
names.push_back(QObject::tr("Invalid Same Range Flag")); // BRepCheck_InvalidSameRangeFlag
names.push_back(QObject::tr("Invalid Same Parameter Flag")); // BRepCheck_InvalidSameParameterFlag
names.push_back(QObject::tr("Invalid Degenerated Flag")); // BRepCheck_InvalidDegeneratedFlag
names.push_back(QObject::tr("Free Edge")); // BRepCheck_FreeEdge
names.push_back(QObject::tr("Invalid MultiConnexity")); // BRepCheck_InvalidMultiConnexity
names.push_back(QObject::tr("Invalid Range")); // BRepCheck_InvalidRange
names.push_back(QObject::tr("Empty Wire")); // BRepCheck_EmptyWire
names.push_back(QObject::tr("Redundant Edge")); // BRepCheck_RedundantEdge
names.push_back(QObject::tr("Self Intersecting Wire")); // BRepCheck_SelfIntersectingWire
names.push_back(QObject::tr("No Surface")); // BRepCheck_NoSurface
names.push_back(QObject::tr("Invalid Wire")); // BRepCheck_InvalidWire
names.push_back(QObject::tr("Redundant Wire")); // BRepCheck_RedundantWire
names.push_back(QObject::tr("Intersecting Wires")); // BRepCheck_IntersectingWires
names.push_back(QObject::tr("Invalid Imbrication Of Wires")); // BRepCheck_InvalidImbricationOfWires
names.push_back(QObject::tr("Empty Shell")); // BRepCheck_EmptyShell
names.push_back(QObject::tr("Redundant Face")); // BRepCheck_RedundantFace
names.push_back(QObject::tr("Unorientable Shape")); // BRepCheck_UnorientableShape
names.push_back(QObject::tr("Not Closed")); // BRepCheck_NotClosed
names.push_back(QObject::tr("Not Connected")); // BRepCheck_NotConnected
names.push_back(QObject::tr("Sub Shape Not In Shape")); // BRepCheck_SubshapeNotInShape
names.push_back(QObject::tr("Bad Orientation")); // BRepCheck_BadOrientation
names.push_back(QObject::tr("Bad Orientation Of Sub Shape")); // BRepCheck_BadOrientationOfSubshape
names.push_back(QObject::tr("Invalid Tolerance Value")); // BRepCheck_InvalidToleranceValue
names.push_back(QObject::tr("Check Failed")); // BRepCheck_CheckFail
names.push_back(QObject::tr("No error")); // BRepCheck_NoError
names.push_back(QObject::tr("Invalid point on curve")); // BRepCheck_InvalidPointOnCurve
names.push_back(QObject::tr("Invalid point on curve on surface")); // BRepCheck_InvalidPointOnCurveOnSurface
names.push_back(QObject::tr("Invalid point on surface")); // BRepCheck_InvalidPointOnSurface
names.push_back(QObject::tr("No 3D curve")); // BRepCheck_No3DCurve
names.push_back(QObject::tr("Multiple 3D curves")); // BRepCheck_Multiple3DCurve
names.push_back(QObject::tr("Invalid 3D curve")); // BRepCheck_Invalid3DCurve
names.push_back(QObject::tr("No curve on surface")); // BRepCheck_NoCurveOnSurface
names.push_back(QObject::tr("Invalid curve on surface")); // BRepCheck_InvalidCurveOnSurface
names.push_back(QObject::tr("Invalid curve on closed surface")); // BRepCheck_InvalidCurveOnClosedSurface
names.push_back(QObject::tr("Invalid same range flag")); // BRepCheck_InvalidSameRangeFlag
names.push_back(QObject::tr("Invalid same parameter flag")); // BRepCheck_InvalidSameParameterFlag
names.push_back(QObject::tr("Invalid degenerated flag")); // BRepCheck_InvalidDegeneratedFlag
names.push_back(QObject::tr("Free edge")); // BRepCheck_FreeEdge
names.push_back(QObject::tr("Invalid multi-connexity")); // BRepCheck_InvalidMultiConnexity
names.push_back(QObject::tr("Invalid range")); // BRepCheck_InvalidRange
names.push_back(QObject::tr("Empty wire")); // BRepCheck_EmptyWire
names.push_back(QObject::tr("Redundant edge")); // BRepCheck_RedundantEdge
names.push_back(QObject::tr("Self-intersecting wire")); // BRepCheck_SelfIntersectingWire
names.push_back(QObject::tr("No surface")); // BRepCheck_NoSurface
names.push_back(QObject::tr("Invalid wire")); // BRepCheck_InvalidWire
names.push_back(QObject::tr("Redundant wire")); // BRepCheck_RedundantWire
names.push_back(QObject::tr("Intersecting wires")); // BRepCheck_IntersectingWires
names.push_back(QObject::tr("Invalid imbrication of wires")); // BRepCheck_InvalidImbricationOfWires
names.push_back(QObject::tr("Empty shell")); // BRepCheck_EmptyShell
names.push_back(QObject::tr("Redundant face")); // BRepCheck_RedundantFace
names.push_back(QObject::tr("Unorientable shape")); // BRepCheck_UnorientableShape
names.push_back(QObject::tr("Not closed")); // BRepCheck_NotClosed
names.push_back(QObject::tr("Not connected")); // BRepCheck_NotConnected
names.push_back(QObject::tr("Sub-shape not in shape")); // BRepCheck_SubshapeNotInShape
names.push_back(QObject::tr("Bad orientation")); // BRepCheck_BadOrientation
names.push_back(QObject::tr("Bad orientation of sub-shape")); // BRepCheck_BadOrientationOfSubshape
names.push_back(QObject::tr("Invalid tolerance value")); // BRepCheck_InvalidToleranceValue
names.push_back(QObject::tr("Check failed")); // BRepCheck_CheckFail
return names;
}
@@ -141,11 +141,11 @@ QString checkStatusToString(const int &index)
static QVector<QString> names = buildCheckStatusStringVector();
if (index == -1)
{
return QString(QObject::tr("No Result"));
return QString(QObject::tr("No result"));
}
if (index > 33 || index < 0)
{
QString message(QObject::tr("Out Of Enum Range:") + QStringLiteral(" "));
QString message(QObject::tr("Out of enum range:") + QStringLiteral(" "));
QString number;
number.setNum(index);
message += number;
@@ -157,18 +157,18 @@ QString checkStatusToString(const int &index)
QVector<QString> buildBOPCheckResultVector()
{
QVector<QString> results;
results.push_back(QObject::tr("Boolean operation: Unknown check")); //BOPAlgo_CheckUnknown
results.push_back(QObject::tr("Boolean operation: Bad type")); //BOPAlgo_BadType
results.push_back(QObject::tr("Boolean operation: Self-intersection found")); //BOPAlgo_SelfIntersect
results.push_back(QObject::tr("Boolean operation: Edge too small")); //BOPAlgo_TooSmallEdge
results.push_back(QObject::tr("Boolean operation: Non-recoverable face")); //BOPAlgo_NonRecoverableFace
results.push_back(QObject::tr("Boolean operation: Incompatibility of vertex")); //BOPAlgo_IncompatibilityOfVertex
results.push_back(QObject::tr("Boolean operation: Incompatibility of edge")); //BOPAlgo_IncompatibilityOfEdge
results.push_back(QObject::tr("Boolean operation: Incompatibility of face")); //BOPAlgo_IncompatibilityOfFace
results.push_back(QObject::tr("Boolean operation: Aborted")); //BOPAlgo_OperationAborted
results.push_back(QObject::tr("Boolean operation: unknown check")); //BOPAlgo_CheckUnknown
results.push_back(QObject::tr("Boolean operation: bad type")); //BOPAlgo_BadType
results.push_back(QObject::tr("Boolean operation: self-intersection found")); //BOPAlgo_SelfIntersect
results.push_back(QObject::tr("Boolean operation: edge too small")); //BOPAlgo_TooSmallEdge
results.push_back(QObject::tr("Boolean operation: non-recoverable face")); //BOPAlgo_NonRecoverableFace
results.push_back(QObject::tr("Boolean operation: incompatibility of vertex")); //BOPAlgo_IncompatibilityOfVertex
results.push_back(QObject::tr("Boolean operation: incompatibility of edge")); //BOPAlgo_IncompatibilityOfEdge
results.push_back(QObject::tr("Boolean operation: incompatibility of face")); //BOPAlgo_IncompatibilityOfFace
results.push_back(QObject::tr("Boolean operation: aborted")); //BOPAlgo_OperationAborted
results.push_back(QObject::tr("Boolean operation: GeomAbs_C0")); //BOPAlgo_GeomAbs_C0
results.push_back(QObject::tr("Boolean operation: Invalid curve on surface")); //BOPAlgo_InvalidCurveOnSurface
results.push_back(QObject::tr("Boolean operation: Not valid")); //BOPAlgo_NotValid
results.push_back(QObject::tr("Boolean operation: invalid curve on surface")); //BOPAlgo_InvalidCurveOnSurface
results.push_back(QObject::tr("Boolean operation: not valid")); //BOPAlgo_NotValid
return results;
}
@@ -396,7 +396,7 @@ void TaskCheckGeometryResults::setupInterface()
message->setTextInteractionFlags(Qt::TextBrowserInteraction);
message->setOpenExternalLinks(false);
connect(message, &QLabel::linkActivated, this, &TaskCheckGeometryResults::generateReport);
message->setText(tr("Check is running..."));
message->setText(tr("Check is running…"));
model = new ResultModel(this);
treeView = new QTreeView(this);
treeView->setModel(model);
@@ -421,7 +421,7 @@ void TaskCheckGeometryResults::goCheck()
reportViewStrings.clear();
reportViewStrings << QLatin1String("\n");
std::string scopeName {tr("Boolean operation check...").toStdString()};
std::string scopeName {tr("Boolean operation check…").toStdString()};
Handle(Message_ProgressIndicator) theProgress = new BOPProgressIndicator(tr("Check geometry"),
Gui::getMainWindow());
@@ -515,7 +515,7 @@ void TaskCheckGeometryResults::goCheck()
if (runSignal) {
std::string label = tr("Checking").toStdString() + " ";
label += sel.pObject->Label.getStrValue();
label += "...";
label += "…";
Message_ProgressScope theInnerScope(theScope.Next(), TCollection_AsciiString(label.c_str()), 1);
theInnerScope.Show();
@@ -545,7 +545,7 @@ void TaskCheckGeometryResults::goCheck()
treeView->header()->resizeSections(QHeaderView::ResizeToContents);
QString aMessage {tr("%1 processed out of %2 selected").arg(checkedCount).arg(selectedCount)};
aMessage += QLatin1String("<br/>") + tr("%n invalid shapes.", "", invalidShapes);
aMessage += QLatin1String(" <a href=\"#report\">") + tr("To Report view.") + QLatin1String("</a>");
aMessage += QLatin1String(" <a href=\"#report\">") + tr("to report view.") + QLatin1String("</a>");
message->setText(aMessage);
}
@@ -666,17 +666,17 @@ void TaskCheckGeometryResults::buildShapeContent(App::DocumentObject *pObject, c
{
args.setItem(0, Py::Long(-1));
Py::Float result(Py::asObject(Part::TopoShape(shape).getPyObject()).callMemberFunction("globalTolerance",args));
stream << " " << tr("Global Minimum").toStdString() << ": " << result << std::endl;
stream << " " << tr("Global minimum").toStdString() << ": " << result << std::endl;
}
{
args.setItem(0, Py::Long(0));
Py::Float result(Py::asObject(Part::TopoShape(shape).getPyObject()).callMemberFunction("globalTolerance",args));
stream << " " << tr("Global Average").toStdString() << ": " << result << std::endl;
stream << " " << tr("Global average").toStdString() << ": " << result << std::endl;
}
{
args.setItem(0, Py::Long(1));
Py::Float result(Py::asObject(Part::TopoShape(shape).getPyObject()).callMemberFunction("globalTolerance",args));
stream << " " << tr("Global Maximum").toStdString() << ": " << result;
stream << " " << tr("Global maximum").toStdString() << ": " << result;
}
}
@@ -1091,7 +1091,7 @@ TaskCheckGeometryDialog::TaskCheckGeometryDialog()
autoRunCheckBox = new QCheckBox();
autoRunCheckBox->setText(tr("Skip this settings page"));
autoRunCheckBox->setToolTip(
tr("Skip this settings page and run the geometry check automatically.")
tr("Skip this settings page and run the geometry check automatically")
+ QStringLiteral("\n")
+ tr("Default: false"));
autoRunCheckBox->setChecked(group->GetBool("AutoRun", false));

18
src/Mod/Part/Gui/TaskFaceAppearances.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Set appearance per face</string>
<string>Appearance per Face</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Click on the faces in the 3D view to select them</string>
<string>Select the faces in the 3D view</string>
</property>
</widget>
</item>
@@ -38,7 +38,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Faces:</string>
<string>Faces</string>
</property>
</widget>
</item>
@@ -63,14 +63,15 @@
<item row="0" column="1">
<widget class="QPushButton" name="buttonCustomAppearance">
<property name="text">
<string>...</string>
<string>Appearance</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelCustomAppearance">
<property name="text">
<string>Custom appearance:</string>
<string>Custom appearance</string>
</property>
</widget>
</item>
@@ -87,18 +88,17 @@
<string>Resets color for all faces of the part</string>
</property>
<property name="text">
<string>Set to default</string>
<string>Set to Default</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="boxSelection">
<property name="toolTip">
<string>When checked, you can select multiple faces
by dragging a selection rectangle in the 3D view</string>
<string>Allows the selection of multiple faces by dragging a rectangle in the 3D view</string>
</property>
<property name="text">
<string>Box selection</string>
<string>Box Selection</string>
</property>
<property name="checkable">
<bool>true</bool>

2
src/Mod/Part/Gui/TaskLoft.cpp
View File

@@ -177,7 +177,7 @@ bool LoftWidget::accept()
int count = d->ui.selector->selectedTreeWidget()->topLevelItemCount();
if (count < 2) {
QMessageBox::critical(this, tr("Too few elements"), tr("At least two vertices, edges, wires or faces are required."));
QMessageBox::critical(this, tr("Too few elements"), tr("At least 2 vertices, edges, wires, or faces are required."));
return false;
}
for (int i=0; i<count; i++) {

2
src/Mod/Part/Gui/TaskOffset.ui
View File

@@ -49,7 +49,7 @@
</item>
<item>
<property name="text">
<string>RectoVerso</string>
<string>Recto verso</string>
</property>
</item>
</widget>

12
src/Mod/Part/Gui/TaskShapeBuilder.cpp
View File

@@ -271,7 +271,7 @@ void ShapeBuilderWidget::createWireFromEdge()
Gui::SelectionFilter edgeFilter ("SELECT Part::Feature SUBELEMENT Edge COUNT 1..");
bool matchEdge = edgeFilter.match();
if (!matchEdge) {
QMessageBox::critical(this, tr("Wrong selection"), tr("Select one or more edges"));
QMessageBox::critical(this, tr("Wrong selection"), tr("Select at least 1 edge"));
return;
}
@@ -364,7 +364,7 @@ void ShapeBuilderWidget::createFaceFromEdge()
Gui::SelectionFilter edgeFilter ("SELECT Part::Feature SUBELEMENT Edge COUNT 1..");
bool matchEdge = edgeFilter.match();
if (!matchEdge) {
QMessageBox::critical(this, tr("Wrong selection"), tr("Select one or more edges"));
QMessageBox::critical(this, tr("Wrong selection"), tr("Select at least 1 edge"));
return;
}
@@ -416,7 +416,7 @@ void ShapeBuilderWidget::createShellFromFace()
Gui::SelectionFilter faceFilter ("SELECT Part::Feature SUBELEMENT Face COUNT 2..");
bool matchFace = faceFilter.match();
if (!matchFace) {
QMessageBox::critical(this, tr("Wrong selection"), tr("Select two or more faces"));
QMessageBox::critical(this, tr("Wrong selection"), tr("Select at least 2 faces"));
return;
}
@@ -477,7 +477,7 @@ void ShapeBuilderWidget::createSolidFromShell()
Gui::SelectionFilter partFilter ("SELECT Part::Feature COUNT 1");
bool matchPart = partFilter.match();
if (!matchPart) {
QMessageBox::critical(this, tr("Wrong selection"), tr("Select only one part object"));
QMessageBox::critical(this, tr("Wrong selection"), tr("Select only 1 shape object"));
return;
}
@@ -543,14 +543,14 @@ void ShapeBuilderWidget::switchMode(int mode)
}
else if (mode == 2) {
d->gate->setMode(ShapeSelection::VERTEX);
d->ui.label->setText(tr("Select a list of vertices"));
d->ui.label->setText(tr("Select vertices"));
d->ui.checkPlanar->setEnabled(true);
d->ui.checkFaces->setEnabled(false);
d->ui.checkRefine->setEnabled(false);
}
else if (mode == 3) {
d->gate->setMode(ShapeSelection::EDGE);
d->ui.label->setText(tr("Select a closed set of edges"));
d->ui.label->setText(tr("Select a closed loop of edges"));
d->ui.checkPlanar->setEnabled(true);
d->ui.checkFaces->setEnabled(false);
d->ui.checkRefine->setEnabled(false);

7
src/Mod/Part/Gui/TaskShapeBuilder.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Create shape</string>
<string>Create Shape</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Create shape</string>
<string>Create Shape</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -98,7 +98,8 @@
<item>
<widget class="QPushButton" name="selectButton">
<property name="text">
<string>Box selection...</string>
<string>Box Selection</string>
</property>
</widget>
</item>

4
src/Mod/Part/Gui/TaskSweep.cpp
View File

@@ -337,7 +337,7 @@ bool SweepWidget::accept()
return false;
}
if (!ok) {
QMessageBox::critical(this, tr("Invalid selection"), tr("Select one or more edges from a single object."));
QMessageBox::critical(this, tr("Invalid selection"), tr("Select at least 1 edge from a single object."));
return false;
}
for (int i=0; i<count; i++) {
@@ -486,7 +486,7 @@ void TaskSweep::clicked(int id)
{
if (id == QDialogButtonBox::Help) {
QString help = QApplication::translate("PartGui::TaskSweep",
"Select one or more profiles and select an edge or wire\n"
"Select at least 1 profile and an edge or wire\n"
"in the 3D view for the sweep path.");
if (!label) {
label = new Gui::StatusWidget(widget);

16
src/Mod/Part/Gui/ViewProvider2DObject.cpp
View File

@@ -64,14 +64,14 @@ PROPERTY_SOURCE(PartGui::ViewProvider2DObjectGrid, PartGui::ViewProvider2DObject
ViewProvider2DObjectGrid::ViewProvider2DObjectGrid()
{
ADD_PROPERTY_TYPE(ShowGrid,(false),"Grid",(App::PropertyType)(App::Prop_None),"Switch the grid on/off");
ADD_PROPERTY_TYPE(ShowGrid,(false),"Grid",(App::PropertyType)(App::Prop_None),"Toggle grid visibility");
ADD_PROPERTY_TYPE(ShowOnlyInEditMode,(true),"Grid",(App::PropertyType)(App::Prop_None),"Show only while in edit mode");
ADD_PROPERTY_TYPE(GridSize,(10.0),"Grid",(App::PropertyType)(App::Prop_None),"Gap size of the grid");
ADD_PROPERTY_TYPE(GridStyle,(0L),"Grid",(App::PropertyType)(App::Prop_None),"Appearance style of the grid");
ADD_PROPERTY_TYPE(TightGrid,(true),"Grid",(App::PropertyType)(App::Prop_None),"Switch the tight grid mode on/off");
ADD_PROPERTY_TYPE(GridSnap,(false),"Grid",(App::PropertyType)(App::Prop_None),"Switch the grid snap on/off");
ADD_PROPERTY_TYPE(GridAutoSize,(true),"Grid",(App::PropertyType)(App::Prop_Hidden),"Autosize grid based on shape boundbox");
ADD_PROPERTY_TYPE(maxNumberOfLines,(10000),"Grid",(App::PropertyType)(App::Prop_None),"Maximum Number of Lines in grid");
ADD_PROPERTY_TYPE(TightGrid,(true),"Grid",(App::PropertyType)(App::Prop_None),"Toggle tight grid mode");
ADD_PROPERTY_TYPE(GridSnap,(false),"Grid",(App::PropertyType)(App::Prop_None),"Toggle grid snapping");
ADD_PROPERTY_TYPE(GridAutoSize,(true),"Grid",(App::PropertyType)(App::Prop_Hidden),"Auto-size grid based on shape boundary box");
ADD_PROPERTY_TYPE(maxNumberOfLines,(10000),"Grid",(App::PropertyType)(App::Prop_None),"Maximum number of lines in grid");
GridRoot = new SoAnnotation();
GridRoot->ref();
@@ -172,7 +172,7 @@ SoSeparator* ViewProvider2DObjectGrid::createGrid()
int lines = vlines + hlines;
if (lines > maxNumberOfLines.getValue()) {
Base::Console().warning("Grid Disabled: Requested number of lines %d is larger than the maximum configured of %d\n."
Base::Console().warning("Grid disabled: requested number of lines %d is larger than the maximum configured of %d\n."
"Either increase the 'GridSize' property to a more reasonable value (recommended) or increase the 'maxNumberOfLines' property.\n", lines, maxNumberOfLines.getValue());
parent->addChild(vts);
parent->addChild(grid);
@@ -328,9 +328,9 @@ ViewProvider2DObject::ViewProvider2DObject()
{
ADD_PROPERTY_TYPE(ShowPlane,
(false),
"Display Options",
"Display options",
(App::PropertyType)(App::Prop_None),
"If true, plane related with object is additionally rendered.");
"If true, plane related with object is additionally rendered");
}
ViewProvider2DObject::~ViewProvider2DObject() = default;

2
src/Mod/Part/Gui/ViewProviderAttachExtension.cpp
View File

@@ -98,7 +98,7 @@ void ViewProviderAttachExtension::extensionSetupContextMenu(QMenu* menu, QObject
if (attach) {
// toggle command to display components
Gui::ActionFunction* func = new Gui::ActionFunction(menu);
QAction* act = menu->addAction(QObject::tr("Attachment editor"));
QAction* act = menu->addAction(QObject::tr("Attachment Editor"));
if (Gui::Control().activeDialog())
act->setDisabled(true);
func->trigger(act, [this](){

2
src/Mod/Part/Gui/ViewProviderExt.cpp
View File

@@ -886,7 +886,7 @@ void ViewProviderPartExt::setupContextMenu(QMenu* menu, QObject* receiver, const
{
QIcon iconObject = mergeGreyableOverlayIcons(Gui::BitmapFactory().pixmap("Part_ColorFace.svg"));
Gui::ViewProviderGeometryObject::setupContextMenu(menu, receiver, member);
QAction* act = menu->addAction(iconObject, QObject::tr("Set appearance per face..."), receiver, member);
QAction* act = menu->addAction(iconObject, QObject::tr("Appearance per Face"), receiver, member);
act->setData(QVariant((int)ViewProvider::Color));
}

2
src/Mod/Part/Gui/ViewProviderGridExtension.cpp
View File

@@ -424,7 +424,7 @@ void GridExtensionP::drawGrid(bool cameraUpdate) {
ViewProviderGridExtension::ViewProviderGridExtension()
{
EXTENSION_ADD_PROPERTY_TYPE(ShowGrid, (false), "Grid", (App::PropertyType)(App::Prop_None), "Switch the grid on/off");
EXTENSION_ADD_PROPERTY_TYPE(ShowGrid, (false), "Grid", (App::PropertyType)(App::Prop_None), "Toggle grid visibility");
EXTENSION_ADD_PROPERTY_TYPE(GridSize, (10.0), "Grid", (App::PropertyType)(App::Prop_None), "Gap size of the grid");
EXTENSION_ADD_PROPERTY_TYPE(GridAuto, (true), "Grid", (App::PropertyType)(App::Prop_None), "Change size of grid based on view area.");

8
src/Mod/Part/Gui/ViewProviderMirror.cpp
View File

@@ -81,7 +81,7 @@ void ViewProviderMirror::setupContextMenu(QMenu* menu, QObject* receiver, const
enabled = false;
}
QAction* act;
act = menu->addAction(QObject::tr("Edit mirror plane"), receiver, member);
act = menu->addAction(QObject::tr("Edit Mirror Plane"), receiver, member);
act->setEnabled(enabled);
act->setData(QVariant((int)ViewProvider::Default));
@@ -207,7 +207,7 @@ bool ViewProviderMirror::onDelete(const std::vector<std::string> &)
void ViewProviderMirror::dragStartCallback(void *, SoDragger *)
{
// This is called when a manipulator is about to manipulating
Gui::Application::Instance->activeDocument()->openCommand(QT_TRANSLATE_NOOP("Command", "Edit Mirror"));
Gui::Application::Instance->activeDocument()->openCommand(QT_TRANSLATE_NOOP("Command", "Edit mirror"));
}
void ViewProviderMirror::dragFinishCallback(void *, SoDragger *)
@@ -291,7 +291,7 @@ void ViewProviderFillet::updateData(const App::Property* prop)
void ViewProviderFillet::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QAction* act;
act = menu->addAction(QObject::tr("Edit fillet edges"), receiver, member);
act = menu->addAction(QObject::tr("Edit Fillet"), receiver, member);
act->setData(QVariant((int)ViewProvider::Default));
PartGui::ViewProviderPart::setupContextMenu(menu, receiver, member);
}
@@ -401,7 +401,7 @@ void ViewProviderChamfer::updateData(const App::Property* prop)
void ViewProviderChamfer::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QAction* act;
act = menu->addAction(QObject::tr("Edit chamfer edges"), receiver, member);
act = menu->addAction(QObject::tr("Edit Chamfer"), receiver, member);
act->setData(QVariant((int)ViewProvider::Default));
PartGui::ViewProviderPart::setupContextMenu(menu, receiver, member);
}

2
src/Mod/Part/Gui/ViewProviderProjectOnSurface.cpp
View File

@@ -51,7 +51,7 @@ ViewProviderProjectOnSurface::~ViewProviderProjectOnSurface() = default;
void ViewProviderProjectOnSurface::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QAction* act = menu->addAction(QObject::tr("Edit projection"), receiver, member);
QAction* act = menu->addAction(QObject::tr("Edit Projection"), receiver, member);
act->setData(QVariant((int)ViewProvider::Default));
ViewProviderPart::setupContextMenu(menu, receiver, member);

2
src/Mod/Part/Gui/ViewProviderSpline.cpp
View File

@@ -91,7 +91,7 @@ void ViewProviderSplineExtension::extensionSetupContextMenu(QMenu* menu, QObject
{
// toggle command to display components
Gui::ActionFunction* func = new Gui::ActionFunction(menu);
QAction* act = menu->addAction(QObject::tr("Show control points"));
QAction* act = menu->addAction(QObject::tr("Show Control Points"));
act->setCheckable(true);
act->setChecked(ControlPoints.getValue());
func->toggle(act, [this](bool on) {

16
src/Mod/Part/Gui/Workbench.cpp
View File

@@ -85,7 +85,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Part_Tube";
Gui::MenuItem* copy = new Gui::MenuItem;
copy->setCommand("Create a copy");
copy->setCommand("Copy");
*copy << "Part_SimpleCopy"
<< "Part_TransformedCopy"
<< "Part_ElementCopy"
@@ -132,17 +132,13 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Part_MakeSolid"
<< "Part_ReverseShape"
<< copy
<< "Part_CheckGeometry"
<< "Part_Defeaturing"
<< "Materials_InspectAppearance"
<< "Materials_InspectMaterial"
<< "Separator"
<< bop << join << split << compound
<< "Separator";
if (hasSketcher) {
*part << "Sketcher_NewSketch";
}
*part << "Part_Extrude"
*part << "Part_Extrude"
<< "Part_Revolve"
<< "Part_Mirror"
<< "Part_Scale"
@@ -158,8 +154,14 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Part_Offset2D"
<< "Part_Thickness"
<< "Part_ProjectionOnSurface"
<< "Part_SectionCut"
<< "Separator"
<< "Part_EditAttachment";
<< "Part_EditAttachment"
<< "Separator"
<< "Part_CheckGeometry"
<< "Part_Defeaturing"
<< "Materials_InspectAppearance"
<< "Materials_InspectMaterial";
Gui::MenuItem* view = root->findItem("&View");
if (view) {

15
src/Mod/Part/Gui/WorkbenchManipulator.cpp
View File

@@ -31,7 +31,6 @@ using namespace PartGui;
void WorkbenchManipulator::modifyMenuBar([[maybe_unused]] Gui::MenuItem* menuBar)
{
addSectionCut(menuBar);
}
void WorkbenchManipulator::modifyToolBars(Gui::ToolBarItem* toolBar)
@@ -44,20 +43,6 @@ void WorkbenchManipulator::modifyDockWindows([[maybe_unused]] Gui::DockWindowIte
{
}
void WorkbenchManipulator::addSectionCut(Gui::MenuItem* menuBar)
{
const char* toggleClipPlane = "Std_ToggleClipPlane";
auto par = menuBar->findParentOf(toggleClipPlane);
if (par) {
auto item = par->findItem(toggleClipPlane);
item = par->afterItem(item);
auto add = new Gui::MenuItem(); // NOLINT
add->setCommand("Part_SectionCut");
par->insertItem(item, add);
}
}
void WorkbenchManipulator::addSelectionFilter(Gui::ToolBarItem* toolBar)
{
if (auto view = toolBar->findItem("View")) {

3
src/Mod/Part/Gui/WorkbenchManipulator.h
View File

@@ -35,7 +35,7 @@ protected:
/*!
* \brief modifyMenuBar
* Method to manipulate the menu structure of a workbench.
* The default implementation doesn't change anything.SectionCut
* The default implementation doesn't change anything.
*/
void modifyMenuBar(Gui::MenuItem* menuBar) override;
/*!
@@ -52,7 +52,6 @@ protected:
void modifyDockWindows([[maybe_unused]] Gui::DockWindowItems* dockWindow) override;
private:
static void addSectionCut(Gui::MenuItem* menuBar);
static void addSelectionFilter(Gui::ToolBarItem* toolBar);
static void addDatums(Gui::ToolBarItem* toolBar);
};

2
src/Mod/Part/TestPartGui.py
View File

@@ -99,7 +99,7 @@ class SectionCutTestCases(unittest.TestCase):
button = box.button(QtWidgets.QDialogButtonBox.Close)
button.click()
else:
print ("No Section Cutting panel found")
print ("No section cutting panel found")
def tearDown(self):
FreeCAD.closeDocument("SectionCut")