diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp
index 60dcd3ecd9..b8796d2f01 100644
--- a/src/Gui/CommandDoc.cpp
+++ b/src/Gui/CommandDoc.cpp
@@ -1583,8 +1583,8 @@ StdCmdTransformManip::StdCmdTransformManip()
{
sGroup = "Edit";
sMenuText = QT_TR_NOOP("Transform");
- sToolTipText = QT_TR_NOOP("Transform the selected object in the 3d view");
- sStatusTip = QT_TR_NOOP("Transform the selected object in the 3d view");
+ sToolTipText = QT_TR_NOOP("Transform the selected object in the 3D view");
+ sStatusTip = QT_TR_NOOP("Transform the selected object in the 3D view");
sWhatsThis = "Std_TransformManip";
sPixmap = "Std_TransformManip";
}
diff --git a/src/Gui/PreferencePages/DlgSettingsMacro.ui b/src/Gui/PreferencePages/DlgSettingsMacro.ui
index 6456593a81..88cce8cdb3 100644
--- a/src/Gui/PreferencePages/DlgSettingsMacro.ui
+++ b/src/Gui/PreferencePages/DlgSettingsMacro.ui
@@ -192,7 +192,7 @@
Commands executed by macro scripts are shown in Python console
- Show script commands in python console
+ Show script commands in Python console
true
diff --git a/src/Gui/SelectionView.cpp b/src/Gui/SelectionView.cpp
index aa5c0c08a0..3e705a2491 100644
--- a/src/Gui/SelectionView.cpp
+++ b/src/Gui/SelectionView.cpp
@@ -656,10 +656,10 @@ void SelectionView::onItemContextMenu(const QPoint& point)
touchAction->setToolTip(tr("Mark this object to be recomputed"));
QAction* toPythonAction =
- menu.addAction(tr("To python console"), this, &SelectionView::toPython);
+ menu.addAction(tr("To Python console"), this, &SelectionView::toPython);
toPythonAction->setIcon(QIcon::fromTheme(QString::fromLatin1("applications-python")));
toPythonAction->setToolTip(
- tr("Reveals this object and its subelements in the python console."));
+ tr("Reveals this object and its subelements in the Python console."));
QStringList elements = item->data(Qt::UserRole).toStringList();
if (elements.length() > 2) {
diff --git a/src/Gui/TextureMapping.cpp b/src/Gui/TextureMapping.cpp
index 2d73f13d01..4a928801ba 100644
--- a/src/Gui/TextureMapping.cpp
+++ b/src/Gui/TextureMapping.cpp
@@ -155,7 +155,7 @@ void TextureMapping::onFileChooserFileNameSelected(const QString& s)
}
if (!this->grp) {
- QMessageBox::warning(this, tr("No 3d view"), tr("No active 3d view found."));
+ QMessageBox::warning(this, tr("No 3D view"), tr("No active 3D view found."));
return;
}
diff --git a/src/Mod/AddonManager/AddonManagerOptions.ui b/src/Mod/AddonManager/AddonManagerOptions.ui
index 2697c9980b..8c9869e5e3 100644
--- a/src/Mod/AddonManager/AddonManagerOptions.ui
+++ b/src/Mod/AddonManager/AddonManagerOptions.ui
@@ -24,7 +24,7 @@
installed addons will be checked for available updates
- Automatically check for updates at start (requires git)
+ Automatically check for updates at start (requires Git)
false
@@ -366,7 +366,7 @@ installed addons will be checked for available updates
- The path to the git executable. Autodetected if needed and not specified.
+ The path to the Git executable. Autodetected if needed and not specified.
GitExecutable
@@ -393,7 +393,7 @@ installed addons will be checked for available updates
-
- Show option to change branches (requires git)
+ Show option to change branches (requires Git)
ShowBranchSwitcher
@@ -406,7 +406,7 @@ installed addons will be checked for available updates
-
- Disable git (fall back to ZIP downloads only)
+ Disable Git (fall back to ZIP downloads only)
disableGit
diff --git a/src/Mod/AddonManager/addonmanager_git.py b/src/Mod/AddonManager/addonmanager_git.py
index e252283493..0cce480db8 100644
--- a/src/Mod/AddonManager/addonmanager_git.py
+++ b/src/Mod/AddonManager/addonmanager_git.py
@@ -21,7 +21,7 @@
# * *
# ***************************************************************************
-""" Wrapper around git executable to simplify calling git commands from Python. """
+"""Wrapper around git executable to simplify calling git commands from Python."""
# pylint: disable=too-few-public-methods
@@ -148,7 +148,7 @@ class GitManager:
fci.Console.PrintWarning(
translate(
"AddonsInstaller",
- "Basic git update failed with the following message:",
+ "Basic Git update failed with the following message:",
)
+ str(e)
+ "\n"
@@ -263,7 +263,7 @@ class GitManager:
self.clone(remote, local_path)
except GitFailed as e:
fci.Console.PrintError(
- translate("AddonsInstaller", "Failed to clone {} into {} using git").format(
+ translate("AddonsInstaller", "Failed to clone {} into {} using Git").format(
remote, local_path
)
)
diff --git a/src/Mod/AddonManager/addonmanager_workers_startup.py b/src/Mod/AddonManager/addonmanager_workers_startup.py
index 4952cd87ab..599330cbe7 100644
--- a/src/Mod/AddonManager/addonmanager_workers_startup.py
+++ b/src/Mod/AddonManager/addonmanager_workers_startup.py
@@ -263,7 +263,7 @@ class CreateAddonListWorker(QtCore.QThread):
if not self.git_manager:
message = translate(
"AddonsInstaller",
- "Git is disabled, skipping git macros",
+ "Git is disabled, skipping Git macros",
)
self.status_message.emit(message)
FreeCAD.Console.PrintWarning(message + "\n")
@@ -311,7 +311,7 @@ class CreateAddonListWorker(QtCore.QThread):
FreeCAD.Console.PrintWarning(
translate(
"AddonsInstaller",
- "Attempting to change non-git Macro setup to use git\n",
+ "Attempting to change non-Git Macro setup to use Git\n",
)
)
self.git_manager.repair(
@@ -587,7 +587,7 @@ class UpdateChecker:
"AddonManager: "
+ translate(
"AddonsInstaller",
- "Unable to fetch git updates for workbench {}",
+ "Unable to fetch Git updates for workbench {}",
).format(wb.name)
+ "\n"
)
@@ -601,7 +601,7 @@ class UpdateChecker:
wb.set_status(Addon.Status.NO_UPDATE_AVAILABLE)
except GitFailed:
FreeCAD.Console.PrintWarning(
- translate("AddonsInstaller", "git status failed for {}").format(wb.name)
+ translate("AddonsInstaller", "Git status failed for {}").format(wb.name)
+ "\n"
)
wb.set_status(Addon.Status.CANNOT_CHECK)
@@ -893,7 +893,7 @@ class GetMacroDetailsWorker(QtCore.QThread):
self.status_message.emit(translate("AddonsInstaller", "Retrieving macro description..."))
if not self.macro.parsed and self.macro.on_git:
- self.status_message.emit(translate("AddonsInstaller", "Retrieving info from git"))
+ self.status_message.emit(translate("AddonsInstaller", "Retrieving info from Git"))
self.macro.fill_details_from_file(self.macro.src_filename)
if not self.macro.parsed and self.macro.on_wiki:
self.status_message.emit(translate("AddonsInstaller", "Retrieving info from wiki"))
diff --git a/src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui b/src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui
index 2e2dcd0af6..fcc464e408 100644
--- a/src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui
+++ b/src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui
@@ -17,7 +17,7 @@
-
- If enabled include all post processing settings in the template.
+ If enabled, include all post processing settings in the template.
Post Processing
@@ -45,7 +45,7 @@
-
- If enabled tool controller definitions are stored in the template.
+ If enabled, tool controller definitions are stored in the template.
Tools
@@ -142,7 +142,7 @@ Note that only operations which currently have configuration values set are list
-
- If enabled the creation of stock is included in the template. If a template does not include a stock definition the default stock creation algorithm will be used (creation from the Base object's bounding box).
+ If enabled, the creation of stock is included in the template. If a template does not include a stock definition the default stock creation algorithm will be used (creation from the Base object's bounding box).
This option is most useful if stock is a box or cylinder, or if the machine has a standard placement for machining.
@@ -158,7 +158,7 @@ Note that this option is disabled if a stock object from an existing solid is us
-
- If enabled the current size settings for the stock object are included in the template.
+ If enabled, the current size settings for the stock object are included in the template.
For Box and Cylinder stocks this means the actual size of the stock solid being created.
@@ -188,7 +188,7 @@ For stock from the Base object's bounding box it means the extra material in all
-
- If enabled the current placement of the stock solid is stored in the template.
+ If enabled, the current placement of the stock solid is stored in the template.
Placement
diff --git a/src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui b/src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui
index 6baca53b9e..804150a6ed 100644
--- a/src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui
+++ b/src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui
@@ -254,7 +254,7 @@
-
- If checked the path is constrained by the solid. Otherwise the volume of the solid describes a 'keep out' zone
+ If checked, the path is constrained by the solid. Otherwise the volume of the solid describes a 'keep out' zone
Constrained to Inside
diff --git a/src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui
index 0057f64d2b..10c4d94f92 100644
--- a/src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui
+++ b/src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui
@@ -56,7 +56,7 @@
- Select one or more features in the 3d view and press 'Add' to add them as the base items for this operation. Selected features can be deleted entirely.
+ Select one or more features in the 3D view and press 'Add' to add them as the base items for this operation. Selected features can be deleted entirely.
QAbstractItemView::ExtendedSelection
diff --git a/src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui
index 3e84ce1b00..190a75f33e 100644
--- a/src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui
+++ b/src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui
@@ -43,7 +43,7 @@ Reset deletes all current items from the list and fills the list with all circul
-
- Add selected items from 3d view to the list of base geometries
+ Add selected items from 3D view to the list of base geometries
Add
diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui
index fb066cb2ce..4b6ced799d 100644
--- a/src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui
+++ b/src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui
@@ -144,7 +144,7 @@
-
- If checked the profile operation is offset by the tool radius. The offset direction is determined by the Cut Side
+ If checked, the profile operation is offset by the tool radius. The offset direction is determined by the Cut Side
Use Compensation
diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui
index be95da54d9..ff9b43d24b 100644
--- a/src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui
+++ b/src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui
@@ -69,7 +69,7 @@
-
- This value is used in discretizing arcs into segments. Smaller values will result in larger gcode. Larger values may cause unwanted segments in the medial line path.
+ This value is used in discretizing arcs into segments. Smaller values will result in larger G-code. Larger values may cause unwanted segments in the medial line path.
3
@@ -137,7 +137,7 @@
true
- After carving travel again the path to remove artifacts and imperfections
+ After carving, travel again the path to remove artifacts and imperfections
diff --git a/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui
index 4860b6a2a1..5409d84059 100644
--- a/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui
+++ b/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui
@@ -394,7 +394,7 @@ FreeCAD has no knowledge of where a particular coordinate system exists within t
-
- If multiple coordinate systems are in use, setting this to TRUE will cause the gcode to be written to multiple output files as controlled by the 'order by' property. For example, if ordering by Fixture, the first output file will be for the first fixture and separate file for the second.
+ If multiple coordinate systems are in use, setting this to TRUE will cause the G-code to be written to multiple output files as controlled by the 'order by' property. For example, if ordering by Fixture, the first output file will be for the first fixture and separate file for the second.
<html><head/><body><p>If True, post processing will create multiple output files based on the <span style=" font-style:italic;">order by</span> setting.
diff --git a/src/Mod/Draft/Resources/ui/TaskShapeString.ui b/src/Mod/Draft/Resources/ui/TaskShapeString.ui
index dc90b619b7..976588c759 100644
--- a/src/Mod/Draft/Resources/ui/TaskShapeString.ui
+++ b/src/Mod/Draft/Resources/ui/TaskShapeString.ui
@@ -111,7 +111,7 @@
-
- Reset 3d point selection
+ Reset 3D point selection
diff --git a/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui b/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui
index 522ef7c673..809a597c2b 100644
--- a/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui
+++ b/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui
@@ -771,7 +771,7 @@
-
- If checked, the Snap widget is displayed in the Draft statusbar
+ If checked, the Snap widget is displayed in the Draft status bar
Show the Snap widget in the Draft Workbench
@@ -790,7 +790,7 @@
-
- If checked, the Annotation scale widget is displayed in the Draft statusbar
+ If checked, the Annotation scale widget is displayed in the Draft status bar
Show the Annotation scale widget in the Draft Workbench
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
index 491d16228a..66084fab86 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
@@ -355,7 +355,7 @@
-
- Spooles equation solver
+ SPOOLES equation solver
-
diff --git a/src/Mod/Part/Gui/DlgExtrusion.ui b/src/Mod/Part/Gui/DlgExtrusion.ui
index 6507e35cc2..bc3a1e4838 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.ui
+++ b/src/Mod/Part/Gui/DlgExtrusion.ui
@@ -65,7 +65,7 @@
-
- Click to start selecting an edge in 3d view.
+ Click to start selecting an edge in 3D view.
Select
diff --git a/src/Mod/Part/Gui/TaskSweep.cpp b/src/Mod/Part/Gui/TaskSweep.cpp
index efecba6a2b..f98b8bca29 100644
--- a/src/Mod/Part/Gui/TaskSweep.cpp
+++ b/src/Mod/Part/Gui/TaskSweep.cpp
@@ -411,7 +411,7 @@ void SweepWidget::onButtonPathToggled(bool on)
d->buttonText = d->ui.buttonPath->text();
d->ui.buttonPath->setText(tr("Done"));
d->ui.buttonPath->setEnabled(true);
- d->ui.labelPath->setText(tr("Select one or more connected edges in the 3d view and press 'Done'"));
+ d->ui.labelPath->setText(tr("Select one or more connected edges in the 3D view and press 'Done'"));
d->ui.labelPath->setEnabled(true);
Gui::Selection().clearSelection();
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
index 7fdfceb51f..95a5bac2ac 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
@@ -287,7 +287,7 @@ void SketcherValidation::onFindReversedClicked()
*sketch,
tr("Reversed external geometry"),
tr("%1 reversed external-geometry arcs were found. Their endpoints are"
- " encircled in 3d view.\n\n"
+ " encircled in 3D view.\n\n"
"%2 constraints are linking to the endpoints. The constraints have"
" been listed in Report view (menu View -> Panels -> Report view).\n\n"
"Click \"Swap endpoints in constraints\" button to reassign endpoints."
@@ -302,7 +302,7 @@ void SketcherValidation::onFindReversedClicked()
*sketch,
tr("Reversed external geometry"),
tr("%1 reversed external-geometry arcs were found. Their endpoints are "
- "encircled in 3d view.\n\n"
+ "encircled in 3D view.\n\n"
"However, no constraints linking to the endpoints were found.")
.arg(points.size() / 2));
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui
index c622bbb480..b9ed36be83 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui
@@ -81,7 +81,7 @@
-
- If checked FreeCAD will use a single color for all text and lines.
+ If checked, FreeCAD will use a single color for all text and lines.
Monochrome
diff --git a/src/Mod/TechDraw/Gui/TaskDimension.ui b/src/Mod/TechDraw/Gui/TaskDimension.ui
index 84e54fc9f3..318161aa9a 100644
--- a/src/Mod/TechDraw/Gui/TaskDimension.ui
+++ b/src/Mod/TechDraw/Gui/TaskDimension.ui
@@ -134,7 +134,7 @@ by negative value of 'Over Tolerance'.
-
- If checked the content of 'Format Spec' will
+ If checked, the content of 'Format Spec' will
be used instead of the dimension value
@@ -173,7 +173,7 @@ be used instead of the dimension value
-
- <html><head/><body><p>If checked the content of tolerance format spec will</p><p>be used instead of the tolerance value</p></body></html>
+ <html><head/><body><p>If checked, the content of tolerance format spec will</p><p>be used instead of the tolerance value</p></body></html>
Arbitrary Tolerance Text