From fcddb21d0e9dcdc093d18a3b0fbbc85ef1c9ca4d Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sun, 3 Mar 2024 21:41:43 -0600 Subject: [PATCH 1/9] TD: Remove trailing spaces from translations --- src/Mod/TechDraw/Gui/PagePrinter.cpp | 2 +- src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui | 2 +- src/Mod/TechDraw/Gui/TaskLinkDim.ui | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/TechDraw/Gui/PagePrinter.cpp b/src/Mod/TechDraw/Gui/PagePrinter.cpp index aede2ed39d..7c74f39cfc 100644 --- a/src/Mod/TechDraw/Gui/PagePrinter.cpp +++ b/src/Mod/TechDraw/Gui/PagePrinter.cpp @@ -322,7 +322,7 @@ void PagePrinter::printBannerPage(QPrinter* printer, QPainter& painter, QPageLay painter.setFont(painterFont); //print a header - QString docLine = QObject::tr("Document Name: ") + QString::fromUtf8(doc->getName()); + QString docLine = QObject::tr("Document Name:") + QLatin1String(" ") + QString::fromUtf8(doc->getName()); int leftMargin = pageLayout.margins().left() * dpmm + 5 * dpmm; //layout margin + 5mm int verticalPos = pageLayout.margins().top() * dpmm + 20 * dpmm;//layout margin + 20mm int verticalSpacing = 2; //double space diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui index 12bde53ed7..b170fc5d3f 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui +++ b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui @@ -204,7 +204,7 @@ - Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.ui b/src/Mod/TechDraw/Gui/TaskLinkDim.ui index 889f1a7872..98e1f7ad21 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.ui +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.ui @@ -124,7 +124,7 @@ - Geometry2: + Geometry2: From 918bcb7f5bc2ff836ed13a6422bf28086932c0e0 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sun, 3 Mar 2024 22:07:22 -0600 Subject: [PATCH 2/9] Gui: Remove trailing spaces from translations --- src/Gui/DlgKeyboard.ui | 6 +++--- src/Gui/DlgLocationPos.ui | 2 +- src/Gui/NotificationArea.cpp | 2 +- src/Gui/PreferencePages/DlgSettings3DView.ui | 2 +- src/Gui/PreferencePages/DlgSettingsPythonConsole.ui | 2 +- src/Gui/QuantitySpinBox_p.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Gui/DlgKeyboard.ui b/src/Gui/DlgKeyboard.ui index 8ff9076675..2c0ba36062 100644 --- a/src/Gui/DlgKeyboard.ui +++ b/src/Gui/DlgKeyboard.ui @@ -134,7 +134,7 @@ - Multi-key sequence delay: + Multi-key sequence delay: @@ -153,9 +153,9 @@ - Time in milliseconds to wait for the next key stroke of the current key sequence. + Time in milliseconds to wait for the next keystroke of the current key sequence. For example, pressing 'F' twice in less than the time delay setting here will be -be treated as shorctcut key sequence 'F, F'. +treated as shortcut key sequence 'F, F'. 10000 diff --git a/src/Gui/DlgLocationPos.ui b/src/Gui/DlgLocationPos.ui index d778fc2c59..e862a92455 100644 --- a/src/Gui/DlgLocationPos.ui +++ b/src/Gui/DlgLocationPos.ui @@ -159,7 +159,7 @@ - 5 m + 5 m diff --git a/src/Gui/NotificationArea.cpp b/src/Gui/NotificationArea.cpp index be26d1531d..8af4b471e8 100644 --- a/src/Gui/NotificationArea.cpp +++ b/src/Gui/NotificationArea.cpp @@ -1084,7 +1084,7 @@ bool NotificationArea::confirmationRequired(Base::LogStyle level) void NotificationArea::showConfirmationDialog(const QString& notifiername, const QString& message) { - auto confirmMsg = QObject::tr("Notifier: ") + notifiername + QStringLiteral("\n\n") + message + auto confirmMsg = QObject::tr("Notifier:") + QStringLiteral(" ") + notifiername + QStringLiteral("\n\n") + message + QStringLiteral("\n\n") + QObject::tr("Do you want to skip confirmation of further critical message notifications " "while loading the file?"); diff --git a/src/Gui/PreferencePages/DlgSettings3DView.ui b/src/Gui/PreferencePages/DlgSettings3DView.ui index 91b6a33e3c..3a85779209 100644 --- a/src/Gui/PreferencePages/DlgSettings3DView.ui +++ b/src/Gui/PreferencePages/DlgSettings3DView.ui @@ -60,7 +60,7 @@ lower right corner within opened files - Relative size : + Relative size: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/Gui/PreferencePages/DlgSettingsPythonConsole.ui b/src/Gui/PreferencePages/DlgSettingsPythonConsole.ui index 79d2bacadd..a8a896bdfe 100644 --- a/src/Gui/PreferencePages/DlgSettingsPythonConsole.ui +++ b/src/Gui/PreferencePages/DlgSettingsPythonConsole.ui @@ -81,7 +81,7 @@ horizontal space in Python console - Python profiler interval (milliseconds): + Python profiler interval (milliseconds): diff --git a/src/Gui/QuantitySpinBox_p.h b/src/Gui/QuantitySpinBox_p.h index 277c0e9f76..2c084b9d50 100644 --- a/src/Gui/QuantitySpinBox_p.h +++ b/src/Gui/QuantitySpinBox_p.h @@ -51,7 +51,7 @@ Q_SIGNALS: private: const QString genericExpressionEditorTooltip = tr("Enter an expression... (=)"); - const QString expressionEditorTooltipPrefix = tr("Expression: "); + const QString expressionEditorTooltipPrefix = tr("Expression:") + QLatin1String(" "); }; #endif // QUANTITYSPINBOX_P_H From ec5aa8f367476dd89b2fa85262debea44190bc05 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sun, 3 Mar 2024 22:08:01 -0600 Subject: [PATCH 3/9] Addon Manager: Remove trailing spaces from translations --- src/Mod/AddonManager/addonmanager_installer_gui.py | 5 +++-- src/Mod/AddonManager/addonmanager_uninstaller.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Mod/AddonManager/addonmanager_installer_gui.py b/src/Mod/AddonManager/addonmanager_installer_gui.py index 66d9a26086..6af6d2cfbd 100644 --- a/src/Mod/AddonManager/addonmanager_installer_gui.py +++ b/src/Mod/AddonManager/addonmanager_installer_gui.py @@ -364,9 +364,10 @@ class AddonInstallerGUI(QtCore.QObject): translate("AddonsInstaller", "Cannot execute pip"), translate( "AddonsInstaller", - "Failed to execute pip, which may be missing from your Python installation. Please ensure your system has pip installed and try again. The failed command was: ", + "Failed to execute pip, which may be missing from your Python installation. Please ensure your system " + "has pip installed and try again. The failed command was:", ) - + f"\n\n{command}\n\n" + + f" \n\n{command}\n\n" + translate( "AddonsInstaller", "Continue with installation of {} anyway?", diff --git a/src/Mod/AddonManager/addonmanager_uninstaller.py b/src/Mod/AddonManager/addonmanager_uninstaller.py index 0c42f591dd..bf709f9172 100644 --- a/src/Mod/AddonManager/addonmanager_uninstaller.py +++ b/src/Mod/AddonManager/addonmanager_uninstaller.py @@ -244,8 +244,9 @@ class MacroUninstaller(QObject): errors.append( translate( "AddonsInstaller", - "Error while trying to remove macro file {}: ", + "Error while trying to remove macro file {}:", ).format(full_path) + + " " + str(e) ) success = False From ee77b586b20c21476a72793abfdc06d929f9137a Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 12 Mar 2024 22:40:40 -0500 Subject: [PATCH 4/9] Spreadsheet: Remove trailing spaces from translations --- src/Mod/Spreadsheet/Gui/DlgSettings.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/Spreadsheet/Gui/DlgSettings.ui b/src/Mod/Spreadsheet/Gui/DlgSettings.ui index 710fcc1c19..947d5e2961 100644 --- a/src/Mod/Spreadsheet/Gui/DlgSettings.ui +++ b/src/Mod/Spreadsheet/Gui/DlgSettings.ui @@ -93,7 +93,7 @@ Defaults to: %V = %A - Delimiter Character: + Delimiter Character: @@ -153,7 +153,7 @@ Defaults to: %V = %A - Quote Character: + Quote Character: @@ -185,7 +185,7 @@ Defaults to: %V = %A - Escape Character: + Escape Character: From d9fc266772e2d482ca4a72f2c4a4f20ed2e04479 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 12 Mar 2024 22:41:00 -0500 Subject: [PATCH 5/9] Sketcher: Remove trailing spaces from translations --- src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp | 2 +- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp index 363aea9859..3283e3b95b 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp @@ -1538,7 +1538,7 @@ void TaskSketcherConstraints::change3DViewVisibilityToTrackFilter() Gui::Command::abortCommand(); Gui::TranslatedUserError( - sketch, tr("Error"), tr("Impossible to update visibility tracking: ")); + sketch, tr("Error"), tr("Impossible to update visibility tracking:") + QLatin1String(" ")); return false; } diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 585c59c1e5..09e656f69f 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -3140,13 +3140,13 @@ void ViewProviderSketch::UpdateSolverInformation() else if (dofs < 0 || hasConflicts) {// over-constrained sketch signalSetUp( QString::fromUtf8("conflicting_constraints"), - tr("Over-constrained: "), + tr("Over-constrained:") + QLatin1String(" "), QString::fromUtf8("#conflicting"), QString::fromUtf8("(%1)").arg(intListHelper(getSketchObject()->getLastConflicting()))); } else if (hasMalformed) {// malformed constraints signalSetUp(QString::fromUtf8("malformed_constraints"), - tr("Malformed constraints: "), + tr("Malformed constraints:") + QLatin1String(" "), QString::fromUtf8("#malformed"), QString::fromUtf8("(%1)").arg( intListHelper(getSketchObject()->getLastMalformedConstraints()))); @@ -3154,13 +3154,13 @@ void ViewProviderSketch::UpdateSolverInformation() else if (hasRedundancies) { signalSetUp( QString::fromUtf8("redundant_constraints"), - tr("Redundant constraints:"), + tr("Redundant constraints:") + QLatin1String(" "), QString::fromUtf8("#redundant"), QString::fromUtf8("(%1)").arg(intListHelper(getSketchObject()->getLastRedundant()))); } else if (hasPartiallyRedundant) { signalSetUp(QString::fromUtf8("partially_redundant_constraints"), - tr("Partially redundant:"), + tr("Partially redundant:") + QLatin1String(" "), QString::fromUtf8("#partiallyredundant"), QString::fromUtf8("(%1)").arg( intListHelper(getSketchObject()->getLastPartiallyRedundant()))); @@ -3173,7 +3173,7 @@ void ViewProviderSketch::UpdateSolverInformation() } else if (dofs > 0) { signalSetUp(QString::fromUtf8("under_constrained"), - tr("Under constrained:"), + tr("Under constrained:") + QLatin1String(" "), QString::fromUtf8("#dofs"), tr("%n DoF(s)", "", dofs)); } From 8ec30e6c9e1caa554f026e8c497a4e433e835ba1 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 12 Mar 2024 22:41:15 -0500 Subject: [PATCH 6/9] FEM: Remove trailing spaces from translations --- src/Mod/Fem/Gui/DlgSettingsFemCcx.ui | 2 +- src/Mod/Fem/Gui/Resources/ui/ElectrostaticPotential.ui | 2 +- src/Mod/Fem/Gui/Resources/ui/ElementFluid1D.ui | 2 +- src/Mod/Fem/Gui/Resources/ui/ElementGeometry1D.ui | 8 ++++---- src/Mod/Fem/Gui/Resources/ui/ElementGeometry2D.ui | 2 +- src/Mod/Fem/Gui/Resources/ui/ElementRotation1D.ui | 2 +- src/Mod/Fem/Gui/Resources/ui/Material.ui | 2 +- src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui | 8 ++++---- src/Mod/Fem/Gui/TaskPanelConstraintTemperature.ui | 2 +- src/Mod/Fem/Gui/TaskTetParameter.ui | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index 393866c37e..46537effc4 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -513,7 +513,7 @@ - Beam, shell element 3D output format + Beam, shell element 3D output format diff --git a/src/Mod/Fem/Gui/Resources/ui/ElectrostaticPotential.ui b/src/Mod/Fem/Gui/Resources/ui/ElectrostaticPotential.ui index de694f8fa3..0e0338008c 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ElectrostaticPotential.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ElectrostaticPotential.ui @@ -563,7 +563,7 @@ Note: has no effect if a solid was selected - Capacity Body: + Capacity Body: diff --git a/src/Mod/Fem/Gui/Resources/ui/ElementFluid1D.ui b/src/Mod/Fem/Gui/Resources/ui/ElementFluid1D.ui index d94289652c..8a37e2b999 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ElementFluid1D.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ElementFluid1D.ui @@ -61,7 +61,7 @@ - Pipe Area + Pipe Area diff --git a/src/Mod/Fem/Gui/Resources/ui/ElementGeometry1D.ui b/src/Mod/Fem/Gui/Resources/ui/ElementGeometry1D.ui index 96a63b0010..6c6609dc97 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ElementGeometry1D.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ElementGeometry1D.ui @@ -68,7 +68,7 @@ - Width: + Width: @@ -112,7 +112,7 @@ - Height: + Height: @@ -222,7 +222,7 @@ - Diameter: + Diameter: @@ -240,7 +240,7 @@ - Outer diameter: + Outer diameter: diff --git a/src/Mod/Fem/Gui/Resources/ui/ElementGeometry2D.ui b/src/Mod/Fem/Gui/Resources/ui/ElementGeometry2D.ui index 89c877b3a1..ff1f0ac438 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ElementGeometry2D.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ElementGeometry2D.ui @@ -74,7 +74,7 @@ - Thickness: + Thickness: diff --git a/src/Mod/Fem/Gui/Resources/ui/ElementRotation1D.ui b/src/Mod/Fem/Gui/Resources/ui/ElementRotation1D.ui index e8cb65e876..c01b66b142 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ElementRotation1D.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ElementRotation1D.ui @@ -86,7 +86,7 @@ - Rotation: + Rotation: diff --git a/src/Mod/Fem/Gui/Resources/ui/Material.ui b/src/Mod/Fem/Gui/Resources/ui/Material.ui index 5c68d36e7f..4bb565eb58 100755 --- a/src/Mod/Fem/Gui/Resources/ui/Material.ui +++ b/src/Mod/Fem/Gui/Resources/ui/Material.ui @@ -152,7 +152,7 @@ - Density + Density diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui index c34a2985cb..d69d2053b0 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui @@ -25,7 +25,7 @@ - Boundary + Boundary @@ -239,7 +239,7 @@ Select a planar edge or face, then press this button - Direction + Direction @@ -331,7 +331,7 @@ normal vector of the face is used as direction - Intensity + Intensity @@ -391,7 +391,7 @@ normal vector of the face is used as direction - Type + Type diff --git a/src/Mod/Fem/Gui/TaskPanelConstraintTemperature.ui b/src/Mod/Fem/Gui/TaskPanelConstraintTemperature.ui index 11b065b1d9..dc9187866b 100644 --- a/src/Mod/Fem/Gui/TaskPanelConstraintTemperature.ui +++ b/src/Mod/Fem/Gui/TaskPanelConstraintTemperature.ui @@ -23,7 +23,7 @@ - Select the vertices, lines and surfaces: + Select the vertices, lines and surfaces: diff --git a/src/Mod/Fem/Gui/TaskTetParameter.ui b/src/Mod/Fem/Gui/TaskTetParameter.ui index 6fcc70af60..5fe3b8d3ba 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.ui +++ b/src/Mod/Fem/Gui/TaskTetParameter.ui @@ -163,7 +163,7 @@ - Node count: + Node count: From 1f94569b93494f1a069cf427df10e37039acc545 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 12 Mar 2024 22:41:29 -0500 Subject: [PATCH 7/9] Part: Remove trailing spaces from translations --- src/Mod/Part/Gui/TaskDimension.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp index a733465e24..8812d4dbb9 100644 --- a/src/Mod/Part/Gui/TaskDimension.cpp +++ b/src/Mod/Part/Gui/TaskDimension.cpp @@ -1416,9 +1416,9 @@ PartGui::SteppedSelection::SteppedSelection(const uint& buttonCountIn, QWidget* for (uint index = 0; index < buttonCountIn; ++index) { ButtonIconPairType tempPair; - QString text = QObject::tr("Selection "); + QString text = QObject::tr("Selection"); std::ostringstream stream; - stream << text.toStdString() << ((index < 10) ? "0" : "") << index + 1; + stream << text.toStdString() << " " << ((index < 10) ? "0" : "") << index + 1; QString buttonText = QString::fromStdString(stream.str()); QPushButton *button = new QPushButton(buttonText, this); button->setCheckable(true); From cbb10b049656f560f0bc74087e6b13f53d1ed1e2 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 12 Mar 2024 22:41:44 -0500 Subject: [PATCH 8/9] Draft: Remove trailing spaces from translations --- src/Mod/Draft/Resources/ui/preferences-dxf.ui | 2 +- src/Mod/Draft/Resources/ui/preferences-svg.ui | 6 +++--- src/Mod/Draft/draftmake/make_label.py | 2 +- src/Mod/Draft/draftutils/utils.py | 11 ++++------- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/Mod/Draft/Resources/ui/preferences-dxf.ui b/src/Mod/Draft/Resources/ui/preferences-dxf.ui index 724586e96e..433b01f99b 100644 --- a/src/Mod/Draft/Resources/ui/preferences-dxf.ui +++ b/src/Mod/Draft/Resources/ui/preferences-dxf.ui @@ -378,7 +378,7 @@ Note that this can take a while! Objects from the same layers will be joined into Draft Blocks, -turning the display faster, but making them less easily editable +turning the display faster, but making them less easily editable. Group layers into blocks diff --git a/src/Mod/Draft/Resources/ui/preferences-svg.ui b/src/Mod/Draft/Resources/ui/preferences-svg.ui index b4b99a9881..09de46b59e 100644 --- a/src/Mod/Draft/Resources/ui/preferences-svg.ui +++ b/src/Mod/Draft/Resources/ui/preferences-svg.ui @@ -80,7 +80,7 @@ If checked, no units conversion will occur. -One unit in the SVG file will translate as one millimeter. +One unit in the SVG file will translate as one millimeter. Disable units scaling @@ -201,9 +201,9 @@ One unit in the SVG file will translate as one millimeter. - Versions of Open CASCADE older than version 6.8 don't support arc projection. + Versions of OpenCASCADE older than version 6.8 don't support arc projection. In this case arcs will be discretized into small line segments. -This value is the maximum segment length. +This value is the maximum segment length. mm diff --git a/src/Mod/Draft/draftmake/make_label.py b/src/Mod/Draft/draftmake/make_label.py index 1a223b18e4..72aa4ebf69 100644 --- a/src/Mod/Draft/draftmake/make_label.py +++ b/src/Mod/Draft/draftmake/make_label.py @@ -261,7 +261,7 @@ def make_label(target_point=App.Vector(0, 0, 0), types = label.get_label_types() if label_type not in types: - _err(translate("draft", "Wrong input: label_type must be one of the following: ") + str(types).strip("[]")) + _err(translate("draft", "Wrong input: label_type must be one of the following:") + " " + str(types).strip("[]")) return None if not custom_text: diff --git a/src/Mod/Draft/draftutils/utils.py b/src/Mod/Draft/draftutils/utils.py index a9a9df98eb..78df6029dd 100644 --- a/src/Mod/Draft/draftutils/utils.py +++ b/src/Mod/Draft/draftutils/utils.py @@ -705,8 +705,8 @@ def compare_objects(obj1, obj2): elif p == "Placement": delta = obj1.Placement.Base.sub(obj2.Placement.Base) text = translate("draft", "Objects have different placements. " - "Distance between the two base points: ") - _msg(text + str(delta.Length)) + "Distance between the two base points:") + _msg(text + " " + str(delta.Length)) else: if getattr(obj1, p) != getattr(obj2, p): _msg("'{}' ".format(p) + translate("draft", "has a different value")) @@ -1106,11 +1106,8 @@ def use_instead(function, version=""): then we should not give a version. """ if version: - _wrn(translate("draft", "This function will be deprecated in ") - + "{}. ".format(version) - + translate("draft", "Please use ") + "'{}'.".format(function)) + _wrn(translate("draft", "This function will be deprecated in {}. Please use '{}'.") .format(version, function)) else: - _wrn(translate("draft", "This function will be deprecated. ") - + translate("draft", "Please use ") + "'{}'.".format(function)) + _wrn(translate("draft", "This function will be deprecated. Please use '{}'.") .format(function)) ## @} From aec4dd76833a2997bba8440bb97575f3b70c2614 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 12 Mar 2024 22:49:06 -0500 Subject: [PATCH 9/9] CAM: Remove trailing spaces from translations --- .../CAM/Gui/Resources/panels/DogboneEdit.ui | 2 +- .../Gui/Resources/panels/HoldingTagsEdit.ui | 2 +- .../CAM/Gui/Resources/panels/PageOpSlotEdit.ui | 18 +++++++++--------- src/Mod/CAM/Gui/Resources/panels/PathEdit.ui | 2 +- src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui | 8 ++++---- .../preferences/PathDressupHoldingTags.ui | 2 +- .../CAM/Gui/Resources/preferences/PathJob.ui | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui index 537172faee..121db96ccb 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui @@ -104,7 +104,7 @@ - Incision + Incision diff --git a/src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui b/src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui index 341765258a..cbceb97244 100644 --- a/src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui @@ -37,7 +37,7 @@ - Angle + Angle diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui index 52690b5f7b..0631eb9f9b 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui @@ -87,7 +87,7 @@ - Choose what point to use on the first selected feature + Choose what point to use on the first selected feature false @@ -159,7 +159,7 @@ - Choose what point to use on the second selected feature + Choose what point to use on the second selected feature false @@ -219,7 +219,7 @@ - No Base Geometry selected + No Base Geometry selected color:blue @@ -238,7 +238,7 @@ - Currently using custom point inputs in the Property View of the Data tab + Currently using custom point inputs in the Property View of the Data tab Currently using custom point inputs available in the Property View of the Data tab. @@ -288,7 +288,7 @@ - Positive extends the beginning of the path, negative shortens + Positive extends the beginning of the path, negative shortens @@ -314,7 +314,7 @@ - Positive extends the end of the path, negative shortens + Positive extends the end of the path, negative shortens @@ -354,7 +354,7 @@ - Complete the operation in a single pass at depth, or multiple passes to final depth + Complete the operation in a single pass at depth, or multiple passes to final depth @@ -378,7 +378,7 @@ - Choose the path orientation with regard to the feature(s) selected + Choose the path orientation with regard to the feature(s) selected @@ -395,7 +395,7 @@ - Enable to reverse the cut direction of the slot path + Enable to reverse the cut direction of the slot path Reverse cut direction diff --git a/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui index 968dca7e82..dd8c783eee 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui @@ -1404,7 +1404,7 @@ Default: "5mm" - Active Tool + Active Tool diff --git a/src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui b/src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui index af490af35e..03ff55b27b 100644 --- a/src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui +++ b/src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui @@ -193,7 +193,7 @@ - D = + D = @@ -210,7 +210,7 @@ - d = + d = @@ -227,7 +227,7 @@ - H = + H = @@ -264,7 +264,7 @@ false - S = + S = diff --git a/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui b/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui index ef2bc6797b..8bd419669b 100644 --- a/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui +++ b/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui @@ -106,7 +106,7 @@ If the radius is bigger than that which the tag shape itself supports, the resul - Initial # Tags + Initial # Tags diff --git a/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui b/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui index 9222e495f4..182fa01e29 100644 --- a/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui +++ b/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui @@ -285,7 +285,7 @@ See the file save policy below on how to deal with name conflicts. - Post Processors Selection + Post Processors Selection @@ -652,7 +652,7 @@ See the file save policy below on how to deal with name conflicts. References to Tool Bits and their shapes can either be stored with an absolute path or with a relative path to the search path. Generally it is recommended to use relative paths due to their flexibility and robustness to layout changes. -Should multiple tools or tool shapes with the same name exist in different directories it can be required to use absolute paths. +Should multiple tools or tool shapes with the same name exist in different directories it can be required to use absolute paths. Store Absolute Paths