diff --git a/src/Gui/Dialogs/DlgObjectSelection.cpp b/src/Gui/Dialogs/DlgObjectSelection.cpp index 158a69bb15..7621fe4802 100644 --- a/src/Gui/Dialogs/DlgObjectSelection.cpp +++ b/src/Gui/Dialogs/DlgObjectSelection.cpp @@ -154,8 +154,8 @@ void DlgObjectSelection::init(const std::vector &objs, * tried adding to .ui file, but could never get the * formatting exactly the way I wanted it. -- */ - useOriginalsBtn = new QPushButton(tr("&Use Original Selections")); - useOriginalsBtn->setToolTip(tr("Ignore dependencies and proceed with objects\noriginally selected prior to opening this dialog")); + useOriginalsBtn = new QPushButton(tr("&Use Original Selection")); + useOriginalsBtn->setToolTip(tr("Ignore dependencies and proceed with the objects\noriginally selected prior to opening this dialog")); ui->buttonBox->addButton(useOriginalsBtn, QDialogButtonBox::ResetRole); connect(ui->treeWidget, &QTreeWidget::itemChanged, this, &DlgObjectSelection::onObjItemChanged); diff --git a/src/Gui/Placement.ui b/src/Gui/Placement.ui index 38f8f7229f..1b43eda2b1 100644 --- a/src/Gui/Placement.ui +++ b/src/Gui/Placement.ui @@ -357,14 +357,14 @@ - Yaw (around z-axis) + Yaw (around Z-axis) - Yaw (around z-axis) + Yaw (around Z-axis) @@ -377,14 +377,14 @@ - Pitch (around y-axis) + Pitch (around Y-axis) - Pitch (around y-axis) + Pitch (around Y-axis) @@ -397,14 +397,14 @@ - Roll (around x-axis) + Roll (around X-axis) - Roll (around the x-axis) + Roll (around the X-axis) diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.ui b/src/Gui/PreferencePages/DlgSettingsNavigation.ui index be7acc2638..1a62a40116 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.ui +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.ui @@ -474,10 +474,10 @@ Select a set and then press the button to view said configurations. Rotation orbit style. Rounded Arcball: moving the mouse in the corners of the screen will only roll the part. -Trackball: moving the mouse horizontally will rotate the part around the y-axis. +Trackball: moving the mouse horizontally will rotate the part around the Y-axis. Trackball Classic: moving the mouse will rotate the part allowing precession. -Turntable: the part will be rotated around the z-axis (with constrained axes). -Free Turntable: the part will be rotated around the z-axis. +Turntable: the part will be rotated around the Z-axis (with constrained axes). +Free Turntable: the part will be rotated around the Z-axis. diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index 9047597f54..b6b68ed2b5 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -683,8 +683,8 @@ TreeWidget::TreeWidget(const char* name, QWidget* parent) connect(this->recomputeObjectAction, &QAction::triggered, this, &TreeWidget::onRecomputeObject); this->searchObjectsAction = new QAction(this); - this->searchObjectsAction->setText(tr("Search...")); - this->searchObjectsAction->setStatusTip(tr("Search for objects")); + this->searchObjectsAction->setText(tr("Search Objects")); + this->searchObjectsAction->setStatusTip(tr("Searches for objects in the tree")); connect(this->searchObjectsAction, &QAction::triggered, this, &TreeWidget::onSearchObjects); diff --git a/src/Gui/ViewProviderDocumentObjectGroup.cpp b/src/Gui/ViewProviderDocumentObjectGroup.cpp index fbbc08056e..3cbf0c2ac6 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.cpp +++ b/src/Gui/ViewProviderDocumentObjectGroup.cpp @@ -104,8 +104,8 @@ void ViewProviderDocumentObjectGroup::setupContextMenu(QMenu* menu, QObject* rec if (group && !group->getObjects().empty()) { // Add the custom action. QIcon icon = BitmapFactory().iconFromTheme("Std_SelectGroupContents"); - QAction* selectAction = new QAction(icon, QObject::tr("Select group contents"), menu); - selectAction->setToolTip(QObject::tr("Selects all objects that are children of this group.")); + QAction* selectAction = new QAction(icon, QObject::tr("Select Group Contents"), menu); + selectAction->setToolTip(QObject::tr("Selects all objects that are children of this group")); // Connect the action's triggered signal to a lambda function that performs the selection. QObject::connect(selectAction, &QAction::triggered, [group]() { diff --git a/src/Mod/BIM/ArchComponent.py b/src/Mod/BIM/ArchComponent.py index c78a412dba..02dfd059ae 100644 --- a/src/Mod/BIM/ArchComponent.py +++ b/src/Mod/BIM/ArchComponent.py @@ -1655,7 +1655,7 @@ class ViewProviderComponent: def contextMenuAddToggleSubcomponents(self, menu): actionToggleSubcomponents = QtGui.QAction(QtGui.QIcon(":/icons/Arch_ToggleSubs.svg"), - translate("Arch", "Toggle subcomponents"), + translate("Arch", "Toggle Subcomponents"), menu) QtCore.QObject.connect(actionToggleSubcomponents, QtCore.SIGNAL("triggered()"), @@ -2092,7 +2092,7 @@ class ComponentTaskPanel: self.baseform.setWindowTitle(QtGui.QApplication.translate("Arch", "Component", None)) self.delButton.setText(QtGui.QApplication.translate("Arch", "Remove", None)) self.addButton.setText(QtGui.QApplication.translate("Arch", "Add", None)) - self.title.setText(QtGui.QApplication.translate("Arch", "Components of this object", None)) + self.title.setText(QtGui.QApplication.translate("Arch", "Components of This Object", None)) self.treeBase.setText(0,QtGui.QApplication.translate("Arch", "Base component", None)) self.treeAdditions.setText(0,QtGui.QApplication.translate("Arch", "Additions", None)) self.treeSubtractions.setText(0,QtGui.QApplication.translate("Arch", "Subtractions", None)) @@ -2102,8 +2102,8 @@ class ComponentTaskPanel: self.treeFixtures.setText(0,QtGui.QApplication.translate("Arch", "Fixtures", None)) self.treeGroup.setText(0,QtGui.QApplication.translate("Arch", "Group", None)) self.treeHosts.setText(0,QtGui.QApplication.translate("Arch", "Hosts", None)) - self.ifcButton.setText(QtGui.QApplication.translate("Arch", "Edit IFC properties", None)) - self.classButton.setText(QtGui.QApplication.translate("Arch", "Edit standard code", None)) + self.ifcButton.setText(QtGui.QApplication.translate("Arch", "Edit IFC Properties", None)) + self.classButton.setText(QtGui.QApplication.translate("Arch", "Edit Standard Code", None)) def editIfcProperties(self): """Open the IFC editor dialog box. diff --git a/src/Mod/BIM/ArchMaterial.py b/src/Mod/BIM/ArchMaterial.py index 08a976adf2..ea2347c946 100644 --- a/src/Mod/BIM/ArchMaterial.py +++ b/src/Mod/BIM/ArchMaterial.py @@ -92,12 +92,12 @@ class _ViewProviderArchMaterialContainer: if FreeCADGui.activeWorkbench().name() != 'BIMWorkbench': return actionMergeByName = QtGui.QAction(QtGui.QIcon(":/icons/Arch_Material_Group.svg"), - translate("Arch", "Merge duplicates"), + translate("Arch", "Merge Duplicates"), menu) actionMergeByName.triggered.connect(self.mergeByName) menu.addAction(actionMergeByName) - actionReorder = QtGui.QAction(translate("Arch", "Reorder children alphabetically"), + actionReorder = QtGui.QAction(translate("Arch", "Reorder Children Alphabetically"), menu) actionReorder.triggered.connect(self.reorder) menu.addAction(actionReorder) diff --git a/src/Mod/BIM/ArchSite.py b/src/Mod/BIM/ArchSite.py index f72cf3fad3..54ef3057b5 100644 --- a/src/Mod/BIM/ArchSite.py +++ b/src/Mod/BIM/ArchSite.py @@ -877,7 +877,7 @@ class _ViewProviderSite: menu.addAction(actionEdit) actionToggleSubcomponents = QtGui.QAction(QtGui.QIcon(":/icons/Arch_ToggleSubs.svg"), - translate("Arch", "Toggle subcomponents"), + translate("Arch", "Toggle Subcomponents"), menu) QtCore.QObject.connect(actionToggleSubcomponents, QtCore.SIGNAL("triggered()"), diff --git a/src/Mod/BIM/ArchWall.py b/src/Mod/BIM/ArchWall.py index 2418598d14..0e9554fff3 100644 --- a/src/Mod/BIM/ArchWall.py +++ b/src/Mod/BIM/ArchWall.py @@ -1430,7 +1430,7 @@ class _ViewProviderWall(ArchComponent.ViewProviderComponent): super().contextMenuAddEdit(menu) actionFlipDirection = QtGui.QAction(QtGui.QIcon(":/icons/Arch_Wall_Tree.svg"), - translate("Arch", "Flip direction"), + translate("Arch", "Flip Direction"), menu) QtCore.QObject.connect(actionFlipDirection, QtCore.SIGNAL("triggered()"), diff --git a/src/Mod/BIM/ArchWindow.py b/src/Mod/BIM/ArchWindow.py index 361811cb14..4c98bf79df 100644 --- a/src/Mod/BIM/ArchWindow.py +++ b/src/Mod/BIM/ArchWindow.py @@ -921,7 +921,7 @@ class _ViewProviderWindow(ArchComponent.ViewProviderComponent): if len(hingeIdxs) > 0: actionInvertOpening = QtGui.QAction(QtGui.QIcon(":/icons/Arch_Window_Tree.svg"), - translate("Arch", "Invert opening direction"), + translate("Arch", "Invert Opening Direction"), menu) QtCore.QObject.connect(actionInvertOpening, QtCore.SIGNAL("triggered()"), @@ -930,7 +930,7 @@ class _ViewProviderWindow(ArchComponent.ViewProviderComponent): if len(hingeIdxs) == 1: actionInvertHinge = QtGui.QAction(QtGui.QIcon(":/icons/Arch_Window_Tree.svg"), - translate("Arch", "Invert hinge position"), + translate("Arch", "Invert Hinge Position"), menu) QtCore.QObject.connect(actionInvertHinge, QtCore.SIGNAL("triggered()"), @@ -1458,15 +1458,15 @@ class _ArchWindowTaskPanel: TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Window elements", None)) self.holeLabel.setText(QtGui.QApplication.translate("Arch", "Hole wire", None)) self.holeNumber.setToolTip(QtGui.QApplication.translate("Arch", "The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire", None)) - self.holeButton.setText(QtGui.QApplication.translate("Arch", "Pick selected", None)) + self.holeButton.setText(QtGui.QApplication.translate("Arch", "Pick Selected", None)) self.delButton.setText(QtGui.QApplication.translate("Arch", "Remove", None)) self.addButton.setText(QtGui.QApplication.translate("Arch", "Add", None)) self.editButton.setText(QtGui.QApplication.translate("Arch", "Edit", None)) - self.createButton.setText(QtGui.QApplication.translate("Arch", "Create/update component", None)) + self.createButton.setText(QtGui.QApplication.translate("Arch", "Create/Update Component", None)) self.title.setText(QtGui.QApplication.translate("Arch", "Base 2D object", None)) self.wiretree.setHeaderLabels([QtGui.QApplication.translate("Arch", "Wires", None)]) self.comptree.setHeaderLabels([QtGui.QApplication.translate("Arch", "Components", None)]) - self.newtitle.setText(QtGui.QApplication.translate("Arch", "Create new component", None)) + self.newtitle.setText(QtGui.QApplication.translate("Arch", "Create new Component", None)) self.new1.setText(QtGui.QApplication.translate("Arch", "Name", None)) self.new2.setText(QtGui.QApplication.translate("Arch", "Type", None)) self.new3.setText(QtGui.QApplication.translate("Arch", "Wires", None)) @@ -1474,14 +1474,14 @@ class _ArchWindowTaskPanel: self.new5.setText(QtGui.QApplication.translate("Arch", "Offset", None)) self.new6.setText(QtGui.QApplication.translate("Arch", "Hinge", None)) self.new7.setText(QtGui.QApplication.translate("Arch", "Opening mode", None)) - self.addp4.setText(QtGui.QApplication.translate("Arch", "+ Frame prop.", None)) + self.addp4.setText(QtGui.QApplication.translate("Arch", "+ Frame property", None)) self.addp4.setToolTip(QtGui.QApplication.translate("Arch", "If this is checked, the window's Frame property value will be added to the value entered here", None)) - self.addp5.setText(QtGui.QApplication.translate("Arch", "+ Offset prop.", None)) + self.addp5.setText(QtGui.QApplication.translate("Arch", "+ Offset property", None)) self.addp5.setToolTip(QtGui.QApplication.translate("Arch", "If this is checked, the window's Offset property value will be added to the value entered here", None)) - self.field6.setText(QtGui.QApplication.translate("Arch", "Get selected edge", None)) + self.field6.setText(QtGui.QApplication.translate("Arch", "Get Selected Edge", None)) self.field6.setToolTip(QtGui.QApplication.translate("Arch", "Press to retrieve the selected edge", None)) - self.invertOpeningButton.setText(QtGui.QApplication.translate("Arch", "Invert opening direction", None)) - self.invertHingeButton.setText(QtGui.QApplication.translate("Arch", "Invert hinge position", None)) + self.invertOpeningButton.setText(QtGui.QApplication.translate("Arch", "Invert Opening Direction", None)) + self.invertHingeButton.setText(QtGui.QApplication.translate("Arch", "Invert Hinge Position", None)) for i in range(len(WindowPartTypes)): self.field2.setItemText(i, QtGui.QApplication.translate("Arch", WindowPartTypes[i], None)) for i in range(len(WindowOpeningModes)): diff --git a/src/Mod/BIM/Resources/ui/dialogLayersIFC.ui b/src/Mod/BIM/Resources/ui/dialogLayersIFC.ui index 06b531b990..cb4c64c92a 100644 --- a/src/Mod/BIM/Resources/ui/dialogLayersIFC.ui +++ b/src/Mod/BIM/Resources/ui/dialogLayersIFC.ui @@ -57,7 +57,7 @@ - Toggle On/Off + Toggle Visibility diff --git a/src/Mod/BIM/bimcommands/BimMaterial.py b/src/Mod/BIM/bimcommands/BimMaterial.py index dcbbd9f018..831ffe4085 100644 --- a/src/Mod/BIM/bimcommands/BimMaterial.py +++ b/src/Mod/BIM/bimcommands/BimMaterial.py @@ -102,8 +102,8 @@ class BIM_Material: searchLayout = QtGui.QHBoxLayout() searchLayout.setSpacing(2) searchBox = MatLineEdit(self.dlg) - searchBox.setPlaceholderText(translate("BIM", "Search…")) - searchBox.setToolTip(translate("BIM", "Searches object labels")) + searchBox.setPlaceholderText(translate("BIM", "Search Objects")) + searchBox.setToolTip(translate("BIM", "Searches for objects in the tree")) self.dlg.searchBox = searchBox searchLayout.addWidget(searchBox) searchBox.textChanged.connect(self.onSearch) @@ -124,14 +124,14 @@ class BIM_Material: lay.addLayout(searchLayout) createButtonsLayoutBox = QtGui.QGroupBox( - translate("BIM", " Material operations"), self.dlg + translate("BIM", " Material Operations"), self.dlg ) createButtonsLayoutBox.setObjectName("matOpsGrpBox") createButtonsLayout = QtGui.QGridLayout() # create buttonCreate = QtGui.QPushButton( - translate("BIM", "Create new material"), self.dlg + translate("BIM", "New Material"), self.dlg ) buttonCreate.setIcon(QtGui.QIcon(":/icons/Arch_Material.svg")) createButtonsLayout.addWidget(buttonCreate, 0, 0) @@ -139,7 +139,7 @@ class BIM_Material: # create multi buttonMulti = QtGui.QPushButton( - translate("BIM", "Create new multi-material"), self.dlg + translate("BIM", "Create new Multi-Material"), self.dlg ) buttonMulti.setIcon(QtGui.QIcon(":/icons/Arch_Material_Multi.svg")) createButtonsLayout.addWidget(buttonMulti, 0, 1) @@ -148,7 +148,7 @@ class BIM_Material: # merge dupes opsLayout = QtGui.QHBoxLayout() buttonMergeDupes = QtGui.QPushButton( - translate("BIM", "Merge duplicates"), self.dlg + translate("BIM", "Merge Duplicates"), self.dlg ) buttonMergeDupes.setIcon(QtGui.QIcon(":/icons/view-refresh.svg")) createButtonsLayout.addWidget(buttonMergeDupes, 1, 0) @@ -159,7 +159,7 @@ class BIM_Material: # delete unused buttonDeleteUnused = QtGui.QPushButton( - translate("BIM", "Delete unused"), self.dlg + translate("BIM", "Delete Unused"), self.dlg ) buttonDeleteUnused.setIcon(QtGui.QIcon(":/icons/delete.svg")) createButtonsLayout.addWidget(buttonDeleteUnused, 1, 1) diff --git a/src/Mod/BIM/bimcommands/BimViews.py b/src/Mod/BIM/bimcommands/BimViews.py index f56e18300e..321b63c8f6 100644 --- a/src/Mod/BIM/bimcommands/BimViews.py +++ b/src/Mod/BIM/bimcommands/BimViews.py @@ -86,13 +86,13 @@ class BIM_Views: # set button self.dialog.menu = QtGui.QMenu() - for button in [("Active", translate("BIM","Active (default)")), - ("AddLevel", translate("BIM","Add level")), - ("AddProxy", translate("BIM","Add proxy")), + for button in [("Active", translate("BIM","Active")), + ("AddLevel", translate("BIM","Add Level")), + ("AddProxy", translate("BIM","Add Proxy WP")), ("Delete", translate("BIM","Delete")), - ("Toggle", translate("BIM","Toggle on/off")), + ("Toggle", translate("BIM","Toggle Visibility")), ("Isolate", translate("BIM","Isolate")), - ("SaveView", translate("BIM","Save view position")), + ("SaveView", translate("BIM","Save View Position")), ("Rename", translate("BIM","Rename"))]: action = QtGui.QAction(button[1]) @@ -121,7 +121,7 @@ class BIM_Views: self.dialog.buttonAddLevel.setToolTip(translate("BIM","Creates a new level")) self.dialog.buttonAddProxy.setToolTip(translate("BIM","Creates a new working plane proxy")) self.dialog.buttonDelete.setToolTip(translate("BIM","Deletes the selected item")) - self.dialog.buttonToggle.setToolTip(translate("BIM","Toggles selected items on/off")) + self.dialog.buttonToggle.setToolTip(translate("BIM","Toggles the visibility of selected items")) self.dialog.buttonIsolate.setToolTip(translate("BIM","Turns all items off except the selected ones")) self.dialog.buttonSaveView.setToolTip(translate("BIM","Saves the current camera position to the selected items")) self.dialog.buttonRename.setToolTip(translate("BIM","Renames the selected item")) diff --git a/src/Mod/BIM/nativeifc/ifc_viewproviders.py b/src/Mod/BIM/nativeifc/ifc_viewproviders.py index 3f50e774fe..ff6d22bc7d 100644 --- a/src/Mod/BIM/nativeifc/ifc_viewproviders.py +++ b/src/Mod/BIM/nativeifc/ifc_viewproviders.py @@ -104,48 +104,48 @@ class ifc_vp_object: FreeCADGui.ActiveDocument.ActiveView.getActiveObject("NativeIFC") == vobj.Object ): - t = translate("BIM", "Deactivate container") + t = translate("BIM", "Deactivate Container") else: - t = translate("BIM", "Make active container") + t = translate("BIM", "Make Active Container") action_activate = QtGui.QAction(icon, t, menu) action_activate.triggered.connect(self.activate) menu.addAction(action_activate) if self.hasChildren(vobj.Object): - action_expand = QtGui.QAction(icon, translate("BIM", "Expand children"), menu) + action_expand = QtGui.QAction(icon, translate("BIM", "Expand Children"), menu) action_expand.triggered.connect(self.expandChildren) actions.append(action_expand) if vobj.Object.Group: - action_shrink = QtGui.QAction(icon, translate("BIM", "Collapse children"), menu) + action_shrink = QtGui.QAction(icon, translate("BIM", "Collapse Children"), menu) action_shrink.triggered.connect(self.collapseChildren) actions.append(action_shrink) if vobj.Object.ShapeMode == "Shape": - t = translate("BIM", "Remove shape") + t = translate("BIM", "Remove Shape") else: - t = translate("BIM", "Load shape") + t = translate("BIM", "Load Shape") action_shape = QtGui.QAction(icon, t, menu) action_shape.triggered.connect(self.switchShape) actions.append(action_shape) if vobj.Object.ShapeMode == "None": - action_coin = QtGui.QAction(icon, translate("BIM", "Load representation"), menu) + action_coin = QtGui.QAction(icon, translate("BIM", "Load Representation"), menu) action_coin.triggered.connect(self.switchCoin) actions.append(action_coin) if element and ifc_tools.has_representation(element): - action_geom = QtGui.QAction(icon, translate("BIM", "Add geometry properties"), menu) + action_geom = QtGui.QAction(icon, translate("BIM", "Add Geometry Properties"), menu) action_geom.triggered.connect(self.addGeometryProperties) actions.append(action_geom) - action_tree = QtGui.QAction(icon, translate("BIM", "Show geometry tree"), menu) + action_tree = QtGui.QAction(icon, translate("BIM", "Show Geometry Tree"), menu) action_tree.triggered.connect(self.showTree) actions.append(action_tree) if ifc_psets.has_psets(self.Object): - action_props = QtGui.QAction(icon, translate("BIM", "Expand property sets"), menu) + action_props = QtGui.QAction(icon, translate("BIM", "Expand Property Sets"), menu) action_props.triggered.connect(self.showProps) actions.append(action_props) if ifc_materials.get_material(self.Object): - action_material = QtGui.QAction(icon, translate("BIM", "Load material"), menu) + action_material = QtGui.QAction(icon, translate("BIM", "Load Material"), menu) action_material.triggered.connect(self.addMaterial) actions.append(action_material) if ifc_types.is_typable(self.Object): - action_type = QtGui.QAction(icon, translate("BIM", "Convert to type"), menu) + action_type = QtGui.QAction(icon, translate("BIM", "Convert to Type"), menu) action_type.triggered.connect(self.convertToType) actions.append(action_type) if actions: @@ -156,7 +156,7 @@ class ifc_vp_object: # generic actions ficon = QtGui.QIcon.fromTheme("folder", QtGui.QIcon(":/icons/folder.svg")) - action_group = QtGui.QAction(ficon, translate("BIM", "Create group..."), menu) + action_group = QtGui.QAction(ficon, translate("BIM", "New Group"), menu) action_group.triggered.connect(self.createGroup) menu.addAction(action_group) @@ -432,14 +432,14 @@ class ifc_vp_document(ifc_vp_object): icon = QtGui.QIcon(":/icons/IFC.svg") if vobj.Object.Modified: - action_diff = QtGui.QAction(icon, translate("BIM", "View diff..."), menu) + action_diff = QtGui.QAction(icon, translate("BIM", "View Diff"), menu) action_diff.triggered.connect(self.diff) ifc_menu.addAction(action_diff) if vobj.Object.IfcFilePath: - action_save = QtGui.QAction(icon, translate("BIM", "Save IFC file"), menu) + action_save = QtGui.QAction(icon, translate("BIM", "Save IFC File"), menu) action_save.triggered.connect(self.save) ifc_menu.addAction(action_save) - action_saveas = QtGui.QAction(icon, translate("BIM", "Save IFC file as..."), menu) + action_saveas = QtGui.QAction(icon, translate("BIM", "Save IFC File As…"), menu) action_saveas.triggered.connect(self.saveas) ifc_menu.addAction(action_saveas) @@ -491,7 +491,7 @@ class ifc_vp_document(ifc_vp_object): msg = "Warning: This operation will change the whole IFC file contents " msg += "and will not give versionable results. It is best to not do " msg += "this while you are in the middle of a project. " - msg += "Do you wish to continue anyway?" + msg += "Continue anyway?" dlg = QtGui.QMessageBox.question( None, "Replace IFC file schema?", @@ -611,7 +611,7 @@ class ifc_vp_material: icon = QtGui.QIcon(":/icons/IFC.svg") if ifc_psets.has_psets(self.Object): - action_props = QtGui.QAction(icon, translate("BIM", "Expand property sets"), menu) + action_props = QtGui.QAction(icon, translate("BIM", "Expand Property Sets"), menu) action_props.triggered.connect(self.showProps) menu.addAction(action_props) diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui index f586297a34..31d6ff4b93 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui @@ -126,7 +126,7 @@ Larger values (further to the right) will calculate faster; smaller values (furt - How much material to leave in the XY plane (i.e. for finishing operation) + How much material to leave in the XY-plane (i.e. for finishing operation) diff --git a/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui b/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui index 6c678f9933..32e42ca4d6 100644 --- a/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui +++ b/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui @@ -27,7 +27,7 @@ - Sets the working plane to the XY plane (ground plane) + Sets the working plane to the XY-plane (ground plane) Top (XY) @@ -37,7 +37,7 @@ - Sets the working plane to the XZ plane (front plane) + Sets the working plane to the XZ-plane (front plane) Front (XZ) @@ -47,7 +47,7 @@ - Sets the working plane to the YZ plane (side plane) + Sets the working plane to the YZ-plane (side plane) Side (YZ) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index dec475840a..5ccff8f7f2 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -2217,7 +2217,7 @@ void CmdFemPostLinearizedStressesFilter::activated(int) Gui::getMainWindow(), qApp->translate("CmdFemPostLinearizedStressesFilter", "Wrong selection"), qApp->translate("CmdFemPostLinearizedStressesFilter", - "Select a Clip filter which clips a STRESS field along a line.")); + "Select a clip filter which clips a stress field along a line")); } } else { @@ -2225,7 +2225,7 @@ void CmdFemPostLinearizedStressesFilter::activated(int) Gui::getMainWindow(), qApp->translate("CmdFemPostLinearizedStressesFilter", "Wrong selection"), qApp->translate("CmdFemPostLinearizedStressesFilter", - "Select a clip filter which clips a stress field along a line.")); + "Select a clip filter which clips a stress field along a line")); } } diff --git a/src/Mod/Part/App/Attacher.cpp b/src/Mod/Part/App/Attacher.cpp index 4f1e041de9..9fe2c114a1 100644 --- a/src/Mod/Part/App/Attacher.cpp +++ b/src/Mod/Part/App/Attacher.cpp @@ -1596,7 +1596,7 @@ AttachEngine3D::_calculateAttachedPlacement(const std::vector - Around x-axis + Around X-axis @@ -251,7 +251,7 @@ - Rotation around the x-axis + Rotation around the X-axis Note: The placement is expressed in local space of object being attached. @@ -277,7 +277,7 @@ Note: The placement is expressed in local space of object being attached. - Around y-axis + Around Y-axis @@ -296,7 +296,7 @@ Note: The placement is expressed in local space of object being attached. - Rotation around the y-axis + Rotation around the Y-axis Note: The placement is expressed in local space of object being attached. @@ -322,7 +322,7 @@ Note: The placement is expressed in local space of object being attached. - Around z-axis + Around Z-axis @@ -341,7 +341,7 @@ Note: The placement is expressed in local space of object being attached. - Rotation around the z-axis + Rotation around the Z-axis Note: The placement is expressed in local space of object being attached. diff --git a/src/Mod/Part/Gui/AttacherTexts.cpp b/src/Mod/Part/Gui/AttacherTexts.cpp index ec188e8a39..5ad0c1a3eb 100644 --- a/src/Mod/Part/Gui/AttacherTexts.cpp +++ b/src/Mod/Part/Gui/AttacherTexts.cpp @@ -86,19 +86,19 @@ TextSet getUIStrings(Base::Type attacherType, eMapMode mmode) qApp->translate("Attacher3D", "Align to Frenet-Serret coordinate system of curved edge. Optional vertex link defines where.","Attachment3D mode tooltip")); case mmConcentric: return TwoStrings(qApp->translate("Attacher3D", "Concentric","Attachment3D mode caption"), - qApp->translate("Attacher3D", "Align XY plane to osculating circle of an edge. Optional vertex link defines where.","Attachment3D mode tooltip")); + qApp->translate("Attacher3D", "Align XY-plane to osculating circle of an edge. Optional vertex link defines where.","Attachment3D mode tooltip")); case mmRevolutionSection: return TwoStrings(qApp->translate("Attacher3D", "Revolution Section","Attachment3D mode caption"), qApp->translate("Attacher3D", "Align Y' axis to match axis of osculating circle of an edge. Optional vertex link defines where.","Attachment3D mode tooltip")); case mmThreePointsPlane: - return TwoStrings(qApp->translate("Attacher3D", "XY plane by 3 points","Attachment3D mode caption"), - qApp->translate("Attacher3D", "Align XY plane to pass through three vertices.","Attachment3D mode tooltip")); + return TwoStrings(qApp->translate("Attacher3D", "XY-plane by 3 points","Attachment3D mode caption"), + qApp->translate("Attacher3D", "Align XY-plane to pass through three vertices.","Attachment3D mode tooltip")); case mmThreePointsNormal: - return TwoStrings(qApp->translate("Attacher3D", "XZ plane by 3 points","Attachment3D mode caption"), - qApp->translate("Attacher3D", "Align XZ plane to pass through 3 points; X axis will pass through two first points.","Attachment3D mode tooltip")); + return TwoStrings(qApp->translate("Attacher3D", "XZ-plane by 3 points","Attachment3D mode caption"), + qApp->translate("Attacher3D", "Align XZ-plane to pass through 3 points; X axis will pass through two first points.","Attachment3D mode tooltip")); case mmFolding: return TwoStrings(qApp->translate("Attacher3D", "Folding","Attachment3D mode caption"), - qApp->translate("Attacher3D", "Specialty mode for folding polyhedra. Select 4 edges in order: foldable edge, fold line, other fold line, other foldable edge. XY plane will be aligned to folding the first edge.","Attachment3D mode tooltip")); + qApp->translate("Attacher3D", "Specialty mode for folding polyhedra. Select 4 edges in order: foldable edge, fold line, other fold line, other foldable edge. XY-plane will be aligned to folding the first edge.","Attachment3D mode tooltip")); case mmInertialCS: return TwoStrings(qApp->translate("Attacher3D", "Inertial CS","Attachment3D mode caption"), qApp->translate("Attacher3D", "Inertial coordinate system, constructed on principal axes of inertia and center of mass.","Attachment3D mode tooltip")); diff --git a/src/Mod/Part/Gui/TaskAttacher.ui b/src/Mod/Part/Gui/TaskAttacher.ui index 06f56f9eed..a5404da168 100644 --- a/src/Mod/Part/Gui/TaskAttacher.ui +++ b/src/Mod/Part/Gui/TaskAttacher.ui @@ -241,7 +241,7 @@ of the object being attached - Around x-axis + Around X-axis @@ -254,7 +254,7 @@ of the object being attached - Rotation around the local x-axis. The offset is expressed in the local coordinate system + Rotation around the local X-axis. The offset is expressed in the local coordinate system of the object being attached. @@ -280,7 +280,7 @@ of the object being attached. - Around y-axis + Around Y-axis @@ -293,7 +293,7 @@ of the object being attached. - Rotation around the local y-axis. The offset is expressed in the local coordinate system + Rotation around the local Y-axis. The offset is expressed in the local coordinate system of the object being attached. @@ -319,7 +319,7 @@ of the object being attached. - Around z-axis + Around Z-axis @@ -332,7 +332,7 @@ of the object being attached. - Rotation around the local z-axis. The offset is expressed in the local coordinate system + Rotation around the local Z-axis. The offset is expressed in the local coordinate system of the object being attached. diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.cpp b/src/Mod/PartDesign/App/FeaturePrimitive.cpp index 2ac3029dc0..53705bc336 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.cpp +++ b/src/Mod/PartDesign/App/FeaturePrimitive.cpp @@ -491,9 +491,9 @@ PROPERTY_SOURCE(PartDesign::Torus, PartDesign::FeaturePrimitive) Torus::Torus() { - ADD_PROPERTY_TYPE(Radius1,(10.0),"Torus",App::Prop_None,"Radius in local xy-plane"); + ADD_PROPERTY_TYPE(Radius1,(10.0),"Torus",App::Prop_None,"Radius in local XY-plane"); Radius1.setConstraints(&quantityRange); - ADD_PROPERTY_TYPE(Radius2,(2.0),"Torus",App::Prop_None,"Radius in local xz-plane"); + ADD_PROPERTY_TYPE(Radius2,(2.0),"Torus",App::Prop_None,"Radius in local XZ-plane"); Radius2.setConstraints(&quantityRange); ADD_PROPERTY_TYPE(Angle1,(-180.0),"Torus",App::Prop_None,"The angle of the torus"); Angle1.setConstraints(&torusRangeV); diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index 2bb3927974..806c171fa9 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -349,7 +349,7 @@ void CmdPartDesignMigrate::activated(int iMsg) } else { // Huh? nothing to migrate? QMessageBox::warning ( nullptr, QObject::tr ( "Nothing to migrate" ), - QObject::tr ( "No Part Design features found that do not belong to a body." + QObject::tr ( "No Part Design features without body found" " Nothing to migrate." ) ); } return; diff --git a/src/Mod/PartDesign/Gui/DlgActiveBody.ui b/src/Mod/PartDesign/Gui/DlgActiveBody.ui index d279a6fba6..2c5214f649 100644 --- a/src/Mod/PartDesign/Gui/DlgActiveBody.ui +++ b/src/Mod/PartDesign/Gui/DlgActiveBody.ui @@ -17,7 +17,7 @@ - To create a new Part Design object, there must be an active body object in the document. + To create a new Part Design object, there must be an active body in the document. Select a body from below, or create a new body. diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp index 11a0a535bf..ca4e27d867 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp @@ -324,7 +324,7 @@ void TaskChamferParameters::apply() // Alert user if he created an empty feature if (ui->listWidgetReferences->count() == 0) { - Base::Console().warning(tr("Empty chamfer created !\n").toStdString().c_str()); + Base::Console().warning(tr("Empty chamfer created!\n").toStdString().c_str()); } } diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp index 868ffb1db8..2fa0914686 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp @@ -284,7 +284,7 @@ void TaskDraftParameters::apply() { // Alert user if he created an empty feature if (ui->listWidgetReferences->count() == 0) { - Base::Console().warning(tr("Empty draft created !\n").toStdString().c_str()); + Base::Console().warning(tr("Empty draft created!\n").toStdString().c_str()); } TaskDressUpParameters::apply(); diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp index 80c8ae2713..d57a981e3e 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp @@ -234,9 +234,9 @@ void TaskHelixParameters::addPartAxes() if (PartDesign::Body* body = PartDesign::Body::findBodyOf(profile)) { try { App::Origin* orig = body->getOrigin(); - addAxisToCombo(orig->getX(), "", tr("Base x-axis")); - addAxisToCombo(orig->getY(), "", tr("Base y-axis")); - addAxisToCombo(orig->getZ(), "", tr("Base z-axis")); + addAxisToCombo(orig->getX(), "", tr("Base X-axis")); + addAxisToCombo(orig->getY(), "", tr("Base Y-axis")); + addAxisToCombo(orig->getZ(), "", tr("Base Z-axis")); } catch (const Base::Exception& ex) { ex.reportException(); diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.ui b/src/Mod/PartDesign/Gui/TaskHelixParameters.ui index 69bc5fbfbd..da5a6a21ba 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.ui @@ -45,17 +45,17 @@ - Base x-axis + Base X-axis - Base y-axis + Base Y-axis - Base z-axis + Base Z-axis diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui index 451e8af680..18bc423976 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui @@ -1020,7 +1020,7 @@ If zero, it is equal to Radius2 - Radius in local xy-plane + Radius in local XY-plane false @@ -1043,7 +1043,7 @@ If zero, it is equal to Radius2 - Radius in local xz-plane + Radius in local XZ-plane false diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp index 562f94a433..619155eb36 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp @@ -232,9 +232,9 @@ void TaskRevolutionParameters::fillAxisCombo(bool forceRefill) if (PartDesign::Body * body = PartDesign::Body::findBodyOf(pcFeat)) { try { App::Origin* orig = body->getOrigin(); - addAxisToCombo(orig->getX(), std::string(), tr("Base x-axis")); - addAxisToCombo(orig->getY(), std::string(), tr("Base y-axis")); - addAxisToCombo(orig->getZ(), std::string(), tr("Base z-axis")); + addAxisToCombo(orig->getX(), std::string(), tr("Base X-axis")); + addAxisToCombo(orig->getY(), std::string(), tr("Base Y-axis")); + addAxisToCombo(orig->getZ(), std::string(), tr("Base Z-axis")); } catch (const Base::Exception &ex) { ex.reportException(); } diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui index aa6ec72897..e858efa474 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui @@ -47,17 +47,17 @@ - Base x-axis + Base X-axis - Base y-axis + Base Y-axis - Base z-axis + Base Z-axis diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp index b968e81ba2..30ca96bbed 100644 --- a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp @@ -58,7 +58,7 @@ using namespace Gui; TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder* view, bool newObj, QWidget* parent) : Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("PartDesign_ShapeBinder"), - tr("Datum Shape Parameters"), true, parent) + tr("Shape Binder Parameters"), true, parent) , SelectionObserver(view) , ui(new Ui_TaskShapeBinder) , vp(view) diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index c45b7c7f8d..52f01dffe1 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -417,9 +417,9 @@ void TaskTransformedParameters::fillAxisCombo(ComboLinks& combolinks, Part::Part if (body) { try { App::Origin* orig = body->getOrigin(); - combolinks.addLink(orig->getX(), "", tr("Base x-axis")); - combolinks.addLink(orig->getY(), "", tr("Base y-axis")); - combolinks.addLink(orig->getZ(), "", tr("Base z-axis")); + combolinks.addLink(orig->getX(), "", tr("Base X-axis")); + combolinks.addLink(orig->getY(), "", tr("Base Y-axis")); + combolinks.addLink(orig->getZ(), "", tr("Base Z-axis")); } catch (const Base::Exception& ex) { Base::Console().error("%s\n", ex.what()); @@ -453,9 +453,9 @@ void TaskTransformedParameters::fillPlanesCombo(ComboLinks& combolinks, Part::Pa if (body) { try { App::Origin* orig = body->getOrigin(); - combolinks.addLink(orig->getXY(), "", tr("Base XY plane")); - combolinks.addLink(orig->getYZ(), "", tr("Base YZ plane")); - combolinks.addLink(orig->getXZ(), "", tr("Base XZ plane")); + combolinks.addLink(orig->getXY(), "", tr("Base XY-plane")); + combolinks.addLink(orig->getYZ(), "", tr("Base YZ-plane")); + combolinks.addLink(orig->getXZ(), "", tr("Base XZ-plane")); } catch (const Base::Exception& ex) { Base::Console().error("%s\n", ex.what()); diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index 6f05ff8619..ddcc45ab55 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -137,7 +137,7 @@ PartDesign::Body *getBody(bool messageIfNot, bool autoActivate, bool assertModer DlgActiveBody dia( Gui::getMainWindow(), doc, - QObject::tr("To use Part Design, an active body object is required in the document. " + QObject::tr("To use Part Design, an active body is required in the document. " "Activate a body (double-click) or create a new one." "\n\nFor legacy documents with Part Design objects lacking a body, " "use the migrate function in Part Design to place them into a body."));