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

Merge pull request #15957 from hasecilu/fix/capitalization

Browse Source 
TechDraw: Fix capitalization of 2D and 3D
This commit is contained in:
Max Wilfinger
2024-11-15 18:37:47 +01:00
committed by GitHub
parent 0003591df9 a90aebeec2
commit 616028efe5
28 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/CommandDoc.cpp
View File

@@ -1590,8 +1590,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";
}

2
src/Gui/PreferencePages/DlgSettingsMacro.ui
View File

@@ -192,7 +192,7 @@
<string>Commands executed by macro scripts are shown in Python console</string>
</property>
<property name="text">
<string>Show script commands in python console</string>
<string>Show script commands in Python console</string>
</property>
<property name="checked">
<bool>true</bool>

4
src/Gui/SelectionView.cpp
View File

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

2
src/Gui/TextureMapping.cpp
View File

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

8
src/Mod/AddonManager/AddonManagerOptions.ui
View File

@@ -24,7 +24,7 @@
installed addons will be checked for available updates</string>
</property>
<property name="text">
<string>Automatically check for updates at start (requires git)</string>
<string>Automatically check for updates at start (requires Git)</string>
</property>
<property name="autoExclusive">
<bool>false</bool>
@@ -366,7 +366,7 @@ installed addons will be checked for available updates</string>
</size>
</property>
<property name="toolTip">
<string>The path to the git executable. Autodetected if needed and not specified.</string>
<string>The path to the Git executable. Autodetected if needed and not specified.</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>GitExecutable</cstring>
@@ -393,7 +393,7 @@ installed addons will be checked for available updates</string>
<item>
<widget class="Gui::PrefCheckBox" name="guiprefcheckboxShowBranchSwitcher">
<property name="text">
<string>Show option to change branches (requires git)</string>
<string>Show option to change branches (requires Git)</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ShowBranchSwitcher</cstring>
@@ -406,7 +406,7 @@ installed addons will be checked for available updates</string>
<item>
<widget class="Gui::PrefCheckBox" name="guiprefcheckboxDisableGit">
<property name="text">
<string>Disable git (fall back to ZIP downloads only)</string>
<string>Disable Git (fall back to ZIP downloads only)</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>disableGit</cstring>

6
src/Mod/AddonManager/addonmanager_git.py
View File

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

10
src/Mod/AddonManager/addonmanager_workers_startup.py
View File

@@ -279,7 +279,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")
@@ -327,7 +327,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(
@@ -603,7 +603,7 @@ class UpdateChecker:
"AddonManager: "
+ translate(
"AddonsInstaller",
"Unable to fetch git updates for workbench {}",
"Unable to fetch Git updates for workbench {}",
).format(wb.name)
+ "\n"
)
@@ -617,7 +617,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)
@@ -909,7 +909,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"))

10
src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui
View File

@@ -17,7 +17,7 @@
<item>
<widget class="QGroupBox" name="postProcessingGroup">
<property name="toolTip">
<string>If enabled include all post processing settings in the template.</string>
<string>If enabled, include all post processing settings in the template.</string>
</property>
<property name="title">
<string>Post Processing</string>
@@ -45,7 +45,7 @@
<item>
<widget class="QGroupBox" name="toolsGroup">
<property name="toolTip">
<string>If enabled tool controller definitions are stored in the template.</string>
<string>If enabled, tool controller definitions are stored in the template.</string>
</property>
<property name="title">
<string>Tools</string>
@@ -142,7 +142,7 @@ Note that only operations which currently have configuration values set are list
<item>
<widget class="QGroupBox" name="stockGroup">
<property name="toolTip">
<string>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).
<string>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
<item row="0" column="0">
<widget class="QCheckBox" name="stockExtent">
<property name="toolTip">
<string>If enabled the current size settings for the stock object are included in the template.
<string>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
<item row="1" column="0">
<widget class="QCheckBox" name="stockPlacement">
<property name="toolTip">
<string>If enabled the current placement of the stock solid is stored in the template.</string>
<string>If enabled, the current placement of the stock solid is stored in the template.</string>
</property>
<property name="text">
<string>Placement</string>

2
src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui
View File

@@ -254,7 +254,7 @@
<item>
<widget class="QCheckBox" name="stockInside">
<property name="toolTip">
<string>If checked the path is constrained by the solid. Otherwise the volume of the solid describes a 'keep out' zone</string>
<string>If checked, the path is constrained by the solid. Otherwise the volume of the solid describes a 'keep out' zone</string>
</property>
<property name="text">
<string>Constrained to Inside</string>

2
src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui
View File

