From 8ff5a1f6888a326f9924e66f22e912353be59146 Mon Sep 17 00:00:00 2001 From: Max Wilfinger <6246609+maxwxyz@users.noreply.github.com> Date: Tue, 9 Jul 2024 00:18:31 +0200 Subject: [PATCH] Fix source string typos mentioned on Crowdin (#15261) --- src/Base/UnitsApi.cpp | 2 +- src/Gui/BlenderNavigationStyle.cpp | 2 +- src/Gui/CommandStd.cpp | 6 ++--- src/Gui/CommandView.cpp | 2 +- src/Gui/CommandWindow.cpp | 4 +-- src/Gui/DlgUnitsCalculator.ui | 2 +- src/Gui/GestureNavigationStyle.cpp | 4 +-- src/Gui/OnlineDocumentation.cpp | 2 +- src/Gui/Placement.ui | 2 +- .../DlgSettingsWorkbenchesImp.cpp | 4 +-- src/Gui/Tree.cpp | 2 +- src/Mod/AddonManager/AddonManagerOptions.ui | 2 +- .../addonmanager_installer_gui.py | 4 +-- src/Mod/Assembly/JointObject.py | 2 +- src/Mod/BIM/ArchBuildingPart.py | 6 ++--- src/Mod/BIM/ArchCommands.py | 12 ++++----- src/Mod/BIM/ArchComponent.py | 2 +- src/Mod/BIM/ArchFloor.py | 4 +-- src/Mod/BIM/ArchGrid.py | 4 +-- src/Mod/BIM/ArchSchedule.py | 2 +- src/Mod/BIM/ArchStructure.py | 12 ++++----- src/Mod/BIM/Resources/ui/ArchMaterial.ui | 2 +- .../BIM/Resources/ui/BimServerTaskPanel.ui | 6 ++--- .../BIM/Resources/ui/dialogConvertDocument.ui | 2 +- .../Resources/ui/dialogCustomProperties.ui | 2 +- src/Mod/BIM/Resources/ui/dialogImport.ui | 4 +-- src/Mod/BIM/Resources/ui/dialogPreflight.ui | 2 +- .../BIM/Resources/ui/dialogProjectManager.ui | 2 +- src/Mod/BIM/Resources/ui/dialogSetup.ui | 10 ++++---- src/Mod/BIM/Resources/ui/dialogWelcome.ui | 2 +- src/Mod/BIM/Resources/ui/preferences-arch.ui | 8 +++--- src/Mod/BIM/Resources/ui/preferences-dae.ui | 2 +- src/Mod/BIM/Resources/ui/preferences-ifc.ui | 6 ++--- src/Mod/BIM/TestArch.py | 4 +-- src/Mod/BIM/bimcommands/BimArchUtils.py | 12 ++++----- src/Mod/BIM/bimcommands/BimIfcExplorer.py | 2 +- src/Mod/BIM/bimcommands/BimPreflight.py | 6 ++--- src/Mod/BIM/bimcommands/BimTDView.py | 2 +- src/Mod/BIM/importers/importIFC.py | 2 +- src/Mod/BIM/importers/importIFCHelper.py | 4 +-- src/Mod/BIM/importers/importIFClegacy.py | 4 +-- src/Mod/CAM/Gui/DlgJobChooser.ui | 2 +- .../CAM/Gui/Resources/panels/DogboneEdit.ui | 2 +- .../Gui/Resources/panels/PageOpCustomEdit.ui | 2 +- src/Mod/CAM/Gui/Resources/panels/PathEdit.ui | 2 +- .../Resources/panels/TaskPathCamoticsSim.ui | 4 +-- src/Mod/CAM/Path/Main/Gui/Camotics.py | 6 ++--- .../CAM/Path/Main/Sanity/ReportGenerator.py | 4 +-- src/Mod/CAM/Path/Op/Custom.py | 2 +- src/Mod/CAM/Path/Op/Profile.py | 2 +- src/Mod/CAM/Path/Op/Slot.py | 2 +- src/Mod/CAM/Path/Op/Surface.py | 2 +- src/Mod/CAM/Path/Tool/Gui/BitLibrary.py | 2 +- src/Mod/CAM/PathScripts/PathUtilsGui.py | 2 +- .../Draft/Resources/translations/Draft_af.ts | 4 +-- src/Mod/Draft/Resources/ui/preferences-dxf.ui | 10 ++++---- src/Mod/Draft/draftguitools/gui_edit.py | 2 +- .../draftguitools/gui_edit_draft_objects.py | 2 +- .../gui_edit_sketcher_objects.py | 2 +- src/Mod/Draft/draftguitools/gui_groups.py | 2 +- src/Mod/Draft/importDXF.py | 2 +- src/Mod/Drawing/Gui/Command.cpp | 4 +-- src/Mod/Fem/Gui/DlgSettingsFemCcx.ui | 4 +-- src/Mod/Fem/Gui/DlgSettingsFemElmer.ui | 2 +- src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui | 2 +- src/Mod/Fem/Gui/DlgSettingsFemGmsh.ui | 2 +- src/Mod/Fem/Gui/DlgSettingsFemZ88.ui | 2 +- .../Fem/Gui/Resources/ui/ElementFluid1D.ui | 2 +- src/Mod/Fem/Gui/Resources/ui/Material.ui | 8 +++--- src/Mod/Fem/Gui/Resources/ui/MeshGmsh.ui | 2 +- .../Fem/Gui/TaskFemConstraintDisplacement.cpp | 2 +- .../Gui/TaskFemConstraintFluidBoundary.cpp | 2 +- .../Fem/Gui/TaskFemConstraintFluidBoundary.ui | 2 +- .../Fem/Gui/TaskFemConstraintRigidBody.cpp | 4 +-- src/Mod/Fem/Gui/TaskTetParameter.ui | 4 +-- src/Mod/Fem/femcommands/commands.py | 8 +++--- src/Mod/Help/Help.py | 2 +- src/Mod/Import/App/dxf/dxf.h | 2 +- src/Mod/Mesh/Gui/RemeshGmsh.cpp | 2 +- src/Mod/Part/Gui/AttacherTexts.cpp | 2 +- src/Mod/Part/Gui/Command.cpp | 8 +++--- src/Mod/Part/Gui/DlgFilletEdges.cpp | 2 +- src/Mod/Part/Gui/DlgFilletEdges.ui | 4 +-- src/Mod/Part/Gui/DlgImportExportIges.ui | 2 +- src/Mod/Part/Gui/DlgPartImportStep.ui | 2 +- src/Mod/Part/Gui/TaskCheckGeometry.cpp | 2 +- src/Mod/Part/Gui/TaskFaceAppearances.ui | 2 +- src/Mod/PartDesign/App/FeatureHelix.cpp | 2 +- src/Mod/PartDesign/Gui/CommandBody.cpp | 2 +- .../Gui/ViewProviderTransformed.cpp | 4 +-- src/Mod/PartDesign/InvoluteGearFeature.py | 6 ++--- src/Mod/PartDesign/SprocketFeature.ui | 4 +-- .../Gui/FitBSplineCurve.cpp | 2 +- .../Gui/FitBSplineSurface.cpp | 2 +- src/Mod/Sketcher/App/SketchAnalysis.cpp | 14 +++++------ src/Mod/Sketcher/App/SketchObject.cpp | 10 ++++---- src/Mod/Sketcher/App/SketchObjectPy.xml | 6 ++--- src/Mod/Sketcher/Gui/Command.cpp | 4 +-- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 25 ++++++++----------- .../Sketcher/Gui/CommandSketcherBSpline.cpp | 14 +++++------ src/Mod/Sketcher/Gui/CommandSketcherTools.cpp | 4 +-- .../Sketcher/Gui/DrawSketchHandlerBSpline.h | 8 +++--- .../Sketcher/Gui/DrawSketchHandlerLineSet.h | 4 +-- .../Gui/EditModeGeometryCoinConverter.cpp | 2 +- ...ditModeInformationOverlayCoinConverter.cpp | 2 +- src/Mod/Sketcher/Gui/TaskSketcherElements.cpp | 10 ++++---- src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp | 10 ++++---- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 2 +- src/Mod/Spreadsheet/Gui/PropertiesDialog.ui | 2 +- src/Mod/TechDraw/Gui/Command.cpp | 16 ++++++------ src/Mod/TechDraw/Gui/CommandCreateDims.cpp | 10 ++++---- src/Mod/TechDraw/Gui/CommandExtensionPack.cpp | 3 +-- .../Gui/DlgPrefsTechDrawAnnotationImp.cpp | 2 +- .../TechDraw/Gui/DlgPrefsTechDrawGeneral.ui | 6 ++--- src/Mod/TechDraw/Gui/TaskCenterLine.cpp | 2 +- src/Mod/TechDraw/Gui/TaskComplexSection.cpp | 2 +- src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui | 2 +- src/Mod/TechDraw/Gui/TaskGeomHatch.ui | 2 +- src/Mod/TechDraw/Gui/TaskHatch.ui | 10 ++++---- src/Mod/TechDraw/Gui/TaskHoleShaftFit.ui | 4 +-- src/Mod/TechDraw/Gui/TaskProjGroup.ui | 4 +-- src/Mod/TechDraw/Gui/TaskSectionView.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderPage.cpp | 2 +- 123 files changed, 252 insertions(+), 258 deletions(-) diff --git a/src/Base/UnitsApi.cpp b/src/Base/UnitsApi.cpp index 9984a4dee8..5dc5c95570 100644 --- a/src/Base/UnitsApi.cpp +++ b/src/Base/UnitsApi.cpp @@ -78,7 +78,7 @@ QString UnitsApi::getDescription(UnitSystem system) case UnitSystem::ImperialBuilding: return tr("Building US (ft-in, sqft, cft)"); case UnitSystem::MmMin: - return tr("Metric small parts & CNC(mm, mm/min)"); + return tr("Metric small parts & CNC (mm, mm/min)"); case UnitSystem::ImperialCivil: return tr("Imperial for Civil Eng (ft, ft/s)"); case UnitSystem::FemMilliMeterNewton: diff --git a/src/Gui/BlenderNavigationStyle.cpp b/src/Gui/BlenderNavigationStyle.cpp index 28a6954dd6..4db964ae5a 100644 --- a/src/Gui/BlenderNavigationStyle.cpp +++ b/src/Gui/BlenderNavigationStyle.cpp @@ -55,7 +55,7 @@ const char* BlenderNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::DRAGGING: return QT_TR_NOOP("Press middle mouse button"); case NavigationStyle::ZOOMING: - return QT_TR_NOOP("Scroll middle mouse button"); + return QT_TR_NOOP("Scroll mouse wheel"); default: return "No description"; } diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index d079d67fec..36215ab2ea 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -775,10 +775,10 @@ StdCmdUnitsCalculator::StdCmdUnitsCalculator() : Command("Std_UnitsCalculator") { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("&Units calculator..."); - sToolTipText = QT_TR_NOOP("Start the units calculator"); + sMenuText = QT_TR_NOOP("&Units converter..."); + sToolTipText = QT_TR_NOOP("Start the units converter"); sWhatsThis = "Std_UnitsCalculator"; - sStatusTip = QT_TR_NOOP("Start the units calculator"); + sStatusTip = QT_TR_NOOP("Start the units converter"); sPixmap = "accessories-calculator"; eType = 0; } diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 2d95176b3a..a3ab08a899 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -3713,7 +3713,7 @@ StdCmdDockOverlayToggleTransparent::StdCmdDockOverlayToggleTransparent() :Command("Std_DockOverlayToggleTransparent") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle transparent"); + sMenuText = QT_TR_NOOP("Toggle transparent mode"); sToolTipText = QT_TR_NOOP("Toggle transparent mode for the docked window under cursor.\n" "This makes the docked window stay transparent at all times."); sWhatsThis = "Std_DockOverlayToggleTransparent"; diff --git a/src/Gui/CommandWindow.cpp b/src/Gui/CommandWindow.cpp index 6b48d5f83a..fa05712d25 100644 --- a/src/Gui/CommandWindow.cpp +++ b/src/Gui/CommandWindow.cpp @@ -350,9 +350,9 @@ StdCmdToggleToolBarLock::StdCmdToggleToolBarLock() { sGroup = "Tools"; sMenuText = QT_TR_NOOP("Lock toolbars"); - sToolTipText = QT_TR_NOOP("Locks toolbar so they are no longer moveable"); + sToolTipText = QT_TR_NOOP("Lock toolbars so they are no longer moveable"); sWhatsThis = "Std_ToggleToolBarLock"; - sStatusTip = QT_TR_NOOP("Locks toolbar so they are no longer moveable"); + sStatusTip = QT_TR_NOOP("Lock toolbars so they are no longer moveable"); eType = 0; } diff --git a/src/Gui/DlgUnitsCalculator.ui b/src/Gui/DlgUnitsCalculator.ui index b49c557b6a..36958a2669 100644 --- a/src/Gui/DlgUnitsCalculator.ui +++ b/src/Gui/DlgUnitsCalculator.ui @@ -11,7 +11,7 @@ - Units calculator + Units converter diff --git a/src/Gui/GestureNavigationStyle.cpp b/src/Gui/GestureNavigationStyle.cpp index b48752f883..eb24572502 100644 --- a/src/Gui/GestureNavigationStyle.cpp +++ b/src/Gui/GestureNavigationStyle.cpp @@ -858,9 +858,9 @@ const char* GestureNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::PANNING: return QT_TR_NOOP("Drag screen with two fingers OR press right mouse button."); case NavigationStyle::DRAGGING: - return QT_TR_NOOP("Drag screen with one finger OR press left mouse button. In Sketcher && other edit modes, hold Alt in addition."); + return QT_TR_NOOP("Drag screen with one finger OR press left mouse button. In Sketcher and other edit modes, hold Alt in addition."); case NavigationStyle::ZOOMING: - return QT_TR_NOOP("Pinch (place two fingers on the screen && drag them apart from || towards each other) OR scroll middle mouse button OR PgUp/PgDown on keyboard."); + return QT_TR_NOOP("Pinch (place two fingers on the screen and drag them apart from or towards each other) OR scroll middle mouse button OR PgUp/PgDown on keyboard."); default: return "No description"; } diff --git a/src/Gui/OnlineDocumentation.cpp b/src/Gui/OnlineDocumentation.cpp index 51d036abee..793d1d9bb1 100644 --- a/src/Gui/OnlineDocumentation.cpp +++ b/src/Gui/OnlineDocumentation.cpp @@ -315,7 +315,7 @@ StdCmdPythonHelp::StdCmdPythonHelp() : Command("Std_PythonHelp"), server(nullptr) { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Automatic python modules documentation"); + sMenuText = QT_TR_NOOP("Automatic Python modules documentation"); sToolTipText = QT_TR_NOOP("Opens a browser to show the Python modules documentation"); sWhatsThis = "Std_PythonHelp"; sStatusTip = QT_TR_NOOP("Opens a browser to show the Python modules documentation"); diff --git a/src/Gui/Placement.ui b/src/Gui/Placement.ui index 81a3b075ff..72a6854ec4 100644 --- a/src/Gui/Placement.ui +++ b/src/Gui/Placement.ui @@ -223,7 +223,7 @@ - Rotation axis with angle + Rotation axis and angle diff --git a/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp b/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp index 6bb24ee76e..ab95f76874 100644 --- a/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp +++ b/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp @@ -89,7 +89,7 @@ wbListItem::wbListItem(const QString& wbName, bool enabled, bool startupWb, bool if (startupWb) { enableCheckBox->setChecked(true); enableCheckBox->setEnabled(false); - enableCheckBox->setToolTip(tr("This is the current startup module, and must be enabled. See Preferences/General/Autoload to change.")); + enableCheckBox->setToolTip(tr("This is the current startup module, and must be enabled.")); } connect(enableCheckBox, &QCheckBox::toggled, this, [this](bool checked) { onWbToggled(checked); }); @@ -134,7 +134,7 @@ wbListItem::wbListItem(const QString& wbName, bool enabled, bool startupWb, bool if (startupWb) { // Figure out whether to check and/or disable this checkBox: autoloadCheckBox->setChecked(true); autoloadCheckBox->setEnabled(false); - autoloadCheckBox->setToolTip(tr("This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change.")); + autoloadCheckBox->setToolTip(tr("This is the current startup module, and must be autoloaded.")); } else if (autoLoad) { autoloadCheckBox->setChecked(true); diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index 6a5b3e2072..f4167163d3 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -3271,7 +3271,7 @@ void TreeWidget::setupText() this->toggleVisibilityInTreeAction->setText(tr("Toggle visibility in tree view")); this->toggleVisibilityInTreeAction->setStatusTip(tr("Toggles the visibility of selected items in the tree view")); - this->createGroupAction->setText(tr("Create group...")); + this->createGroupAction->setText(tr("Create group")); this->createGroupAction->setStatusTip(tr("Create a group")); this->relabelObjectAction->setText(tr("Rename")); diff --git a/src/Mod/AddonManager/AddonManagerOptions.ui b/src/Mod/AddonManager/AddonManagerOptions.ui index cb4d5b45a5..cf0a1a0ddc 100644 --- a/src/Mod/AddonManager/AddonManagerOptions.ui +++ b/src/Mod/AddonManager/AddonManagerOptions.ui @@ -350,7 +350,7 @@ installed addons will be checked for available updates - Path to git executable (optional): + Path to Git executable (optional): diff --git a/src/Mod/AddonManager/addonmanager_installer_gui.py b/src/Mod/AddonManager/addonmanager_installer_gui.py index 6af6d2cfbd..265525e749 100644 --- a/src/Mod/AddonManager/addonmanager_installer_gui.py +++ b/src/Mod/AddonManager/addonmanager_installer_gui.py @@ -148,7 +148,7 @@ class AddonInstallerGUI(QtCore.QObject): "

" + translate( "AddonsInstaller", - "This addon requires Python packages that are not installed, and cannot be installed automatically. To use this workbench you must install the following Python packages manually:", + "This addon requires Python packages that are not installed, and cannot be installed automatically. To use this addon you must install the following Python packages manually:", ) + "

    " ) @@ -243,7 +243,7 @@ class AddonInstallerGUI(QtCore.QObject): translate("AddonsInstaller", "Incompatible Python version"), translate( "AddonsInstaller", - "This Addon (or one if its dependencies) requires Python {}.{}, and your system is running {}.{}. Installation cancelled.", + "This Addon (or one of its dependencies) requires Python {}.{}, and your system is running {}.{}. Installation cancelled.", ).format( missing.python_min_version["major"], missing.python_min_version["minor"], diff --git a/src/Mod/Assembly/JointObject.py b/src/Mod/Assembly/JointObject.py index 20be467ae3..099bcad1d3 100644 --- a/src/Mod/Assembly/JointObject.py +++ b/src/Mod/Assembly/JointObject.py @@ -290,7 +290,7 @@ class Joint: "Joint", QT_TRANSLATE_NOOP( "App::Property", - "This is the distance of the joint. It is used only by the distance joint and by RackPinion (pitch radius), Screw and Gears and Belt(radius1)", + "This is the distance of the joint. It is used only by the Distance joint and Rack and Pinion (pitch radius), Screw and Gears and Belt (radius1)", ), ) diff --git a/src/Mod/BIM/ArchBuildingPart.py b/src/Mod/BIM/ArchBuildingPart.py index 1ed2fdd242..3dee6b7e6b 100644 --- a/src/Mod/BIM/ArchBuildingPart.py +++ b/src/Mod/BIM/ArchBuildingPart.py @@ -229,7 +229,7 @@ class BuildingPart(ArchIFC.IfcProduct): if not "Shape" in pl: obj.addProperty("Part::PropertyPartShape","Shape","BuildingPart",QT_TRANSLATE_NOOP("App::Property","The shape of this object")) if not "SavedInventor" in pl: - obj.addProperty("App::PropertyFileIncluded","SavedInventor","BuildingPart",QT_TRANSLATE_NOOP("App::Property","This property stores an inventor representation for this object")) + obj.addProperty("App::PropertyFileIncluded","SavedInventor","BuildingPart",QT_TRANSLATE_NOOP("App::Property","This property stores an OpenInventor representation for this object")) obj.setEditorMode("SavedInventor",2) if not "OnlySolids" in pl: obj.addProperty("App::PropertyBool","OnlySolids","BuildingPart",QT_TRANSLATE_NOOP("App::Property","If true, only solids will be collected by this object when referenced from other files")) @@ -489,9 +489,9 @@ class ViewProviderBuildingPart: # inventor saving if not "SaveInventor" in pl: - vobj.addProperty("App::PropertyBool","SaveInventor","Interaction",QT_TRANSLATE_NOOP("App::Property","If this is enabled, the inventor representation of this object will be saved in the FreeCAD file, allowing to reference it in other files in lightweight mode.")) + vobj.addProperty("App::PropertyBool","SaveInventor","Interaction",QT_TRANSLATE_NOOP("App::Property","If this is enabled, the OpenInventor representation of this object will be saved in the FreeCAD file, allowing to reference it in other files in lightweight mode.")) if not "SavedInventor" in pl: - vobj.addProperty("App::PropertyFileIncluded","SavedInventor","Interaction",QT_TRANSLATE_NOOP("App::Property","A slot to save the inventor representation of this object, if enabled")) + vobj.addProperty("App::PropertyFileIncluded","SavedInventor","Interaction",QT_TRANSLATE_NOOP("App::Property","A slot to save the OpenInventor representation of this object, if enabled")) vobj.setEditorMode("SavedInventor",2) # children properties diff --git a/src/Mod/BIM/ArchCommands.py b/src/Mod/BIM/ArchCommands.py index be9f266d81..bc0086583c 100644 --- a/src/Mod/BIM/ArchCommands.py +++ b/src/Mod/BIM/ArchCommands.py @@ -204,7 +204,7 @@ def removeComponents(objectsList,host=None): h.Objects = a def makeComponent(baseobj=None,name=None,delete=False): - '''makeComponent([baseobj],[name],[delete]): creates an undefined, non-parametric Arch + '''makeComponent([baseobj],[name],[delete]): creates an undefined, non-parametric BIM component from the given base object''' if not FreeCAD.ActiveDocument: FreeCAD.Console.PrintError("No active document. Aborting\n") @@ -405,7 +405,7 @@ def getCutVolume(cutplane,shapes,clip=False,depth=None): else: p = cutplane.copy().Faces[0] except Part.OCCError: - FreeCAD.Console.PrintMessage(translate("Arch","Invalid cutplane")+"\n") + FreeCAD.Console.PrintMessage(translate("Arch","Invalid cut plane")+"\n") return None,None,None ce = p.CenterOfMass ax = p.normalAt(0,0) @@ -1134,19 +1134,19 @@ def toggleIfcBrepFlag(obj): """toggleIfcBrepFlag(obj): toggles the IFC brep flag of the given object, forcing it to be exported as brep geometry or not.""" if not hasattr(obj,"IfcData"): - FreeCAD.Console.PrintMessage(translate("Arch","Object doesn't have settable IFCData")) + FreeCAD.Console.PrintMessage(translate("Arch","Object doesn't have settable IFC attributes")) else: d = obj.IfcData if "FlagForceBrep" in d: if d["FlagForceBrep"] == "True": d["FlagForceBrep"] = "False" - FreeCAD.Console.PrintMessage(translate("Arch","Disabling Brep force flag of object")+" "+obj.Label+"\n") + FreeCAD.Console.PrintMessage(translate("Arch","Disabling B-rep force flag of object")+" "+obj.Label+"\n") else: d["FlagForceBrep"] = "True" - FreeCAD.Console.PrintMessage(translate("Arch","Enabling Brep force flag of object")+" "+obj.Label+"\n") + FreeCAD.Console.PrintMessage(translate("Arch","Enabling B-rep force flag of object")+" "+obj.Label+"\n") else: d["FlagForceBrep"] = "True" - FreeCAD.Console.PrintMessage(translate("Arch","Enabling Brep force flag of object")+" "+obj.Label+"\n") + FreeCAD.Console.PrintMessage(translate("Arch","Enabling B-rep force flag of object")+" "+obj.Label+"\n") obj.IfcData = d diff --git a/src/Mod/BIM/ArchComponent.py b/src/Mod/BIM/ArchComponent.py index f15048d725..9354cd58f5 100644 --- a/src/Mod/BIM/ArchComponent.py +++ b/src/Mod/BIM/ArchComponent.py @@ -1137,7 +1137,7 @@ class Component(ArchIFC.IfcProduct): Returns ------- list of - The Arch Structures hosting this component. + The BIM Structures hosting this component. """ hosts = [] diff --git a/src/Mod/BIM/ArchFloor.py b/src/Mod/BIM/ArchFloor.py index 85c66daf6f..57284f6d6c 100644 --- a/src/Mod/BIM/ArchFloor.py +++ b/src/Mod/BIM/ArchFloor.py @@ -103,7 +103,7 @@ class _CommandFloor: Create a floor from the objects selected by the user, if any. Exclude objects that appear higher in the object hierarchy, such as sites or - buildings. If free linking is enabled in the Arch preferences, allow higher + buildings. If free linking is enabled in the BIM preferences, allow higher hierarchy objects to be part of floors. Find documentation on the end user usage of Arch Floor here: @@ -132,7 +132,7 @@ class _CommandFloor: Create a floor from the objects selected by the user, if any. Exclude objects that appear higher in the object hierarchy, such as sites or - buildings. If free linking is enabled in the Arch preferences, allow + buildings. If free linking is enabled in the BIM preferences, allow higher hierarchy objects to be part of floors. """ diff --git a/src/Mod/BIM/ArchGrid.py b/src/Mod/BIM/ArchGrid.py index eeb931e889..7f8da557e5 100644 --- a/src/Mod/BIM/ArchGrid.py +++ b/src/Mod/BIM/ArchGrid.py @@ -387,8 +387,8 @@ class ArchGridTaskPanel: self.hLabel.setText(QtGui.QApplication.translate("Arch", "Total height", None)) self.addRowButton.setText(QtGui.QApplication.translate("Arch", "Add row", None)) self.delRowButton.setText(QtGui.QApplication.translate("Arch", "Del row", None)) - self.addColumnButton.setText(QtGui.QApplication.translate("Arch", "Add col", None)) - self.delColumnButton.setText(QtGui.QApplication.translate("Arch", "Del col", None)) + self.addColumnButton.setText(QtGui.QApplication.translate("Arch", "Add column", None)) + self.delColumnButton.setText(QtGui.QApplication.translate("Arch", "Del column", None)) self.spanButton.setText(QtGui.QApplication.translate("Arch", "Create span", None)) self.delSpanButton.setText(QtGui.QApplication.translate("Arch", "Remove span", None)) self.title.setText(QtGui.QApplication.translate("Arch", "Rows", None)+": "+str(self.table.rowCount())+" / "+QtGui.QApplication.translate("Arch", "Columns", None)+": "+str(self.table.columnCount())) diff --git a/src/Mod/BIM/ArchSchedule.py b/src/Mod/BIM/ArchSchedule.py index 8e5fcffa54..4f97bae6e8 100644 --- a/src/Mod/BIM/ArchSchedule.py +++ b/src/Mod/BIM/ArchSchedule.py @@ -127,7 +127,7 @@ class _ArchSchedule: "App::PropertyLink", "Schedule", "Arch", - QT_TRANSLATE_NOOP("App::Property", "The Arch Schedule that uses this spreadsheet")) + QT_TRANSLATE_NOOP("App::Property", "The BIM Schedule that uses this spreadsheet")) sp.Schedule = obj def getSpreadSheet(self, obj, force=False): diff --git a/src/Mod/BIM/ArchStructure.py b/src/Mod/BIM/ArchStructure.py index 7030573f23..ab074f2d85 100644 --- a/src/Mod/BIM/ArchStructure.py +++ b/src/Mod/BIM/ArchStructure.py @@ -194,7 +194,7 @@ class CommandStructuresFromSelection: def GetResources(self): return {'Pixmap': 'Arch_MultipleStructures', 'MenuText': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Multiple Structures"), - 'ToolTip': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Create multiple Arch Structures from a selected base, using each selected edge as an extrusion path")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Create multiple BIM Structures from a selected base, using each selected edge as an extrusion path")} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -441,7 +441,7 @@ class _CommandStructure: grid = QtGui.QGridLayout(w) # mode box - labelmode = QtGui.QLabel(translate("Arch","Drawing mode")+":") + labelmode = QtGui.QLabel(translate("Arch","Parameters of the structure")+":") self.modeb = QtGui.QRadioButton(translate("Arch","Beam")) self.modec = QtGui.QRadioButton(translate("Arch","Column")) if self.bpoint or self.beammode: @@ -496,9 +496,9 @@ class _CommandStructure: grid.addWidget(self.vHeight,6,1,1,1) # horizontal button - value5 = QtGui.QPushButton(translate("Arch","Switch L/H")) + value5 = QtGui.QPushButton(translate("Arch","Switch Length/Height")) grid.addWidget(value5,7,0,1,1) - value6 = QtGui.QPushButton(translate("Arch","Switch L/W")) + value6 = QtGui.QPushButton(translate("Arch","Switch Length/Width")) grid.addWidget(value6,7,1,1,1) # continue button @@ -716,7 +716,7 @@ class _Structure(ArchComponent.Component): obj.addProperty("App::PropertyEnumeration","FaceMaker","Structure",QT_TRANSLATE_NOOP("App::Property","The facemaker type to use to build the profile of this object")) obj.FaceMaker = ["None","Simple","Cheese","Bullseye"] if not "ArchSketchEdges" in pl: # PropertyStringList - obj.addProperty("App::PropertyStringList","ArchSketchEdges","Structure",QT_TRANSLATE_NOOP("App::Property","Selected edges (or group of edges) of the base ArchSketch, to use in creating the shape of this Arch Structure (instead of using all the Base shape's edges by default). Input are index numbers of edges or groups.")) + obj.addProperty("App::PropertyStringList","ArchSketchEdges","Structure",QT_TRANSLATE_NOOP("App::Property","Selected edges (or group of edges) of the base ArchSketch, to use in creating the shape of this BIM Structure (instead of using all the Base shape's edges by default). Input are index numbers of edges or groups.")) else: # test if the property was added but as IntegerList, then update; type = obj.getTypeIdOfProperty('ArchSketchEdges') @@ -724,7 +724,7 @@ class _Structure(ArchComponent.Component): oldIntValue = obj.ArchSketchEdges newStrValue = [str(x) for x in oldIntValue] obj.removeProperty("ArchSketchEdges") - obj.addProperty("App::PropertyStringList","ArchSketchEdges","Structure",QT_TRANSLATE_NOOP("App::Property","Selected edges (or group of edges) of the base ArchSketch, to use in creating the shape of this Arch Structure (instead of using all the Base shape's edges by default). Input are index numbers of edges or groups.")) + obj.addProperty("App::PropertyStringList","ArchSketchEdges","Structure",QT_TRANSLATE_NOOP("App::Property","Selected edges (or group of edges) of the base ArchSketch, to use in creating the shape of this BIM Structure (instead of using all the Base shape's edges by default). Input are index numbers of edges or groups.")) obj.ArchSketchEdges = newStrValue self.Type = "Structure" diff --git a/src/Mod/BIM/Resources/ui/ArchMaterial.ui b/src/Mod/BIM/Resources/ui/ArchMaterial.ui index f195beaad0..5ca0e88cd1 100644 --- a/src/Mod/BIM/Resources/ui/ArchMaterial.ui +++ b/src/Mod/BIM/Resources/ui/ArchMaterial.ui @@ -265,7 +265,7 @@ - Father + Parent diff --git a/src/Mod/BIM/Resources/ui/BimServerTaskPanel.ui b/src/Mod/BIM/Resources/ui/BimServerTaskPanel.ui index 7c09e2e098..c1a86f66f2 100644 --- a/src/Mod/BIM/Resources/ui/BimServerTaskPanel.ui +++ b/src/Mod/BIM/Resources/ui/BimServerTaskPanel.ui @@ -25,10 +25,10 @@ - The name of the BimServer you are currently connecting to. Change settings in Arch Preferences + The name of the BIM Server you are currently connecting to. Change settings in the BIM preferences - Bim Server + BIM Server @@ -94,7 +94,7 @@ - The list of projects present on the Bim Server + The list of projects present on the BIM Server diff --git a/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui b/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui index 77e774e064..978a5e047f 100644 --- a/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui +++ b/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui @@ -40,7 +40,7 @@ If this is checked, you won't be asked again when creating a new FreeCAD document, and that document won't be turned into an IFC document automatically. You can still turn a FreeCAD document into an IFC document manually, using -menu IFC -> Convert document +Utils -> Make IFC project Do not ask again diff --git a/src/Mod/BIM/Resources/ui/dialogCustomProperties.ui b/src/Mod/BIM/Resources/ui/dialogCustomProperties.ui index 04d4d12663..d9efe96209 100644 --- a/src/Mod/BIM/Resources/ui/dialogCustomProperties.ui +++ b/src/Mod/BIM/Resources/ui/dialogCustomProperties.ui @@ -48,7 +48,7 @@ - The property will be hidden in the interface, and can only be modified via python script + The property will be hidden in the interface, and can only be modified via Python script Hidden diff --git a/src/Mod/BIM/Resources/ui/dialogImport.ui b/src/Mod/BIM/Resources/ui/dialogImport.ui index c4a787158c..7a0c709db2 100644 --- a/src/Mod/BIM/Resources/ui/dialogImport.ui +++ b/src/Mod/BIM/Resources/ui/dialogImport.ui @@ -48,7 +48,7 @@ - This defines how the IFC data is stored in the FreeCAD document. 'Single IFC document' means that the FreeCAD document is the IFC document, anything you create in it belongs to the IFC document too. 'Use IFCdocument object' means that an object will be created inside the FreeCAD document to represent the IFC document. You will be able to add non-IFC objects alongside. + This defines how the IFC data is stored in the FreeCAD document. 'Single IFC document' means that the FreeCAD document is the IFC document, anything you create in it belongs to the IFC document too. 'Use IFC document object' means that an object will be created inside the FreeCAD document to represent the IFC document. You will be able to add non-IFC objects alongside. @@ -146,7 +146,7 @@ - If this is unchecked, these settings will be applied automatically next time. You can change this later under menu Edit -> Preferences -> Import/Export -> Native IFC + If this is unchecked, these settings will be applied automatically next time. You can change this later under menu Edit -> Preferences -> BIM -> Native IFC Ask me again next time diff --git a/src/Mod/BIM/Resources/ui/dialogPreflight.ui b/src/Mod/BIM/Resources/ui/dialogPreflight.ui index a653c185a4..cf847a7c17 100644 --- a/src/Mod/BIM/Resources/ui/dialogPreflight.ui +++ b/src/Mod/BIM/Resources/ui/dialogPreflight.ui @@ -412,7 +412,7 @@ - <html><head/><body><p>When exporting a model to IFC, all BIM objects that are an extrusion of a rectangular profile will use an IfcRectangleProfileDef entity as their extrusion profile. However, Revit won't import these correctly. If you are going to use the IFC file in Revit, we recommend you to disable this behavior by checking the option under menu <span style=" font-weight:600;">Edit -&gt; Preferences -&gt; Import/Export -&gt; IFC -&gt; Disable IfcRectangularProfileDef</span>.</p><p>When that option is checked, all extrusion profiles will be exported as generic IfcArbitraryProfileDef entities, regardless of if they are rectangular or not, which will contain a little less information, but will open correctly in Revit.</p></body></html> + <html><head/><body><p>When exporting a model to IFC, all BIM objects that are an extrusion of a rectangular profile will use an IfcRectangleProfileDef entity as their extrusion profile. However, Revit won't import these correctly. If you are going to use the IFC file in Revit, we recommend you to disable this behavior by checking the option under menu <span style=" font-weight:600;">Edit -&gt; Preferences -&gt; BIM -&gt; NativeIFC -&gt; Disable IfcRectangularProfileDef</span>.</p><p>When that option is checked, all extrusion profiles will be exported as generic IfcArbitraryProfileDef entities, regardless of if they are rectangular or not, which will contain a little less information, but will open correctly in Revit.</p></body></html> Is IfcRectangleProfileDef export disabled? (Revit only) diff --git a/src/Mod/BIM/Resources/ui/dialogProjectManager.ui b/src/Mod/BIM/Resources/ui/dialogProjectManager.ui index 868a2692ae..e93f90809d 100644 --- a/src/Mod/BIM/Resources/ui/dialogProjectManager.ui +++ b/src/Mod/BIM/Resources/ui/dialogProjectManager.ui @@ -160,7 +160,7 @@ - If locked, any new object created in FreeCAd will automatically become an IFC object and part of this project + If locked, any new object created in FreeCAD will automatically become an IFC object and part of this project Locked diff --git a/src/Mod/BIM/Resources/ui/dialogSetup.ui b/src/Mod/BIM/Resources/ui/dialogSetup.ui index b9ce2e8f2c..5247760970 100644 --- a/src/Mod/BIM/Resources/ui/dialogSetup.ui +++ b/src/Mod/BIM/Resources/ui/dialogSetup.ui @@ -112,7 +112,7 @@ - <html><head/><body><p>The unit you prefer to work with, that will be used everywhere: in dialogs, measurements and dimensions. However, you can enter any other unit anytime. For example, if you configured FreeCAD to work in millimeters, you can still enter measures as &quot;10m&quot; or &quot;5ft&quot;. You can also change the working unit anytime without causing any modification to your model. Location in preferences: <span style=" font-weight:600;">General &gt; Units &gt; User system</span></p></body></html> + <html><head/><body><p>The unit you prefer to work with, that will be used everywhere: in dialogs, measurements and dimensions. However, you can enter any other unit anytime. For example, if you configured FreeCAD to work in millimeters, you can still enter measures as &quot;10m&quot; or &quot;5ft&quot;. You can also change the default unit system anytime without causing any modification to your model. Location in preferences: <span style=" font-weight:600;">General &gt; Default unit system</span></p></body></html> @@ -346,7 +346,7 @@ - <html><head/><body><p>The default color of construction geometry. Location in preferences: <span style=" font-weight:600;">Draft &gt; General Settings &gt; Construction geometry color</span></p></body></html> + <html><head/><body><p>The default color of construction geometry. Location in preferences: <span style=" font-weight:600;">Draft &gt; General &gt; Construction geometry color</span></p></body></html> @@ -381,7 +381,7 @@ - <html><head/><body><p>The default color for helper objects such as grids and axes. Location in preferences: <span style=" font-weight:600;">Arch &gt; Defaults &gt; Helpers</span></p></body></html> + <html><head/><body><p>The default color for helper objects such as grids and axes. Location in preferences: <span style=" font-weight:600;">BIM &gt; Defaults &gt; Helpers</span></p></body></html> @@ -567,7 +567,7 @@ - <html><head/><body><p>Where the grid appears at FreeCAD startup. Location in preferences: <span style=" font-weight:600;">Draft &gt; General settings &gt; Default working plane</span></p></body></html> + <html><head/><body><p>Where the grid appears at FreeCAD startup. Location in preferences: <span style=" font-weight:600;">Draft &gt; General &gt; Default working plane</span></p></body></html> @@ -623,7 +623,7 @@ - MissingWorkbenches + Missing Workbenches true diff --git a/src/Mod/BIM/Resources/ui/dialogWelcome.ui b/src/Mod/BIM/Resources/ui/dialogWelcome.ui index 7589873095..acee1c1e89 100644 --- a/src/Mod/BIM/Resources/ui/dialogWelcome.ui +++ b/src/Mod/BIM/Resources/ui/dialogWelcome.ui @@ -60,7 +60,7 @@ - <html><head/><body><p>This appears to be the first time that you are using the BIM workbench. If you press OK, the next screen will propose you to set a couple of typical FreeCAD options that are suitable for BIM work. You can change these options anytime later under menu <span style=" font-weight:600;">Manage -&gt; Setup</span></p></body></html> + <html><head/><body><p>This appears to be the first time that you are using the BIM workbench. If you press OK, the next screen will propose you to set a couple of typical FreeCAD options that are suitable for BIM work. You can change these options anytime later under menu <span style=" font-weight:600;">Manage -&gt; BIM Setup...</span></p></body></html> true diff --git a/src/Mod/BIM/Resources/ui/preferences-arch.ui b/src/Mod/BIM/Resources/ui/preferences-arch.ui index 60d50d378f..9f65960054 100644 --- a/src/Mod/BIM/Resources/ui/preferences-arch.ui +++ b/src/Mod/BIM/Resources/ui/preferences-arch.ui @@ -512,7 +512,7 @@ a Footprint display mode - Bim server + BIM server @@ -525,7 +525,7 @@ a Footprint display mode - The URL of a bim server instance (www.bimserver.org) to connect to. + The URL of a BIM server instance (www.bimserver.org) to connect to. http://localhost:8082 @@ -541,8 +541,8 @@ a Footprint display mode - If this is selected, the "Open BimServer in browser" -button will open the Bim Server interface in an external browser + If this is selected, the "Open BIM Server in browser" +button will open the BIM Server interface in an external browser instead of the FreeCAD web workbench diff --git a/src/Mod/BIM/Resources/ui/preferences-dae.ui b/src/Mod/BIM/Resources/ui/preferences-dae.ui index 3ea66d8ede..bc8b930999 100644 --- a/src/Mod/BIM/Resources/ui/preferences-dae.ui +++ b/src/Mod/BIM/Resources/ui/preferences-dae.ui @@ -105,7 +105,7 @@ If using Netgen, make sure that it is available. - Builtin and mefisto mesher options + Builtin and Mefisto mesher options diff --git a/src/Mod/BIM/Resources/ui/preferences-ifc.ui b/src/Mod/BIM/Resources/ui/preferences-ifc.ui index 99d60661f9..5a2d18bb7b 100644 --- a/src/Mod/BIM/Resources/ui/preferences-ifc.ui +++ b/src/Mod/BIM/Resources/ui/preferences-ifc.ui @@ -179,12 +179,12 @@ if you start getting crashes when you set multiple cores. - Parametric Arch objects + Parametric BIM objects - Non-parametric Arch objects + Non-parametric BIM objects @@ -228,7 +228,7 @@ if you start getting crashes when you set multiple cores. - Non-parametric Arch objects + Non-parametric BIM objects diff --git a/src/Mod/BIM/TestArch.py b/src/Mod/BIM/TestArch.py index 4058c96ff8..48ebc43a4e 100644 --- a/src/Mod/BIM/TestArch.py +++ b/src/Mod/BIM/TestArch.py @@ -436,9 +436,9 @@ class ArchTest(unittest.TestCase): "Arch Wall with MultiMaterial and 3 alignments failed") def testStructure(self): - App.Console.PrintLog ('Checking Arch Structure...\n') + App.Console.PrintLog ('Checking BIM Structure...\n') s = Arch.makeStructure(length=2,width=3,height=5) - self.assertTrue(s,"Arch Structure failed") + self.assertTrue(s,"BIM Structure failed") def testRebar(self): App.Console.PrintLog ('Checking Arch Rebar...\n') diff --git a/src/Mod/BIM/bimcommands/BimArchUtils.py b/src/Mod/BIM/bimcommands/BimArchUtils.py index c50a173c1c..e545804098 100644 --- a/src/Mod/BIM/bimcommands/BimArchUtils.py +++ b/src/Mod/BIM/bimcommands/BimArchUtils.py @@ -209,8 +209,8 @@ class Arch_RemoveShape: "the Arch RemoveShape command definition" def GetResources(self): return {'Pixmap' : 'Arch_RemoveShape', - 'MenuText': QT_TRANSLATE_NOOP("Arch_RemoveShape","Remove Shape from Arch"), - 'ToolTip': QT_TRANSLATE_NOOP("Arch_RemoveShape","Removes cubic shapes from Arch components")} + 'MenuText': QT_TRANSLATE_NOOP("Arch_RemoveShape","Remove Shape from BIM"), + 'ToolTip': QT_TRANSLATE_NOOP("Arch_RemoveShape","Removes cubic shapes from BIM components")} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -283,12 +283,12 @@ class Arch_Survey: class Arch_ToggleIfcBrepFlag: - "the Toggle IFC Brep flag command definition" + "the Toggle IFC B-rep flag command definition" def GetResources(self): return {'Pixmap' : 'Arch_ToggleIfcBrepFlag', - 'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Toggle IFC Brep flag"), - 'ToolTip': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Force an object to be exported as Brep or not")} + 'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Toggle IFC B-rep flag"), + 'ToolTip': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Force an object to be exported as B-rep or not")} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -458,7 +458,7 @@ class Arch_MergeWalls: ostr += ",FreeCAD.ActiveDocument." + o.Name ok = True if ok: - FreeCAD.ActiveDocument.openTransaction(translate("Arch","Merge Wall")) + FreeCAD.ActiveDocument.openTransaction(translate("Arch","Merge Walls")) FreeCADGui.addModule("Arch") FreeCADGui.doCommand("Arch.joinWalls(["+ostr+"],delete=True)") FreeCAD.ActiveDocument.commitTransaction() diff --git a/src/Mod/BIM/bimcommands/BimIfcExplorer.py b/src/Mod/BIM/bimcommands/BimIfcExplorer.py index a6e8451a7d..6d784b88d6 100644 --- a/src/Mod/BIM/bimcommands/BimIfcExplorer.py +++ b/src/Mod/BIM/bimcommands/BimIfcExplorer.py @@ -104,7 +104,7 @@ class BIM_IfcExplorer: # create the dialog self.dialog = QtGui.QDialog() self.dialog.setObjectName("IfcExplorer") - self.dialog.setWindowTitle(translate("BIM", "Ifc Explorer")) + self.dialog.setWindowTitle(translate("BIM", "IFC Explorer")) self.dialog.resize(720, 540) toolbar = FreeCADGui.UiLoader().createWidget("Gui::ToolBar") diff --git a/src/Mod/BIM/bimcommands/BimPreflight.py b/src/Mod/BIM/bimcommands/BimPreflight.py index f1587243dd..077d5a5f9d 100644 --- a/src/Mod/BIM/bimcommands/BimPreflight.py +++ b/src/Mod/BIM/bimcommands/BimPreflight.py @@ -350,7 +350,7 @@ class BIM_Preflight_TaskPanel: msg = ( translate( "BIM", - "The version of ifcopenshell installed on your system could not be parsed", + "The version of Ifcopenshell installed on your system could not be parsed", ) + " " ) @@ -362,7 +362,7 @@ class BIM_Preflight_TaskPanel: msg += ( translate( "BIM", - "The version of ifcopenshell installed on your system will produce files with this schema version:", + "The version of Ifcopenshell installed on your system will produce files with this schema version:", ) + "\n\n" ) @@ -647,7 +647,7 @@ class BIM_Preflight_TaskPanel: msg += o.Label + "\n" msg += translate( "BIM", - "You can turn these objects into BIM objects by using the Utils -> Make Component tool.", + "You can turn these objects into BIM objects by using the Modify -> Add Component tool.", ) if msg: self.failed(test) diff --git a/src/Mod/BIM/bimcommands/BimTDView.py b/src/Mod/BIM/bimcommands/BimTDView.py index f63d17f80c..554d1cdd6b 100644 --- a/src/Mod/BIM/bimcommands/BimTDView.py +++ b/src/Mod/BIM/bimcommands/BimTDView.py @@ -68,7 +68,7 @@ class BIM_TDView: FreeCAD.Console.PrintError( translate( "BIM", - "No section view or draft objects selected, or no page selected, or no page found in document", + "No section view or Draft objects selected, or no page selected, or no page found in document", ) + "\n" ) diff --git a/src/Mod/BIM/importers/importIFC.py b/src/Mod/BIM/importers/importIFC.py index adbccf572e..4f6b8b6a21 100644 --- a/src/Mod/BIM/importers/importIFC.py +++ b/src/Mod/BIM/importers/importIFC.py @@ -743,7 +743,7 @@ def insert(srcfile, docname, skip=[], only=[], root=None, preferences=None): elif (preferences['MERGE_MODE_ARCH'] == 1 and archobj) or (preferences['MERGE_MODE_STRUCT'] == 0 and not archobj): - # non-parametric Arch objects (just Arch components with a shape) + # non-parametric BIM objects (just Arch components with a shape) if ptype in ["IfcSite","IfcBuilding","IfcBuildingStorey"]: for freecadtype,ifctypes in typesmap.items(): diff --git a/src/Mod/BIM/importers/importIFCHelper.py b/src/Mod/BIM/importers/importIFCHelper.py index a551f86028..3f69b1be67 100644 --- a/src/Mod/BIM/importers/importIFCHelper.py +++ b/src/Mod/BIM/importers/importIFCHelper.py @@ -78,8 +78,8 @@ def getPreferences(): """Retrieve the IFC preferences available in import and export. MERGE_MODE_ARCH: - 0 = parametric arch objects - 1 = non-parametric arch objects + 0 = parametric BIM objects + 1 = non-parametric BIM objects 2 = Part shapes 3 = One compound per storey """ diff --git a/src/Mod/BIM/importers/importIFClegacy.py b/src/Mod/BIM/importers/importIFClegacy.py index 037e889ce5..ef398cf7d2 100644 --- a/src/Mod/BIM/importers/importIFClegacy.py +++ b/src/Mod/BIM/importers/importIFClegacy.py @@ -935,7 +935,7 @@ def export(exportList,filename): if (not hasattr(ifcw,"IfcFile")) and (not hasattr(ifcw,"file")): FreeCAD.Console.PrintError(translate("Arch","Error: your IfcOpenShell version is too old")+"\n") - print("""importIFC: The version of ifcOpenShell installed on this system doesn't + print("""importIFC: The version of IfcOpenShell installed on this system doesn't have IFC export capabilities. IFC export currently requires an experimental version of IfcOpenShell available from https://github.com/aothms/IfcOpenShell""") return @@ -1852,7 +1852,7 @@ def explorer(filename,schema="IFC2X3_TC1.exp"): d = QtGui.QDialog() d.setObjectName("IfcExplorer") - d.setWindowTitle("Ifc Explorer") + d.setWindowTitle("IFC Explorer") d.resize(640, 480) layout = QtGui.QVBoxLayout(d) layout.addWidget(tree) diff --git a/src/Mod/CAM/Gui/DlgJobChooser.ui b/src/Mod/CAM/Gui/DlgJobChooser.ui index d6d460130a..94cfb25c42 100644 --- a/src/Mod/CAM/Gui/DlgJobChooser.ui +++ b/src/Mod/CAM/Gui/DlgJobChooser.ui @@ -14,7 +14,7 @@ - Choose a Path Job + Choose a CAM Job diff --git a/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui index 121db96ccb..59c79bc97c 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui @@ -152,7 +152,7 @@ - <html><head/><body><p>List of bone locations (with all bones at that location) that are part of this dressup. The list is determined by the corners in the profile and the selected <span style=" font-weight:600;">Side</span> for the bones. </p><p>You can <span style=" font-weight:600;">un-check</span> the bones you don't want to be dressed up.</p><p>If a bone is <span style=" font-weight:600;">grayed out</span> it means that it is already dressed up by a previous dressup. Or put another way, if you dress up this dogobone dressup again you will only be able to select the bones that are un-checked here.</p><p>If this list is empty it probably means you're trying to create bones on the wrong side of the profile.</p></body></html> + <html><head/><body><p>List of bone locations (with all bones at that location) that are part of this dressup. The list is determined by the corners in the profile and the selected <span style=" font-weight:600;">Side</span> for the bones. </p><p>You can <span style=" font-weight:600;">un-check</span> the bones you don't want to be dressed up.</p><p>If a bone is <span style=" font-weight:600;">grayed out</span> it means that it is already dressed up by a previous dressup. Or put another way, if you dress up this dogbone dressup again you will only be able to select the bones that are un-checked here.</p><p>If this list is empty it probably means you're trying to create bones on the wrong side of the profile.</p></body></html> diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui index 2be28a1f5d..38db977972 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui @@ -59,7 +59,7 @@ - G Gode + G-Code diff --git a/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui index 117227880a..eead38bdc4 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui @@ -252,7 +252,7 @@ Ordering by operation will do each operation in all coordinate systems before mo <html><head/><body><p><span style=" font-style:italic;">Work Coordinate Systems</span> also called <span style=" font-style:italic;">Work Offsets</span>, <span style=" font-style:italic;">Fixture Offsets</span>, or <span style=" font-style:italic;">Fixtures </span>are useful for building efficient production jobs where the same part is done many times on the machine. -FreeCAD has no knowledge of where a particular coordinate system exists within the machine coordinate system so adding additional coordinate systems to your job will have no visual change within your job. It will, however, change your gcode output. The exact way in which the output is affected is controlled by the 'order by' setting.</p></body></html> +FreeCAD has no knowledge of where a particular coordinate system exists within the machine coordinate system so adding additional coordinate systems to your job will have no visual change within your job. It will, however, change your G-code output. The exact way in which the output is affected is controlled by the 'order by' setting.</p></body></html> QListView::Adjust diff --git a/src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui b/src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui index 3fca6c0c93..1f481d3de6 100644 --- a/src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui +++ b/src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui @@ -65,14 +65,14 @@ - Launch Camotics + Launch CAMotics - Make Camotics File + Make CAMotics File diff --git a/src/Mod/CAM/Path/Main/Gui/Camotics.py b/src/Mod/CAM/Path/Main/Gui/Camotics.py index 1e18f6fbff..a29a000d77 100644 --- a/src/Mod/CAM/Path/Main/Gui/Camotics.py +++ b/src/Mod/CAM/Path/Main/Gui/Camotics.py @@ -81,7 +81,7 @@ class CAMoticsUI: self.form, translate("Path", "Save Project As"), "", - translate("Path", "Camotics Project (*.camotics)"), + translate("Path", "CAMotics Project (*.camotics)"), )[0] if filename: if not filename.endswith(".camotics"): @@ -311,9 +311,9 @@ class CommandCamoticsSimulate: def GetResources(self): return { "Pixmap": "CAM_Camotics", - "MenuText": QT_TRANSLATE_NOOP("CAM_Camotics", "Camotics"), + "MenuText": QT_TRANSLATE_NOOP("CAM_Camotics", "CAMotics"), "Accel": "P, C", - "ToolTip": QT_TRANSLATE_NOOP("CAM_Camotics", "Simulate using Camotics"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Camotics", "Simulate using CAMotics"), "CmdType": "ForEdit", } diff --git a/src/Mod/CAM/Path/Main/Sanity/ReportGenerator.py b/src/Mod/CAM/Path/Main/Sanity/ReportGenerator.py index 1fd1a35748..01796a75aa 100644 --- a/src/Mod/CAM/Path/Main/Sanity/ReportGenerator.py +++ b/src/Mod/CAM/Path/Main/Sanity/ReportGenerator.py @@ -74,7 +74,7 @@ class ReportGenerator: "opLabel": translate("CAM_Sanity", "Operation"), "operatorLabel": translate("CAM_Sanity", "Operator"), "orderByLabel": translate("CAM_Sanity", "Order By"), - "outputLabel": translate("CAM_Sanity", "Output (Gcode)"), + "outputLabel": translate("CAM_Sanity", "Output (G-code)"), "partInformationLabel": translate("CAM_Sanity", "Part Information"), "partNumberLabel": translate("CAM_Sanity", "Part Number"), "postLabel": translate("CAM_Sanity", "Postprocessor"), @@ -86,7 +86,7 @@ class ReportGenerator: "squawksLabel": translate("CAM_Sanity", "Squawks"), "stopsLabel": translate("CAM_Sanity", "Stops"), "sSpeedCarbideLabel": translate("CAM_Sanity", "Surface Speed Carbide"), - "sSpeedHSSLabel": translate("CAM_Sanity", "Surace Speed HSS"), + "sSpeedHSSLabel": translate("CAM_Sanity", "Surface Speed HSS"), "tableOfContentsLabel": translate("CAM_Sanity", "Table of Contents"), "tcLabel": translate("CAM_Sanity", "Tool Controller"), "toolDataLabel": translate("CAM_Sanity", "Tool Data"), diff --git a/src/Mod/CAM/Path/Op/Custom.py b/src/Mod/CAM/Path/Op/Custom.py index 690b9f7917..0f3d0ae547 100644 --- a/src/Mod/CAM/Path/Op/Custom.py +++ b/src/Mod/CAM/Path/Op/Custom.py @@ -185,7 +185,7 @@ class ObjectCustom(PathOp.ObjectOp): self.commandlist.append(newcommand) except ValueError: Path.Log.warning( - translate("PathCustom", "Invalid Gcode line: %s") % l + translate("PathCustom", "Invalid G-code line: %s") % l ) continue diff --git a/src/Mod/CAM/Path/Op/Profile.py b/src/Mod/CAM/Path/Op/Profile.py index 5b7c0fc86c..d4f122d367 100644 --- a/src/Mod/CAM/Path/Op/Profile.py +++ b/src/Mod/CAM/Path/Op/Profile.py @@ -130,7 +130,7 @@ class ObjectProfile(PathAreaOp.ObjectOp): "MiterLimit", "Profile", QT_TRANSLATE_NOOP( - "App::Property", "Maximum distance before a miter join is truncated" + "App::Property", "Maximum distance before a miter joint is truncated" ), ), ( diff --git a/src/Mod/CAM/Path/Op/Slot.py b/src/Mod/CAM/Path/Op/Slot.py index 10d879748a..feecdd8d90 100644 --- a/src/Mod/CAM/Path/Op/Slot.py +++ b/src/Mod/CAM/Path/Op/Slot.py @@ -206,7 +206,7 @@ class ObjectSlot(PathOp.ObjectOp): "Slot", QtCore.QT_TRANSLATE_NOOP( "App::Property", - "For arcs/circlular edges, offset the radius for the toolpath.", + "For arcs/circular edges, offset the radius for the toolpath.", ), ), ( diff --git a/src/Mod/CAM/Path/Op/Surface.py b/src/Mod/CAM/Path/Op/Surface.py index d61144de54..a5c314c897 100644 --- a/src/Mod/CAM/Path/Op/Surface.py +++ b/src/Mod/CAM/Path/Op/Surface.py @@ -783,7 +783,7 @@ class ObjectSurface(PathOp.ObjectOp): JOB = PathUtils.findParentJob(obj) self.JOB = JOB if JOB is None: - Path.Log.error(translate("PathSurface", "No JOB")) + Path.Log.error(translate("PathSurface", "No job")) return self.stockZMin = JOB.Stock.Shape.BoundBox.ZMin diff --git a/src/Mod/CAM/Path/Tool/Gui/BitLibrary.py b/src/Mod/CAM/Path/Tool/Gui/BitLibrary.py index 9d19140812..700becf169 100644 --- a/src/Mod/CAM/Path/Tool/Gui/BitLibrary.py +++ b/src/Mod/CAM/Path/Tool/Gui/BitLibrary.py @@ -876,7 +876,7 @@ class ToolBitLibrary(object): TooltableTypeJSON = translate("CAM_ToolBit", "Tooltable JSON (*.fctl)") TooltableTypeLinuxCNC = translate("CAM_ToolBit", "LinuxCNC tooltable (*.tbl)") - TooltableTypeCamotics = translate("CAM_ToolBit", "Camotics tooltable (*.json)") + TooltableTypeCamotics = translate("CAM_ToolBit", "CAMotics tooltable (*.json)") filename = PySide.QtGui.QFileDialog.getSaveFileName( self.form, diff --git a/src/Mod/CAM/PathScripts/PathUtilsGui.py b/src/Mod/CAM/PathScripts/PathUtilsGui.py index b69fcd8e6b..5f9bade9b8 100644 --- a/src/Mod/CAM/PathScripts/PathUtilsGui.py +++ b/src/Mod/CAM/PathScripts/PathUtilsGui.py @@ -88,7 +88,7 @@ class PathUtilsUserInput(object): mylist = [j.Label for j in jobs] jobname, result = QtGui.QInputDialog.getItem( - None, translate("Path", "Choose a Path Job"), None, mylist + None, translate("Path", "Choose a CAM Job"), None, mylist ) if result is False: diff --git a/src/Mod/Draft/Resources/translations/Draft_af.ts b/src/Mod/Draft/Resources/translations/Draft_af.ts index 3a3bd0fd0f..82f5a32adc 100644 --- a/src/Mod/Draft/Resources/translations/Draft_af.ts +++ b/src/Mod/Draft/Resources/translations/Draft_af.ts @@ -485,7 +485,7 @@ The 'Custom Text' is displayed only if 'Label Type' is set to 'Custom'. @@ -493,7 +493,7 @@ or from the subelement 'VertexN', 'EdgeN', or 'FaceN', respectively, if it is sp If 'Custom' is chosen, the contents of 'Custom Text' will be used. For other types, the string will be calculated automatically from the object defined in 'Target'. -'Tag' and 'Material' only work for objects that have these properties, like Arch objects. +'Tag' and 'Material' only work for objects that have these properties, like BIM objects. For 'Position', 'Length', and 'Area' these properties will be extracted from the main object in 'Target', or from the subelement 'VertexN', 'EdgeN', or 'FaceN', respectively, if it is specified. diff --git a/src/Mod/Draft/Resources/ui/preferences-dxf.ui b/src/Mod/Draft/Resources/ui/preferences-dxf.ui index dee8bb7ddf..2a6b2026fc 100644 --- a/src/Mod/Draft/Resources/ui/preferences-dxf.ui +++ b/src/Mod/Draft/Resources/ui/preferences-dxf.ui @@ -55,7 +55,7 @@ Note: C++ importer is faster, but is not as featureful yet - Use legacy python importer + Use legacy Python importer false @@ -75,7 +75,7 @@ Note: C++ importer is faster, but is not as featureful yet Note: C++ exporter is faster, but is not as featureful yet - Use legacy python exporter + Use legacy Python exporter dxfUseLegacyExporter @@ -164,7 +164,7 @@ from the Addon Manager. If unchecked, texts and mtexts won't be imported - texts and dimensions + Texts and dimensions dxftext @@ -196,7 +196,7 @@ from the Addon Manager. If checked, paper space objects will be imported too - layouts + Layouts dxflayout @@ -245,7 +245,7 @@ from the Addon Manager. Only standard Part objects will be created (fastest) - simple Part shapes + Simple Part shapes true diff --git a/src/Mod/Draft/draftguitools/gui_edit.py b/src/Mod/Draft/draftguitools/gui_edit.py index 31a371d0c0..a880f5f258 100644 --- a/src/Mod/Draft/draftguitools/gui_edit.py +++ b/src/Mod/Draft/draftguitools/gui_edit.py @@ -256,7 +256,7 @@ class Edit(gui_base_original.Modifier): return {'Pixmap': 'Draft_Edit', 'Accel': "D, E", 'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Edit", "Edit"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Edit", "Edits the active object.\nPress E or ALT+LeftClick to display context menu\non supported nodes and on supported objects.") + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Edit", "Edits the active object.\nPress E or ALT + Left Click to display context menu\non supported nodes and on supported objects.") } diff --git a/src/Mod/Draft/draftguitools/gui_edit_draft_objects.py b/src/Mod/Draft/draftguitools/gui_edit_draft_objects.py index adf03fc953..85ac640137 100644 --- a/src/Mod/Draft/draftguitools/gui_edit_draft_objects.py +++ b/src/Mod/Draft/draftguitools/gui_edit_draft_objects.py @@ -774,7 +774,7 @@ class DraftBezCurveGuiTools(GuiTools): knot = 0 else: App.Console.PrintWarning(translate("draft", - "Endpoint of BezCurve can't be smoothed") + "Endpoint of Bézier curve can't be smoothed") + "\n") return segment = knot // deg # segment index diff --git a/src/Mod/Draft/draftguitools/gui_edit_sketcher_objects.py b/src/Mod/Draft/draftguitools/gui_edit_sketcher_objects.py index 7f45c1b96e..620432e0f3 100644 --- a/src/Mod/Draft/draftguitools/gui_edit_sketcher_objects.py +++ b/src/Mod/Draft/draftguitools/gui_edit_sketcher_objects.py @@ -59,7 +59,7 @@ class SketcherSketchObjectGuiTools(GuiTools): return editpoints else: _wrn = translate("draft", "Sketch is too complex to edit: " - "it is suggested to use sketcher default editor") + "it is suggested to use the default Sketcher editor") App.Console.PrintWarning(_wrn + "\n") return None diff --git a/src/Mod/Draft/draftguitools/gui_groups.py b/src/Mod/Draft/draftguitools/gui_groups.py index e19aec9255..959a13c09c 100644 --- a/src/Mod/Draft/draftguitools/gui_groups.py +++ b/src/Mod/Draft/draftguitools/gui_groups.py @@ -207,7 +207,7 @@ class SetAutoGroup(gui_base.GuiCommandSimplest): """Set icon, menu and tooltip.""" return {'Pixmap': 'Draft_AutoGroup', 'MenuText': QT_TRANSLATE_NOOP("Draft_AutoGroup", "Autogroup"), - 'ToolTip': QT_TRANSLATE_NOOP("Draft_AutoGroup", "Select a group to add all Draft and Arch objects to.")} + 'ToolTip': QT_TRANSLATE_NOOP("Draft_AutoGroup", "Select a group to add all Draft and BIM objects to.")} def Activated(self): """Execute when the command is called. diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py index 12b98e1569..8dae32e086 100644 --- a/src/Mod/Draft/importDXF.py +++ b/src/Mod/Draft/importDXF.py @@ -134,7 +134,7 @@ from menu Tools -> Addon Manager""") if gui: message = translate('draft', """The DXF import/export libraries needed by FreeCAD to handle the DXF format were not found on this system. -Please either enable FreeCAD to download these libraries: +Please either allow FreeCAD to download these libraries: 1 - Load Draft workbench 2 - Menu Edit > Preferences > Import-Export > DXF > Enable downloads Or download these libraries manually, as explained on diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp index 64b5ca7bd7..a09c755a93 100644 --- a/src/Mod/Drawing/Gui/Command.cpp +++ b/src/Mod/Drawing/Gui/Command.cpp @@ -614,9 +614,9 @@ CmdDrawingSymbol::CmdDrawingSymbol() // setting the sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("&Symbol"); - sToolTipText = QT_TR_NOOP("Inserts a symbol from a svg file in the active drawing"); + sToolTipText = QT_TR_NOOP("Inserts a symbol from a SVG file in the active drawing"); sWhatsThis = "Drawing_Symbol"; - sStatusTip = QT_TR_NOOP("Inserts a symbol from a svg file in the active drawing"); + sStatusTip = QT_TR_NOOP("Inserts a symbol from a SVG file in the active drawing"); sPixmap = "actions/drawing-symbol"; } diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index b76e93c8c4..491d16228a 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -355,7 +355,7 @@ - Spooles + Spooles equation solver @@ -365,7 +365,7 @@ - Iterative Cholesky + Cholesky iterative solver diff --git a/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui b/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui index 598048f7d0..ced7c677c8 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui @@ -258,7 +258,7 @@ - Multi-CPU core support: + Multi-core CPU support: diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui b/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui index 0ec652f2ea..8dee1efefe 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui @@ -28,7 +28,7 @@ - Working directory for solving analysis and gmsh meshing + Working directory for solving analysis and Gmsh meshing diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGmsh.ui b/src/Mod/Fem/Gui/DlgSettingsFemGmsh.ui index c0697f1d10..acddbffe75 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGmsh.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemGmsh.ui @@ -96,7 +96,7 @@ - Leave blank to use default gmsh binary file + Leave blank to use default Gmsh binary file gmshBinaryPath diff --git a/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui b/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui index 16b80c656b..856dacd0e9 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui @@ -108,7 +108,7 @@ - Leave blank to use default Z88 z88r binary file + Leave blank to use default Z88, z88r binary file z88BinaryPath diff --git a/src/Mod/Fem/Gui/Resources/ui/ElementFluid1D.ui b/src/Mod/Fem/Gui/Resources/ui/ElementFluid1D.ui index 8a37e2b999..35779494cd 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ElementFluid1D.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ElementFluid1D.ui @@ -648,7 +648,7 @@ - Head Loss[mm] + Head Loss [mm] diff --git a/src/Mod/Fem/Gui/Resources/ui/Material.ui b/src/Mod/Fem/Gui/Resources/ui/Material.ui index 4bb565eb58..d47b5a97d8 100755 --- a/src/Mod/Fem/Gui/Resources/ui/Material.ui +++ b/src/Mod/Fem/Gui/Resources/ui/Material.ui @@ -104,7 +104,7 @@ - use FreeCAD material editor + Use FreeCAD material editor @@ -120,7 +120,7 @@ Qt::RightToLeft - use this task panel + Use this task panel false @@ -389,7 +389,7 @@ - Thermal Properties + Thermal Properties @@ -494,7 +494,7 @@ - Specific Heat: + Specific Heat Capacity: diff --git a/src/Mod/Fem/Gui/Resources/ui/MeshGmsh.ui b/src/Mod/Fem/Gui/Resources/ui/MeshGmsh.ui index c5ce6d2fc0..a8ae88a12b 100644 --- a/src/Mod/Fem/Gui/Resources/ui/MeshGmsh.ui +++ b/src/Mod/Fem/Gui/Resources/ui/MeshGmsh.ui @@ -23,7 +23,7 @@ - FEM Mesh Parameter + FEM Mesh Parameters diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp index 0f408da3ac..2801938614 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp @@ -361,7 +361,7 @@ void TaskFemConstraintDisplacement::addToSelection() } for (const auto& SubElement : SubElements) { if (SubElement.find(searchStr) == std::string::npos) { - QString msg = tr("Only one type of selection (vertex,face or edge) per " + QString msg = tr("Only one type of selection (vertex, face or edge) per " "analysis feature allowed!"); QMessageBox::warning(this, tr("Selection error"), msg); addMe = false; diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp index e7cac57583..4055c5d0eb 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp @@ -509,7 +509,7 @@ void TaskFemConstraintFluidBoundary::updateTurbulenceUI() ui->labelTurbulentLengthValue->setText(tr("Dissipation Rate [m2/s3]")); } else if (turbulenceSpec == "intensity&LengthScale") { - ui->labelTurbulentLengthValue->setText(tr("Length Scale[m]")); + ui->labelTurbulentLengthValue->setText(tr("Length Scale [m]")); } else if (turbulenceSpec == "intensity&ViscosityRatio") { ui->labelTurbulentLengthValue->setText(tr("Viscosity Ratio [1]")); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui index d69d2053b0..ad3b78fe1c 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui @@ -408,7 +408,7 @@ normal vector of the face is used as direction - Temperature[K] + Temperature [K] diff --git a/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp b/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp index 9f08c67df5..ff3d255c8c 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp @@ -319,8 +319,8 @@ void TaskFemConstraintRigidBody::addToSelection() } for (size_t iStr = 0; iStr < (SubElements.size()); ++iStr) { if (SubElements[iStr].find(searchStr) == std::string::npos) { - QString msg = tr( - "Only one type of selection (vertex,face or edge) per constraint allowed!"); + QString msg = tr("Only one type of selection (vertex, face or edge) per " + "constraint allowed!"); QMessageBox::warning(this, tr("Selection error"), msg); addMe = false; break; diff --git a/src/Mod/Fem/Gui/TaskTetParameter.ui b/src/Mod/Fem/Gui/TaskTetParameter.ui index 2560d0c513..c9ff7febb1 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.ui +++ b/src/Mod/Fem/Gui/TaskTetParameter.ui @@ -126,7 +126,7 @@ - Nbr. Segs per Edge: + Number of Segments per Edge: @@ -143,7 +143,7 @@ - Nbr. Segs per Radius: + Number of Segments per Radius: diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py index b84339155c..e92e9088ff 100644 --- a/src/Mod/Fem/femcommands/commands.py +++ b/src/Mod/Fem/femcommands/commands.py @@ -392,7 +392,7 @@ class _EquationDeformation(CommandManager): self.menutext = Qt.QT_TRANSLATE_NOOP("FEM_EquationDeformation", "Deformation equation") self.tooltip = Qt.QT_TRANSLATE_NOOP( "FEM_EquationDeformation", - "Creates a FEM equation for\n deformation (nonlinear elasticity)", + "Creates a FEM equation for deformation (nonlinear elasticity)", ) self.is_active = "with_solver_elmer" self.do_activated = "add_obj_on_gui_selobj_expand_noset_edit" @@ -405,7 +405,7 @@ class _EquationElasticity(CommandManager): super().__init__() self.menutext = Qt.QT_TRANSLATE_NOOP("FEM_EquationElasticity", "Elasticity equation") self.tooltip = Qt.QT_TRANSLATE_NOOP( - "FEM_EquationElasticity", "Creates a FEM equation for\n elasticity (stress)" + "FEM_EquationElasticity", "Creates a FEM equation for elasticity (stress)" ) self.is_active = "with_solver_elmer" self.do_activated = "add_obj_on_gui_selobj_expand_noset_edit" @@ -480,7 +480,7 @@ class _EquationMagnetodynamic(CommandManager): ) self.tooltip = Qt.QT_TRANSLATE_NOOP( "FEM_EquationMagnetodynamic", - "Creates a FEM equation for\n magnetodynamic forces", + "Creates a FEM equation for magnetodynamic forces", ) self.is_active = "with_solver_elmer" self.do_activated = "add_obj_on_gui_selobj_expand_noset_edit" @@ -496,7 +496,7 @@ class _EquationMagnetodynamic2D(CommandManager): ) self.tooltip = Qt.QT_TRANSLATE_NOOP( "FEM_EquationMagnetodynamic2D", - "Creates a FEM equation for\n 2D magnetodynamic forces", + "Creates a FEM equation for 2D magnetodynamic forces", ) self.is_active = "with_solver_elmer" self.do_activated = "add_obj_on_gui_selobj_expand_noset_edit" diff --git a/src/Mod/Help/Help.py b/src/Mod/Help/Help.py index 99adda6688..113bf3c627 100644 --- a/src/Mod/Help/Help.py +++ b/src/Mod/Help/Help.py @@ -79,7 +79,7 @@ LOGTXT = translate( ) CONVERTTXT = translate( "Help", - "There is no markdown renderer installed on your system, so this help page is rendered as is. Please install the markdown or pandoc python modules to improve the rendering of this page.", + "There is no Markdown renderer installed on your system, so this help page is rendered as is. Please install the Markdown or Pandoc Python modules to improve the rendering of this page.", ) PREFS = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Help") ICON = ":/icons/help-browser.svg" diff --git a/src/Mod/Import/App/dxf/dxf.h b/src/Mod/Import/App/dxf/dxf.h index 7d82e38bc5..a661e39b19 100644 --- a/src/Mod/Import/App/dxf/dxf.h +++ b/src/Mod/Import/App/dxf/dxf.h @@ -493,7 +493,7 @@ protected: }; // This is a combination of ui options: // "Group layers into blocks" (groupLayers) checkbox which means MergeShapes, - // "simple part shapes" (dxfCreatePart) radio button which means SingleShapes + // "Simple part shapes" (dxfCreatePart) radio button which means SingleShapes // "Draft objects" (dxfCreateDraft) radio button which means DraftObjects // We do not support (dxfCreateSketch). // (joingeometry) is described as being slow so I think the implication is that it only joins diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.cpp b/src/Mod/Mesh/Gui/RemeshGmsh.cpp index dbe2f65451..978b15cf36 100644 --- a/src/Mod/Mesh/Gui/RemeshGmsh.cpp +++ b/src/Mod/Mesh/Gui/RemeshGmsh.cpp @@ -238,7 +238,7 @@ void GmshWidget::started() if (!d->label) { d->label = new Gui::StatusWidget(this); d->label->setAttribute(Qt::WA_DeleteOnClose); - d->label->setStatusText(tr("Running gmsh...")); + d->label->setStatusText(tr("Running Gmsh...")); d->label->show(); } } diff --git a/src/Mod/Part/Gui/AttacherTexts.cpp b/src/Mod/Part/Gui/AttacherTexts.cpp index 10f0db60f1..38ae2b8efd 100644 --- a/src/Mod/Part/Gui/AttacherTexts.cpp +++ b/src/Mod/Part/Gui/AttacherTexts.cpp @@ -278,7 +278,7 @@ TextSet getUIStrings(Base::Type attacherType, eMapMode mmode) qApp->translate("Attacher0D", "Attachment is disabled. Point can be moved by editing Placement property.","AttachmentPoint mode tooltip")); case mm0Origin: return TwoStrings(qApp->translate("Attacher0D", "Object's origin","AttachmentPoint mode caption"), - qApp->translate("Attacher0D", "Point is put at object's Placement.Position. Works on objects with placements, and ellipse/parabola/hyperbola edges.","AttachmentPoint mode tooltip")); + qApp->translate("Attacher0D", "Point is put at object's placement position. Works on objects with placements, and ellipse/parabola/hyperbola edges.","AttachmentPoint mode tooltip")); case mm0Focus1: return TwoStrings(qApp->translate("Attacher0D", "Focus1","AttachmentPoint mode caption"), qApp->translate("Attacher0D", "Focus of ellipse, parabola, hyperbola.","AttachmentPoint mode tooltip")); diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index d8a44a2885..9b3bd9ad37 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -386,7 +386,7 @@ void CmdPartCommon::activated(int iMsg) } if (numShapes < 2) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select two shapes or more, please. Or, select one compound containing two or more shapes to compute common between.")); + QObject::tr("Please select two shapes or more. Or, select one compound containing two or more shapes to compute the intersection between.")); return; } @@ -462,7 +462,7 @@ void CmdPartFuse::activated(int iMsg) } if (numShapes < 2) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select two shapes or more, please. Or, select one compound containing two or more shapes to be fused.")); + QObject::tr("Please select two shapes or more. Or, select one compound containing two or more shapes to be fused.")); return; } @@ -944,7 +944,7 @@ CmdPartImport::CmdPartImport() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Import CAD..."); + sMenuText = QT_TR_NOOP("Import CAD file..."); sToolTipText = QT_TR_NOOP("Imports a CAD file"); sWhatsThis = "Part_Import"; sStatusTip = sToolTipText; @@ -1007,7 +1007,7 @@ CmdPartExport::CmdPartExport() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Export CAD..."); + sMenuText = QT_TR_NOOP("Export CAD file..."); sToolTipText = QT_TR_NOOP("Exports to a CAD file"); sWhatsThis = "Part_Export"; sStatusTip = sToolTipText; diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 26ad96c3dc..dd85b4e2a9 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -266,7 +266,7 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge d->filletType = type; if (d->filletType == DlgFilletEdges::CHAMFER) { - ui->parameterName->setTitle(tr("Chamfer Parameter")); + ui->parameterName->setTitle(tr("Chamfer Parameters")); ui->labelfillet->setText(tr("Chamfer type")); ui->labelRadius->setText(tr("Length:")); ui->filletType->setItemText(0, tr("Equal distance")); diff --git a/src/Mod/Part/Gui/DlgFilletEdges.ui b/src/Mod/Part/Gui/DlgFilletEdges.ui index 91e72f46c7..4cacfe6720 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.ui +++ b/src/Mod/Part/Gui/DlgFilletEdges.ui @@ -48,7 +48,7 @@ - Fillet Parameter + Parameters @@ -107,7 +107,7 @@ - Fillet type: + Type: diff --git a/src/Mod/Part/Gui/DlgImportExportIges.ui b/src/Mod/Part/Gui/DlgImportExportIges.ui index fc714764b4..4911c732bd 100644 --- a/src/Mod/Part/Gui/DlgImportExportIges.ui +++ b/src/Mod/Part/Gui/DlgImportExportIges.ui @@ -62,7 +62,7 @@ - Write solids and shells as + Export solids and shells as diff --git a/src/Mod/Part/Gui/DlgPartImportStep.ui b/src/Mod/Part/Gui/DlgPartImportStep.ui index d5d7dba7d1..9efc79e582 100644 --- a/src/Mod/Part/Gui/DlgPartImportStep.ui +++ b/src/Mod/Part/Gui/DlgPartImportStep.ui @@ -11,7 +11,7 @@ - Step input file + STEP input file diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp index fb0333edb6..fc4b003744 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp +++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp @@ -1010,7 +1010,7 @@ TaskCheckGeometryDialog::TaskCheckGeometryDialog() Content.push_back(settingsBox); autoRunCheckBox = new QCheckBox(); - autoRunCheckBox->setText(tr("Skip settings page")); + autoRunCheckBox->setText(tr("Skip this settings page")); autoRunCheckBox->setToolTip( tr("Skip this settings page and run the geometry check automatically.") + QStringLiteral("\n") diff --git a/src/Mod/Part/Gui/TaskFaceAppearances.ui b/src/Mod/Part/Gui/TaskFaceAppearances.ui index 08f64a1527..aae26cbd9c 100644 --- a/src/Mod/Part/Gui/TaskFaceAppearances.ui +++ b/src/Mod/Part/Gui/TaskFaceAppearances.ui @@ -94,7 +94,7 @@ - When checked, the you can select multiple faces + When checked, you can select multiple faces by dragging a selection rectangle in the 3D view diff --git a/src/Mod/PartDesign/App/FeatureHelix.cpp b/src/Mod/PartDesign/App/FeatureHelix.cpp index 55e53d8e8d..ace36c1c81 100644 --- a/src/Mod/PartDesign/App/FeatureHelix.cpp +++ b/src/Mod/PartDesign/App/FeatureHelix.cpp @@ -125,7 +125,7 @@ App::DocumentObjectExecReturn* Helix::execute() HelixMode mode = static_cast(Mode.getValue()); if (mode == HelixMode::pitch_height_angle) { if (Pitch.getValue() < Precision::Confusion()) - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Error: Pitch too small")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Error: Pitch too small!")); if (Height.getValue() < Precision::Confusion()) return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Error: height too small!")); Turns.setValue(Height.getValue() / Pitch.getValue()); diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index 38b6f99596..8f32f7135d 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -431,7 +431,7 @@ void CmdPartDesignMigrate::activated(int iMsg) } // do the actual migration - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy part design features to Bodies")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy Part Design features to Bodies")); for ( auto chainIt = featureChains.begin(); !featureChains.empty(); featureChains.erase (chainIt), chainIt = featureChains.begin () ) { diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp index d69041721f..d71df04623 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp @@ -176,9 +176,9 @@ void ViewProviderTransformed::recomputeFeature(bool recompute) if (rejected > 0) { msg = QString::fromLatin1("%1
    \r\n%2"); if (rejected == 1) - msg = msg.arg(QObject::tr("One transformed shape does not intersect support")); + msg = msg.arg(QObject::tr("One transformed shape does not intersect the support")); else { - msg = msg.arg(QObject::tr("%1 transformed shapes do not intersect support")); + msg = msg.arg(QObject::tr("%1 transformed shapes do not intersect the support")); msg = msg.arg(rejected); } } diff --git a/src/Mod/PartDesign/InvoluteGearFeature.py b/src/Mod/PartDesign/InvoluteGearFeature.py index 68041d39e6..e2d3e44051 100644 --- a/src/Mod/PartDesign/InvoluteGearFeature.py +++ b/src/Mod/PartDesign/InvoluteGearFeature.py @@ -98,17 +98,17 @@ class _InvoluteGear: doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "Number of gear teeth"), default=26) ensure_property("App::PropertyLength", "Modules", - doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "Modules of the gear"), + doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "Module of the gear"), default="2.5 mm") ensure_property("App::PropertyAngle", "PressureAngle", doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "Pressure angle of gear teeth"), default="20 deg") ensure_property("App::PropertyBool", "HighPrecision", doc=QtCore.QT_TRANSLATE_NOOP("App::Property", - "True=2 curves with each 3 control points False=1 curve with 4 control points."), + "True=2 curves with each 3 control points, False=1 curve with 4 control points."), default=True) ensure_property("App::PropertyBool", "ExternalGear", - doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "True=external Gear False=internal Gear"), + doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "True=external Gear, False=internal Gear"), default=True) ensure_property("App::PropertyFloat", "AddendumCoefficient", doc=QtCore.QT_TRANSLATE_NOOP("App::Property", diff --git a/src/Mod/PartDesign/SprocketFeature.ui b/src/Mod/PartDesign/SprocketFeature.ui index 197790f902..d33e4f37ec 100644 --- a/src/Mod/PartDesign/SprocketFeature.ui +++ b/src/Mod/PartDesign/SprocketFeature.ui @@ -11,7 +11,7 @@
    - Sprocket parameter + Sprocket parameters @@ -307,7 +307,7 @@ - Tooth Width + Tooth Width: diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineCurve.cpp b/src/Mod/ReverseEngineering/Gui/FitBSplineCurve.cpp index d411ff4c34..b0f9e542c2 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineCurve.cpp +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineCurve.cpp @@ -136,7 +136,7 @@ void FitBSplineCurveWidget::exeCommand(const QString& cmd) { Gui::WaitCursor wc; Gui::Command::addModule(Gui::Command::App, "ReverseEngineering"); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Fit B-Spline")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Fit B-spline")); Gui::Command::runCommand(Gui::Command::Doc, cmd.toLatin1()); Gui::Command::commitCommand(); Gui::Command::updateActive(); diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp index 481011d1de..d09392ded1 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp @@ -228,7 +228,7 @@ bool FitBSplineSurfaceWidget::accept() Gui::WaitCursor wc; Gui::Command::addModule(Gui::Command::App, "ReverseEngineering"); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Fit B-Spline")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Fit B-spline")); Gui::Command::runCommand(Gui::Command::Doc, command.toLatin1()); Gui::Command::commitCommand(); Gui::Command::updateActive(); diff --git a/src/Mod/Sketcher/App/SketchAnalysis.cpp b/src/Mod/Sketcher/App/SketchAnalysis.cpp index 527e83e529..e2e4751771 100644 --- a/src/Mod/Sketcher/App/SketchAnalysis.cpp +++ b/src/Mod/Sketcher/App/SketchAnalysis.cpp @@ -673,7 +673,7 @@ void SketchAnalysis::makeMissingPointOnPointCoincidentOneByOne() { makeConstraintsOneByOne(vertexConstraints, QT_TRANSLATE_NOOP("Exceptions", - "Autoconstrain error: Unsolvable sketch while " + "Autoconstraint error: Unsolvable sketch while " "applying coincident constraints.")); } @@ -720,7 +720,7 @@ void SketchAnalysis::makeMissingVerticalHorizontalOneByOne() { makeConstraintsOneByOne(verthorizConstraints, QT_TRANSLATE_NOOP("Exceptions", - "Autoconstrain error: Unsolvable sketch while " + "Autoconstraint error: Unsolvable sketch while " "applying vertical/horizontal constraints.")); } @@ -812,7 +812,7 @@ void SketchAnalysis::makeMissingEqualityOneByOne() makeConstraintsOneByOne(equalities, QT_TRANSLATE_NOOP("Exceptions", - "Autoconstrain error: Unsolvable sketch while " + "Autoconstraint error: Unsolvable sketch while " "applying equality constraints.")); lineequalityConstraints.clear(); radiusequalityConstraints.clear(); @@ -852,7 +852,7 @@ void SketchAnalysis::autoDeleteAllConstraints() // a failure should not be possible at this moment as we start from a clean situation solveSketch(QT_TRANSLATE_NOOP("Exceptions", - "Autoconstrain error: Unsolvable sketch without constraints.")); + "Autoconstraint error: Unsolvable sketch without constraints.")); } void SketchAnalysis::autoHorizontalVerticalConstraints() @@ -866,7 +866,7 @@ void SketchAnalysis::autoHorizontalVerticalConstraints() doc->commitTransaction(); solveSketch(QT_TRANSLATE_NOOP("Exceptions", - "Autoconstrain error: Unsolvable sketch after applying " + "Autoconstraint error: Unsolvable sketch after applying " "horizontal and vertical constraints.")); } @@ -881,7 +881,7 @@ void SketchAnalysis::autoPointOnPointCoincident() doc->commitTransaction(); solveSketch(QT_TRANSLATE_NOOP("Exceptions", - "Autoconstrain error: Unsolvable sketch after applying " + "Autoconstraint error: Unsolvable sketch after applying " "point-on-point constraints.")); } @@ -902,7 +902,7 @@ void SketchAnalysis::autoMissingEquality() doc->commitTransaction(); solveSketch(QT_TRANSLATE_NOOP("Exceptions", - "Autoconstrain error: Unsolvable sketch after " + "Autoconstraint error: Unsolvable sketch after " "applying equality constraints.")); } diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 4afebcf61d..fca9b5c34d 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -6613,7 +6613,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m if (GeoId < 0 || GeoId > getHighestCurveIndex()) THROWMT(Base::ValueError, - QT_TRANSLATE_NOOP("Exceptions", "BSpline Geometry Index (GeoID) is out of bounds.")) + QT_TRANSLATE_NOOP("Exceptions", "B-spline Geometry Index (GeoID) is out of bounds.")) if (multiplicityincr == 0)// no change in multiplicity THROWMT( @@ -6625,7 +6625,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m if (geo->getTypeId() != Part::GeomBSplineCurve::getClassTypeId()) THROWMT(Base::TypeError, QT_TRANSLATE_NOOP("Exceptions", - "The Geometry Index (GeoId) provided is not a B-spline curve.")) + "The Geometry Index (GeoId) provided is not a B-spline.")) const Part::GeomBSplineCurve* bsp = static_cast(geo); @@ -6797,7 +6797,7 @@ bool SketchObject::insertBSplineKnot(int GeoId, double param, int multiplicity) if (GeoId < 0 || GeoId > getHighestCurveIndex()) THROWMT( Base::ValueError, - QT_TRANSLATE_NOOP("Exceptions", "BSpline Geometry Index (GeoID) is out of bounds.")); + QT_TRANSLATE_NOOP("Exceptions", "B-spline Geometry Index (GeoID) is out of bounds.")); if (multiplicity == 0) THROWMT(Base::ValueError, @@ -6808,7 +6808,7 @@ bool SketchObject::insertBSplineKnot(int GeoId, double param, int multiplicity) if (geo->getTypeId() != Part::GeomBSplineCurve::getClassTypeId()) THROWMT(Base::TypeError, QT_TRANSLATE_NOOP("Exceptions", - "The Geometry Index (GeoId) provided is not a B-spline curve.")); + "The Geometry Index (GeoId) provided is not a B-spline.")); const Part::GeomBSplineCurve* bsp = static_cast(geo); @@ -6825,7 +6825,7 @@ bool SketchObject::insertBSplineKnot(int GeoId, double param, int multiplicity) if (param > lastParam || param < firstParam) THROWMT(Base::ValueError, QT_TRANSLATE_NOOP("Exceptions", - "Knot cannot be inserted outside the BSpline parameter range.")); + "Knot cannot be inserted outside the B-spline parameter range.")); std::unique_ptr bspline; diff --git a/src/Mod/Sketcher/App/SketchObjectPy.xml b/src/Mod/Sketcher/App/SketchObjectPy.xml index 1f601064f8..06cdfec6b0 100644 --- a/src/Mod/Sketcher/App/SketchObjectPy.xml +++ b/src/Mod/Sketcher/App/SketchObjectPy.xml @@ -619,17 +619,17 @@ setLabelDistance(constraintIndex:int, value:float) - Approximates the given geometry with a B-Spline + Approximates the given geometry with a B-spline - Increases the given BSpline Degree by a number of degrees + Increases the given B-spline Degree by a number of degrees - Decreases the given BSpline Degree by a number of degrees by approximating this curve + Decreases the given B-spline Degree by a number of degrees by approximating this curve diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index b52ab63a3a..5e11dc226f 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -784,7 +784,7 @@ CmdSketcherValidateSketch::CmdSketcherValidateSketch() sAppModule = "Sketcher"; sGroup = "Sketcher"; sMenuText = QT_TR_NOOP("Validate sketch..."); - sToolTipText = QT_TR_NOOP("Validate a sketch by looking at missing coincidences,\n" + sToolTipText = QT_TR_NOOP("Validates a sketch by looking at missing coincidences,\n" "invalid constraints, degenerated geometry, etc."); sWhatsThis = "Sketcher_ValidateSketch"; sStatusTip = sToolTipText; @@ -824,7 +824,7 @@ CmdSketcherMirrorSketch::CmdSketcherMirrorSketch() sAppModule = "Sketcher"; sGroup = "Sketcher"; sMenuText = QT_TR_NOOP("Mirror sketch"); - sToolTipText = QT_TR_NOOP("Create a new mirrored sketch for each selected sketch\n" + sToolTipText = QT_TR_NOOP("Creates a new mirrored sketch for each selected sketch\n" "by using the X or Y axes, or the origin point,\n" "as mirroring reference."); sWhatsThis = "Sketcher_MirrorSketch"; diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 224b5567d8..12f77daf7f 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -3968,12 +3968,7 @@ void CmdSketcherConstrainCoincidentUnified::activatedPointOnObject(SketchObject* abortCommand(); Gui::TranslatedUserWarning(obj, QObject::tr("Wrong selection"), - QObject::tr("None of the selected points were constrained " - "onto the respective curves, " - "because they are parts " - "of the same element, " - "because they are both external geometry, " - "or because the edge is not eligible.")); + QObject::tr("None of the selected points were constrained onto the respective curves, because they are part of the same element, they are both external geometry, or the edge is not eligible.")); } return; } @@ -6592,7 +6587,7 @@ bool CmdSketcherConstrainTangent::substituteConstraintCombinations(SketchObject* Gui::Command::openCommand( QT_TRANSLATE_NOOP("Command", - "Swap PointOnObject+tangency with point to curve tangency")); + "Swap point on object and tangency with point to curve tangency")); doEndpointToEdgeTangency(Obj, (*it)->First, (*it)->FirstPos, (*it)->Second); @@ -7516,7 +7511,7 @@ void CmdSketcherConstrainRadius::activated(int iMsg) Gui::TranslatedUserWarning( Obj, QObject::tr("Wrong selection"), - QObject::tr("Select either only one or more B-Spline poles or only one or more arcs or " + QObject::tr("Select either only one or more B-spline poles or only one or more arcs or " "circles from the sketch, but not mixed.")); return; } @@ -8193,7 +8188,7 @@ void CmdSketcherConstrainRadiam::activated(int iMsg) Gui::TranslatedUserWarning( Obj, QObject::tr("Wrong selection"), - QObject::tr("Select either only one or more B-Spline poles or only one or more arcs or " + QObject::tr("Select either only one or more B-spline poles or only one or more arcs or " "circles from the sketch, but not mixed.")); return; } @@ -8560,9 +8555,9 @@ void CmdSketcherCompConstrainRadDia::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdSketcherCompConstrainRadDia", "Constrain radius")); arc1->setToolTip(QApplication::translate("Sketcher_ConstrainRadius", - "Fix the radius of a circle or an arc")); + "Fix the radius of an arc or a circle")); arc1->setStatusTip(QApplication::translate("Sketcher_ConstrainRadius", - "Fix the radius of a circle or an arc")); + "Fix the radius of an arc or a circle")); QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdSketcherCompConstrainRadDia", "Constrain diameter")); arc2->setToolTip(QApplication::translate("Sketcher_ConstrainDiameter", @@ -8573,9 +8568,9 @@ void CmdSketcherCompConstrainRadDia::languageChange() arc3->setText(QApplication::translate("CmdSketcherCompConstrainRadDia", "Constrain auto radius/diameter")); arc3->setToolTip(QApplication::translate("Sketcher_ConstrainRadiam", - "Fix the radius/diameter of a circle or an arc")); + "Fix the radius/diameter of an arc or a circle")); arc3->setStatusTip(QApplication::translate("Sketcher_ConstrainRadiam", - "Fix the radius/diameter of a circle or an arc")); + "Fix the radius/diameter of an arc or a circle")); } bool CmdSketcherCompConstrainRadDia::isActive() @@ -9684,7 +9679,7 @@ void CmdSketcherConstrainSnellsLaw::activated(int iMsg) "and an edge representing a boundary. " "The first selected point corresponds " "to index n1, second to n2, " - "and datum value sets the ratio n2/n1.", + "and the value sets the ratio n2/n1.", "Constraint_SnellsLaw"); const char dmbg[] = "Constraint_SnellsLaw"; @@ -10113,7 +10108,7 @@ void CmdSketcherToggleActiveConstraint::activated(int iMsg) } // undo command open - openCommand(QT_TRANSLATE_NOOP("Command", "Activate/Deactivate constraint")); + openCommand(QT_TRANSLATE_NOOP("Command", "Activate/Deactivate constraints")); int successful = SubNames.size(); diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp index f2405e6df7..50c8202e01 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp @@ -214,7 +214,7 @@ void CmdSketcherIncreaseDegree::activated(int iMsg) const std::vector& SubNames = selection[0].getSubNames(); Sketcher::SketchObject* Obj = static_cast(selection[0].getObject()); - openCommand(QT_TRANSLATE_NOOP("Command", "Increase spline degree")); + openCommand(QT_TRANSLATE_NOOP("Command", "Increase B-spline degree")); bool ignored = false; @@ -243,7 +243,7 @@ void CmdSketcherIncreaseDegree::activated(int iMsg) Gui::TranslatedUserWarning(Obj, QObject::tr("Wrong selection"), QObject::tr("At least one of the selected " - "objects was not a B-Spline and was ignored.")); + "objects was not a B-spline and was ignored.")); } commitCommand(); @@ -293,7 +293,7 @@ void CmdSketcherDecreaseDegree::activated(int iMsg) const std::vector& SubNames = selection[0].getSubNames(); Sketcher::SketchObject* Obj = static_cast(selection[0].getObject()); - openCommand(QT_TRANSLATE_NOOP("Command", "Decrease spline degree")); + openCommand(QT_TRANSLATE_NOOP("Command", "Decrease B-spline degree")); bool ignored = false; @@ -326,7 +326,7 @@ void CmdSketcherDecreaseDegree::activated(int iMsg) Gui::TranslatedUserWarning(Obj, QObject::tr("Wrong selection"), QObject::tr("At least one of the selected " - "objects was not a B-Spline and was ignored.")); + "objects was not a B-spline and was ignored.")); } commitCommand(); @@ -918,7 +918,7 @@ void CmdSketcherInsertKnot::activated(int iMsg) // as we need only one object to get the new GeoId after multiplicity change Gui::TranslatedUserWarning(getActiveGuiDocument()->getDocument(), QObject::tr("Selection is empty"), - QObject::tr("Nothing is selected. Please select a b-spline.")); + QObject::tr("Nothing is selected. Please select a B-spline.")); return; } @@ -936,8 +936,8 @@ void CmdSketcherInsertKnot::activated(int iMsg) Gui::TranslatedUserWarning( Obj, QObject::tr("Wrong selection"), - QObject::tr("Please select a b-spline curve to insert a knot (not a knot on it). " - "If the curve is not a b-spline, please convert it into one first.")); + QObject::tr("Please select a B-spline to insert a knot (not a knot on it). " + "If the curve is not a B-spline, please convert it into one first.")); } getSelection().clearSelection(); diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp index d79e9e6876..bc2785dea0 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp @@ -887,7 +887,7 @@ CmdSketcherSelectElementsWithDoFs::CmdSketcherSelectElementsWithDoFs() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Select unconstrained DoF"); + sMenuText = QT_TR_NOOP("Select under-constrained elements"); sToolTipText = QT_TR_NOOP("Select geometrical elements where the solver still detects " "unconstrained degrees of freedom."); sWhatsThis = "Sketcher_SelectElementsWithDoFs"; @@ -2369,7 +2369,7 @@ void CmdSketcherOffset::activated(int iMsg) getSelection().clearSelection(); Gui::NotifyUserError(Obj, QT_TRANSLATE_NOOP("Notifications", "Invalid selection"), - QT_TRANSLATE_NOOP("Notifications", "Selection has no valid geometries. BSplines, Points are not supported yet.")); + QT_TRANSLATE_NOOP("Notifications", "Selection has no valid geometries. B-splines and points are not supported yet.")); } } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index 34819c4c0f..37f2b5b94f 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -450,7 +450,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("BSpline parameters")); + return QString(QObject::tr("B-spline parameters")); } bool canGoToNextMode() override @@ -557,7 +557,7 @@ private: { Gui::Command::abortCommand(); tryAutoRecomputeIfNotSolve(sketchgui->getSketchObject()); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add sketch bSpline")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add sketch B-spline")); SplineDegree = 3; geoIds.clear(); @@ -679,7 +679,7 @@ private: catch (const Base::Exception&) { Gui::NotifyError(sketchgui, QT_TRANSLATE_NOOP("Notifications", "Error"), - QT_TRANSLATE_NOOP("Notifications", "Error adding B-Spline pole/knot")); + QT_TRANSLATE_NOOP("Notifications", "Error adding B-spline pole/knot")); Gui::Command::abortCommand(); @@ -695,7 +695,7 @@ private: // Restart the command Gui::Command::abortCommand(); tryAutoRecomputeIfNotSolve(sketchgui->getSketchObject()); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add sketch bSpline")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add sketch B-spline")); // Add the necessary alignment geometries and constraints for (size_t i = 0; i < geoIds.size(); ++i) { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h index 54a9fce65b..5e746e4432 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h @@ -454,7 +454,7 @@ public: try { // open the transaction Gui::Command::openCommand( - QT_TRANSLATE_NOOP("Command", "Add line to sketch wire")); + QT_TRANSLATE_NOOP("Command", "Add line to sketch polyline")); Gui::cmdAppObjectArgs( sketchgui->getObject(), "addGeometry(Part.LineSegment(App.Vector(%f,%f,0),App.Vector(%f,%f,0)),%s)", @@ -482,7 +482,7 @@ public: try { Gui::Command::openCommand( - QT_TRANSLATE_NOOP("Command", "Add arc to sketch wire")); + QT_TRANSLATE_NOOP("Command", "Add arc to sketch polyline")); Gui::cmdAppObjectArgs( sketchgui->getObject(), "addGeometry(Part.ArcOfCircle" diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp index 093d5903b9..2babbd66e0 100644 --- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp +++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp @@ -434,7 +434,7 @@ void EditModeGeometryCoinConverter::convert(const Sketcher::GeometryFacade* geom e.ReportException(); Base::Console().DeveloperError( "EditModeGeometryCoinConverter", - "Curvature graph for B-Spline with GeoId=%d could not be calculated.\n", + "Curvature graph for B-spline with GeoId=%d could not be calculated.\n", geoid); // TODO: Fix identification of curve. curvaturelist[i] = 0; } diff --git a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp index 9b106e45b8..e3c53f32c4 100644 --- a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp +++ b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp @@ -215,7 +215,7 @@ void EditModeInformationOverlayCoinConverter::calculate(const Part::Geometry* ge e.ReportException(); Base::Console().DeveloperError( "EditModeInformationOverlayCoinConverter", - "Curvature graph for B-Spline with GeoId=%d could not be calculated.\n", + "Curvature graph for B-spline with GeoId=%d could not be calculated.\n", geoid); curvaturelist.emplace_back(0); } diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index d8ed1b524e..107450f7f7 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -305,7 +305,7 @@ private: {QT_TR_NOOP("Arc of ellipse"), 1}, {QT_TR_NOOP("Arc of hyperbola"), 1}, {QT_TR_NOOP("Arc of parabola"), 1}, - {QT_TR_NOOP("B-Spline"), 1}}; + {QT_TR_NOOP("B-spline"), 1}}; }; }// namespace SketcherGui @@ -1853,12 +1853,12 @@ void TaskSketcherElements::slotElementsChanged() : QString::fromLatin1(""))) : (QString::fromLatin1("%1-").arg(i) + tr("Parabolic Arc"))) : type == Part::GeomBSplineCurve::getClassTypeId() - ? (isNamingBoxChecked ? (tr("BSpline") + IdInformation()) + ? (isNamingBoxChecked ? (tr("B-spline") + IdInformation()) + (construction ? (QString::fromLatin1("-") + tr("Construction")) : (internalAligned ? (QString::fromLatin1("-") + tr("Internal")) : QString::fromLatin1(""))) - : (QString::fromLatin1("%1-").arg(i) + tr("BSpline"))) + : (QString::fromLatin1("%1-").arg(i) + tr("B-spline"))) : (isNamingBoxChecked ? (tr("Other") + IdInformation()) + (construction ? (QString::fromLatin1("-") + tr("Construction")) @@ -1965,8 +1965,8 @@ void TaskSketcherElements::slotElementsChanged() ? (tr("Parabolic Arc") + linkname) : (QString::fromLatin1("%1-").arg(i - 2) + tr("Parabolic Arc"))) : type == Part::GeomBSplineCurve::getClassTypeId() - ? (isNamingBoxChecked ? (tr("BSpline") + linkname) - : (QString::fromLatin1("%1-").arg(i - 2) + tr("BSpline"))) + ? (isNamingBoxChecked ? (tr("B-spline") + linkname) + : (QString::fromLatin1("%1-").arg(i - 2) + tr("B-spline"))) : (isNamingBoxChecked ? (tr("Other") + linkname) : (QString::fromLatin1("%1-").arg(i - 2) + tr("Other"))), sketchView); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp index 53de9993b7..333d0cc2b1 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp @@ -139,18 +139,18 @@ void TaskSketcherMessages::updateToolTip(const QString& link) { if (link == QString::fromLatin1("#conflicting")) ui->labelConstrainStatusLink->setToolTip( - tr("Click to select the conflicting constraints.")); + tr("Click to select these conflicting constraints.")); else if (link == QString::fromLatin1("#redundant")) - ui->labelConstrainStatusLink->setToolTip(tr("Click to select the redundant constraints.")); + ui->labelConstrainStatusLink->setToolTip(tr("Click to select these redundant constraints.")); else if (link == QString::fromLatin1("#dofs")) ui->labelConstrainStatusLink->setToolTip( tr("The sketch has unconstrained elements giving rise to those Degrees Of Freedom. " - "Click to select the unconstrained elements.")); + "Click to select these unconstrained elements.")); else if (link == QString::fromLatin1("#malformed")) - ui->labelConstrainStatusLink->setToolTip(tr("Click to select the malformed constraints.")); + ui->labelConstrainStatusLink->setToolTip(tr("Click to select these malformed constraints.")); else if (link == QString::fromLatin1("#partiallyredundant")) ui->labelConstrainStatusLink->setToolTip( - tr("Some constraints in combination are partially redundant. Click to select the " + tr("Some constraints in combination are partially redundant. Click to select these " "partially redundant constraints.")); } diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 3cd0ccbf95..52a747331d 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -3283,7 +3283,7 @@ void ViewProviderSketch::UpdateSolverInformation() } else if (dofs > 0) { signalSetUp(QString::fromUtf8("under_constrained"), - tr("Under constrained:") + QLatin1String(" "), + tr("Under-constrained:") + QLatin1String(" "), QString::fromUtf8("#dofs"), tr("%n DoF(s)", "", dofs)); } diff --git a/src/Mod/Spreadsheet/Gui/PropertiesDialog.ui b/src/Mod/Spreadsheet/Gui/PropertiesDialog.ui index a66c3c865d..a5f6cd3f65 100644 --- a/src/Mod/Spreadsheet/Gui/PropertiesDialog.ui +++ b/src/Mod/Spreadsheet/Gui/PropertiesDialog.ui @@ -236,7 +236,7 @@ - Unit string + Text for the unit diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index 08456771f0..3023f4a7d4 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -356,7 +356,7 @@ void CmdTechDrawView::activated(int iMsg) else if (DrawGuiUtil::isArchSection(obj)) { std::string FeatName = getUniqueObjectName("ArchView"); std::string SourceName = obj->getNameInDocument(); - openCommand(QT_TRANSLATE_NOOP("Command", "Create ArchView")); + openCommand(QT_TRANSLATE_NOOP("Command", "Create BIM View")); doCommand(Doc, "App.activeDocument().addObject('TechDraw::DrawViewArch', '%s')", FeatName.c_str()); doCommand(Doc, "App.activeDocument().%s.translateLabel('DrawViewArch', 'ArchView', '%s')", @@ -834,8 +834,8 @@ CmdTechDrawComplexSection::CmdTechDrawComplexSection() : Command("TechDraw_Compl { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Complex Section"); - sToolTipText = QT_TR_NOOP("Insert a Complex Section"); + sMenuText = QT_TR_NOOP("Insert Complex Section View"); + sToolTipText = QT_TR_NOOP("Insert a Complex Section View"); sWhatsThis = "TechDraw_ComplexSection"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ComplexSection"; @@ -1601,8 +1601,8 @@ CmdTechDrawArchView::CmdTechDrawArchView() : Command("TechDraw_ArchView") { // setting the Gui eye-candy sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Arch Workbench Object"); - sToolTipText = QT_TR_NOOP("Insert a View of a Section Plane from Arch Workbench"); + sMenuText = QT_TR_NOOP("Insert BIM Workbench Object"); + sToolTipText = QT_TR_NOOP("Insert a View of a Section Plane from BIM Workbench"); sWhatsThis = "TechDraw_NewArch"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ArchView"; @@ -1629,13 +1629,13 @@ void CmdTechDrawArchView::activated(int iMsg) } if (archCount > 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Please select only 1 Arch Section.")); + QObject::tr("Please select only 1 BIM Section.")); return; } if (!archObject) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("No Arch Sections in selection.")); + QObject::tr("No BIM Sections in selection.")); return; } @@ -1819,7 +1819,7 @@ void CmdTechDrawExportPageDXF::activated(int iMsg) } std::string PageName = page->getNameInDocument(); - openCommand(QT_TRANSLATE_NOOP("Command", "Save page to dxf")); + openCommand(QT_TRANSLATE_NOOP("Command", "Save page to DXF")); doCommand(Doc, "import TechDraw"); fileName = Base::Tools::escapeEncodeFilename(fileName); doCommand(Doc, "TechDraw.writeDXFPage(App.activeDocument().%s, u\"%s\")", PageName.c_str(), diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index d3395e6795..7a5c5e6a31 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -1838,7 +1838,7 @@ CmdTechDrawAreaDimension::CmdTechDrawAreaDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Area Dimension"); + sMenuText = QT_TR_NOOP("Insert Area Annotation"); sToolTipText = sMenuText; sWhatsThis = "TechDraw_AreaDimension"; sStatusTip = sToolTipText; @@ -2417,7 +2417,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr if (geometryRefs2d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("Can not make 2d dimension from selection")); + QObject::tr("Can not make 2D dimension from selection")); return; } @@ -2433,7 +2433,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr if (geometryRefs3d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("Can not make 3d dimension from selection")); + QObject::tr("Can not make 3D dimension from selection")); return; } } @@ -2458,7 +2458,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr QMessageBox::StandardButton result = QMessageBox::warning( Gui::getMainWindow(), QObject::tr("BSpline Curve Warning"), - QObject::tr("Selected edge is a BSpline. Value will be approximate. Continue?"), + QObject::tr("Selected edge is a B-spline. Value will be approximate. Continue?"), QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel); if (result != QMessageBox::Ok) { @@ -2469,7 +2469,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr QMessageBox::critical( Gui::getMainWindow(), QObject::tr("BSpline Curve Error"), - QObject::tr("Selected edge is a BSpline and a radius/diameter can not be calculated.")); + QObject::tr("Selected edge is a B-spline and a radius/diameter can not be calculated.")); return; } } diff --git a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp index 449aaa2d70..7878f897bc 100644 --- a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp +++ b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp @@ -1765,8 +1765,7 @@ CmdTechDrawExtensionAreaAnnotation::CmdTechDrawExtensionAreaAnnotation() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Calculate the area of selected faces"); - sToolTipText = QT_TR_NOOP("Select several faces
    \ - - click this tool"); + sToolTipText = QT_TR_NOOP("Select several faces then click this tool"); sWhatsThis = "TechDraw_ExtensionAreaAnnotation"; sStatusTip = sToolTipText; sPixmap = "TechDraw_ExtensionAreaAnnotation"; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp index 32ed5fb8d0..551d20d45a 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp @@ -238,7 +238,7 @@ void DlgPrefsTechDrawAnnotationImp::onLineGroupChanged(int index) } ui->pcbLineGroup->setToolTip( QObject::tr("%1 defines these line widths:\n thin: %2\n graphic: %3\n" - "thick: %4") + " thick: %4") .arg(QString::fromStdString(lgNames.at(0).substr(1)), QString::fromStdString(lgNames.at(1)), QString::fromStdString(lgNames.at(2)), diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui index 243795b859..4849d86a46 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui @@ -411,12 +411,12 @@ for ProjectionGroups
    - First + First-angle - Third + Third-angle @@ -728,7 +728,7 @@ for ProjectionGroups
    - Alternate directory to search for Svg symbol files. + Alternate directory to search for SVG symbol files. Gui::FileChooser::Directory diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp index 26af5345ce..7ea9dc0b8f 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp @@ -403,7 +403,7 @@ int TaskCenterLine::checkPathologicalVertices(int inMode) //****************************************************************************** void TaskCenterLine::createCenterLine() { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create CenterLine")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Centerline")); // check for illogical parameters if (m_type == CenterLine::EDGE) { diff --git a/src/Mod/TechDraw/Gui/TaskComplexSection.cpp b/src/Mod/TechDraw/Gui/TaskComplexSection.cpp index 91a7a842c2..453e3a1bb8 100644 --- a/src/Mod/TechDraw/Gui/TaskComplexSection.cpp +++ b/src/Mod/TechDraw/Gui/TaskComplexSection.cpp @@ -650,7 +650,7 @@ void TaskComplexSection::updateComplexSection() return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit SectionView")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit Section View")); if (m_section) { QString qTemp = ui->leSymbol->text(); std::string temp = Base::Tools::toStdString(qTemp); diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui index 62b8382bad..fb1f721a9e 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui +++ b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui @@ -209,7 +209,7 @@ - Check this box to make an arc from atart angle to end angle in a clockwise direction. + Check this box to make an arc from start angle to end angle in a clockwise direction. Clockwise Angle diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.ui b/src/Mod/TechDraw/Gui/TaskGeomHatch.ui index cbe79e343b..a9ab22aaef 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.ui +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.ui @@ -121,7 +121,7 @@ - Line Weight + Line Width diff --git a/src/Mod/TechDraw/Gui/TaskHatch.ui b/src/Mod/TechDraw/Gui/TaskHatch.ui index 53148f1f0f..0d172cdf94 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.ui +++ b/src/Mod/TechDraw/Gui/TaskHatch.ui @@ -35,7 +35,7 @@ - Select an Svg or Bitmap file + Select an SVG or Bitmap file Pattern Parameters @@ -52,7 +52,7 @@ - Choose an Svg or Bitmap file as a pattern + Choose an SVG or Bitmap file as a pattern @@ -82,7 +82,7 @@ - Enlarges/shrinks the pattern (Svg Only) + Enlarges/shrinks the pattern (SVG Only) Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -130,7 +130,7 @@ - Color of pattern lines (Svg Only) + Color of pattern lines (SVG Only)
    @@ -156,7 +156,7 @@ - Svg Pattern Scale + SVG Pattern Scale diff --git a/src/Mod/TechDraw/Gui/TaskHoleShaftFit.ui b/src/Mod/TechDraw/Gui/TaskHoleShaftFit.ui index 67d83d6cf6..f3d5010eda 100644 --- a/src/Mod/TechDraw/Gui/TaskHoleShaftFit.ui +++ b/src/Mod/TechDraw/Gui/TaskHoleShaftFit.ui @@ -34,7 +34,7 @@ - shaft fit + Shaft fit true @@ -44,7 +44,7 @@ - hole fit + Hole fit diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.ui b/src/Mod/TechDraw/Gui/TaskProjGroup.ui index 98a97cb407..c099880db7 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.ui +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.ui @@ -637,7 +637,7 @@ using the given X/Y Spacing - Horizontal space between border of projections + Horizontal space between borders of projections false @@ -684,7 +684,7 @@ using the given X/Y Spacing - Vertical space between border of projections + Vertical space between borders of projections false diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp index 40b2d880b6..1ce02bac58 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp +++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp @@ -583,7 +583,7 @@ void TaskSectionView::updateSectionView() const std::string objectName("SectionView"); std::string baseName = m_base->getNameInDocument(); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit SectionView")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit Section View")); if (m_section) { Command::doCommand(Command::Doc, "App.ActiveDocument.%s.SectionDirection = '%s'", m_sectionName.c_str(), m_dirName.c_str()); diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index fae8b1a27b..4a7a261330 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -232,7 +232,7 @@ void ViewProviderPage::setupContextMenu(QMenu* menu, QObject* receiver, const ch Gui::ViewProviderDocumentObject::setupContextMenu(menu, receiver, member); QAction* act = menu->addAction(QObject::tr("Show drawing"), receiver, member); act->setData(QVariant((int)_SHOWDRAWING)); - QAction* act2 = menu->addAction(QObject::tr("Toggle KeepUpdated"), receiver, member); + QAction* act2 = menu->addAction(QObject::tr("Toggle Keep Updated"), receiver, member); act2->setData(QVariant((int)_TOGGLEUPDATE)); }