From 9fc40b33dedfc21c4dc3658afe225f536b3c309b Mon Sep 17 00:00:00 2001 From: Max Wilfinger <6246609+maxwxyz@users.noreply.github.com> Date: Mon, 25 Aug 2025 03:51:32 +0200 Subject: [PATCH] Fix source string mistakes reported on Crowdin (#23157) * Fix source string mistakes reported on Crowdin * Update src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com> * Update src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com> * Update src/Mod/Draft/draftfunctions/upgrade.py Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com> * Update src/Mod/Draft/draftfunctions/upgrade.py Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com> * Update src/Mod/Draft/draftguitools/gui_downgrade.py Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com> * Update src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com> --------- Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com> --- src/Gui/Action.cpp | 9 +- src/Gui/Application.h | 2 +- src/Gui/Dialogs/DlgActionsImp.cpp | 12 +-- src/Gui/Dialogs/DlgMacroExecute.ui | 2 +- src/Gui/Language/Translator.cpp | 88 +++++++++---------- src/Gui/Navigation/CADNavigationStyle.cpp | 2 +- src/Gui/Navigation/GestureNavigationStyle.cpp | 2 +- .../Navigation/InventorNavigationStyle.cpp | 2 +- .../Navigation/MayaGestureNavigationStyle.cpp | 2 +- .../Navigation/TinkerCADNavigationStyle.cpp | 2 +- src/Gui/OverlayParams.cpp | 7 +- src/Gui/OverlayParams.py | 4 +- .../PreferencePages/DlgSettingsNavigation.ui | 4 +- src/Gui/PreferencePages/DlgSettingsUI.ui | 2 +- src/Gui/propertyeditor/PropertyEditor.cpp | 4 +- src/Mod/Assembly/CommandCreateSimulation.py | 2 +- src/Mod/Assembly/CommandInsertNewPart.py | 2 +- src/Mod/Assembly/JointObject.py | 36 ++++---- src/Mod/BIM/ArchCommands.py | 6 +- src/Mod/BIM/ArchGrid.py | 12 +-- src/Mod/BIM/ArchStructure.py | 4 +- src/Mod/BIM/Resources/ui/ArchSchedule.ui | 2 +- .../BIM/Resources/ui/dialogConvertDocument.ui | 2 +- .../BIM/Resources/ui/dialogIfcProperties.ui | 2 +- .../Resources/ui/dialogIfcPropertiesRedux.ui | 2 +- src/Mod/BIM/Resources/ui/dialogImport.ui | 4 +- .../BIM/Resources/ui/dialogProjectManager.ui | 2 +- src/Mod/BIM/Resources/ui/dialogSetup.ui | 6 +- src/Mod/BIM/Resources/ui/dialogWelcome.ui | 2 +- src/Mod/BIM/Resources/ui/preferences-ifc.ui | 2 +- src/Mod/BIM/bimcommands/BimArchUtils.py | 4 +- src/Mod/BIM/bimcommands/BimTDPage.py | 2 +- src/Mod/BIM/importers/importWebGL.py | 2 +- .../CAM/PathSimulator/AppGL/GuiDisplay.cpp | 2 +- .../Resources/ui/TaskPanel_CircularArray.ui | 6 +- .../Draft/Resources/ui/TaskPanel_SetStyle.ui | 6 +- .../Draft/Resources/ui/preferences-draft.ui | 2 +- src/Mod/Draft/Resources/ui/preferences-dxf.ui | 2 +- src/Mod/Draft/Resources/ui/preferences-svg.ui | 2 +- src/Mod/Draft/draftfunctions/upgrade.py | 4 +- src/Mod/Draft/draftguitools/gui_downgrade.py | 2 +- src/Mod/Draft/draftobjects/array.py | 12 +-- src/Mod/Draft/draftobjects/bspline.py | 2 +- src/Mod/Draft/draftobjects/dimension.py | 5 +- src/Mod/Draft/draftobjects/label.py | 2 +- .../drafttaskpanels/task_circulararray.py | 2 +- .../Draft/draftutils/init_draft_statusbar.py | 2 +- src/Mod/Draft/importDWG.py | 4 +- src/Mod/Draft/importDXF.py | 16 ++-- src/Mod/Fem/Gui/Command.cpp | 14 +-- src/Mod/Fem/Gui/DlgSettingsFemCcx.ui | 2 +- src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui | 3 +- src/Mod/Fem/Gui/Resources/ui/ResultHints.ui | 16 ++-- src/Mod/Fem/Gui/TaskCreateElementSet.cpp | 6 +- src/Mod/Fem/Gui/TaskFemConstraint.cpp | 2 +- src/Mod/Fem/Gui/TaskObjectName.cpp | 5 +- .../Fem/femguiutils/vtk_module_handling.py | 12 +-- .../femtaskpanels/task_result_mechanical.py | 4 +- src/Mod/Help/Help.py | 4 +- src/Mod/Mesh/Gui/Command.cpp | 41 ++++----- src/Mod/MeshPart/Gui/TaskCurveOnMesh.ui | 2 +- .../Resources/ui/openscadprefs-base.ui | 2 +- src/Mod/Part/App/FaceMakerBullseye.cpp | 8 +- src/Mod/Part/App/FaceMakerCheese.cpp | 2 +- src/Mod/Part/Gui/Command.cpp | 2 +- src/Mod/Part/Gui/CommandSimple.cpp | 2 +- src/Mod/Part/Gui/Workbench.cpp | 8 +- src/Mod/PartDesign/App/FeaturePipe.cpp | 2 +- src/Mod/PartDesign/Gui/Command.cpp | 2 +- .../Gui/TaskRevolutionParameters.ui | 2 +- src/Mod/Robot/Gui/CommandTrajectory.cpp | 2 +- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 2 +- .../Sketcher/Gui/CommandSketcherBSpline.cpp | 2 +- .../Sketcher/Gui/DrawSketchDefaultHandler.h | 2 +- src/Mod/Sketcher/Gui/DrawSketchHandler.cpp | 2 +- .../Sketcher/Gui/DrawSketchHandlerBSpline.h | 6 +- .../Gui/SketcherSettingsAppearance.ui | 4 +- .../Sketcher/Gui/TaskSketcherValidation.cpp | 4 +- src/Mod/Start/Gui/StartView.cpp | 2 +- src/Mod/TechDraw/Gui/Command.cpp | 4 +- .../Gui/DlgPrefsTechDrawDimensions.ui | 2 +- src/Mod/TechDraw/Gui/TaskBalloon.ui | 6 +- src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui | 10 +-- src/Mod/TechDraw/Gui/TaskCosmeticLine.ui | 12 +-- src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui | 6 +- src/Mod/TechDraw/Gui/TaskDimension.ui | 4 +- src/Mod/TechDraw/Gui/TaskLinkDim.ui | 8 +- .../TechDraw/Gui/TaskSelectLineAttributes.ui | 4 +- src/Mod/TechDraw/Gui/Workbench.cpp | 12 +-- src/Tools/freecad-thumbnailer.in | 2 +- 90 files changed, 274 insertions(+), 272 deletions(-) diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp index 51b2389114..fc870af556 100644 --- a/src/Gui/Action.cpp +++ b/src/Gui/Action.cpp @@ -1145,10 +1145,11 @@ void RecentMacrosAction::setFiles(const QStringList& files) for (int index = 0; index < existingCommands.count(); index++) { msgMain += QStringLiteral(" %1").arg(existingCommands[index]); } - msgMain += QStringLiteral(" respectively.\nHint: In Preferences -> Python -> Macro ->" - " Recent Macros menu -> Keyboard Modifiers this should be Ctrl+Shift+" - " by default, if this is now blank then you should revert it back to" - " Ctrl+Shift+ by pressing both keys at the same time."); + msgMain += + QStringLiteral(" respectively.\nHint: In Preferences → Python → Macro →" + " Recent Macros menu → Keyboard Modifiers this should be Ctrl+Shift+" + " by default, if this is now blank then you should revert it back to" + " Ctrl+Shift+ by pressing both keys at the same time."); Base::Console().warning("%s\n", qPrintable(msgMain)); } } diff --git a/src/Gui/Application.h b/src/Gui/Application.h index 45af443579..060202a880 100644 --- a/src/Gui/Application.h +++ b/src/Gui/Application.h @@ -292,7 +292,7 @@ protected: std::make_pair(QT_TRANSLATE_NOOP("EditMode", "&Color"), QT_TRANSLATE_NOOP("EditMode", "The object will have the color of its individual faces " - "editable with the Part FaceAppearances command"))}, + "editable with the Appearance per Face command"))}, }; int userEditMode = userEditModes.begin()->first; diff --git a/src/Gui/Dialogs/DlgActionsImp.cpp b/src/Gui/Dialogs/DlgActionsImp.cpp index 3ad15b3322..d12b41619d 100644 --- a/src/Gui/Dialogs/DlgActionsImp.cpp +++ b/src/Gui/Dialogs/DlgActionsImp.cpp @@ -211,7 +211,7 @@ void DlgCustomActionsImp::onActionListWidgetItemActivated(QTreeWidgetItem* item) if (!bFound) { QMessageBox::critical(this, tr("Macro not found"), - tr("Could not find macro file '%1'.").arg(scriptName)); + tr("Could not find macro file '%1'").arg(scriptName)); } // fill up labels with the command's data @@ -235,12 +235,12 @@ void DlgCustomActionsImp::onActionListWidgetItemActivated(QTreeWidgetItem* item) void DlgCustomActionsImp::onButtonAddActionClicked() { if (ui->actionMacros->currentText().isEmpty()) { - QMessageBox::warning(this, tr("Empty macro"), tr("First, specify the macro.")); + QMessageBox::warning(this, tr("Empty macro"), tr("Specify the macro first")); return; } if (ui->actionMenu->text().isEmpty()) { - QMessageBox::warning(this, tr("Empty text"), tr("Fisrst, specify the menu text.")); + QMessageBox::warning(this, tr("Empty text"), tr("Specify the menu text first")); return; } @@ -305,12 +305,12 @@ void DlgCustomActionsImp::onButtonReplaceActionClicked() { QTreeWidgetItem* item = ui->actionListWidget->currentItem(); if (!item) { - QMessageBox::warning(this, tr("No item selected"), tr("First, select a macro item.")); + QMessageBox::warning(this, tr("No item selected"), tr("Select a macro item first")); return; } if (ui->actionMenu->text().isEmpty()) { - QMessageBox::warning(this, tr("Empty text"), tr("First, specify the menu text.")); + QMessageBox::warning(this, tr("Empty text"), tr("Specify the menu text first")); return; } @@ -622,7 +622,7 @@ void IconFolders::removeFolder() QMessageBox::information( this, tr("Remove folder"), - tr("Removing a folder only takes effect after an application restart.")); + tr("Removing a folder only takes effect after an application restart")); } addButton->setEnabled(true); diff --git a/src/Gui/Dialogs/DlgMacroExecute.ui b/src/Gui/Dialogs/DlgMacroExecute.ui index e509502676..c2bdb3e9a3 100644 --- a/src/Gui/Dialogs/DlgMacroExecute.ui +++ b/src/Gui/Dialogs/DlgMacroExecute.ui @@ -103,7 +103,7 @@ - Filter by case-insensitive file content, regular expressions supported + Filter by file content, case-insensitive. Regular expressions are supported. diff --git a/src/Gui/Language/Translator.cpp b/src/Gui/Language/Translator.cpp index d49a976bc2..9bcd1fced6 100644 --- a/src/Gui/Language/Translator.cpp +++ b/src/Gui/Language/Translator.cpp @@ -178,50 +178,50 @@ Translator::Translator() // This is needed for Qt's lupdate // clang-format off d = new TranslatorP; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Afrikaans" )] = "af"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Arabic" )] = "ar"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Basque" )] = "eu"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Belarusian" )] = "be"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Bulgarian" )] = "bg"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Catalan" )] = "ca"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Chinese Simplified" )] = "zh-CN"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Chinese Traditional" )] = "zh-TW"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Croatian" )] = "hr"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Czech" )] = "cs"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Danish" )] = "da"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Dutch" )] = "nl"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("English" )] = "en"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Filipino" )] = "fil"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Finnish" )] = "fi"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("French" )] = "fr"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Galician" )] = "gl"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Georgian" )] = "ka"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("German" )] = "de"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Greek" )] = "el"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Hungarian" )] = "hu"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Indonesian" )] = "id"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Italian" )] = "it"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Japanese" )] = "ja"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Kabyle" )] = "kab"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Korean" )] = "ko"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Lithuanian" )] = "lt"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Norwegian" )] = "no"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Polish" )] = "pl"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Portuguese, Brazilian")] = "pt-BR"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Portuguese" )] = "pt-PT"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Romanian" )] = "ro"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Russian" )] = "ru"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Serbian" )] = "sr"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Serbian, Latin" )] = "sr-CS"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Slovak" )] = "sk"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Slovenian" )] = "sl"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Spanish" )] = "es-ES"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Spanish, Argentina" )] = "es-AR"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Swedish" )] = "sv-SE"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Turkish" )] = "tr"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Ukrainian" )] = "uk"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Valencian" )] = "val-ES"; - d->mapLanguageTopLevelDomain[QT_TR_NOOP("Vietnamese" )] = "vi"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Afrikaans" )] = "af"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Arabic" )] = "ar"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Basque" )] = "eu"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Belarusian" )] = "be"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Bulgarian" )] = "bg"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Catalan" )] = "ca"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Chinese (Simplified)" )] = "zh-CN"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Chinese (Traditional)" )] = "zh-TW"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Croatian" )] = "hr"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Czech" )] = "cs"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Danish" )] = "da"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Dutch" )] = "nl"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("English" )] = "en"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Filipino" )] = "fil"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Finnish" )] = "fi"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("French" )] = "fr"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Galician" )] = "gl"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Georgian" )] = "ka"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("German" )] = "de"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Greek" )] = "el"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Hungarian" )] = "hu"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Indonesian" )] = "id"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Italian" )] = "it"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Japanese" )] = "ja"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Kabyle" )] = "kab"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Korean" )] = "ko"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Lithuanian" )] = "lt"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Norwegian" )] = "no"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Polish" )] = "pl"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Portuguese (Brazilian)")] = "pt-BR"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Portuguese" )] = "pt-PT"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Romanian" )] = "ro"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Russian" )] = "ru"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Serbian" )] = "sr"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Serbian (Latin)" )] = "sr-CS"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Slovak" )] = "sk"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Slovenian" )] = "sl"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Spanish" )] = "es-ES"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Spanish (Argentina)" )] = "es-AR"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Swedish" )] = "sv-SE"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Turkish" )] = "tr"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Ukrainian" )] = "uk"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Valencian" )] = "val-ES"; + d->mapLanguageTopLevelDomain[QT_TR_NOOP("Vietnamese" )] = "vi"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Malay")] = "ms"; auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/General"); diff --git a/src/Gui/Navigation/CADNavigationStyle.cpp b/src/Gui/Navigation/CADNavigationStyle.cpp index af91f144ab..2c242436f0 100644 --- a/src/Gui/Navigation/CADNavigationStyle.cpp +++ b/src/Gui/Navigation/CADNavigationStyle.cpp @@ -54,7 +54,7 @@ const char* CADNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::DRAGGING: return QT_TR_NOOP("Press middle+left or middle+right mouse button"); case NavigationStyle::ZOOMING: - return QT_TR_NOOP("Scroll middle mouse button or keep middle button depressed\n" + return QT_TR_NOOP("Scroll mouse wheel or keep middle button depressed\n" "while doing a left or right click and move the mouse up or down"); default: return "No description"; diff --git a/src/Gui/Navigation/GestureNavigationStyle.cpp b/src/Gui/Navigation/GestureNavigationStyle.cpp index 7c5fcf8dac..877f98f069 100644 --- a/src/Gui/Navigation/GestureNavigationStyle.cpp +++ b/src/Gui/Navigation/GestureNavigationStyle.cpp @@ -860,7 +860,7 @@ const char* GestureNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::DRAGGING: 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 and drag them apart from or 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 mouse wheel OR PgUp/PgDown on keyboard."); default: return "No description"; } diff --git a/src/Gui/Navigation/InventorNavigationStyle.cpp b/src/Gui/Navigation/InventorNavigationStyle.cpp index d7ba4b68ec..2f09ead1f6 100644 --- a/src/Gui/Navigation/InventorNavigationStyle.cpp +++ b/src/Gui/Navigation/InventorNavigationStyle.cpp @@ -54,7 +54,7 @@ const char* InventorNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::DRAGGING: return QT_TR_NOOP("Press left 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/Navigation/MayaGestureNavigationStyle.cpp b/src/Gui/Navigation/MayaGestureNavigationStyle.cpp index 80e37805d5..5e17c0356f 100644 --- a/src/Gui/Navigation/MayaGestureNavigationStyle.cpp +++ b/src/Gui/Navigation/MayaGestureNavigationStyle.cpp @@ -97,7 +97,7 @@ const char* MayaGestureNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::DRAGGING: return QT_TR_NOOP("Drag screen with one finger OR press Alr + 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 and drag them apart from or towards each other) OR scroll middle mouse button OR press Alt + right 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 mouse wheel OR press Alt + right mouse button OR PgUp/PgDown on keyboard."); default: return "No description"; } diff --git a/src/Gui/Navigation/TinkerCADNavigationStyle.cpp b/src/Gui/Navigation/TinkerCADNavigationStyle.cpp index 2935e2037f..0a4c3516a1 100644 --- a/src/Gui/Navigation/TinkerCADNavigationStyle.cpp +++ b/src/Gui/Navigation/TinkerCADNavigationStyle.cpp @@ -52,7 +52,7 @@ const char* TinkerCADNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::DRAGGING: return QT_TR_NOOP("Press right 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/OverlayParams.cpp b/src/Gui/OverlayParams.cpp index 5d0bbe08db..090960a5de 100644 --- a/src/Gui/OverlayParams.cpp +++ b/src/Gui/OverlayParams.cpp @@ -315,7 +315,7 @@ void OverlayParams::removeDockOverlayAutoView() { // Auto generated code (Tools/params_utils.py:350) const char *OverlayParams::docDockOverlayDelay() { return QT_TRANSLATE_NOOP("OverlayParams", -"Overlay dock (re),layout delay."); +"Overlay layout delay"); } // Auto generated code (Tools/params_utils.py:358) @@ -454,8 +454,9 @@ void OverlayParams::removeDockOverlayAutoMouseThrough() { // Auto generated code (Tools/params_utils.py:350) const char *OverlayParams::docDockOverlayWheelPassThrough() { - return QT_TRANSLATE_NOOP("OverlayParams", -"Auto pass through mouse wheel event on transparent dock overlay."); + return QT_TRANSLATE_NOOP( + "OverlayParams", + "Automatically passes mouse wheel events through the transparent areas of an overlay panel"); } // Auto generated code (Tools/params_utils.py:358) diff --git a/src/Gui/OverlayParams.py b/src/Gui/OverlayParams.py index fde13a371b..4ba6f17685 100644 --- a/src/Gui/OverlayParams.py +++ b/src/Gui/OverlayParams.py @@ -99,7 +99,7 @@ class ParamAnimationCurve(ParamProxy): Params = [ ParamBool('DockOverlayAutoView', True, on_change=True, title="Auto hide in non 3D view"), - ParamInt('DockOverlayDelay', 200, "Overlay dock (re),layout delay.", title="Layout delay", proxy=ParamSpinBox(0, 5000, 100, suffix=" ms")), + ParamInt('DockOverlayDelay', 200, "Overlay layout delay", title="Layout delay", proxy=ParamSpinBox(0, 5000, 100, suffix=" ms")), ParamInt('DockOverlayRevealDelay', 2000), ParamInt('DockOverlaySplitterHandleTimeout', 0, title="Splitter auto hide delay", proxy=ParamSpinBox(0, 99999, 100, suffix=" ms"), doc="Overlay splitter handle auto hide delay. Set zero to disable auto hiding."), @@ -109,7 +109,7 @@ Params = [ ParamBool('DockOverlayAutoMouseThrough', True, "Auto mouse click through transparent part of dock overlay.", title="Auto mouse pass through"), ParamBool('DockOverlayWheelPassThrough', True, - "Auto pass through mouse wheel event on transparent dock overlay.", title="Auto mouse wheel pass through"), + "Automatically passes mouse wheel events through the transparent areas of an overlay panel", title="Auto mouse wheel pass through"), ParamInt('DockOverlayWheelDelay', 1000, title="Delay mouse wheel pass through", proxy=ParamSpinBox(0, 99999, 1, suffix=" ms"), doc="Delay capturing mouse wheel event for passing through if it is\n" "previously handled by other widget."), diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.ui b/src/Gui/PreferencePages/DlgSettingsNavigation.ui index 53f463c8fe..be7acc2638 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.ui +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.ui @@ -717,7 +717,7 @@ Zoom step of '1' means a factor of 7.5 for every zoom step. Prevents view tilting when pinch-zooming. -Affects only gesture navigation style. +Affects only Gesture navigation style. Mouse tilting is not disabled by this setting. @@ -746,7 +746,7 @@ Mouse tilting is not disabled by this setting. - Enable support of legacy space mouse devices + Enable support of legacy SpaceMouse devices LegacySpaceMouseDevices diff --git a/src/Gui/PreferencePages/DlgSettingsUI.ui b/src/Gui/PreferencePages/DlgSettingsUI.ui index bbf9a98c3a..c2ad4f5b71 100644 --- a/src/Gui/PreferencePages/DlgSettingsUI.ui +++ b/src/Gui/PreferencePages/DlgSettingsUI.ui @@ -477,7 +477,7 @@ - Auto pass through mouse wheel event on transparent dock overlay. + Automatically passes mouse wheel events through the transparent areas of an overlay panel Automatically pass through of the mouse wheel diff --git a/src/Gui/propertyeditor/PropertyEditor.cpp b/src/Gui/propertyeditor/PropertyEditor.cpp index d7b0ec5e64..bb75964c74 100644 --- a/src/Gui/propertyeditor/PropertyEditor.cpp +++ b/src/Gui/propertyeditor/PropertyEditor.cpp @@ -773,7 +773,7 @@ void PropertyEditor::contextMenuEvent(QContextMenuEvent*) auto prop = *props.begin(); if (prop->testStatus(App::Property::PropDynamic) && !prop->testStatus(App::Property::LockDynamic)) { - menu.addAction(tr("Rename property"))->setData(QVariant(MA_RenameProp)); + menu.addAction(tr("Rename Property"))->setData(QVariant(MA_RenameProp)); } } @@ -790,7 +790,7 @@ void PropertyEditor::contextMenuEvent(QContextMenuEvent*) } } if (canRemove) { - menu.addAction(tr("Remove Property"))->setData(QVariant(MA_RemoveProp)); + menu.addAction(tr("Delete Property"))->setData(QVariant(MA_RemoveProp)); } // add a separator between adding/removing properties and the rest diff --git a/src/Mod/Assembly/CommandCreateSimulation.py b/src/Mod/Assembly/CommandCreateSimulation.py index 3e04debab6..2bf7c0f595 100644 --- a/src/Mod/Assembly/CommandCreateSimulation.py +++ b/src/Mod/Assembly/CommandCreateSimulation.py @@ -526,7 +526,7 @@ class MotionEditDialog: self.help_label0 = QLabel( translate( "Assembly", - "In capital are variables that you need to replace with actual values. More details about each example in it's tooltip.", + "In capital are variables that you need to replace with actual values. More details about each example in its tooltip.", ), self.dialog, ) diff --git a/src/Mod/Assembly/CommandInsertNewPart.py b/src/Mod/Assembly/CommandInsertNewPart.py index 482c888641..55454a1fbc 100644 --- a/src/Mod/Assembly/CommandInsertNewPart.py +++ b/src/Mod/Assembly/CommandInsertNewPart.py @@ -137,7 +137,7 @@ class TaskAssemblyNewPart(JointObject.TaskAssemblyCreateJoint): translate("Assembly", "Save"), QtWidgets.QMessageBox.AcceptRole ) cancelButton = msgBox.addButton( - translate("Assembly", "Do not link"), QtWidgets.QMessageBox.RejectRole + translate("Assembly", "Do not Link"), QtWidgets.QMessageBox.RejectRole ) msgBox.exec_() diff --git a/src/Mod/Assembly/JointObject.py b/src/Mod/Assembly/JointObject.py index 839cdef039..389d768d88 100644 --- a/src/Mod/Assembly/JointObject.py +++ b/src/Mod/Assembly/JointObject.py @@ -217,7 +217,7 @@ class Joint: "Joint Connector 1", QT_TRANSLATE_NOOP( "App::Property", - "This is the local coordinate system within Reference1's object that will be used for the joint.", + "This is the local coordinate system within Reference1's object that will be used for the joint", ), locked=True, ) @@ -229,7 +229,7 @@ class Joint: "Joint Connector 1", QT_TRANSLATE_NOOP( "App::Property", - "This prevents Placement1 from recomputing, enabling custom positioning of the placement.", + "This prevents Placement1 from recomputing, enabling custom positioning of the placement", ), locked=True, ) @@ -241,7 +241,7 @@ class Joint: "Joint Connector 1", QT_TRANSLATE_NOOP( "App::Property", - "This is the attachment offset of the first connector of the joint.", + "This is the attachment offset of the first connector of the joint", ), locked=True, ) @@ -263,7 +263,7 @@ class Joint: "Joint Connector 2", QT_TRANSLATE_NOOP( "App::Property", - "This is the local coordinate system within Reference2's object that will be used for the joint.", + "This is the local coordinate system within Reference2's object that will be used for the joint", ), locked=True, ) @@ -275,7 +275,7 @@ class Joint: "Joint Connector 2", QT_TRANSLATE_NOOP( "App::Property", - "This prevents Placement2 from recomputing, enabling custom positioning of the placement.", + "This prevents Placement2 from recomputing, enabling custom positioning of the placement", ), locked=True, ) @@ -287,7 +287,7 @@ class Joint: "Joint Connector 2", QT_TRANSLATE_NOOP( "App::Property", - "This is the attachment offset of the second connector of the joint.", + "This is the attachment offset of the second connector of the joint", ), locked=True, ) @@ -324,7 +324,7 @@ class Joint: "Limits", QT_TRANSLATE_NOOP( "App::Property", - "Enable the minimum length limit of the joint.", + "Enable the minimum length limit of the joint", ), locked=True, ) @@ -337,7 +337,7 @@ class Joint: "Limits", QT_TRANSLATE_NOOP( "App::Property", - "Enable the maximum length limit of the joint.", + "Enable the maximum length limit of the joint", ), locked=True, ) @@ -350,7 +350,7 @@ class Joint: "Limits", QT_TRANSLATE_NOOP( "App::Property", - "Enable the minimum angle limit of the joint.", + "Enable the minimum angle limit of the joint", ), locked=True, ) @@ -363,7 +363,7 @@ class Joint: "Limits", QT_TRANSLATE_NOOP( "App::Property", - "Enable the minimum length of the joint.", + "Enable the maximum angle limit of the joint", ), locked=True, ) @@ -376,7 +376,7 @@ class Joint: "Limits", QT_TRANSLATE_NOOP( "App::Property", - "This is the minimum limit for the length between both coordinate systems (along their Z axis).", + "This is the minimum limit for the length between both coordinate systems (along their z-axis)", ), locked=True, ) @@ -388,7 +388,7 @@ class Joint: "Limits", QT_TRANSLATE_NOOP( "App::Property", - "This is the maximum limit for the length between both coordinate systems (along their Z axis).", + "This is the maximum limit for the length between both coordinate systems (along their z-axis)", ), locked=True, ) @@ -400,7 +400,7 @@ class Joint: "Limits", QT_TRANSLATE_NOOP( "App::Property", - "This is the minimum limit for the angle between both coordinate systems (between their X axis).", + "This is the minimum limit for the angle between both coordinate systems (between their x-axis)", ), locked=True, ) @@ -412,7 +412,7 @@ class Joint: "Limits", QT_TRANSLATE_NOOP( "App::Property", - "This is the maximum limit for the angle between both coordinate systems (between their X axis).", + "This is the maximum limit for the angle between both coordinate systems (between their x-axis)", ), locked=True, ) @@ -512,7 +512,7 @@ class Joint: "Joint Connector 1", QT_TRANSLATE_NOOP( "App::Property", - "This is the attachment offset of the first connector of the joint.", + "This is the attachment offset of the first connector of the joint", ), locked=True, ) @@ -523,7 +523,7 @@ class Joint: "Joint Connector 2", QT_TRANSLATE_NOOP( "App::Property", - "This is the attachment offset of the second connector of the joint.", + "This is the attachment offset of the second connector of the joint", ), locked=True, ) @@ -565,7 +565,7 @@ class Joint: activated = joint.Activated if not activated: print( - "The 'Activated' property has been replaced by the 'Suppressed' property. Your file has a deactivated joint that is being migrated. If you open back this file in an older version, it will not be deactivated anymore." + "The 'Activated' property has been replaced by the 'Suppressed' property. The file has a deactivated joint that is being migrated. If you open this file in an older version, it will not be deactivated anymore." ) joint.removeProperty("Activated") joint.Suppressed = not activated @@ -1390,7 +1390,7 @@ class TaskAssemblyCreateJoint(QtCore.QObject): def accept(self): if len(self.refs) != 2: App.Console.PrintWarning( - translate("Assembly", "You need to select 2 elements from 2 separate parts.") + translate("Assembly", "Select 2 elements from 2 separate parts") ) return False diff --git a/src/Mod/BIM/ArchCommands.py b/src/Mod/BIM/ArchCommands.py index 4ba5f27564..2576de135b 100644 --- a/src/Mod/BIM/ArchCommands.py +++ b/src/Mod/BIM/ArchCommands.py @@ -1183,10 +1183,10 @@ class SurveyTaskPanel: def retranslateUi(self,dlg): self.form.setWindowTitle(QtGui.QApplication.translate("Arch", "Survey", None)) - self.addButton.setText(QtGui.QApplication.translate("Arch", "Set description", None)) + self.addButton.setText(QtGui.QApplication.translate("Arch", "Set Description", None)) self.clearButton.setText(QtGui.QApplication.translate("Arch", "Clear", None)) - self.copyLength.setText(QtGui.QApplication.translate("Arch", "Copy Length", None)) - self.copyArea.setText(QtGui.QApplication.translate("Arch", "Copy Area", None)) + self.copyLength.setText(QtGui.QApplication.translate("Arch", "Copy Total Length", None)) + self.copyArea.setText(QtGui.QApplication.translate("Arch", "Copy Total Area", None)) self.export.setText(QtGui.QApplication.translate("Arch", "Export CSV", None)) self.tree.setHeaderLabels([QtGui.QApplication.translate("Arch", "Description", None), QtGui.QApplication.translate("Arch", "Length", None), diff --git a/src/Mod/BIM/ArchGrid.py b/src/Mod/BIM/ArchGrid.py index 2d654fdb7d..de39ac6ee0 100644 --- a/src/Mod/BIM/ArchGrid.py +++ b/src/Mod/BIM/ArchGrid.py @@ -391,12 +391,12 @@ class ArchGridTaskPanel: self.form.setWindowTitle(QtGui.QApplication.translate("Arch", "Grid", None)) self.wLabel.setText(QtGui.QApplication.translate("Arch", "Total width", None)) 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 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.addRowButton.setText(QtGui.QApplication.translate("Arch", "Add Row", None)) + self.delRowButton.setText(QtGui.QApplication.translate("Arch", "Delete Row", None)) + self.addColumnButton.setText(QtGui.QApplication.translate("Arch", "Add Column", None)) + self.delColumnButton.setText(QtGui.QApplication.translate("Arch", "Delete 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())) def update(self): diff --git a/src/Mod/BIM/ArchStructure.py b/src/Mod/BIM/ArchStructure.py index 5b57eac616..9fcf3119d6 100644 --- a/src/Mod/BIM/ArchStructure.py +++ b/src/Mod/BIM/ArchStructure.py @@ -334,9 +334,9 @@ class _CommandStructure: self.dents = ArchPrecast._DentsTaskPanel() self.precast.Dents = self.dents if self.beammode: - title=translate("Arch","First point of the beam")+":" + title=translate("Arch","First point of the beam") else: - title=translate("Arch","Base point of column")+":" + title=translate("Arch","Base point of column") FreeCADGui.Snapper.getPoint(callback=self.getPoint,movecallback=self.update,extradlg=[self.taskbox(),self.precast.form,self.dents.form],title=title) FreeCADGui.draftToolBar.continueCmd.show() diff --git a/src/Mod/BIM/Resources/ui/ArchSchedule.ui b/src/Mod/BIM/Resources/ui/ArchSchedule.ui index 83eb2e75d9..e916053c14 100644 --- a/src/Mod/BIM/Resources/ui/ArchSchedule.ui +++ b/src/Mod/BIM/Resources/ui/ArchSchedule.ui @@ -174,7 +174,7 @@ When dealing with native IFC objects, you can use FreeCAD properties name, ex: ' Deletes the selected line - Del Row + Delete Row diff --git a/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui b/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui index fa6de9c122..26a6c6d269 100644 --- a/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui +++ b/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui @@ -37,7 +37,7 @@ - Prevents further prompts when creating new FreeCAD documents. New documents will not be converted to IFC automatically, but conversion remains possible later via Utils → Make IFC Project. + Prevents further prompts when creating new FreeCAD documents. New documents will not be converted to IFC automatically, but conversion remains possible later via Utils → Create IFC Project. Do not ask again diff --git a/src/Mod/BIM/Resources/ui/dialogIfcProperties.ui b/src/Mod/BIM/Resources/ui/dialogIfcProperties.ui index 3074158b44..3189ab4e86 100644 --- a/src/Mod/BIM/Resources/ui/dialogIfcProperties.ui +++ b/src/Mod/BIM/Resources/ui/dialogIfcProperties.ui @@ -179,7 +179,7 @@ - Delete Selected Property/Set + Delete Selected Property/Property Set diff --git a/src/Mod/BIM/Resources/ui/dialogIfcPropertiesRedux.ui b/src/Mod/BIM/Resources/ui/dialogIfcPropertiesRedux.ui index 22c9175e5f..7b8ad5cb91 100644 --- a/src/Mod/BIM/Resources/ui/dialogIfcPropertiesRedux.ui +++ b/src/Mod/BIM/Resources/ui/dialogIfcPropertiesRedux.ui @@ -60,7 +60,7 @@ - Delete selected property/set + Delete Selected Property/Property Set diff --git a/src/Mod/BIM/Resources/ui/dialogImport.ui b/src/Mod/BIM/Resources/ui/dialogImport.ui index e5ce66ebd4..66ad390aca 100644 --- a/src/Mod/BIM/Resources/ui/dialogImport.ui +++ b/src/Mod/BIM/Resources/ui/dialogImport.ui @@ -48,7 +48,7 @@ - Defines how IFC data is stored in the FreeCAD document. Single IFC document" treats the FreeCAD document itself as the IFC document, with all created content belonging to it. Use IFC document object" creates a separate object representing the IFC document, allowing both IFC and non-IFC content to coexist. + Defines how IFC data is stored in the FreeCAD document. 'Single IFC document' treats the FreeCAD document itself as the IFC document, with all created content belonging to it. 'Use IFC document object' creates a separate object representing the IFC document, allowing both IFC and non-IFC content to coexist. @@ -116,7 +116,7 @@ - Preload IFC types that are connected to the objects. It is also possible to leave this setting disabled and double click later on the object to load the types + Preloads IFC types that are connected to the objects. It is also possible to leave this setting disabled and double click later on the object to load the types. Preload types diff --git a/src/Mod/BIM/Resources/ui/dialogProjectManager.ui b/src/Mod/BIM/Resources/ui/dialogProjectManager.ui index f0eb08d4b7..8d2cf0176d 100644 --- a/src/Mod/BIM/Resources/ui/dialogProjectManager.ui +++ b/src/Mod/BIM/Resources/ui/dialogProjectManager.ui @@ -17,7 +17,7 @@ - This screen assists in creating and configuring a new BIM project in FreeCAD + This dialog assists in creating and configuring a new BIM project in FreeCAD true diff --git a/src/Mod/BIM/Resources/ui/dialogSetup.ui b/src/Mod/BIM/Resources/ui/dialogSetup.ui index 0a37f5dac0..d3435466f2 100644 --- a/src/Mod/BIM/Resources/ui/dialogSetup.ui +++ b/src/Mod/BIM/Resources/ui/dialogSetup.ui @@ -353,7 +353,7 @@ - <html><head/><body><p>The default color of faces in the 3D view. Location in preferences: <span style=" font-weight:600;">Display &gt; Part Color &gt; Default shape color</span></p></body></html> + <html><head/><body><p>The default color of faces in the 3D view. Location in preferences: <span style=" font-weight:600;">Display &gt; Part/Part Design Color &gt; Shape Appearance &gt; Shape 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;">BIM &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; Helper colors</span></p></body></html> @@ -395,7 +395,7 @@ - <html><head/><body><p>The default color of lines in the 3D view. Location in preferences: <span style=" font-weight:600;">Display &gt; Part Colors &gt; Default line color, Draft &gt; Visual settings &gt; Default line color</span></p></body></html> + <html><head/><body><p>The default color of lines in the 3D view. Location in preferences: <span style=" font-weight:600;">Display &gt; Part/Part Design Color &gt; Shape Appearance &gt; Default line color</span></p></body></html> diff --git a/src/Mod/BIM/Resources/ui/dialogWelcome.ui b/src/Mod/BIM/Resources/ui/dialogWelcome.ui index 75cf4b7874..44dec35ff5 100644 --- a/src/Mod/BIM/Resources/ui/dialogWelcome.ui +++ b/src/Mod/BIM/Resources/ui/dialogWelcome.ui @@ -97,7 +97,7 @@ - FreeCAD is a complex application. For those new to FreeCAD, or without prior experience in 3D modelling or BIM, it is recommended to begin with the <a href="https://wiki.freecad.org/BIM_ingame_tutorial">BIM tutorial</a>. This can also be accessed under menu <span style=" font-weight:600;">Help -&gt; BIM Tutorial</span>). + FreeCAD is a complex application. For those new to FreeCAD, or without prior experience in 3D modelling or BIM, it is recommended to begin with the <a href="https://wiki.freecad.org/BIM_ingame_tutorial">BIM tutorial</a>. This can also be accessed under menu <span style=" font-weight:600;">Help -&gt; BIM Tutorial</span>. true diff --git a/src/Mod/BIM/Resources/ui/preferences-ifc.ui b/src/Mod/BIM/Resources/ui/preferences-ifc.ui index 7cf558a2d5..a53e09a71d 100644 --- a/src/Mod/BIM/Resources/ui/preferences-ifc.ui +++ b/src/Mod/BIM/Resources/ui/preferences-ifc.ui @@ -202,7 +202,7 @@ if crashes occur when multiple cores are set. - Import struct IFC objects as + Import structure IFC objects as diff --git a/src/Mod/BIM/bimcommands/BimArchUtils.py b/src/Mod/BIM/bimcommands/BimArchUtils.py index eb3279f5de..80d9b69632 100644 --- a/src/Mod/BIM/bimcommands/BimArchUtils.py +++ b/src/Mod/BIM/bimcommands/BimArchUtils.py @@ -235,7 +235,7 @@ class Arch_CloseHoles: def GetResources(self): return {'Pixmap' : 'Arch_CloseHoles', 'MenuText': QT_TRANSLATE_NOOP("Arch_CloseHoles","Close Holes"), - 'ToolTip': QT_TRANSLATE_NOOP("Arch_CloseHoles","Closes holes in open shapes, turning them solids")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_CloseHoles","Closes holes in open shapes, turning them into solids")} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -471,7 +471,7 @@ class Arch_MergeWalls: FreeCAD.ActiveDocument.commitTransaction() return else: - FreeCAD.Console.PrintWarning(translate("Arch","The selected wall contains no subwall to merge")) + FreeCAD.Console.PrintWarning(translate("Arch","The selected wall contains no subwalls to merge")) return else: FreeCAD.Console.PrintWarning(translate("Arch","Select only wall objects")) diff --git a/src/Mod/BIM/bimcommands/BimTDPage.py b/src/Mod/BIM/bimcommands/BimTDPage.py index b756ebe298..5c6993bc80 100644 --- a/src/Mod/BIM/bimcommands/BimTDPage.py +++ b/src/Mod/BIM/bimcommands/BimTDPage.py @@ -37,7 +37,7 @@ class BIM_TDPage: def GetResources(self): return { "Pixmap": "BIM_PageDefault", - "MenuText": QT_TRANSLATE_NOOP("BIM_TDPage", "Page"), + "MenuText": QT_TRANSLATE_NOOP("BIM_TDPage", "New Page"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_TDPage", "Creates a new TechDraw page from a template" ), diff --git a/src/Mod/BIM/importers/importWebGL.py b/src/Mod/BIM/importers/importWebGL.py index 8b94dbf71b..b02e478cd5 100644 --- a/src/Mod/BIM/importers/importWebGL.py +++ b/src/Mod/BIM/importers/importWebGL.py @@ -181,7 +181,7 @@ def getHTMLTemplate(): "BIM", "The default WebGL export template is not available at path:" " {}\n\nPlease check your FreeCAD installation or provide a " - "custom template under menu Preferences -> Import-Export -> WebGL.", + "custom template under menu Preferences → Import-Export → WebGL.", ).format(default_template_path) # Use getMainWindow() as parent following FreeCAD patterns diff --git a/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.cpp b/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.cpp index 24ce02f1f1..fe21ae8cf2 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.cpp +++ b/src/Mod/CAM/PathSimulator/AppGL/GuiDisplay.cpp @@ -286,7 +286,7 @@ void MillSim::GuiDisplay::SetupTooltips() "Toggle turn table animation", nullptr); guiItems[eGuiItemAmbientOclusion].toolTip = - QCoreApplication::translate("CAM:Simulator:Tooltips", "Toggle ambient oclusion", nullptr); + QCoreApplication::translate("CAM:Simulator:Tooltips", "Toggle ambient occlusion", nullptr); guiItems[eGuiItemView].toolTip = QCoreApplication::translate("CAM:Simulator:Tooltips", "Toggle view simulation/model", nullptr); diff --git a/src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui b/src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui index 0b4b8489b4..1039509479 100644 --- a/src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui +++ b/src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui @@ -79,18 +79,18 @@ It cannot be zero. - Number of circular layers or rings to create, including a copy of the original object. + Number of concentric circles to create, including a copy of the original object. It must be at least 2. - Number of circular layers + Number of concentric circles - Number of circular layers or rings to create, including a copy of the original object. + Number of concentric circles to create, including a copy of the original object. It must be at least 2. diff --git a/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui b/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui index 504461f5b0..4858950fbb 100644 --- a/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui +++ b/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui @@ -567,7 +567,7 @@ Annotation scale widget. If the scale is 1:100 the multiplier is 100. - Dim line overshoot + Dimension line overshoot @@ -584,7 +584,7 @@ Annotation scale widget. If the scale is 1:100 the multiplier is 100. - Ext line length + Extension line length @@ -604,7 +604,7 @@ for linear dimensions. - Ext line overshoot + Extension line overshoot diff --git a/src/Mod/Draft/Resources/ui/preferences-draft.ui b/src/Mod/Draft/Resources/ui/preferences-draft.ui index bc336f2173..df0c57f6b9 100644 --- a/src/Mod/Draft/Resources/ui/preferences-draft.ui +++ b/src/Mod/Draft/Resources/ui/preferences-draft.ui @@ -113,7 +113,7 @@ faces are picked during commands. plane orientation appears when picking points - Show working plane tracker + Show working plane orientation showPlaneTracker diff --git a/src/Mod/Draft/Resources/ui/preferences-dxf.ui b/src/Mod/Draft/Resources/ui/preferences-dxf.ui index 477f89cd4e..576b323df5 100644 --- a/src/Mod/Draft/Resources/ui/preferences-dxf.ui +++ b/src/Mod/Draft/Resources/ui/preferences-dxf.ui @@ -583,7 +583,7 @@ instead of Draft or Part objects. This overrides the 'Import As' settingfalse - All objects containing faces will be exported as 3D polyfaces + All objects containing faces will be exported as 3D polyface meshes Export 3D objects as polyface meshes diff --git a/src/Mod/Draft/Resources/ui/preferences-svg.ui b/src/Mod/Draft/Resources/ui/preferences-svg.ui index 1be399e3c8..03d0b73715 100644 --- a/src/Mod/Draft/Resources/ui/preferences-svg.ui +++ b/src/Mod/Draft/Resources/ui/preferences-svg.ui @@ -242,7 +242,7 @@ a raw wire from the original shape is added All white lines will appear in black in the SVG for better readability against white backgrounds - Translate white line color to black + Convert white line color to black true diff --git a/src/Mod/Draft/draftfunctions/upgrade.py b/src/Mod/Draft/draftfunctions/upgrade.py index 132af193f8..79cc7449ff 100644 --- a/src/Mod/Draft/draftfunctions/upgrade.py +++ b/src/Mod/Draft/draftfunctions/upgrade.py @@ -568,7 +568,7 @@ def upgrade(objects, delete=False, force=None): and not utils.get_type(objects[0]) in ["BezCurve", "BSpline", "Wire"]: result = _draftify(objects[0]) if result: - _msg(translate("draft", "Found 1 non-parametric object: draftifying it")) + _msg(translate("draft", "Found 1 non-parametric object: replacing it with a Draft object")) # in the following cases there are no faces elif not faces: @@ -612,7 +612,7 @@ def upgrade(objects, delete=False, force=None): if edge_type in ("Line", "Circle"): result = _draftify(objects[0]) if result: - _msg(translate("draft", "Found 1 non-parametric object: draftifying it")) + _msg(translate("draft", "Found 1 non-parametric object: replacing it with a Draft object")) # only points, no edges elif not edges and len(objects) > 1: diff --git a/src/Mod/Draft/draftguitools/gui_downgrade.py b/src/Mod/Draft/draftguitools/gui_downgrade.py index f9cc9c3ed1..9d10fa8a75 100644 --- a/src/Mod/Draft/draftguitools/gui_downgrade.py +++ b/src/Mod/Draft/draftguitools/gui_downgrade.py @@ -56,7 +56,7 @@ class Downgrade(gui_base_original.Modifier): return {'Pixmap': 'Draft_Downgrade', 'Accel': "D, N", 'MenuText': QT_TRANSLATE_NOOP("Draft_Downgrade", "Downgrade"), - 'ToolTip': QT_TRANSLATE_NOOP("Draft_Downgrade", "Downgrades the selected objects into simpler shapes.\nThe result of the operation depends on the types of objects, which may be able to be downgraded several times in a row.\nFor example, it explodes the selected polylines into simpler faces, wires, and then edges. It can also subtract faces.")} + 'ToolTip': QT_TRANSLATE_NOOP("Draft_Downgrade", "Downgrades the selected objects into simpler shapes.\nThe result of the operation depends on the types of objects, which may be downgraded several times in a row.\nFor example, a 3D solid is deconstructed into separate faces, wires, and then edges. Faces can also be subtracted.")} def Activated(self): """Execute when the command is called.""" diff --git a/src/Mod/Draft/draftobjects/array.py b/src/Mod/Draft/draftobjects/array.py index 6e2d01ceb5..90af198fa2 100644 --- a/src/Mod/Draft/draftobjects/array.py +++ b/src/Mod/Draft/draftobjects/array.py @@ -111,7 +111,7 @@ class Array(DraftLink): "angle, and with certain orientation " "defined by a center and an axis.\n" "- Circular: places the copies " - "in concentric circular layers " + "in concentric circles " "around the base object.") obj.addProperty("App::PropertyEnumeration", "ArrayType", @@ -314,7 +314,7 @@ class Array(DraftLink): if "RadialDistance" not in properties: _tip = QT_TRANSLATE_NOOP("App::Property", - "Distance between circular layers") + "Distance between concentric circles") obj.addProperty("App::PropertyDistance", "RadialDistance", "Circular array", @@ -325,7 +325,7 @@ class Array(DraftLink): if "TangentialDistance" not in properties: _tip = QT_TRANSLATE_NOOP("App::Property", "Distance between copies " - "in the same circular layer") + "in the same circle") obj.addProperty("App::PropertyDistance", "TangentialDistance", "Circular array", @@ -335,8 +335,8 @@ class Array(DraftLink): if "NumberCircles" not in properties: _tip = QT_TRANSLATE_NOOP("App::Property", - "Number of circular layers. " - "The 'Base' object counts as one layer.") + "Number of concentric circle. " + "The 'Base' object counts as one circle.") obj.addProperty("App::PropertyInteger", "NumberCircles", "Circular array", @@ -348,7 +348,7 @@ class Array(DraftLink): _tip = QT_TRANSLATE_NOOP("App::Property", "A parameter that determines " "how many symmetry planes " - "the circular array will have.") + "the circular array will have") obj.addProperty("App::PropertyInteger", "Symmetry", "Circular array", diff --git a/src/Mod/Draft/draftobjects/bspline.py b/src/Mod/Draft/draftobjects/bspline.py index 7a0194bfd3..56c8ef6feb 100644 --- a/src/Mod/Draft/draftobjects/bspline.py +++ b/src/Mod/Draft/draftobjects/bspline.py @@ -50,7 +50,7 @@ class BSpline(DraftObject): obj.addProperty("App::PropertyBool","Closed", "Draft", _tip, locked=True) _tip = QT_TRANSLATE_NOOP("App::Property", - "Create a face if this spline is closed") + "Create a face if this B-spline is closed") obj.addProperty("App::PropertyBool","MakeFace", "Draft",_tip, locked=True) _tip = QT_TRANSLATE_NOOP("App::Property", "The area of this object") diff --git a/src/Mod/Draft/draftobjects/dimension.py b/src/Mod/Draft/draftobjects/dimension.py index e76fbff7fc..e14a4820fd 100644 --- a/src/Mod/Draft/draftobjects/dimension.py +++ b/src/Mod/Draft/draftobjects/dimension.py @@ -144,8 +144,7 @@ class DimensionBase(DraftAnnotation): # but it is not used. if "Support" not in properties: _tip = QT_TRANSLATE_NOOP("App::Property", - "The object measured by this dimension " - "object") + "The object measured by this dimension") obj.addProperty("App::PropertyLink", "Support", "Dimension", @@ -157,7 +156,7 @@ class DimensionBase(DraftAnnotation): _tip = QT_TRANSLATE_NOOP("App::Property", "The object, and specific subelements " "of it,\n" - "that this dimension object " + "that this dimension " "is measuring.\n" "\n" "There are various possibilities:\n" diff --git a/src/Mod/Draft/draftobjects/label.py b/src/Mod/Draft/draftobjects/label.py index d6464b75d3..187a96243a 100644 --- a/src/Mod/Draft/draftobjects/label.py +++ b/src/Mod/Draft/draftobjects/label.py @@ -215,7 +215,7 @@ class Label(DraftAnnotation): "object defined in 'Target'.\n" "'Tag' and 'Material' only work " "for objects that have these properties, " - "like Arch objects.\n" + "like BIM objects.\n" "\n" "For 'Position', 'Length', and 'Area' " "these properties will be extracted " diff --git a/src/Mod/Draft/drafttaskpanels/task_circulararray.py b/src/Mod/Draft/drafttaskpanels/task_circulararray.py index 6c1bdc03e2..7fcceb2957 100644 --- a/src/Mod/Draft/drafttaskpanels/task_circulararray.py +++ b/src/Mod/Draft/drafttaskpanels/task_circulararray.py @@ -334,7 +334,7 @@ class TaskPanelCircularArray: _msg(translate("draft","Object:") + " {}".format(sel_obj.Label)) _msg(translate("draft","Radial distance:") + " {}".format(self.r_distance)) _msg(translate("draft","Tangential distance:") + " {}".format(self.tan_distance)) - _msg(translate("draft","Number of circular layers:") + " {}".format(self.number)) + _msg(translate("draft","Number of concentric circles:") + " {}".format(self.number)) _msg(translate("draft","Symmetry parameter:") + " {}".format(self.symmetry)) _msg(translate("draft","Center of rotation:") + " ({0}, {1}, {2})".format(self.center.x, diff --git a/src/Mod/Draft/draftutils/init_draft_statusbar.py b/src/Mod/Draft/draftutils/init_draft_statusbar.py index 51ccf95139..a7c0c85e17 100644 --- a/src/Mod/Draft/draftutils/init_draft_statusbar.py +++ b/src/Mod/Draft/draftutils/init_draft_statusbar.py @@ -211,7 +211,7 @@ def init_draft_statusbar_scale(): scale_label = scale_to_label(annotation_scale) scaleLabel.setText(scale_label) scaleLabel.setToolTip(translate("draft", - "Set the scale used by draft annotation tools")) + "Set the scale used by Draft annotation tools")) scale_widget.addWidget(scaleLabel) scale_widget.scaleLabel = scaleLabel diff --git a/src/Mod/Draft/importDWG.py b/src/Mod/Draft/importDWG.py index 6f46db4ea8..c482639d89 100644 --- a/src/Mod/Draft/importDWG.py +++ b/src/Mod/Draft/importDWG.py @@ -334,7 +334,7 @@ or try saving to a lower DWG version.""") + "\n" FCC.PrintError(translate("draft", "QCAD converter not found") + "\n") FCC.PrintError(translate("draft", """No suitable external DWG converter has been found. -Please set one manually under menu Edit -> Preferences -> Import/Export -> DWG +Please set one manually under menu Edit → Preferences → Import/Export → DWG For more information see: https://wiki.freecad.org/Import_Export_Preferences""") + "\n") return None @@ -401,7 +401,7 @@ def convertToDwg(dxffilename, dwgfilename): FCC.PrintError(translate("draft", "QCAD converter not found") + "\n") FCC.PrintError(translate("draft", """No suitable external DWG converter has been found. -Please set one manually under menu Edit -> Preferences -> Import/Export -> DWG +Please set one manually under menu Edit → Preferences → Import/Export → DWG For more information see: https://wiki.freecad.org/Import_Export_Preferences""") + "\n") return None diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py index 71fabd41d3..5f1660edc7 100644 --- a/src/Mod/Draft/importDXF.py +++ b/src/Mod/Draft/importDXF.py @@ -130,13 +130,13 @@ def errorDXFLib(gui): p = ArchCommands.download(baseurl + f, force=True) if not p: if gui: - message = translate("Draft", """Download of dxf libraries failed. -Please install the dxf Library addon manually -from menu Tools -> Addon Manager""") + message = translate("Draft", """Download of DXF libraries failed. +Please install the DXF Library addon manually +from menu Tools → Addon Manager""") QtWidgets.QMessageBox.information(None, "", message) else: FCC.PrintWarning("The DXF import/export libraries needed by FreeCAD to handle the DXF format are not installed.\n") - FCC.PrintWarning("Please install the dxf Library addon from Tools -> Addon Manager\n") + FCC.PrintWarning("Please install the DXF Library addon from Tools → Addon Manager\n") break progressbar.stop() sys.path.append(FreeCAD.ConfigGet("UserAppData")) @@ -146,7 +146,7 @@ from menu Tools -> Addon Manager""") the DXF format were not found on this system. Please either allow FreeCAD to download these libraries: 1 - Load Draft workbench - 2 - Menu Edit > Preferences > Import-Export > DXF > Enable downloads + 2 - Menu Edit → Preferences → Import-Export → DXF → Enable downloads Or download these libraries manually, as explained on https://github.com/yorikvanhavre/Draft-dxf-importer To enabled FreeCAD to download these libraries, answer Yes.""") @@ -164,7 +164,7 @@ To enabled FreeCAD to download these libraries, answer Yes.""") _maj = _ver[0] _min = _ver[1] if float(_maj + "." + _min) >= 0.17: - FCC.PrintWarning("Please install the dxf Library addon from Tools -> Addon Manager\n") + FCC.PrintWarning("Please install the DXF Library addon from Tools → Addon Manager\n") else: FCC.PrintWarning("Please check https://github.com/yorikvanhavre/Draft-dxf-importer\n") @@ -192,13 +192,13 @@ def getDXFlibs(): libsok = False except ImportError: libsok = False - FCC.PrintWarning("DXF libraries not found. Trying to download...\n") + FCC.PrintWarning("DXF libraries not found. Trying to download…\n") else: if float(dxfLibrary.__version__[1:5]) >= CURRENTDXFLIB: libsok = True else: FCC.PrintWarning("DXF libraries need to be updated. " - "Trying to download...\n") + "Trying to download…\n") libsok = False if not libsok: errorDXFLib(gui) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index 26c50f9af5..dec475840a 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -899,7 +899,7 @@ void CmdFemConstraintSpring::activated(int) std::string FeatName = getUniqueObjectName("ConstraintSpring"); - openCommand(QT_TRANSLATE_NOOP("Command", "Make spring on face")); + openCommand(QT_TRANSLATE_NOOP("Command", "Make Spring Constraint")); doCommand(Doc, "App.activeDocument().addObject(\"Fem::ConstraintSpring\",\"%s\")", FeatName.c_str()); @@ -1128,10 +1128,10 @@ CmdFemDefineNodesSet::CmdFemDefineNodesSet() { sAppModule = "Fem"; sGroup = QT_TR_NOOP("Fem"); - sMenuText = QT_TR_NOOP("Node Set by Poly"); - sToolTipText = QT_TR_NOOP("Creates a node set by poly"); + sMenuText = QT_TR_NOOP("Node Set by Polygon"); + sToolTipText = QT_TR_NOOP("Creates a node set by polygon selection"); sWhatsThis = "FEM_DefineNodesSet"; - sStatusTip = QT_TR_NOOP("Create node set by Poly"); + sStatusTip = sToolTipText; sPixmap = "FEM_CreateNodesSet"; } @@ -1280,10 +1280,10 @@ CmdFemDefineElementsSet::CmdFemDefineElementsSet() { sAppModule = "Fem"; sGroup = QT_TR_NOOP("Fem"); - sMenuText = QT_TR_NOOP("Element Set by Poly"); - sToolTipText = QT_TR_NOOP("Create element set by poly"); + sMenuText = QT_TR_NOOP("Element Set From Polygon"); + sToolTipText = QT_TR_NOOP("Creates a collection of elements selected by a polygon"); sWhatsThis = "FEM_DefineElementsSet"; - sStatusTip = QT_TR_NOOP("Create Element set by Poly"); + sStatusTip = sToolTipText; sPixmap = "FEM_CreateElementsSet"; } diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index 6f6cfbee7d..21004d7437 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -69,7 +69,7 @@ - ccx binary path + CCX binary path diff --git a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui index ad7edd3b1c..61507a50d1 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui @@ -34,8 +34,7 @@ All: All elements will be exported. -Highest: Only the highest elements will be exported. This means -for means volumes for a volume mesh and faces for a shell mesh. +Highest: Only the highest elements will be exported. This means volumes for a volume mesh and faces for a shell mesh. FEM: Only FEM elements will be exported. This means only edges not belonging to faces and faces not belonging to volumes. diff --git a/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui b/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui index 3ebf9535a3..00444e50b1 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui @@ -175,7 +175,7 @@ - max shear stress: MS + maximum shear stress: MS Qt::TextSelectableByMouse @@ -185,7 +185,7 @@ - max princ. stress vector: s3x, s3y, s3z + maximum princ. stress vector: s3x, s3y, s3z Qt::TextSelectableByMouse @@ -195,7 +195,7 @@ - max principal stress: P1 + maximum principal stress: P1 Qt::TextSelectableByMouse @@ -205,7 +205,7 @@ - med princ. stress vector: s2x, s2y, s2z + medium princ. stress vector: s2x, s2y, s2z Qt::TextSelectableByMouse @@ -215,7 +215,7 @@ - med principal stress: P2 + medium principal stress: P2 Qt::TextSelectableByMouse @@ -225,7 +225,7 @@ - min princ. stress vector: s1x, s1y, s1z + minimum princ. stress vector: s1x, s1y, s1z Qt::TextSelectableByMouse @@ -235,7 +235,7 @@ - min principal stress: P3 + minimum principal stress: P3 Qt::TextSelectableByMouse @@ -245,7 +245,7 @@ - Mohr Coulomb: mc + Mohr-Coulomb: mc Qt::TextSelectableByMouse diff --git a/src/Mod/Fem/Gui/TaskCreateElementSet.cpp b/src/Mod/Fem/Gui/TaskCreateElementSet.cpp index 04c23a4512..13d762d29f 100644 --- a/src/Mod/Fem/Gui/TaskCreateElementSet.cpp +++ b/src/Mod/Fem/Gui/TaskCreateElementSet.cpp @@ -222,14 +222,14 @@ void myCopyResultsMesh(std::string oldName, std::string newName) Base::Console().warning("copy: %s and %s\n", oldName.c_str(), newName.c_str()); if (oldName.compare(newName) == 0 && error == 0) { error = 1; - Base::Console().warning("Can't copy ResultMesh to ResultMesh: %s and %s\n", + Base::Console().warning("Cannot copy ResultMesh to ResultMesh: %s and %s\n", oldName.c_str(), newName.c_str()); QMessageBox::warning( Gui::getMainWindow(), // QMessageBox::warning(Gui::MainWindow(), qApp->translate("CmdFemCreateElementsSet", "Wrong selection"), - qApp->translate("CmdFemCreateElementsSet", "Can't copy ResultMesh to ResultMesh")); + qApp->translate("CmdFemCreateElementsSet", "Cannot copy ResultMesh to ResultMesh")); } if ((oldName.find("Result") == std::string::npos || newName.find("Result") == std::string::npos) && error == 0) { @@ -239,7 +239,7 @@ void myCopyResultsMesh(std::string oldName, std::string newName) Gui::getMainWindow(), // QMessageBox::warning(Gui::MainWindow(), qApp->translate("CmdFemCreateElementsSet", "Wrong selection"), - qApp->translate("CmdFemCreateElementsSet", "Mesh must be a Results mesh")); + qApp->translate("CmdFemCreateElementsSet", "Mesh must be a ResultMesh")); } if (error == 0) { Gui::Command::doCommand(Gui::Command::Doc, diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.cpp b/src/Mod/Fem/Gui/TaskFemConstraint.cpp index 097236c79e..8df9f10fb2 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraint.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraint.cpp @@ -54,7 +54,7 @@ TaskFemConstraint::TaskFemConstraint(ViewProviderFemConstraint* ConstraintView, QWidget* parent, const char* pixmapname) : TaskBox(Gui::BitmapFactory().pixmap(pixmapname), - tr("Analysis feature parameters"), + tr("Analysis Feature Properties"), true, parent) , proxy(nullptr) diff --git a/src/Mod/Fem/Gui/TaskObjectName.cpp b/src/Mod/Fem/Gui/TaskObjectName.cpp index 91560721f6..0cdb3a62ce 100644 --- a/src/Mod/Fem/Gui/TaskObjectName.cpp +++ b/src/Mod/Fem/Gui/TaskObjectName.cpp @@ -38,7 +38,10 @@ using namespace FemGui; using namespace Gui; TaskObjectName::TaskObjectName(App::DocumentObject* pcObject, QWidget* parent) - : TaskBox(Gui::BitmapFactory().pixmap("FEM_CreateNodesSet"), tr("TaskObjectName"), true, parent) + : TaskBox(Gui::BitmapFactory().pixmap("FEM_CreateNodesSet"), + tr("Name of the object"), + true, + parent) , pcObject(pcObject) , ui(new Ui_TaskObjectName) { diff --git a/src/Mod/Fem/femguiutils/vtk_module_handling.py b/src/Mod/Fem/femguiutils/vtk_module_handling.py index 9ae5cc2fb9..ec04ae023c 100644 --- a/src/Mod/Fem/femguiutils/vtk_module_handling.py +++ b/src/Mod/Fem/femguiutils/vtk_module_handling.py @@ -165,7 +165,7 @@ def vtk_module_handling(): if not FreeCAD.GuiUp: FreeCAD.Console.PrintError( - "FEM: vtk python module is not compatible with internal vtk library" + "FEM: VTK Python module is not compatible with internal VTK library" ) return @@ -183,7 +183,7 @@ def vtk_module_handling(): "FEM", ( "FreeCAD is linked to a different VTK library than the imported " - "VTK python module. This is incompatible and will lead to errors." + "VTK Python module. This is incompatible and will lead to errors." "\n\nWrong python module is imported from: \n{}" ), ).format(path) @@ -216,7 +216,7 @@ def vtk_module_handling(): else: message += translate( - "FEM", "\n\nNo matching module was found in the current python path." + "FEM", "\n\nNo matching module was found in the current Python path." ) # raise a dialog to the user @@ -224,7 +224,7 @@ def vtk_module_handling(): button = QtGui.QMessageBox.critical( FreeCADGui.getMainWindow(), - translate("FEM", "VTK module conflict"), + translate("FEM", "VTK Python module conflict"), message, buttons=buttons, ) @@ -250,9 +250,9 @@ def vtk_compatibility_abort(inform=True): button = QtGui.QMessageBox.critical( FreeCADGui.getMainWindow(), - translate("FEM", "VTK module conflict"), + translate("FEM", "VTK Python Module Conflict"), translate( - "FEM", "This functionality is not available due to VTK python module conflict" + "FEM", "This functionality is not available due to VTK Python module conflict" ), buttons=QtGui.QMessageBox.Discard, ) diff --git a/src/Mod/Fem/femtaskpanels/task_result_mechanical.py b/src/Mod/Fem/femtaskpanels/task_result_mechanical.py index 5bb93ce236..7558e6f6f4 100644 --- a/src/Mod/Fem/femtaskpanels/task_result_mechanical.py +++ b/src/Mod/Fem/femtaskpanels/task_result_mechanical.py @@ -736,7 +736,9 @@ class _TaskPanel: ) error_message = translate("FEM", the_error_messagetext) + "\n" FreeCAD.Console.PrintError(error_message) - QtGui.QMessageBox.critical(None, translate("FEM", "Empty result mesh"), error_message) + QtGui.QMessageBox.critical( + None, translate("FEM", "Result mesh is empty"), error_message + ) elif self.mesh_obj.FemMesh.NodeCount == len(self.result_obj.NodeNumbers): self.suitable_results = True hide_parts_constraints() diff --git a/src/Mod/Help/Help.py b/src/Mod/Help/Help.py index 291f0aa4e2..cf6249e05c 100644 --- a/src/Mod/Help/Help.py +++ b/src/Mod/Help/Help.py @@ -70,11 +70,11 @@ MD_RENDERED_URL = "https://github.com/FreeCAD/FreeCAD-documentation/blob/main/wi MD_TRANSLATIONS_FOLDER = "translations" ERRORTXT = translate( "Help", - "Contents for this page could not be retrieved. Please check settings under menu Edit -> Preferences -> General -> Help", + "Contents for this page could not be retrieved. Please check settings under menu Edit → Preferences → General → Help", ) LOCTXT = translate( "Help", - "Help files location could not be determined. Please check settings under menu Edit -> Preferences -> General -> Help", + "Help files location could not be determined. Please check settings under menu Edit → Preferences → General → Help", ) LOGTXT = translate( "Help", diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index 69503e9ab5..06e74538ec 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -138,12 +138,11 @@ void CmdMeshUnion::activated(int) qApp->translate("Mesh_Union", "Unknown error occurred while running OpenSCAD.")); } else { - QMessageBox::warning( - Gui::getMainWindow(), - qApp->translate("Mesh_Union", "OpenSCAD"), - qApp->translate("Mesh_Union", - "OpenSCAD cannot be found on the system.\n" - "Visit http://www.openscad.org/index.html to install it.")); + QMessageBox::warning(Gui::getMainWindow(), + qApp->translate("Mesh_Union", "OpenSCAD"), + qApp->translate("Mesh_Union", + "OpenSCAD cannot be found on the system.\n" + "Visit https://openscad.org/ to install it.")); } } } @@ -217,12 +216,11 @@ void CmdMeshDifference::activated(int) qApp->translate("Mesh_Union", "Unknown error occurred while running OpenSCAD.")); } else { - QMessageBox::warning( - Gui::getMainWindow(), - qApp->translate("Mesh_Union", "OpenSCAD"), - qApp->translate("Mesh_Union", - "OpenSCAD cannot be found on the system.\n" - "Visit http://www.openscad.org/index.html to install it.")); + QMessageBox::warning(Gui::getMainWindow(), + qApp->translate("Mesh_Union", "OpenSCAD"), + qApp->translate("Mesh_Union", + "OpenSCAD cannot be found on the system.\n" + "Visit https://openscad.org/ to install it.")); } } } @@ -296,12 +294,11 @@ void CmdMeshIntersection::activated(int) qApp->translate("Mesh_Union", "Unknown error occurred while running OpenSCAD.")); } else { - QMessageBox::warning( - Gui::getMainWindow(), - qApp->translate("Mesh_Union", "OpenSCAD"), - qApp->translate("Mesh_Union", - "OpenSCAD cannot be found on the system.\n" - "Visit http://www.openscad.org/index.html to install it.")); + QMessageBox::warning(Gui::getMainWindow(), + qApp->translate("Mesh_Union", "OpenSCAD"), + qApp->translate("Mesh_Union", + "OpenSCAD cannot be found on the system.\n" + "Visit https://openscad.org/ to install it.")); } } } @@ -1432,8 +1429,8 @@ CmdMeshBoundingBox::CmdMeshBoundingBox() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Boundings Info"); - sToolTipText = QT_TR_NOOP("Shows the boundings of the selected mesh"); + sMenuText = QT_TR_NOOP("Bounding Box Info"); + sToolTipText = QT_TR_NOOP("Shows the bounding box coordinates of the selected mesh"); sWhatsThis = "Mesh_BoundingBox"; sStatusTip = sToolTipText; sPixmap = "Mesh_BoundingBox"; @@ -1567,8 +1564,8 @@ CmdMeshFillInteractiveHole::CmdMeshFillInteractiveHole() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Close Holes"); - sToolTipText = QT_TR_NOOP("Closes holes interactively in the mesh"); + sMenuText = QT_TR_NOOP("Close Hole"); + sToolTipText = QT_TR_NOOP("Closes a hole interactively in the mesh"); sWhatsThis = "Mesh_FillInteractiveHole"; sStatusTip = sToolTipText; sPixmap = "Mesh_FillInteractiveHole"; diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.ui b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.ui index 0d98840c2c..d2e6af173f 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.ui +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.ui @@ -22,7 +22,7 @@ Press 'Start', then pick points on the mesh; when enough points have been set, right-click and choose 'Create'. Repeat this process to create more splines. Close this task panel to complete the operation. -This command only works with a 'mesh' object, not a regular face or surface. To convert an object to a mesh use the tools of the Mesh workbench. +This command only works with a Mesh object, not a regular face or surface. To convert an object to a mesh use the tools of the Mesh workbench. true diff --git a/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui b/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui index 238ecd8959..53f3e3e9a6 100644 --- a/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui +++ b/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui @@ -99,7 +99,7 @@ If this is checked, Features will claim their children in the tree view - Use ViewProvider in Tree View + Use ViewProviders in Tree View useViewProviderTree diff --git a/src/Mod/Part/App/FaceMakerBullseye.cpp b/src/Mod/Part/App/FaceMakerBullseye.cpp index 3c65816096..b08f7af3ea 100644 --- a/src/Mod/Part/App/FaceMakerBullseye.cpp +++ b/src/Mod/Part/App/FaceMakerBullseye.cpp @@ -64,7 +64,7 @@ std::string FaceMakerBullseye::getUserFriendlyName() const std::string FaceMakerBullseye::getBriefExplanation() const { - return {tr("Supports making planar faces with holes with islands.").toStdString()}; + return {tr("Supports making planar faces with holes with islands in them").toStdString()}; } bool FaceMakerBullseye::WireInfo::operator<(const WireInfo& other) const @@ -100,7 +100,7 @@ void FaceMakerBullseye::Build_Essence() } BRepLib_FindSurface planeFinder(comp, -1, /*OnlyPlane=*/Standard_True); if (!planeFinder.Found()) { - throw Base::ValueError("Wires are not coplanar."); + throw Base::ValueError("Wires are not coplanar"); } plane = GeomAdaptor_Surface(planeFinder.Surface()).Plane(); } @@ -221,7 +221,7 @@ FaceMakerBullseye::FaceDriller::hitTest(const TopoShape& shape) const auto point = BRep_Tool::Pnt(vertex); double u, v; GeomAPI_ProjectPointOnSurf(point, myHPlane).LowerDistanceParameters(u, v); - const char* err = "FaceMakerBullseye::FaceDriller::hitTest: result unknown."; + const char* err = "FaceMakerBullseye::FaceDriller::hitTest: result unknown"; auto hit = HitTest::HitNone; if (!myFaceBound.IsNull()) { BRepClass_FaceClassifier cl(myFaceBound, gp_Pnt2d(u, v), tol); @@ -371,5 +371,5 @@ std::string FaceMakerRing::getUserFriendlyName() const std::string FaceMakerRing::getBriefExplanation() const { - return {tr("Supports making planar faces with holes and holes as faces.").toStdString()}; + return {tr("Supports making planar faces with holes and holes as faces").toStdString()}; } diff --git a/src/Mod/Part/App/FaceMakerCheese.cpp b/src/Mod/Part/App/FaceMakerCheese.cpp index eb83584eb8..8db278aaef 100644 --- a/src/Mod/Part/App/FaceMakerCheese.cpp +++ b/src/Mod/Part/App/FaceMakerCheese.cpp @@ -249,7 +249,7 @@ std::string FaceMakerCheese::getUserFriendlyName() const std::string FaceMakerCheese::getBriefExplanation() const { - return {tr("Supports making planar faces with holes, but no islands inside holes.").toStdString()}; + return {tr("Supports making planar faces with holes, but no islands inside holes").toStdString()}; } void FaceMakerCheese::Build_Essence() diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index 41e81c527d..2c530fc90b 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -1067,7 +1067,7 @@ void CmdPartImportCurveNet::activated(int iMsg) QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString(), QString(), filter.join(QLatin1String(";;"))); if (!fn.isEmpty()) { QFileInfo fi; fi.setFile(fn); - openCommand(QT_TRANSLATE_NOOP("Command", "Part Import Curve Net")); + openCommand(QT_TRANSLATE_NOOP("Command", "Import Curve Net")); doCommand(Doc,"f = App.activeDocument().addObject(\"Part::CurveNet\",\"%s\")", (const char*)fi.baseName().toLatin1()); doCommand(Doc,"f.FileName = \"%s\"",(const char*)fn.toLatin1()); commitCommand(); diff --git a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp index 8ecc6df4ff..3138a2cc45 100644 --- a/src/Mod/Part/Gui/CommandSimple.cpp +++ b/src/Mod/Part/Gui/CommandSimple.cpp @@ -67,7 +67,7 @@ void CmdPartSimpleCylinder::activated(int iMsg) if (dlg.exec()== QDialog::Accepted) { Base::Vector3d dir = dlg.getDirection(); Base::Vector3d pos = dlg.getPosition(); - openCommand(QT_TRANSLATE_NOOP("Command", "Create Part Cylinder")); + openCommand(QT_TRANSLATE_NOOP("Command", "Create Cylinder")); doCommand(Doc,"from FreeCAD import Base"); doCommand(Doc,"import Part"); doCommand(Doc,"App.ActiveDocument.addObject(\"Part::Feature\",\"Cylinder\")" diff --git a/src/Mod/Part/Gui/Workbench.cpp b/src/Mod/Part/Gui/Workbench.cpp index 2bfd14978c..05f3b07dcb 100644 --- a/src/Mod/Part/Gui/Workbench.cpp +++ b/src/Mod/Part/Gui/Workbench.cpp @@ -35,8 +35,8 @@ using namespace PartGui; qApp->translate("Workbench", "&Simple"); qApp->translate("Workbench", "&Parametric"); qApp->translate("Workbench", "Solids"); - qApp->translate("Workbench", "Part tools"); - qApp->translate("Workbench", "Boolean"); + qApp->translate("Workbench", "Part Tools"); + qApp->translate("Workbench", "Boolean Tools"); qApp->translate("Workbench", "Primitives"); qApp->translate("Workbench", "Join"); qApp->translate("Workbench", "Split"); @@ -190,7 +190,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "Part_Builder"; Gui::ToolBarItem* tool = new Gui::ToolBarItem(root); - tool->setCommand("Part tools"); + tool->setCommand("Part Tools"); if (hasSketcher) { *tool << "Sketcher_NewSketch"; } @@ -212,7 +212,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "Part_ColorPerFace"; // See issues #0477 and #1954 in the tracker Gui::ToolBarItem* boolop = new Gui::ToolBarItem(root); - boolop->setCommand("Boolean"); + boolop->setCommand("Boolean Tools"); *boolop << "Part_CompCompoundTools" << "Part_Boolean" << "Part_Cut" diff --git a/src/Mod/PartDesign/App/FeaturePipe.cpp b/src/Mod/PartDesign/App/FeaturePipe.cpp index 5255ab94bd..89793acb80 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.cpp +++ b/src/Mod/PartDesign/App/FeaturePipe.cpp @@ -235,7 +235,7 @@ App::DocumentObjectExecReturn *Pipe::execute() for (auto& subSet : multisections) { if (!subSet.first->isDerivedFrom()) return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", - "Pipe: All sections need to be part features")); + "Pipe: All sections need to be Part features")); // if the section is an object's face then take just the face TopoDS_Shape shape = getSectionShape(subSet.first, subSet.second); diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 42d714eb50..b89fa45711 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -914,7 +914,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons if (!onlyAllowed) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("Cannot use selected object. Selected object must belong to the active body")); - msgBox.setInformativeText(QObject::tr("Consider using a sape binder or a base feature to reference external geometry in a body")); + msgBox.setInformativeText(QObject::tr("Consider using a shape binder or a base feature to reference external geometry in a body")); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok); msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui index dcd94bc59b..aa6ec72897 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui @@ -57,7 +57,7 @@ - Base z-xis + Base z-axis diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp index cd4230f411..a8c329b849 100644 --- a/src/Mod/Robot/Gui/CommandTrajectory.cpp +++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp @@ -87,7 +87,7 @@ CmdRobotInsertWaypoint::CmdRobotInsertWaypoint() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Insert in trajectory"); + sMenuText = QT_TR_NOOP("Insert in Trajectory"); sToolTipText = QT_TR_NOOP("Inserts the robot tool location into the trajectory"); sWhatsThis = "Robot_InsertWaypoint"; sStatusTip = sToolTipText; diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 7339f7503a..1f0e89f795 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -3869,7 +3869,7 @@ void CmdSketcherConstrainBlock::activated(int iMsg) for (std::vector::iterator itg = GeoId.begin(); itg != GeoId.end(); ++itg) { // undo command open - openCommand(QT_TRANSLATE_NOOP("Command", "Add 'Block' constraint")); + openCommand(QT_TRANSLATE_NOOP("Command", "Add Block constraint")); bool safe = addConstraintSafely(Obj, [&]() { Gui::cmdAppObjectArgs(Obj, "addConstraint(Sketcher.Constraint('Block',%d))", (*itg)); diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp index 8bc5e61a9d..6ae4cf3e3b 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp @@ -112,7 +112,7 @@ CmdSketcherConvertToNURBS::CmdSketcherConvertToNURBS() sAppModule = "Sketcher"; sGroup = "Sketcher"; sMenuText = QT_TR_NOOP("Geometry to B-Spline"); - sToolTipText = QT_TR_NOOP("Converts the selected geometry to a B-spline"); + sToolTipText = QT_TR_NOOP("Converts the selected geometry to B-splines"); sWhatsThis = "Sketcher_BSplineConvertToNURBS"; sStatusTip = sToolTipText; sPixmap = "Sketcher_BSplineConvertToNURBS"; diff --git a/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h b/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h index e44b03df9e..49118cf61b 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h @@ -889,7 +889,7 @@ protected: try { // add auto-constraints if (owncommand) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add auto constraints")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add Auto-Constraints")); } tryAddAutoConstraints(); diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp index 26b60ecd6d..ab2879968e 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp @@ -760,7 +760,7 @@ void DrawSketchHandler::createAutoConstraints(const std::vector& if (createowncommand) { // Open the Command - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add auto constraints")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add Auto-Constraints")); } // Iterate through constraints diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index 041865e970..7858833e49 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -91,7 +91,7 @@ public: void activated() override { DrawSketchHandlerBSplineBase::activated(); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add sketch bSpline")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add Sketch B-Spline")); } private: @@ -595,7 +595,7 @@ private: { Gui::Command::abortCommand(); tryAutoRecomputeIfNotSolve(sketchgui->getSketchObject()); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add sketch B-spline")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add Sketch B-Spline")); SplineDegree = 3; geoIds.clear(); @@ -733,7 +733,7 @@ private: // Restart the command Gui::Command::abortCommand(); tryAutoRecomputeIfNotSolve(sketchgui->getSketchObject()); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add sketch B-spline")); + 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/SketcherSettingsAppearance.ui b/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui index 8cdf655e67..574fedeadd 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui @@ -168,7 +168,7 @@ - Pattern + Line Type @@ -519,7 +519,7 @@ - Line pattern of external edges + Line pattern of external reference edges -1 diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp index ea07d60487..6d993164a8 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp @@ -351,7 +351,7 @@ void SketcherValidation::onOrientLockEnableClicked() *sketch, tr("Constraint orientation locking"), tr("Orientation locking was enabled and recomputed for %1 constraints. The" - " constraints have been listed in the report view (menu View -> Panels ->" + " constraints have been listed in the report view (menu View → Panels →" " Report view).") .arg(n)); @@ -372,7 +372,7 @@ void SketcherValidation::onOrientLockDisableClicked() *sketch, tr("Constraint orientation locking"), tr("Orientation locking was disabled for %1 constraints. The" - " constraints have been listed in the report view (menu View -> Panels ->" + " constraints have been listed in the report view (menu View → Panels →" " Report view). Note that for all future constraints, the locking still" " defaults to ON.") .arg(n)); diff --git a/src/Mod/Start/Gui/StartView.cpp b/src/Mod/Start/Gui/StartView.cpp index 5b039357e4..cf9ced5b9e 100644 --- a/src/Mod/Start/Gui/StartView.cpp +++ b/src/Mod/Start/Gui/StartView.cpp @@ -222,7 +222,7 @@ void StartView::configureNewFileButtons(QLayout* layout) const QLatin1String(":/icons/AssemblyWorkbench.svg")})); auto draft = gsl::owner( new NewFileButton({tr("2D Draft"), - tr("Creates a 2D draft document"), + tr("Creates a 2D Draft document"), QLatin1String(":/icons/DraftWorkbench.svg")})); auto arch = gsl::owner(new NewFileButton({tr("BIM/Architecture"), diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index afbd3469c4..1b40037eac 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -796,7 +796,7 @@ void CmdTechDrawSectionGroup::languageChange() arc1->setToolTip(QApplication::translate("TechDraw_SectionView", "Inserts a simple section view")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; - arc2->setText(QApplication::translate("CmdTechDrawSectionGroup", "Complex Section")); + arc2->setText(QApplication::translate("CmdTechDrawSectionGroup", "Complex Section View")); arc2->setToolTip( QApplication::translate("TechDraw_ComplexSection", "Inserts a complex section view")); arc2->setStatusTip(arc2->toolTip()); @@ -1870,7 +1870,7 @@ void CmdTechDrawExportPageDXF::activated(int iMsg) if (v->isDerivedFrom()) { QMessageBox::StandardButton rc = QMessageBox::question( Gui::getMainWindow(), QObject::tr("Cannot export selection"), - QObject::tr("Page contains DrawViewArch which will not be exported. Continue?"), + QObject::tr("Page contains DrawViewBIM which will not be exported. Continue?"), QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No)); if (rc == QMessageBox::No) { return; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui index 4d8cf95f89..2da766ec05 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui @@ -563,7 +563,7 @@ This affects only the toolbar; all tools remain available via the menu and short - Dimension tool diameter/radius mode: + Dimension tool diameter/radius mode diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.ui b/src/Mod/TechDraw/Gui/TaskBalloon.ui index a65a6a6c41..57c9910ea6 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.ui +++ b/src/Mod/TechDraw/Gui/TaskBalloon.ui @@ -19,7 +19,7 @@ - Text: + Text @@ -33,7 +33,7 @@ - Text color: + Text color @@ -92,7 +92,7 @@ - Bubble shape: + Bubble shape diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui index b38f711cf4..6459ce6a1c 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui +++ b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui @@ -98,7 +98,7 @@ - X: + X @@ -112,7 +112,7 @@ - Y: + Y @@ -126,7 +126,7 @@ - Z: + Z @@ -144,7 +144,7 @@ - Radius: + Radius @@ -178,7 +178,7 @@ - End angle: + End angle diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui b/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui index b525e8d60b..2bed07b163 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui @@ -91,7 +91,7 @@ - X: + X @@ -105,7 +105,7 @@ - Y: + Y @@ -119,7 +119,7 @@ - Z: + Z @@ -170,7 +170,7 @@ - X: + X @@ -184,7 +184,7 @@ - Y: + Y @@ -198,7 +198,7 @@ - Z: + Z diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui index 79b6085c22..d5ac16f342 100644 --- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui +++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui @@ -133,7 +133,7 @@ - Circular runout + Circular run-out ↗ @@ -143,7 +143,7 @@ - Total runout + Total run-out ⌰ @@ -214,7 +214,7 @@ - Minimax (Tschebyschew) + Minimax (Chebychev) Ⓒ diff --git a/src/Mod/TechDraw/Gui/TaskDimension.ui b/src/Mod/TechDraw/Gui/TaskDimension.ui index c6e4984ef4..1cc9caf937 100644 --- a/src/Mod/TechDraw/Gui/TaskDimension.ui +++ b/src/Mod/TechDraw/Gui/TaskDimension.ui @@ -76,7 +76,7 @@ the negated value for 'Undertolerance'. - Undertolerance: + Undertolerance @@ -205,7 +205,7 @@ by negative value of 'Overtolerance'. - Color: + Color diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.ui b/src/Mod/TechDraw/Gui/TaskLinkDim.ui index b32beb3c4e..4cb959ee1c 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.ui +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.ui @@ -64,7 +64,7 @@ - Feature1: + Feature1 @@ -84,7 +84,7 @@ - Geometry1: + Geometry1 @@ -104,7 +104,7 @@ - Feature2: + Feature2 @@ -124,7 +124,7 @@ - Geometry2: + Geometry2 diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui index fc5c39c8af..501f2971bd 100644 --- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui +++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui @@ -31,7 +31,7 @@ - Line style: + Line style @@ -45,7 +45,7 @@ - Line width: + Line width diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp index 1d33f24852..67bf0e9f3b 100644 --- a/src/Mod/TechDraw/Gui/Workbench.cpp +++ b/src/Mod/TechDraw/Gui/Workbench.cpp @@ -37,9 +37,9 @@ using namespace TechDrawGui; #if 0// needed for Qt's lupdate utility qApp->translate("Workbench", "Dimensions"); - qApp->translate("Workbench", "Extensions: Attributes/Modifications"); - qApp->translate("Workbench", "Extensions: Centerlines/Threading"); - qApp->translate("Workbench", "Extensions: Dimensions"); + qApp->translate("Workbench", "Attributes/Modifications"); + qApp->translate("Workbench", "Centerlines/Threading"); + qApp->translate("Workbench", "Format/Organize Dimensions"); qApp->translate("Workbench", "Annotations"); qApp->translate("Workbench", "Stacking"); qApp->translate("Workbench", "Add Lines"); @@ -101,7 +101,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // extension: attributes and modifications Gui::MenuItem* toolattrib = new Gui::MenuItem; - toolattrib->setCommand("Extensions: Attributes/Modifications"); + toolattrib->setCommand("Attributes/Modifications"); *toolattrib << "TechDraw_ExtensionSelectLineAttributes"; *toolattrib << "TechDraw_ExtensionChangeLineAttributes"; *toolattrib << "Separator"; @@ -124,7 +124,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // extension: centerlines and threading Gui::MenuItem* toolcenter = new Gui::MenuItem; - toolcenter->setCommand("Extensions: Centerlines/Threading"); + toolcenter->setCommand("Centerlines/Threading"); *toolcenter << "TechDraw_ExtensionCircleCenterLines"; *toolcenter << "TechDraw_ExtensionHoleCircle"; *toolcenter << "Separator"; @@ -145,7 +145,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // extension: dimensions Gui::MenuItem* tooldimensions = new Gui::MenuItem; - tooldimensions->setCommand("Extensions: Dimensions"); + tooldimensions->setCommand("Format/Organize Dimensions"); *tooldimensions << "TechDraw_ExtensionCreateHorizChainDimension"; *tooldimensions << "TechDraw_ExtensionCreateVertChainDimension"; *tooldimensions << "TechDraw_ExtensionCreateObliqueChainDimension"; diff --git a/src/Tools/freecad-thumbnailer.in b/src/Tools/freecad-thumbnailer.in index 0a6fe451cd..09c11cd8d5 100644 --- a/src/Tools/freecad-thumbnailer.in +++ b/src/Tools/freecad-thumbnailer.in @@ -28,7 +28,7 @@ HINT: Make sure that the symlink /usr/bin/python exists and points to the Python NOTE: To make sure FreeCAD saves thumbnail information: - Edit -> Preferences... -> Document -> Save thumbnail into project when saving document + Edit → Preferences → Document → Save thumbnail into project when saving document """ import sys import zipfile