@@ -56,7 +56,7 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>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.</string>
<string>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.</string>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>

2
src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui
View File

@@ -43,7 +43,7 @@ Reset deletes all current items from the list and fills the list with all circul
<item row="1" column="0">
<widget class="QPushButton" name="addBase">
<property name="toolTip">
<string>Add selected items from 3d view to the list of base geometries</string>
<string>Add selected items from 3D view to the list of base geometries</string>
</property>
<property name="text">
<string>Add</string>

2
src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui
View File

@@ -144,7 +144,7 @@
<item row="1" column="0">
<widget class="QCheckBox" name="useCompensation">
<property name="toolTip">
<string>If checked the profile operation is offset by the tool radius. The offset direction is determined by the Cut Side</string>
<string>If checked, the profile operation is offset by the tool radius. The offset direction is determined by the Cut Side</string>
</property>
<property name="text">
<string>Use Compensation</string>

4
src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui
View File

@@ -69,7 +69,7 @@
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="discretize">
<property name="toolTip">
<string>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.</string>
<string>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.</string>
</property>
<property name="decimals">
<number>3</number>
@@ -137,7 +137,7 @@
<bool>true</bool>
</property>
<property name="toolTip">
<string>After carving travel again the path to remove artifacts and imperfections</string>
<string>After carving, travel again the path to remove artifacts and imperfections</string>
</property>
<property name="statusTip">
<string/>

2
src/Mod/CAM/Gui/Resources/panels/PathEdit.ui
View File

@@ -394,7 +394,7 @@ FreeCAD has no knowledge of where a particular coordinate system exists within t
<item row="3" column="0">
<widget class="QCheckBox" name="splitOutput">
<property name="toolTip">
<string>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.</string>
<string>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.</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If True, post processing will create multiple output files based on the &lt;span style=&quot; font-style:italic;&quot;&gt;order by&lt;/span&gt; setting.

2
src/Mod/Draft/Resources/ui/TaskShapeString.ui
View File

@@ -111,7 +111,7 @@
<item>
<widget class="QPushButton" name="pbReset">
<property name="toolTip">
<string>Reset 3d point selection</string>
<string>Reset 3D point selection</string>
</property>
<property name="statusTip">
<string/>

4
src/Mod/Draft/Resources/ui/preferences-draftinterface.ui
View File

@@ -771,7 +771,7 @@
<item row="1" column="0">
<widget class="Gui::PrefCheckBox" name="checkBox_DisplayStatusbarSnapWidget">
<property name="toolTip">
<string>If checked, the Snap widget is displayed in the Draft statusbar</string>
<string>If checked, the Snap widget is displayed in the Draft status bar</string>
</property>
<property name="text">
<string>Show the Snap widget in the Draft Workbench</string>
@@ -790,7 +790,7 @@
<item row="2" column="0">
<widget class="Gui::PrefCheckBox" name="checkBox_DisplayStatusbarScaleWidget">
<property name="toolTip">
<string>If checked, the Annotation scale widget is displayed in the Draft statusbar</string>
<string>If checked, the Annotation scale widget is displayed in the Draft status bar</string>
</property>
<property name="text">
<string>Show the Annotation scale widget in the Draft Workbench</string>

2
src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
View File

@@ -355,7 +355,7 @@
</item>
<item>
<property name="text">
<string>Spooles equation solver</string>
<string>SPOOLES equation solver</string>
</property>
</item>
<item>

2
src/Mod/OpenSCAD/importCSG.py
View File

@@ -305,7 +305,7 @@ def p_part(p):
def p_2d_point(p):
'2d_point : OSQUARE NUMBER COMMA NUMBER ESQUARE'
global points_list
if printverbose: print("2d Point")
if printverbose: print("2D Point")
p[0] = [float(p[2]), float(p[4])]

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

@@ -65,7 +65,7 @@
<item row="5" column="2">
<widget class="QPushButton" name="btnSelectEdge">
<property name="toolTip">
<string>Click to start selecting an edge in 3d view.</string>
<string>Click to start selecting an edge in 3D view.</string>
</property>
<property name="text">
<string>Select</string>

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

@@ -412,7 +412,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();

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

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

6
src/Mod/TechDraw/Gui/CommandCreateDims.cpp
View File

@@ -2106,7 +2106,7 @@ void execExtent(Gui::Command* cmd, const std::string& dimType)
if (!ref.getSubName().empty()) {
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Incorrect selection"),
QObject::tr("Selection contains both 2d and 3d geometry"));
QObject::tr("Selection contains both 2D and 3D geometry"));
return;
}
}
@@ -2131,7 +2131,7 @@ void execExtent(Gui::Command* cmd, const std::string& dimType)
if (geometryRefs2d == TechDraw::isInvalid) {
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Incorrect Selection"),
QObject::tr("Can not make 2d extent dimension from selection"));
QObject::tr("Can not make 2D extent dimension from selection"));
return;
}
@@ -2146,7 +2146,7 @@ void execExtent(Gui::Command* cmd, const std::string& dimType)
if (geometryRefs3d == isInvalid) {
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Incorrect Selection"),
QObject::tr("Can not make 3d extent dimension from selection"));
QObject::tr("Can not make 3D extent dimension from selection"));
return;
}
}

2
src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui
View File

@@ -81,7 +81,7 @@
<item row="11" column="0">
<widget class="Gui::PrefCheckBox" name="pcbMonochrome">
<property name="toolTip">
<string>If checked FreeCAD will use a single color for all text and lines.</string>
<string>If checked, FreeCAD will use a single color for all text and lines.</string>
</property>
<property name="text">
<string>Monochrome</string>

4
src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui
View File

@@ -847,10 +847,10 @@ for ProjectionGroups</string>
</font>
</property>
<property name="toolTip">
<string>If checked, the 3d camera direction (or normal of a selected face) will be used as the view direction. If not checked, Views will be created as Front Views.</string>
<string>If checked, the 3D camera direction (or normal of a selected face) will be used as the view direction. If not checked, Views will be created as Front Views.</string>
</property>
<property name="text">
<string>Use 3d Camera Direction</string>
<string>Use 3D Camera Direction</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>UseCameraDirection</cstring>

2
src/Mod/TechDraw/Gui/TaskActiveView.ui
View File

@@ -96,7 +96,7 @@
<item row="5" column="0">
<widget class="QCheckBox" name="cbUse3d">
<property name="text">
<string>Use 3d Background</string>
<string>Use 3D Background</string>
</property>
<property name="autoExclusive">
<bool>true</bool>

8
src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui
View File

@@ -58,10 +58,10 @@
<item row="1" column="0">
<widget class="QRadioButton" name="rb2d1">
<property name="toolTip">
<string>Treat the center point as a 2d point within the parent View. Z coordinate is ignored.</string>
<string>Treat the center point as a 2D point within the parent View. Z coordinate is ignored.</string>
</property>
<property name="text">
<string>2d Point</string>
<string>2D Point</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -74,10 +74,10 @@
<item row="1" column="1">
<widget class="QRadioButton" name="rb3d1">
<property name="toolTip">
<string>Treat the center point as a 3d point and project it onto the parent View.</string>
<string>Treat the center point as a 3D point and project it onto the parent View.</string>
</property>
<property name="text">
<string>3d Point</string>
<string>3D Point</string>
</property>
<property name="autoExclusive">
<bool>true</bool>

8
src/Mod/TechDraw/Gui/TaskCosmeticLine.ui
View File

@@ -58,7 +58,7 @@
<item row="0" column="0">
<widget class="QRadioButton" name="rb2d1">
<property name="text">
<string>2d Point</string>
<string>2D Point</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -74,7 +74,7 @@
<item row="0" column="1">
<widget class="QRadioButton" name="rb3d1">
<property name="text">
<string>3d Point</string>
<string>3D Point</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
@@ -137,7 +137,7 @@
<item row="0" column="0">
<widget class="QRadioButton" name="rb2d2">
<property name="text">
<string>2d Point</string>
<string>2D Point</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -153,7 +153,7 @@
<item row="0" column="1">
<widget class="QRadioButton" name="rb3d2">
<property name="text">
<string>3d Point</string>
<string>3D Point</string>
</property>
<property name="autoExclusive">
<bool>true</bool>

4
src/Mod/TechDraw/Gui/TaskDimension.ui
View File

@@ -134,7 +134,7 @@ by negative value of 'Over Tolerance'.</string>
<item row="1" column="0">
<widget class="QCheckBox" name="cbArbitrary">
<property name="toolTip">
<string>If checked the content of 'Format Spec' will
<string>If checked, the content of 'Format Spec' will
be used instead of the dimension value</string>
</property>
<property name="text">
@@ -173,7 +173,7 @@ be used instead of the dimension value</string>
<item row="4" column="0">
<widget class="QCheckBox" name="cbArbitraryTolerances">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked the content of tolerance format spec will&lt;/p&gt;&lt;p&gt;be used instead of the tolerance value&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked, the content of tolerance format spec will&lt;/p&gt;&lt;p&gt;be used instead of the tolerance value&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Arbitrary Tolerance Text</string>