diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp index 2369bd0bde..51b2389114 100644 --- a/src/Gui/Action.cpp +++ b/src/Gui/Action.cpp @@ -722,7 +722,7 @@ void WorkbenchGroup::refreshWorkbenchList() action->setObjectName(wbName); action->setIcon(px); action->setToolTip(tip); - action->setStatusTip(tr("Select the '%1' workbench").arg(name)); + action->setStatusTip(tr("Selects the '%1' workbench").arg(name)); if (index < 9) { action->setShortcut(QKeySequence(QStringLiteral("W,%1").arg(index + 1))); } @@ -1137,7 +1137,7 @@ void RecentMacrosAction::setFiles(const QStringList& files) } // Raise a single warning no matter how many conflicts if (!existingCommands.isEmpty()) { - auto msgMain = QStringLiteral("Recent macros : keyboard shortcut(s)"); + auto msgMain = QStringLiteral("Recent macros : keyboard shortcuts"); for (int index = 0; index < accel_col.size(); index++) { msgMain += QStringLiteral(" %1").arg(accel_col[index]); } diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index e56c3db80c..7acd57933f 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -447,10 +447,9 @@ Application::Application(bool GUIenabled) 0, QLatin1String("Invalid system settings"), QLatin1String( - "Your system uses the same symbol for decimal point and group separator.\n\n" - "This causes serious problems and makes the application fail to work " - "properly.\n" - "Go to the system configuration panel of the OS and fix this issue, please.")); + "The system locale uses the same symbol for the decimal point and the thousands separator.\n\n" + "This may prevent the application from functioning correctly." + "Go to the system configuration panel of the OS and fix this issue.")); throw Base::RuntimeError("Invalid system settings"); } #endif @@ -1053,10 +1052,10 @@ void Application::checkForRecomputes() { WaitCursor wc; wc.restoreCursor(); auto res = QMessageBox::warning(getMainWindow(), QObject::tr("Recomputation required"), - QObject::tr("Some document(s) require recomputation for migration purposes. " + QObject::tr("Some documents require recomputation for migration purposes. " "It is highly recommended to perform a recomputation before " "any modification to avoid compatibility problems.\n\n" - "Do you want to recompute now?"), + "Recompute now?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); if (res != QMessageBox::Yes) return; @@ -1071,8 +1070,8 @@ void Application::checkForRecomputes() { } if (hasError) QMessageBox::critical(getMainWindow(), QObject::tr("Recompute error"), - QObject::tr("Failed to recompute some document(s).\n" - "Please check report view for more details.")); + QObject::tr("Failed to recompute some documents.\n" + "Check the report view for more details.")); } void Application::checkPartialRestore(App::Document* doc) @@ -2293,7 +2292,7 @@ void tryRunEventLoop(GUISingleApplication& mainApp) try { boost::interprocess::file_lock flock(filename.c_str()); if (flock.try_lock()) { - Base::Console().log("Init: Executing event loop...\n"); + Base::Console().log("Init: Executing event loop…\n"); QApplication::exec(); // Qt can't handle exceptions thrown from event handlers, so we need diff --git a/src/Gui/AutoSaver.cpp b/src/Gui/AutoSaver.cpp index 62e76b1001..f23e576635 100644 --- a/src/Gui/AutoSaver.cpp +++ b/src/Gui/AutoSaver.cpp @@ -171,7 +171,7 @@ void AutoSaver::saveDocument(const std::string& name, AutoSaveProperty& saver) bool save = hGrp->GetBool("SaveThumbnail",true); hGrp->SetBool("SaveThumbnail",false); - getMainWindow()->showMessage(tr("Please wait until the AutoRecovery file has been saved..."), 5000); + getMainWindow()->showMessage(tr("Wait until the auto-recovery file has been saved…"), 5000); //qApp->processEvents(); Base::TimeElapsed startTime; @@ -222,7 +222,7 @@ void AutoSaver::saveDocument(const std::string& name, AutoSaveProperty& saver) } } - Base::Console().log("Save AutoRecovery file in %fs\n", Base::TimeElapsed::diffTimeF(startTime,Base::TimeElapsed())); + Base::Console().log("Save auto-recovery file in %fs\n", Base::TimeElapsed::diffTimeF(startTime,Base::TimeElapsed())); hGrp->SetBool("SaveThumbnail",save); } } diff --git a/src/Gui/Clipping.ui b/src/Gui/Clipping.ui index 82b50229d2..6b456a30a0 100644 --- a/src/Gui/Clipping.ui +++ b/src/Gui/Clipping.ui @@ -152,7 +152,7 @@ - Clipping custom direction + Custom Clipping Direction true diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp index 60b5f6fc26..7790fcb059 100644 --- a/src/Gui/CommandDoc.cpp +++ b/src/Gui/CommandDoc.cpp @@ -86,10 +86,10 @@ StdCmdOpen::StdCmdOpen() { // setting the sGroup = "File"; - sMenuText = QT_TR_NOOP("&Open..."); - sToolTipText = QT_TR_NOOP("Open a document or import files"); + sMenuText = QT_TR_NOOP("&Open…"); + sToolTipText = QT_TR_NOOP("Opens a document or imports files"); sWhatsThis = "Std_Open"; - sStatusTip = QT_TR_NOOP("Open a document or import files"); + sStatusTip = sToolTipText; sPixmap = "document-open"; sAccel = keySequenceToAccel(QKeySequence::Open); eType = NoTransaction; @@ -180,10 +180,10 @@ StdCmdImport::StdCmdImport() { // setting the sGroup = "File"; - sMenuText = QT_TR_NOOP("&Import..."); - sToolTipText = QT_TR_NOOP("Import a file in the active document"); + sMenuText = QT_TR_NOOP("&Import…"); + sToolTipText = QT_TR_NOOP("Imports a file into the active document"); sWhatsThis = "Std_Import"; - sStatusTip = QT_TR_NOOP("Import a file in the active document"); + sStatusTip = sToolTipText; sPixmap = "Std_Import"; sAccel = "Ctrl+Shift+I"; } @@ -266,11 +266,10 @@ StdCmdExport::StdCmdExport() { // setting the sGroup = "File"; - sMenuText = QT_TR_NOOP("&Export..."); - sToolTipText = QT_TR_NOOP("Export an object in the active document"); + sMenuText = QT_TR_NOOP("&Export…"); + sToolTipText = QT_TR_NOOP("Exports an object in the active document"); sWhatsThis = "Std_Export"; - sStatusTip = QT_TR_NOOP("Export an object in the active document"); - //sPixmap = "Open"; + sStatusTip = sToolTipText; sAccel = "Ctrl+E"; sPixmap = "Std_Export"; eType = 0; @@ -404,7 +403,7 @@ void StdCmdExport::activated(int iMsg) if (selection.empty()) { QMessageBox::warning(Gui::getMainWindow(), QCoreApplication::translate("StdCmdExport", "No selection"), - QCoreApplication::translate("StdCmdExport", "Select the objects to export before choosing Export.")); + QCoreApplication::translate("StdCmdExport", "Select objects to export before using the Export command.")); return; } @@ -522,10 +521,12 @@ StdCmdMergeProjects::StdCmdMergeProjects() { sAppModule = "File"; sGroup = "File"; - sMenuText = QT_TR_NOOP("&Merge document..."); - sToolTipText = QT_TR_NOOP("Merge document"); + sMenuText = QT_TR_NOOP("&Merge Document"); + + sToolTipText = QT_TR_NOOP("Merges another FreeCAD document into the active one"); + sWhatsThis = "Std_MergeProjects"; - sStatusTip = QT_TR_NOOP("Merge document"); + sStatusTip = sToolTipText; sPixmap = "Std_MergeProjects"; } @@ -575,9 +576,10 @@ StdCmdDependencyGraph::StdCmdDependencyGraph() { // setting the sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Dependency gra&ph..."); - sToolTipText = QT_TR_NOOP("Show the dependency graph of the objects in the active document"); - sStatusTip = QT_TR_NOOP("Show the dependency graph of the objects in the active document"); + sMenuText = QT_TR_NOOP("Dependency Gra&ph"); + + sToolTipText = QT_TR_NOOP("Shows the dependency graph of the objects in the active document"); + sStatusTip = sToolTipText; sWhatsThis = "Std_DependencyGraph"; eType = 0; sPixmap = "Std_DependencyGraph"; @@ -588,7 +590,7 @@ void StdCmdDependencyGraph::activated(int iMsg) Q_UNUSED(iMsg); App::Document* doc = App::GetApplication().getActiveDocument(); auto view = new Gui::GraphvizView(*doc); - view->setWindowTitle(qApp->translate("Std_DependencyGraph","Dependency graph")); + view->setWindowTitle(qApp->translate("Std_DependencyGraph","Dependency Graph")); getMainWindow()->addWindow(view); } @@ -607,9 +609,11 @@ StdCmdExportDependencyGraph::StdCmdExportDependencyGraph() : Command("Std_ExportDependencyGraph") { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Export dependency &graph..."); - sToolTipText = QT_TR_NOOP("Export the dependency graph to a file"); - sStatusTip = QT_TR_NOOP("Export the dependency graph to a file"); + sMenuText = QT_TR_NOOP("Export Dependency &Graph"); + + QT_TR_NOOP("Exports the dependency graph as a Graphviz (.gv) file"); + + sStatusTip = sToolTipText; sWhatsThis = "Std_ExportDependencyGraph"; eType = 0; //sPixmap = "Std_ExportDependencyGraph"; @@ -648,10 +652,10 @@ StdCmdNew::StdCmdNew() :Command("Std_New") { sGroup = "File"; - sMenuText = QT_TR_NOOP("&New"); - sToolTipText = QT_TR_NOOP("Create a new empty document"); + sMenuText = QT_TR_NOOP("&New Document"); + sToolTipText = QT_TR_NOOP("Creates a new empty document"); sWhatsThis = "Std_New"; - sStatusTip = QT_TR_NOOP("Create a new empty document"); + sStatusTip = sToolTipText; sPixmap = "document-new"; sAccel = keySequenceToAccel(QKeySequence::New); } @@ -679,9 +683,9 @@ StdCmdSave::StdCmdSave() { sGroup = "File"; sMenuText = QT_TR_NOOP("&Save"); - sToolTipText = QT_TR_NOOP("Save the active document"); + sToolTipText = QT_TR_NOOP("Saves the active document"); sWhatsThis = "Std_Save"; - sStatusTip = QT_TR_NOOP("Save the active document"); + sStatusTip = sToolTipText; sPixmap = "document-save"; sAccel = keySequenceToAccel(QKeySequence::Save); eType = 0; @@ -707,10 +711,10 @@ StdCmdSaveAs::StdCmdSaveAs() :Command("Std_SaveAs") { sGroup = "File"; - sMenuText = QT_TR_NOOP("Save &As..."); - sToolTipText = QT_TR_NOOP("Save the active document under a new file name"); + sMenuText = QT_TR_NOOP("Save &As…"); + sToolTipText = QT_TR_NOOP("Saves the active document under a new file name"); sWhatsThis = "Std_SaveAs"; - sStatusTip = QT_TR_NOOP("Save the active document under a new file name"); + sStatusTip = sToolTipText; sPixmap = "document-save-as"; sAccel = keySequenceToAccel(QKeySequence::SaveAs); eType = 0; @@ -736,10 +740,11 @@ StdCmdSaveCopy::StdCmdSaveCopy() :Command("Std_SaveCopy") { sGroup = "File"; - sMenuText = QT_TR_NOOP("Save a Cop&y..."); - sToolTipText = QT_TR_NOOP("Save a copy of the active document under a new file name"); + sMenuText = QT_TR_NOOP("Save Cop&y"); + + sToolTipText = QT_TR_NOOP("Saves a copy of the active document under a new file name"); sWhatsThis = "Std_SaveCopy"; - sStatusTip = QT_TR_NOOP("Save a copy of the active document under a new file name"); + sStatusTip = sToolTipText; sPixmap = "Std_SaveCopy"; } @@ -764,9 +769,9 @@ StdCmdSaveAll::StdCmdSaveAll() { sGroup = "File"; sMenuText = QT_TR_NOOP("Sa&ve All"); - sToolTipText = QT_TR_NOOP("Save all opened document"); + sToolTipText = QT_TR_NOOP("Saves all open documents"); sWhatsThis = "Std_SaveAll"; - sStatusTip = QT_TR_NOOP("Save all opened document"); + sStatusTip = sToolTipText; sPixmap = "Std_SaveAll"; } @@ -794,7 +799,7 @@ StdCmdRevert::StdCmdRevert() sMenuText = QT_TR_NOOP("Rever&t"); sToolTipText = QT_TR_NOOP("Reverts to the saved version of this file"); sWhatsThis = "Std_Revert"; - sStatusTip = QT_TR_NOOP("Reverts to the saved version of this file"); + sStatusTip = sToolTipText; sPixmap = "Std_Revert"; eType = NoTransaction; } @@ -804,9 +809,9 @@ void StdCmdRevert::activated(int iMsg) Q_UNUSED(iMsg); QMessageBox msgBox(Gui::getMainWindow()); msgBox.setIcon(QMessageBox::Question); - msgBox.setWindowTitle(qApp->translate("Std_Revert","Revert document")); - msgBox.setText(qApp->translate("Std_Revert","This will discard all the changes since last file save.")); - msgBox.setInformativeText(qApp->translate("Std_Revert","Do you want to continue?")); + msgBox.setWindowTitle(qApp->translate("Std_Revert","Revert Document")); + msgBox.setText(qApp->translate("Std_Revert","This will discard all the changes since the last file save.")); + msgBox.setInformativeText(qApp->translate("Std_Revert","Continue?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No); int ret = msgBox.exec(); @@ -830,10 +835,11 @@ StdCmdProjectInfo::StdCmdProjectInfo() { // setting the sGroup = "File"; - sMenuText = QT_TR_NOOP("Doc&ument information..."); - sToolTipText = QT_TR_NOOP("Show details of the currently active document"); + sMenuText = QT_TR_NOOP("Doc&ument Information"); + + sToolTipText = QT_TR_NOOP("Shows information about the active document"); sWhatsThis = "Std_ProjectInfo"; - sStatusTip = QT_TR_NOOP("Show details of the currently active document"); + sStatusTip = sToolTipText; sPixmap = "document-properties"; } @@ -861,9 +867,10 @@ StdCmdProjectUtil::StdCmdProjectUtil() // setting the sGroup = "Tools"; sWhatsThis = "Std_ProjectUtil"; - sMenuText = QT_TR_NOOP("Do&cument utility..."); - sToolTipText = QT_TR_NOOP("Utility to extract or create document files"); - sStatusTip = QT_TR_NOOP("Utility to extract or create document files"); + sMenuText = QT_TR_NOOP("Do&cument Utility"); + + sToolTipText = QT_TR_NOOP("Extracts or creates document files"); + sStatusTip = sToolTipText; sPixmap = "Std_ProjectUtil"; } @@ -888,10 +895,11 @@ StdCmdPrint::StdCmdPrint() :Command("Std_Print") { sGroup = "File"; - sMenuText = QT_TR_NOOP("&Print..."); - sToolTipText = QT_TR_NOOP("Print the document"); + sMenuText = QT_TR_NOOP("&Print"); + + sToolTipText = QT_TR_NOOP("Prints the active document"); sWhatsThis = "Std_Print"; - sStatusTip = QT_TR_NOOP("Print the document"); + sStatusTip = sToolTipText; sPixmap = "document-print"; sAccel = keySequenceToAccel(QKeySequence::Print); eType = 0; @@ -901,7 +909,7 @@ void StdCmdPrint::activated(int iMsg) { Q_UNUSED(iMsg); if (getMainWindow()->activeWindow()) { - getMainWindow()->showMessage(QObject::tr("Printing...")); + getMainWindow()->showMessage(QObject::tr("Printing…")); getMainWindow()->activeWindow()->print(); } } @@ -920,10 +928,11 @@ StdCmdPrintPreview::StdCmdPrintPreview() :Command("Std_PrintPreview") { sGroup = "File"; - sMenuText = QT_TR_NOOP("Print previe&w..."); - sToolTipText = QT_TR_NOOP("Print the document"); + sMenuText = QT_TR_NOOP("Print Previe&w"); + + sToolTipText = QT_TR_NOOP("Previews the active document before printing"); sWhatsThis = "Std_PrintPreview"; - sStatusTip = QT_TR_NOOP("Print preview"); + sStatusTip = sToolTipText; sPixmap = "document-print-preview"; eType = 0; } @@ -950,10 +959,11 @@ StdCmdPrintPdf::StdCmdPrintPdf() :Command("Std_PrintPdf") { sGroup = "File"; - sMenuText = QT_TR_NOOP("Export P&DF..."); - sToolTipText = QT_TR_NOOP("Export the document as PDF"); + sMenuText = QT_TR_NOOP("Export P&DF"); + + sToolTipText = QT_TR_NOOP("Exports the active document as a PDF file"); sWhatsThis = "Std_PrintPdf"; - sStatusTip = QT_TR_NOOP("Export the document as PDF"); + sStatusTip = sToolTipText; sPixmap = "Std_PrintPdf"; eType = 0; } @@ -962,7 +972,7 @@ void StdCmdPrintPdf::activated(int iMsg) { Q_UNUSED(iMsg); if (getMainWindow()->activeWindow()) { - getMainWindow()->showMessage(QObject::tr("Exporting PDF...")); + getMainWindow()->showMessage(QObject::tr("Exporting PDF…")); getMainWindow()->activeWindow()->printPdf(); } } @@ -985,7 +995,7 @@ StdCmdQuit::StdCmdQuit() sMenuText = QT_TR_NOOP("E&xit"); sToolTipText = QT_TR_NOOP("Quits the application"); sWhatsThis = "Std_Quit"; - sStatusTip = QT_TR_NOOP("Quits the application"); + sStatusTip = sToolTipText; sPixmap = "application-exit"; sAccel = keySequenceToAccel(QKeySequence::Quit); eType = NoTransaction; @@ -1009,9 +1019,9 @@ StdCmdUndo::StdCmdUndo() { sGroup = "Edit"; sMenuText = QT_TR_NOOP("&Undo"); - sToolTipText = QT_TR_NOOP("Undo exactly one action"); + sToolTipText = QT_TR_NOOP("Undoes the previous action"); sWhatsThis = "Std_Undo"; - sStatusTip = QT_TR_NOOP("Undo exactly one action"); + sStatusTip = sToolTipText; sPixmap = "edit-undo"; sAccel = keySequenceToAccel(QKeySequence::Undo); eType = ForEdit|NoTransaction; @@ -1055,7 +1065,7 @@ StdCmdRedo::StdCmdRedo() sMenuText = QT_TR_NOOP("&Redo"); sToolTipText = QT_TR_NOOP("Redoes a previously undone action"); sWhatsThis = "Std_Redo"; - sStatusTip = QT_TR_NOOP("Redoes a previously undone action"); + sStatusTip = sToolTipText; sPixmap = "edit-redo"; sAccel = keySequenceToAccel(QKeySequence::Redo); eType = ForEdit|NoTransaction; @@ -1096,9 +1106,9 @@ StdCmdCut::StdCmdCut() { sGroup = "Edit"; sMenuText = QT_TR_NOOP("Cu&t"); - sToolTipText = QT_TR_NOOP("Cut out"); + sToolTipText = QT_TR_NOOP("Removes the selection and copies it to the clipboard"); sWhatsThis = "Std_Cut"; - sStatusTip = QT_TR_NOOP("Cut out"); + sStatusTip = sToolTipText; sPixmap = "edit-cut"; sAccel = keySequenceToAccel(QKeySequence::Cut); } @@ -1124,9 +1134,9 @@ StdCmdCopy::StdCmdCopy() { sGroup = "Edit"; sMenuText = QT_TR_NOOP("&Copy"); - sToolTipText = QT_TR_NOOP("Copy operation"); + sToolTipText = QT_TR_NOOP("Copies the selection to the clipboard"); sWhatsThis = "Std_Copy"; - sStatusTip = QT_TR_NOOP("Copy operation"); + sStatusTip = sToolTipText; sPixmap = "edit-copy"; sAccel = keySequenceToAccel(QKeySequence::Copy); } @@ -1159,9 +1169,9 @@ StdCmdPaste::StdCmdPaste() { sGroup = "Edit"; sMenuText = QT_TR_NOOP("&Paste"); - sToolTipText = QT_TR_NOOP("Paste operation"); + sToolTipText = QT_TR_NOOP("Pastes the contents of the clipboard"); sWhatsThis = "Std_Paste"; - sStatusTip = QT_TR_NOOP("Paste operation"); + sStatusTip = sToolTipText; sPixmap = "edit-paste"; sAccel = keySequenceToAccel(QKeySequence::Paste); } @@ -1198,10 +1208,10 @@ StdCmdDuplicateSelection::StdCmdDuplicateSelection() { sAppModule = "Edit"; sGroup = "Edit"; - sMenuText = QT_TR_NOOP("Duplicate selecti&on"); - sToolTipText = QT_TR_NOOP("Put duplicates of the selected objects to the active document"); + sMenuText = QT_TR_NOOP("Duplicate Selecti&on"); + sToolTipText = QT_TR_NOOP("Duplicates the selected objects to the active document"); sWhatsThis = "Std_DuplicateSelection"; - sStatusTip = QT_TR_NOOP("Put duplicates of the selected objects to the active document"); + sStatusTip = sToolTipText; sPixmap = "Std_DuplicateSelection"; } @@ -1233,7 +1243,7 @@ void StdCmdDuplicateSelection::activated(int iMsg) hasXLink = App::PropertyXLink::hasXLink(sel,&unsaved); if(!unsaved.empty()) { QMessageBox::critical(getMainWindow(), QObject::tr("Unsaved document"), - QObject::tr("The exported object contains external link. Please save the document" + QObject::tr("The exported object contains an external link. Save the document." "at least once before exporting.")); return; } @@ -1253,7 +1263,7 @@ void StdCmdDuplicateSelection::activated(int iMsg) qApp->translate("Std_DuplicateSelection","Object dependencies"), qApp->translate("Std_DuplicateSelection", "To link to external objects, the document must be saved at least once.\n" - "Do you want to save the document now?"), + "Save the document now?"), QMessageBox::Yes,QMessageBox::No); if(ret == QMessageBox::Yes) proceed = Application::Instance->getDocument(doc)->saveAs(); @@ -1287,9 +1297,9 @@ StdCmdSelectAll::StdCmdSelectAll() { sGroup = "Edit"; sMenuText = QT_TR_NOOP("Select &All"); - sToolTipText = QT_TR_NOOP("Select all"); + sToolTipText = QT_TR_NOOP("Selects all objects in the active document"); sWhatsThis = "Std_SelectAll"; - sStatusTip = QT_TR_NOOP("Select all"); + sStatusTip = sToolTipText; sPixmap = "edit-select-all"; //sAccel = "Ctrl+A"; // supersedes shortcuts for text edits } @@ -1320,7 +1330,7 @@ StdCmdDelete::StdCmdDelete() sMenuText = QT_TR_NOOP("&Delete"); sToolTipText = QT_TR_NOOP("Deletes the selected objects"); sWhatsThis = "Std_Delete"; - sStatusTip = QT_TR_NOOP("Deletes the selected objects"); + sStatusTip = sToolTipText; sPixmap = "edit-delete"; sAccel = keySequenceToAccel(QtTools::deleteKeySequence()); eType = ForEdit; @@ -1397,7 +1407,7 @@ void StdCmdDelete::activated(int iMsg) QTextStream bodyMessageStream(&bodyMessage); bodyMessageStream << qApp->translate("Std_Delete", "The following referencing objects might break.\n\n" - "Are you sure you want to continue?\n"); + "Continue?\n"); for (const auto ¤tLabel : affectedLabels) bodyMessageStream << '\n' << currentLabel; if(more) @@ -1465,10 +1475,10 @@ StdCmdRefresh::StdCmdRefresh() : Command("Std_Refresh") { sGroup = "Edit"; - sMenuText = QT_TR_NOOP("Refres&h"); - sToolTipText = QT_TR_NOOP("Recomputes the current active document"); + sMenuText = QT_TR_NOOP("Recompute"); + sToolTipText = QT_TR_NOOP("Recomputes the active document"); sWhatsThis = "Std_Refresh"; - sStatusTip = QT_TR_NOOP("Recomputes the current active document"); + sStatusTip = sToolTipText; sPixmap = "view-refresh"; sAccel = keySequenceToAccel(QKeySequence::Refresh); eType = AlterDoc | Alter3DView | AlterSelection | ForEdit; @@ -1497,8 +1507,8 @@ void StdCmdRefresh::activated([[maybe_unused]] int iMsg) catch (Base::Exception& /*e*/) { auto ret = QMessageBox::warning(getMainWindow(), QObject::tr("Dependency error"), qApp->translate("Std_Refresh", "The document contains dependency cycles.\n" - "Please check the Report View for more details.\n\n" - "Do you still want to proceed?"), + "Check the report view for more details.\n\n" + "Proceed?"), QMessageBox::Yes, QMessageBox::No); if(ret == QMessageBox::No) return; @@ -1520,9 +1530,10 @@ StdCmdTransform::StdCmdTransform() : Command("Std_Transform") { sGroup = "Edit"; - sMenuText = QT_TR_NOOP("Transform..."); - sToolTipText = QT_TR_NOOP("Transform the geometry of selected objects"); - sStatusTip = QT_TR_NOOP("Transform the geometry of selected objects"); + sMenuText = QT_TR_NOOP("Transform"); + + sToolTipText = QT_TR_NOOP("Transforms the selected object"); + sStatusTip = sToolTipText; sWhatsThis = "Std_Transform"; } @@ -1546,9 +1557,11 @@ StdCmdPlacement::StdCmdPlacement() : Command("Std_Placement") { sGroup = "Edit"; - sMenuText = QT_TR_NOOP("P&lacement..."); - sToolTipText = QT_TR_NOOP("Place the selected objects"); - sStatusTip = QT_TR_NOOP("Place the selected objects"); + sMenuText = QT_TR_NOOP("P&lacement"); + + sToolTipText = QT_TR_NOOP("Opens the placement editor to adjust the placement of the selected object"); + + sStatusTip = sToolTipText; sWhatsThis = "Std_Placement"; sPixmap = "Std_Placement"; } @@ -1594,8 +1607,8 @@ StdCmdTransformManip::StdCmdTransformManip() { sGroup = "Edit"; sMenuText = QT_TR_NOOP("Trans&form"); - sToolTipText = QT_TR_NOOP("Transform the selected object in the 3D view"); - sStatusTip = QT_TR_NOOP("Transform the selected object in the 3D view"); + sToolTipText = QT_TR_NOOP("Transforms the selected object in the 3D view"); + sStatusTip = sToolTipText; sWhatsThis = "Std_TransformManip"; sPixmap = "Std_TransformManip"; } @@ -1628,9 +1641,10 @@ StdCmdAlignment::StdCmdAlignment() : Command("Std_Alignment") { sGroup = "Edit"; - sMenuText = QT_TR_NOOP("Ali&gnment..."); - sToolTipText = QT_TR_NOOP("Align the selected objects"); - sStatusTip = QT_TR_NOOP("Align the selected objects"); + sMenuText = QT_TR_NOOP("Ali&gn To…"); + + sToolTipText = QT_TR_NOOP("Aligns the selected objects"); + sStatusTip = sToolTipText; sWhatsThis = "Std_Alignment"; sPixmap = "Std_Alignment"; } @@ -1698,10 +1712,10 @@ StdCmdEdit::StdCmdEdit() : Command("Std_Edit") { sGroup = "Edit"; - sMenuText = QT_TR_NOOP("Toggle &Edit mode"); + sMenuText = QT_TR_NOOP("Toggle &Edit Mode"); sToolTipText = QT_TR_NOOP("Toggles the selected object's edit mode"); sWhatsThis = "Std_Edit"; - sStatusTip = QT_TR_NOOP("Activates or Deactivates the selected object's edit mode"); + sStatusTip = sToolTipText; sAccel = ""; sPixmap = "edit-edit"; eType = ForEdit; @@ -1737,14 +1751,14 @@ DEF_STD_CMD_A(StdCmdProperties) StdCmdProperties::StdCmdProperties() : Command("Std_Properties") { - sGroup = "Edit"; - sMenuText = QT_TR_NOOP("Propert&ies"); - sToolTipText = QT_TR_NOOP("Show the property view, which displays the properties of the selected object."); - sWhatsThis = "Std_Properties"; - sStatusTip = sToolTipText; - sAccel = "Alt+Return"; - sPixmap = "document-properties"; - eType = Alter3DView; + sGroup = "Edit"; + sMenuText = QT_TR_NOOP("Propert&ies"); + sToolTipText = QT_TR_NOOP("Shows the property view, which displays the properties of the selected object."); + sWhatsThis = "Std_Properties"; + sStatusTip = sToolTipText; + sAccel = "Alt+Return"; + sPixmap = "document-properties"; + eType = Alter3DView; } void StdCmdProperties::activated(int iMsg) @@ -1775,10 +1789,10 @@ public: StdCmdExpression() : Command("Std_Expressions") { sGroup = "Edit"; - sMenuText = QT_TR_NOOP("Expression actions"); + sMenuText = QT_TR_NOOP("Expression Actions"); sToolTipText = QT_TR_NOOP("Actions that apply to expressions"); sWhatsThis = "Std_Expressions"; - sStatusTip = QT_TR_NOOP("Actions that apply to expressions"); + sStatusTip = sToolTipText; eType = ForEdit; } @@ -1819,9 +1833,9 @@ protected: pcAction->setDropDownMenu(true); applyCommandData(this->className(), pcAction); - pcActionCopySel = pcAction->addAction(QObject::tr("Copy selected")); - pcActionCopyActive = pcAction->addAction(QObject::tr("Copy active document")); - pcActionCopyAll = pcAction->addAction(QObject::tr("Copy all documents")); + pcActionCopySel = pcAction->addAction(QObject::tr("Copy Selected")); + pcActionCopyActive = pcAction->addAction(QObject::tr("Copy Active Document")); + pcActionCopyAll = pcAction->addAction(QObject::tr("Copy All Documents")); pcActionPaste = pcAction->addAction(QObject::tr("Paste")); return pcAction; @@ -1929,7 +1943,7 @@ protected: if(failed) { QMessageBox::critical(getMainWindow(), QObject::tr("Expression error"), QObject::tr("Failed to parse some of the expressions.\n" - "Please check the Report View for more details.")); + "Check the report view for more details.")); return; } diff --git a/src/Gui/CommandFeat.cpp b/src/Gui/CommandFeat.cpp index 371d430c5e..9685959b80 100644 --- a/src/Gui/CommandFeat.cpp +++ b/src/Gui/CommandFeat.cpp @@ -57,9 +57,9 @@ StdCmdFeatRecompute::StdCmdFeatRecompute() // setting the sGroup = "File"; sMenuText = QT_TR_NOOP("&Recompute"); - sToolTipText = QT_TR_NOOP("Recompute feature or document"); + sToolTipText = QT_TR_NOOP("Recomputes a feature or document"); sWhatsThis = "Std_Recompute"; - sStatusTip = QT_TR_NOOP("Recompute feature or document"); + sStatusTip = sToolTipText; sPixmap = "view-refresh"; sAccel = "Ctrl+R"; } @@ -79,10 +79,10 @@ StdCmdRandomColor::StdCmdRandomColor() :Command("Std_RandomColor") { sGroup = "File"; - sMenuText = QT_TR_NOOP("Random &color"); - sToolTipText = QT_TR_NOOP("Set each selected object to a randomly-selected color"); + sMenuText = QT_TR_NOOP("Random &Color"); + sToolTipText = QT_TR_NOOP("Assigns random diffuse colors for the selected objects"); sWhatsThis = "Std_RandomColor"; - sStatusTip = QT_TR_NOOP("Set each selected object to a randomly-selected color"); + sStatusTip = sToolTipText; sPixmap = "Std_RandomColor"; } @@ -159,7 +159,7 @@ StdCmdToggleFreeze::StdCmdToggleFreeze() : Command("Std_ToggleFreeze") { sGroup = "File"; - sMenuText = QT_TR_NOOP("Toggle freeze"); + sMenuText = QT_TR_NOOP("Toggle Freeze"); static std::string toolTip = std::string("

") + QT_TR_NOOP("Toggles freeze state of the selected objects. A frozen object is not recomputed when its parents change.") + "

"; @@ -221,7 +221,7 @@ StdCmdSendToPythonConsole::StdCmdSendToPythonConsole() sMenuText = QT_TR_NOOP("&Send to Python Console"); sToolTipText = QT_TR_NOOP("Sends the selected object to the Python console"); sWhatsThis = "Std_SendToPythonConsole"; - sStatusTip = QT_TR_NOOP("Sends the selected object to the Python console"); + sStatusTip = sToolTipText; sPixmap = "applications-python"; sAccel = "Ctrl+Shift+P"; } diff --git a/src/Gui/CommandLink.cpp b/src/Gui/CommandLink.cpp index 4eea6d8b81..111609a6f9 100644 --- a/src/Gui/CommandLink.cpp +++ b/src/Gui/CommandLink.cpp @@ -76,8 +76,8 @@ StdCmdLinkMakeGroup::StdCmdLinkMakeGroup() : Command("Std_LinkMakeGroup") { sGroup = "Link"; - sMenuText = QT_TR_NOOP("Make link group"); - sToolTipText = QT_TR_NOOP("Create a group of links"); + sMenuText = QT_TR_NOOP("Link Group"); + sToolTipText = QT_TR_NOOP("Creates a group of links"); sWhatsThis = "Std_LinkMakeGroup"; sStatusTip = sToolTipText; eType = AlterDoc; @@ -96,11 +96,11 @@ Action * StdCmdLinkMakeGroup::createAction() // add the action items QAction* action = nullptr; - action = pcAction->addAction(QObject::tr("Simple group")); + action = pcAction->addAction(QObject::tr("Simple Group")); action->setWhatsThis(QString::fromLatin1(getWhatsThis())); - action = pcAction->addAction(QObject::tr("Group with links")); + action = pcAction->addAction(QObject::tr("Group With Links")); action->setWhatsThis(QString::fromLatin1(getWhatsThis())); - action = pcAction->addAction(QObject::tr("Group with transform links")); + action = pcAction->addAction(QObject::tr("Group With Transform Links")); action->setWhatsThis(QString::fromLatin1(getWhatsThis())); return pcAction; } @@ -113,9 +113,9 @@ void StdCmdLinkMakeGroup::languageChange() return; auto pcAction = qobject_cast(_pcAction); QList acts = pcAction->actions(); - acts[0]->setText(QObject::tr("Simple group")); - acts[1]->setText(QObject::tr("Group with links")); - acts[2]->setText(QObject::tr("Group with transform links")); + acts[0]->setText(QObject::tr("Simple Group")); + acts[1]->setText(QObject::tr("Group With Links")); + acts[2]->setText(QObject::tr("Group With Transform Links")); } @@ -207,9 +207,9 @@ StdCmdLinkMake::StdCmdLinkMake() : Command("Std_LinkMake") { sGroup = "Link"; - sMenuText = QT_TR_NOOP("Make link"); - sToolTipText = QT_TR_NOOP("A Link is an object that references or links to another object in the same document, " - "or in another document. Unlike Clones, Links reference the original Shape directly, " + sMenuText = QT_TR_NOOP("Make Link"); + sToolTipText = QT_TR_NOOP("A link is an object that references another object, either within the same " + "or in another document. Unlike clones, links reference the original shape directly, " "making them more memory-efficient, which helps with the creation of complex assemblies."); sWhatsThis = "Std_LinkMake"; sStatusTip = sToolTipText; @@ -272,8 +272,8 @@ StdCmdLinkMakeRelative::StdCmdLinkMakeRelative() : Command("Std_LinkMakeRelative") { sGroup = "Link"; - sMenuText = QT_TR_NOOP("Make sub-link"); - sToolTipText = QT_TR_NOOP("Create a sub-object or sub-element link"); + sMenuText = QT_TR_NOOP("Make Sub-Link"); + sToolTipText = QT_TR_NOOP("Creates a sub-object or sub-element link"); sWhatsThis = "Std_LinkMakeRelative"; sStatusTip = sToolTipText; eType = AlterDoc; @@ -493,8 +493,8 @@ StdCmdLinkReplace::StdCmdLinkReplace() : Command("Std_LinkReplace") { sGroup = "Link"; - sMenuText = QT_TR_NOOP("Replace with link"); - sToolTipText = QT_TR_NOOP("Replace the selected object(s) with link"); + sMenuText = QT_TR_NOOP("Replace With Link"); + sToolTipText = QT_TR_NOOP("Replaces the selected objects with links"); sWhatsThis = "Std_LinkReplace"; sStatusTip = sToolTipText; eType = AlterDoc; @@ -518,7 +518,7 @@ StdCmdLinkUnlink::StdCmdLinkUnlink() { sGroup = "Link"; sMenuText = QT_TR_NOOP("Unlink"); - sToolTipText = QT_TR_NOOP("Strip on level of link"); + sToolTipText = QT_TR_NOOP("Unlinks the object by placing it directly in the container"); sWhatsThis = "Std_LinkUnlink"; sStatusTip = sToolTipText; eType = AlterDoc; @@ -541,8 +541,8 @@ StdCmdLinkImport::StdCmdLinkImport() : Command("Std_LinkImport") { sGroup = "Link"; - sMenuText = QT_TR_NOOP("Import links"); - sToolTipText = QT_TR_NOOP("Import selected external link(s)"); + sMenuText = QT_TR_NOOP("Import Links"); + sToolTipText = QT_TR_NOOP("Imports selected external links"); sWhatsThis = "Std_LinkImport"; sStatusTip = sToolTipText; eType = AlterDoc; @@ -605,8 +605,8 @@ StdCmdLinkImportAll::StdCmdLinkImportAll() : Command("Std_LinkImportAll") { sGroup = "Link"; - sMenuText = QT_TR_NOOP("Import all links"); - sToolTipText = QT_TR_NOOP("Import all links of the active document"); + sMenuText = QT_TR_NOOP("Import All Links"); + sToolTipText = QT_TR_NOOP("Imports all links of the active document"); sWhatsThis = "Std_LinkImportAll"; sStatusTip = sToolTipText; eType = AlterDoc; @@ -646,8 +646,8 @@ StdCmdLinkSelectLinked::StdCmdLinkSelectLinked() : Command("Std_LinkSelectLinked") { sGroup = "Link"; - sMenuText = QT_TR_NOOP("&Go to linked object"); - sToolTipText = QT_TR_NOOP("Select the linked object and switch to its owner document"); + sMenuText = QT_TR_NOOP("&Go to Linked Object"); + sToolTipText = QT_TR_NOOP("Selects the linked object and switches to its original document"); sWhatsThis = "Std_LinkSelectLinked"; sStatusTip = sToolTipText; eType = AlterSelection; @@ -774,8 +774,8 @@ StdCmdLinkSelectLinkedFinal::StdCmdLinkSelectLinkedFinal() : Command("Std_LinkSelectLinkedFinal") { sGroup = "Link"; - sMenuText = QT_TR_NOOP("Go to the &deepest linked object"); - sToolTipText = QT_TR_NOOP("Select the deepest linked object and switch to its owner document"); + sMenuText = QT_TR_NOOP("Go to &Deepest Linked Object"); + sToolTipText = QT_TR_NOOP("Selects the deepest linked object and switches to its original document"); sWhatsThis = "Std_LinkSelectLinkedFinal"; sStatusTip = sToolTipText; eType = AlterSelection; @@ -809,8 +809,8 @@ StdCmdLinkSelectAllLinks::StdCmdLinkSelectAllLinks() : Command("Std_LinkSelectAllLinks") { sGroup = "Link"; - sMenuText = QT_TR_NOOP("Select &all links"); - sToolTipText = QT_TR_NOOP("Select all links to the current selected object"); + sMenuText = QT_TR_NOOP("Select &All Links"); + sToolTipText = QT_TR_NOOP("Selects all links to the current selected object"); sWhatsThis = "Std_LinkSelectAllLinks"; sStatusTip = sToolTipText; eType = AlterSelection; @@ -849,10 +849,10 @@ public: : GroupCommand("Std_LinkSelectActions") { sGroup = "View"; - sMenuText = QT_TR_NOOP("&Link navigation"); + sMenuText = QT_TR_NOOP("&Link Navigation"); sToolTipText = QT_TR_NOOP("Link navigation actions"); sWhatsThis = "Std_LinkSelectActions"; - sStatusTip = QT_TR_NOOP("Link navigation actions"); + sStatusTip = sToolTipText; eType = AlterSelection; bCanLog = false; @@ -875,10 +875,10 @@ public: : GroupCommand("Std_LinkActions") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Link actions"); - sToolTipText = QT_TR_NOOP("Actions that apply to link objects"); + sMenuText = QT_TR_NOOP("Link Actions"); + sToolTipText = QT_TR_NOOP("Commands that operate on link objects"); sWhatsThis = "Std_LinkActions"; - sStatusTip = QT_TR_NOOP("Actions that apply to link objects"); + sStatusTip = sToolTipText; eType = AlterDoc; bCanLog = false; diff --git a/src/Gui/CommandMacro.cpp b/src/Gui/CommandMacro.cpp index 78defd427a..622817c922 100644 --- a/src/Gui/CommandMacro.cpp +++ b/src/Gui/CommandMacro.cpp @@ -50,10 +50,11 @@ StdCmdDlgMacroRecord::StdCmdDlgMacroRecord() : Command("Std_DlgMacroRecord") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("&Macro recording..."); + sMenuText = QT_TR_NOOP("Record &Macro"); + sToolTipText = QT_TR_NOOP("Opens a dialog to record a macro"); sWhatsThis = "Std_DlgMacroRecord"; - sStatusTip = QT_TR_NOOP("Opens a dialog to record a macro"); + sStatusTip = sToolTipText; sPixmap = "media-record"; eType = 0; } @@ -93,10 +94,11 @@ StdCmdDlgMacroExecute::StdCmdDlgMacroExecute() : Command("Std_DlgMacroExecute") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("Ma&cros..."); - sToolTipText = QT_TR_NOOP("Opens a dialog to let you execute a recorded macro"); + sMenuText = QT_TR_NOOP("Ma&cros"); + + sToolTipText = QT_TR_NOOP("Opens a dialog to execute a recorded macro"); sWhatsThis = "Std_DlgMacroExecute"; - sStatusTip = QT_TR_NOOP("Opens a dialog to let you execute a recorded macro"); + sStatusTip = sToolTipText; sPixmap = "accessories-text-editor"; eType = 0; } @@ -122,10 +124,10 @@ StdCmdDlgMacroExecuteDirect::StdCmdDlgMacroExecuteDirect() : Command("Std_DlgMacroExecuteDirect") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("&Execute macro"); - sToolTipText = QT_TR_NOOP("Execute the macro in the editor"); + sMenuText = QT_TR_NOOP("&Execute Macro"); + sToolTipText = QT_TR_NOOP("Executes the macro in the editor"); sWhatsThis = "Std_DlgMacroExecuteDirect"; - sStatusTip = QT_TR_NOOP("Execute the macro in the editor"); + sStatusTip = sToolTipText; sPixmap = "media-playback-start"; sAccel = "Ctrl+F6"; eType = 0; @@ -148,10 +150,11 @@ StdCmdMacroAttachDebugger::StdCmdMacroAttachDebugger() : Command("Std_MacroAttachDebugger") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("&Attach to remote debugger..."); - sToolTipText = QT_TR_NOOP("Attach to a remotely running debugger"); + sMenuText = QT_TR_NOOP("&Attach to Remote Debugger"); + + sToolTipText = QT_TR_NOOP("Attaches to a remotely running debugger"); sWhatsThis = "Std_MacroAttachDebugger"; - sStatusTip = QT_TR_NOOP("Attach to a remotely running debugger"); + sStatusTip = sToolTipText; eType = 0; } @@ -173,10 +176,10 @@ StdCmdMacroStartDebug::StdCmdMacroStartDebug() : Command("Std_MacroStartDebug") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("&Debug macro"); - sToolTipText = QT_TR_NOOP("Start debugging of macro"); + sMenuText = QT_TR_NOOP("&Debug Macro"); + sToolTipText = QT_TR_NOOP("Starts the debugging of macros"); sWhatsThis = "Std_MacroStartDebug"; - sStatusTip = QT_TR_NOOP("Start debugging of macro"); + sStatusTip = sToolTipText; sPixmap = "debug-start"; sAccel = "F6"; eType = 0; @@ -203,10 +206,10 @@ StdCmdMacroStopDebug::StdCmdMacroStopDebug() : Command("Std_MacroStopDebug") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("&Stop debugging"); - sToolTipText = QT_TR_NOOP("Stop debugging of macro"); + sMenuText = QT_TR_NOOP("&Stop Debugging"); + sToolTipText = QT_TR_NOOP("Stops the debugging of macros"); sWhatsThis = "Std_MacroStopDebug"; - sStatusTip = QT_TR_NOOP("Stop debugging of macro"); + sStatusTip = sToolTipText; sPixmap = "debug-stop"; sAccel = "Shift+F6"; eType = 0; @@ -230,10 +233,10 @@ StdCmdMacroStepOver::StdCmdMacroStepOver() : Command("Std_MacroStepOver") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("Step &over"); - sToolTipText = QT_TR_NOOP("Step to the next line in this file"); + sMenuText = QT_TR_NOOP("Step &Over"); + sToolTipText = QT_TR_NOOP("Steps to the next line in this file"); sWhatsThis = "Std_MacroStepOver"; - sStatusTip = QT_TR_NOOP("Step to the next line in this file"); + sStatusTip = sToolTipText; sPixmap = nullptr; sAccel = "F10"; eType = 0; @@ -257,10 +260,10 @@ StdCmdMacroStepInto::StdCmdMacroStepInto() : Command("Std_MacroStepInto") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("Step &into"); - sToolTipText = QT_TR_NOOP("Step to the next line executed"); + sMenuText = QT_TR_NOOP("Step &Into"); + sToolTipText = QT_TR_NOOP("Steps to the next line executed"); sWhatsThis = "Std_MacroStepInto"; - sStatusTip = QT_TR_NOOP("Step to the next line executed"); + sStatusTip = sToolTipText; sPixmap = nullptr; sAccel = "F11"; eType = 0; @@ -284,10 +287,10 @@ StdCmdToggleBreakpoint::StdCmdToggleBreakpoint() : Command("Std_ToggleBreakpoint") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("Toggle &breakpoint"); - sToolTipText = QT_TR_NOOP("Add or remove a breakpoint at this position"); + sMenuText = QT_TR_NOOP("Toggle &Breakpoint"); + sToolTipText = QT_TR_NOOP("Adds or removes a breakpoint at this position"); sWhatsThis = "Std_ToggleBreakpoint"; - sStatusTip = QT_TR_NOOP("Add or remove a breakpoint at this position"); + sStatusTip = sToolTipText; sPixmap = nullptr; sAccel = "F9"; eType = 0; @@ -310,10 +313,10 @@ StdCmdMacrosFolder::StdCmdMacrosFolder() : Command("Std_OpenMacrosFolder") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("Open macros containing folder"); - sToolTipText = QT_TR_NOOP("Open macros containing folder by default system file manager"); + sMenuText = QT_TR_NOOP("Open Macro Folder"); + sToolTipText = QT_TR_NOOP("Opens the macros folder in the system file manager"); sWhatsThis = "Std_OpenMacrosFolder"; - sStatusTip = QT_TR_NOOP("Open macros containing folder by default system file manager"); + sStatusTip = sToolTipText; sPixmap = "MacroFolder"; sAccel = ""; eType = 0; diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index cc93595e84..d3a9ca5c1c 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -73,9 +73,9 @@ StdCmdWorkbench::StdCmdWorkbench() { sGroup = "View"; sMenuText = QT_TR_NOOP("&Workbench"); - sToolTipText = QT_TR_NOOP("Switch between workbenches"); + sToolTipText = QT_TR_NOOP("Switches between workbenches"); sWhatsThis = "Std_Workbench"; - sStatusTip = QT_TR_NOOP("Switch between workbenches"); + sStatusTip = sToolTipText; sPixmap = "freecad"; eType = 0; } @@ -138,9 +138,9 @@ StdCmdRecentFiles::StdCmdRecentFiles() { sGroup = "File"; sMenuText = QT_TR_NOOP("Open &Recent"); - sToolTipText = QT_TR_NOOP("Recent file list"); + sToolTipText = QT_TR_NOOP("Displays the list of recently opened files"); sWhatsThis = "Std_RecentFiles"; - sStatusTip = QT_TR_NOOP("Recent file list"); + sStatusTip = sToolTipText; sPixmap = "Std_RecentFiles"; eType = NoTransaction; } @@ -178,10 +178,10 @@ StdCmdRecentMacros::StdCmdRecentMacros() :Command("Std_RecentMacros") { sGroup = "Macro"; - sMenuText = QT_TR_NOOP("&Recent macros"); - sToolTipText = QT_TR_NOOP("Recent macro list"); + sMenuText = QT_TR_NOOP("&Recent Macros"); + sToolTipText = QT_TR_NOOP("Displays the list of recently used macros"); sWhatsThis = "Std_RecentMacros"; - sStatusTip = QT_TR_NOOP("Recent macro list"); + sStatusTip = sToolTipText; sPixmap = "Std_RecentMacros"; eType = NoTransaction; } @@ -220,7 +220,7 @@ StdCmdAbout::StdCmdAbout() { sGroup = "Help"; sMenuText = QT_TR_NOOP("&About %1"); - sToolTipText = QT_TR_NOOP("Displays important information About %1"); + sToolTipText = QT_TR_NOOP("Displays information about %1"); sWhatsThis = "Std_About"; sStatusTip = sToolTipText; eType = 0; @@ -286,9 +286,9 @@ StdCmdAboutQt::StdCmdAboutQt() { sGroup = "Help"; sMenuText = QT_TR_NOOP("About &Qt"); - sToolTipText = QT_TR_NOOP("About Qt"); + sToolTipText = QT_TR_NOOP("Displays information about Qt"); sWhatsThis = "Std_AboutQt"; - sStatusTip = QT_TR_NOOP("About Qt"); + sStatusTip = sToolTipText; eType = 0; } @@ -308,7 +308,7 @@ StdCmdWhatsThis::StdCmdWhatsThis() { sGroup = "Help"; sMenuText = QT_TR_NOOP("&What's This?"); - sToolTipText = QT_TR_NOOP("Opens the documentation corresponding to the selection"); + sToolTipText = QT_TR_NOOP("Opens the documentation for the selected command"); sWhatsThis = "Std_WhatsThis"; sStatusTip = sToolTipText; sAccel = keySequenceToAccel(QKeySequence::WhatsThis); @@ -345,9 +345,9 @@ void StdCmdRestartInSafeMode::activated(int iMsg) QMessageBox restartBox(Gui::getMainWindow()); restartBox.setIcon(QMessageBox::Warning); - restartBox.setWindowTitle(QObject::tr("Restart in safe mode")); - restartBox.setText(QObject::tr("Are you sure you want to restart FreeCAD and enter safe mode?")); - restartBox.setInformativeText(QObject::tr("Safe mode temporarily disables your configuration and addons.")); + restartBox.setWindowTitle(QObject::tr("Restart in Safe Mode")); + restartBox.setText(QObject::tr("Restart FreeCAD and enter safe mode?")); + restartBox.setInformativeText(QObject::tr("Safe mode temporarily disables the configuration and addons.")); restartBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); restartBox.setDefaultButton(QMessageBox::No); @@ -378,10 +378,11 @@ StdCmdDlgParameter::StdCmdDlgParameter() :Command("Std_DlgParameter") { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("E&dit parameters..."); + sMenuText = QT_TR_NOOP("E&dit Parameters"); + sToolTipText = QT_TR_NOOP("Opens a dialog to edit the parameters"); sWhatsThis = "Std_DlgParameter"; - sStatusTip = QT_TR_NOOP("Opens a dialog to edit the parameters"); + sStatusTip = sToolTipText; sPixmap = "Std_DlgParameter"; eType = 0; } @@ -403,10 +404,11 @@ StdCmdDlgPreferences::StdCmdDlgPreferences() :Command("Std_DlgPreferences") { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Prefere&nces ..."); + sMenuText = QT_TR_NOOP("Prefere&nces"); + sToolTipText = QT_TR_NOOP("Opens a dialog to edit the preferences"); sWhatsThis = "Std_DlgPreferences"; - sStatusTip = QT_TR_NOOP("Opens a dialog to edit the preferences"); + sStatusTip = sToolTipText; sPixmap = "preferences-system"; eType = 0; sAccel = "Ctrl+,"; @@ -447,10 +449,10 @@ StdCmdDlgCustomize::StdCmdDlgCustomize() :Command("Std_DlgCustomize") { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Cu&stomize..."); - sToolTipText = QT_TR_NOOP("Customize toolbars and command bars"); + sMenuText = QT_TR_NOOP("Cu&stomize…"); + sToolTipText = QT_TR_NOOP("Opens a dialog to edit toolbars, shortcuts, and macros"); sWhatsThis = "Std_DlgCustomize"; - sStatusTip = QT_TR_NOOP("Customize toolbars and command bars"); + sStatusTip = sToolTipText; sPixmap = "applications-accessories"; eType = 0; } @@ -474,10 +476,11 @@ StdCmdCommandLine::StdCmdCommandLine() :Command("Std_CommandLine") { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Start command &line..."); - sToolTipText = QT_TR_NOOP("Opens the command line in the console"); + sMenuText = QT_TR_NOOP("Command &Line"); + + sToolTipText = QT_TR_NOOP("Opens a command line interface in the console"); sWhatsThis = "Std_CommandLine"; - sStatusTip = QT_TR_NOOP("Opens the command line in the console"); + sStatusTip = sToolTipText; sPixmap = "utilities-terminal"; eType = 0; } @@ -720,7 +723,7 @@ StdCmdReportBug::StdCmdReportBug() { sGroup = "Help"; sMenuText = QT_TR_NOOP("Report an &Issue"); - sToolTipText = QT_TR_NOOP("Report an issue or suggest a new feature"); + sToolTipText = QT_TR_NOOP("Opens the bugtracker to report an issue"); sWhatsThis = "Std_ReportBug"; sStatusTip = sToolTipText; sPixmap = "internet-web-browser"; @@ -746,10 +749,10 @@ StdCmdTextDocument::StdCmdTextDocument() :Command("Std_TextDocument") { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Add te&xt document"); - sToolTipText = QT_TR_NOOP("Add text document to active document"); + sMenuText = QT_TR_NOOP("Te&xt Document"); + sToolTipText = QT_TR_NOOP("Adds a text document to the active document"); sWhatsThis = "Std_TextDocument"; - sStatusTip = QT_TR_NOOP("Add text document to active document"); + sStatusTip = sToolTipText; sPixmap = "TextDocument"; eType = 0; } @@ -779,10 +782,11 @@ StdCmdUnitsCalculator::StdCmdUnitsCalculator() : Command("Std_UnitsCalculator") { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("&Units converter..."); - sToolTipText = QT_TR_NOOP("Start the units converter"); + sMenuText = QT_TR_NOOP("&Units Converter"); + + sToolTipText = QT_TR_NOOP("Starts the units converter"); sWhatsThis = "Std_UnitsCalculator"; - sStatusTip = QT_TR_NOOP("Start the units converter"); + sStatusTip = sToolTipText; sPixmap = "accessories-calculator"; eType = 0; } @@ -815,9 +819,9 @@ StdCmdUserEditMode::StdCmdUserEditMode() : Command("Std_UserEditMode") { sGroup = "Edit"; - sMenuText = QT_TR_NOOP("Edit &mode"); - sToolTipText = QT_TR_NOOP("Defines behavior when editing an object from tree"); - sStatusTip = QT_TR_NOOP("Defines behavior when editing an object from tree"); + sMenuText = QT_TR_NOOP("Edit &Mode"); + sToolTipText = QT_TR_NOOP("Defines behavior when editing an object from the tree view"); + sStatusTip = sToolTipText; sWhatsThis = "Std_UserEditMode"; sPixmap = "Std_UserEditModeDefault"; eType = ForEdit; @@ -907,10 +911,10 @@ StdCmdReloadStyleSheet::StdCmdReloadStyleSheet() : Command("Std_ReloadStyleSheet") { sGroup = "View"; - sMenuText = QT_TR_NOOP("&Reload stylesheet"); + sMenuText = QT_TR_NOOP("&Reload Stylesheet"); sToolTipText = QT_TR_NOOP("Reloads the current stylesheet"); sWhatsThis = "Std_ReloadStyleSheet"; - sStatusTip = QT_TR_NOOP("Reloads the current stylesheet"); + sStatusTip = sToolTipText; sPixmap = "view-refresh"; sWhatsThis = "Std_ReloadStyleSheet"; } diff --git a/src/Gui/CommandStructure.cpp b/src/Gui/CommandStructure.cpp index 1fd797e675..e16fe3421c 100644 --- a/src/Gui/CommandStructure.cpp +++ b/src/Gui/CommandStructure.cpp @@ -49,10 +49,10 @@ StdCmdPart::StdCmdPart() : Command("Std_Part") { sGroup = "Structure"; - sMenuText = QT_TR_NOOP("Create part"); - sToolTipText = QT_TR_NOOP("A Part is a general purpose container to keep together a group of objects so that they " - "act as a unit in the 3D view. It is meant to arrange objects that have a Part " - "TopoShape, like Part Primitives, PartDesign Bodies, and other Parts."); + sMenuText = QT_TR_NOOP("New Part"); + sToolTipText = QT_TR_NOOP("Creates a part, which is a general-purpose container to group objects so they " + "act as a unit in the 3D view. It is intended to arrange objects that have a part " + "TopoShape, like part primitives, Part Design bodies, and other parts."); sWhatsThis = "Std_Part"; sStatusTip = sToolTipText; sPixmap = "Geofeaturegroup"; @@ -104,9 +104,9 @@ StdCmdGroup::StdCmdGroup() : Command("Std_Group") { sGroup = "Structure"; - sMenuText = QT_TR_NOOP("Create group"); - sToolTipText = QT_TR_NOOP("A Group is a general purpose container to group objects in the " - "Tree view, regardless of their data type. It is a simple folder to organize " + sMenuText = QT_TR_NOOP("New Group"); + sToolTipText = QT_TR_NOOP("Creates a group, which is a general-purpose container to group objects in the " + "tree view, regardless of their data type. It is a simple folder to organize " "the objects in a model."); sWhatsThis = "Std_Group"; sStatusTip = sToolTipText; @@ -166,9 +166,8 @@ StdCmdVarSet::StdCmdVarSet() : Command("Std_VarSet") { sGroup = "Structure"; - sMenuText = QT_TR_NOOP("Create a variable set"); - sToolTipText = QT_TR_NOOP("A Variable Set is an object that maintains a set of properties to be used as " - "variables."); + sMenuText = QT_TR_NOOP("Variable Set"); + sToolTipText = QT_TR_NOOP("Creates a variable set, which is an object that maintains a set of properties to be used as variables"); sWhatsThis = "Std_VarSet"; sStatusTip = sToolTipText; sPixmap = "VarSet"; diff --git a/src/Gui/CommandTest.cpp b/src/Gui/CommandTest.cpp index 1828080a13..ab789e7448 100644 --- a/src/Gui/CommandTest.cpp +++ b/src/Gui/CommandTest.cpp @@ -60,8 +60,9 @@ Std_TestQM::Std_TestQM() : Command("Std_TestQM") { sGroup = "Standard-Test"; - sMenuText = "Test translation files..."; - sToolTipText = "Test function to check .qm translation files"; + sMenuText = "Test Translation Files"; + + sToolTipText = "Runs a test to verify .qm translation files"; sWhatsThis = "Std_TestQM"; sStatusTip = sToolTipText; } @@ -98,8 +99,8 @@ Std_TestReloadQM::Std_TestReloadQM() : Command("Std_TestReloadQM") { sGroup = "Standard-Test"; - sMenuText = "Reload translation files"; - sToolTipText = "Test function to check .qm translation files"; + sMenuText = "Reload Translation Files"; + sToolTipText = "Reloads the translation files"; sWhatsThis = "Std_TestReloadQM"; sStatusTip = sToolTipText; } @@ -294,7 +295,7 @@ CmdTestCmdFuncs::CmdTestCmdFuncs() : Command("Std_TestCmdFuncs") { sGroup = "Standard-Test"; - sMenuText = "Test functions"; + sMenuText = "Test Functions"; sToolTipText = "Test functions"; sWhatsThis = "Std_TestCmdFuncs"; sStatusTip = sToolTipText; @@ -344,7 +345,7 @@ CmdTestProgress1::CmdTestProgress1() : Command("Std_TestProgress1") { sGroup = "Standard-Test"; - sMenuText = "Breakable bar"; + sMenuText = "Breakable Bar"; sToolTipText = "Test a breakable progress bar"; sWhatsThis = "Std_TestProgress1"; sStatusTip = sToolTipText; @@ -386,7 +387,7 @@ CmdTestProgress2::CmdTestProgress2() : Command("Std_TestProgress2") { sGroup = "Standard-Test"; - sMenuText = "Unbreakable bar"; + sMenuText = "Unbreakable Bar"; sToolTipText = "Test a unbreakable progress bar"; sWhatsThis = "Std_TestProgress2"; sStatusTip = sToolTipText; @@ -429,7 +430,7 @@ CmdTestProgress3::CmdTestProgress3() : Command("Std_TestProgress3") { sGroup = "Standard-Test"; - sMenuText = "Nested progress bar"; + sMenuText = "Nested Progress Bar"; sToolTipText = "Test nested progress bar"; sWhatsThis = "Std_TestProgress3"; sStatusTip = sToolTipText; @@ -499,7 +500,7 @@ CmdTestProgress4::CmdTestProgress4() : Command("Std_TestProgress4") { sGroup = "Standard-Test"; - sMenuText = "Mixed nested bar"; + sMenuText = "Mixed Nested Bar"; sToolTipText = "Test a mixed up nested progress bar"; sWhatsThis = "Std_TestProgress4"; sStatusTip = sToolTipText; @@ -554,7 +555,7 @@ CmdTestProgress5::CmdTestProgress5() : Command("Std_TestProgress5") { sGroup = "Standard-Test"; - sMenuText = "From thread"; + sMenuText = "From Thread"; sToolTipText = "Test a progress bar from a thread"; sWhatsThis = "Std_TestProgress5"; sStatusTip = sToolTipText; @@ -712,9 +713,9 @@ CmdTestConsoleOutput::CmdTestConsoleOutput() : Command("Std_TestConsoleOutput") { sGroup = "Standard-Test"; - sMenuText = QT_TR_NOOP("Test console output"); + sMenuText = QT_TR_NOOP("Test Console Output"); sToolTipText= QT_TR_NOOP("Run test cases to verify console messages"); - sStatusTip = QT_TR_NOOP("Run test cases to verify console messages"); + sStatusTip = sToolTipText; } namespace Gui { diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 30dfdb0911..414d793034 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -129,10 +129,10 @@ StdOrthographicCamera::StdOrthographicCamera() : Command("Std_OrthographicCamera") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Orthographic view"); + sMenuText = QT_TR_NOOP("Orthographic View"); sToolTipText = QT_TR_NOOP("Switches to orthographic view mode"); sWhatsThis = "Std_OrthographicCamera"; - sStatusTip = QT_TR_NOOP("Switches to orthographic view mode"); + sStatusTip = sToolTipText; sPixmap = "view-isometric"; sAccel = "V, O"; eType = Alter3DView; @@ -179,10 +179,10 @@ StdPerspectiveCamera::StdPerspectiveCamera() : Command("Std_PerspectiveCamera") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Perspective view"); + sMenuText = QT_TR_NOOP("Perspective View"); sToolTipText = QT_TR_NOOP("Switches to perspective view mode"); sWhatsThis = "Std_PerspectiveCamera"; - sStatusTip = QT_TR_NOOP("Switches to perspective view mode"); + sStatusTip = sToolTipText; sPixmap = "view-perspective"; sAccel = "V, P"; eType = Alter3DView; @@ -239,9 +239,9 @@ StdCmdViewSaveCamera::StdCmdViewSaveCamera() : Command("Std_ViewSaveCamera") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Save current camera"); - sToolTipText = QT_TR_NOOP("Save current camera settings"); - sStatusTip = QT_TR_NOOP("Save current camera settings"); + sMenuText = QT_TR_NOOP("Save Current Camera"); + sToolTipText = QT_TR_NOOP("Saves the current camera settings"); + sStatusTip = sToolTipText; sWhatsThis = "Std_ViewSaveCamera"; eType = Alter3DView; } @@ -265,9 +265,9 @@ StdCmdViewRestoreCamera::StdCmdViewRestoreCamera() : Command("Std_ViewRestoreCamera") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Restore saved camera"); - sToolTipText = QT_TR_NOOP("Restore saved camera settings"); - sStatusTip = QT_TR_NOOP("Restore saved camera settings"); + sMenuText = QT_TR_NOOP("Restore Saved Camera"); + sToolTipText = QT_TR_NOOP("Restores the saved camera settings"); + sStatusTip = sToolTipText; sWhatsThis = "Std_ViewRestoreCamera"; eType = Alter3DView; } @@ -320,10 +320,10 @@ StdCmdFreezeViews::StdCmdFreezeViews() : Command("Std_FreezeViews") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("F&reeze display"); + sMenuText = QT_TR_NOOP("F&reeze Display"); sToolTipText = QT_TR_NOOP("Freezes the current view position"); sWhatsThis = "Std_FreezeViews"; - sStatusTip = QT_TR_NOOP("Freezes the current view position"); + sStatusTip = sToolTipText; sAccel = "Shift+F"; eType = Alter3DView; } @@ -335,15 +335,15 @@ Action * StdCmdFreezeViews::createAction() applyCommandData(this->className(), pcAction); // add the action items - saveView = pcAction->addAction(QObject::tr("&Save views...")); + saveView = pcAction->addAction(QObject::tr("&Save Views…")); saveView->setWhatsThis(QString::fromLatin1(getWhatsThis())); - QAction* loadView = pcAction->addAction(QObject::tr("&Load views...")); + QAction* loadView = pcAction->addAction(QObject::tr("&Load Views…")); loadView->setWhatsThis(QString::fromLatin1(getWhatsThis())); pcAction->addAction(QStringLiteral(""))->setSeparator(true); - freezeView = pcAction->addAction(QObject::tr("F&reeze view")); + freezeView = pcAction->addAction(QObject::tr("F&reeze View")); freezeView->setShortcut(QString::fromLatin1(getAccel())); freezeView->setWhatsThis(QString::fromLatin1(getWhatsThis())); - clearView = pcAction->addAction(QObject::tr("&Clear views")); + clearView = pcAction->addAction(QObject::tr("&Clear Views")); clearView->setWhatsThis(QString::fromLatin1(getWhatsThis())); separator = pcAction->addAction(QStringLiteral("")); separator->setSeparator(true); @@ -461,7 +461,7 @@ void StdCmdFreezeViews::onRestoreViews() if (savedViews > 0) { auto ret = QMessageBox::question(getMainWindow(), QObject::tr("Restore views"), QObject::tr("Importing the restored views would clear the already stored views.\n" - "Do you want to continue?"), QMessageBox::Yes | QMessageBox::No, + "Continue?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); if (ret != QMessageBox::Yes) return; @@ -568,14 +568,14 @@ void StdCmdFreezeViews::languageChange() return; auto pcAction = qobject_cast(_pcAction); QList acts = pcAction->actions(); - acts[0]->setText(QObject::tr("&Save views...")); - acts[1]->setText(QObject::tr("&Load views...")); - acts[3]->setText(QObject::tr("F&reeze view")); - acts[4]->setText(QObject::tr("&Clear views")); + acts[0]->setText(QObject::tr("&Save Views…")); + acts[1]->setText(QObject::tr("&Load Views…")); + acts[3]->setText(QObject::tr("F&reeze View")); + acts[4]->setText(QObject::tr("&Clear Views")); int index=1; for (QList::Iterator it = acts.begin()+5; it != acts.end(); ++it, index++) { if ((*it)->isVisible()) { - QString viewnr = QString(QObject::tr("Restore view &%1")).arg(index); + QString viewnr = QString(QObject::tr("Restore View &%1")).arg(index); (*it)->setText(viewnr); } } @@ -592,10 +592,10 @@ StdCmdToggleClipPlane::StdCmdToggleClipPlane() : Command("Std_ToggleClipPlane") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Clippin&g plane"); - sToolTipText = QT_TR_NOOP("Toggles clipping plane for active view"); + sMenuText = QT_TR_NOOP("Clippin&g View"); + sToolTipText = QT_TR_NOOP("Toggles clipping of the active view"); sWhatsThis = "Std_ToggleClipPlane"; - sStatusTip = QT_TR_NOOP("Toggles clipping plane for active view"); + sStatusTip = sToolTipText; sPixmap = "Std_ToggleClipPlane"; eType = Alter3DView; } @@ -645,9 +645,9 @@ StdCmdDrawStyle::StdCmdDrawStyle() : Command("Std_DrawStyle") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Draw style"); - sToolTipText = QT_TR_NOOP("Change the draw style of the objects"); - sStatusTip = QT_TR_NOOP("Change the draw style of the objects"); + sMenuText = QT_TR_NOOP("&Draw Style"); + sToolTipText = QT_TR_NOOP("Changes the draw style of the objects"); + sStatusTip = sToolTipText; sWhatsThis = "Std_DrawStyle"; sPixmap = "DrawStyleAsIs"; eType = Alter3DView; @@ -865,9 +865,9 @@ StdCmdToggleVisibility::StdCmdToggleVisibility() : Command("Std_ToggleVisibility") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle &visibility"); - sToolTipText = QT_TR_NOOP("Toggles visibility"); - sStatusTip = QT_TR_NOOP("Toggles visibility"); + sMenuText = QT_TR_NOOP("Toggle &Visibility"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the selection"); + sStatusTip = sToolTipText; sWhatsThis = "Std_ToggleVisibility"; sPixmap = "Std_ToggleVisibility"; sAccel = "Space"; @@ -896,10 +896,10 @@ StdCmdToggleTransparency::StdCmdToggleTransparency() : Command("Std_ToggleTransparency") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle transparenc&y"); + sMenuText = QT_TR_NOOP("Toggle Transparenc&y"); static std::string toolTip = std::string("

") - + QT_TR_NOOP("Toggles transparency of the selected objects. You can also fine tune transparency " - "value in the Appearance taskbox (right click an object in the tree, Appearance).") + + QT_TR_NOOP("Toggles the transparency of the selected objects. Transparency " + "can be fine-tuned in the appearance task dialog") + "

"; sToolTipText = toolTip.c_str(); sStatusTip = sToolTipText; @@ -1007,9 +1007,9 @@ StdCmdToggleSelectability::StdCmdToggleSelectability() : Command("Std_ToggleSelectability") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle se&lectability"); - sToolTipText = QT_TR_NOOP("Toggles the property of the objects to get selected in the 3D-View"); - sStatusTip = QT_TR_NOOP("Toggles the property of the objects to get selected in the 3D-View"); + sMenuText = QT_TR_NOOP("Toggle Se&lectability"); + sToolTipText = QT_TR_NOOP("Toggles the property of the objects to get selected in the 3D view"); + sStatusTip = sToolTipText; sWhatsThis = "Std_ToggleSelectability"; sPixmap = "view-unselectable"; eType = Alter3DView; @@ -1059,9 +1059,9 @@ StdCmdShowSelection::StdCmdShowSelection() : Command("Std_ShowSelection") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Sho&w selection"); - sToolTipText = QT_TR_NOOP("Show all selected objects"); - sStatusTip = QT_TR_NOOP("Show all selected objects"); + sMenuText = QT_TR_NOOP("Sho&w Selection"); + sToolTipText = QT_TR_NOOP("Shows all selected objects"); + sStatusTip = sToolTipText; sWhatsThis = "Std_ShowSelection"; sPixmap = "Std_ShowSelection"; eType = Alter3DView; @@ -1087,9 +1087,9 @@ StdCmdHideSelection::StdCmdHideSelection() : Command("Std_HideSelection") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Hide selection"); - sToolTipText = QT_TR_NOOP("Hide all selected objects"); - sStatusTip = QT_TR_NOOP("Hide all selected objects"); + sMenuText = QT_TR_NOOP("&Hide Selection"); + sToolTipText = QT_TR_NOOP("Hides all selected objects"); + sStatusTip = sToolTipText; sWhatsThis = "Std_HideSelection"; sPixmap = "Std_HideSelection"; eType = Alter3DView; @@ -1115,9 +1115,9 @@ StdCmdSelectVisibleObjects::StdCmdSelectVisibleObjects() : Command("Std_SelectVisibleObjects") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Select visible objects"); - sToolTipText = QT_TR_NOOP("Select visible objects in the active document"); - sStatusTip = QT_TR_NOOP("Select visible objects in the active document"); + sMenuText = QT_TR_NOOP("&Select Visible Objects"); + sToolTipText = QT_TR_NOOP("Selects all visible objects in the active document"); + sStatusTip = sToolTipText; sWhatsThis = "Std_SelectVisibleObjects"; sPixmap = "Std_SelectVisibleObjects"; eType = Alter3DView; @@ -1157,9 +1157,9 @@ StdCmdToggleObjects::StdCmdToggleObjects() : Command("Std_ToggleObjects") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("To&ggle all objects"); - sToolTipText = QT_TR_NOOP("Toggles visibility of all objects in the active document"); - sStatusTip = QT_TR_NOOP("Toggles visibility of all objects in the active document"); + sMenuText = QT_TR_NOOP("To&ggle all Objects"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of all objects in the active document"); + sStatusTip = sToolTipText; sWhatsThis = "Std_ToggleObjects"; sPixmap = "Std_ToggleObjects"; eType = Alter3DView; @@ -1198,9 +1198,9 @@ StdCmdShowObjects::StdCmdShowObjects() : Command("Std_ShowObjects") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Show &all objects"); - sToolTipText = QT_TR_NOOP("Show all objects in the document"); - sStatusTip = QT_TR_NOOP("Show all objects in the document"); + sMenuText = QT_TR_NOOP("Show &all Objects"); + sToolTipText = QT_TR_NOOP("Shows all objects in the document"); + sStatusTip = sToolTipText; sWhatsThis = "Std_ShowObjects"; sPixmap = "Std_ShowObjects"; eType = Alter3DView; @@ -1235,9 +1235,9 @@ StdCmdHideObjects::StdCmdHideObjects() : Command("Std_HideObjects") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Hide all &objects"); - sToolTipText = QT_TR_NOOP("Hide all objects in the document"); - sStatusTip = QT_TR_NOOP("Hide all objects in the document"); + sMenuText = QT_TR_NOOP("Hide all &Objects"); + sToolTipText = QT_TR_NOOP("Hides all objects in the document"); + sStatusTip = sToolTipText; sWhatsThis = "Std_HideObjects"; sPixmap = "Std_HideObjects"; eType = Alter3DView; @@ -1273,9 +1273,9 @@ StdCmdViewHome::StdCmdViewHome() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&Home"); - sToolTipText = QT_TR_NOOP("Set to default home view"); + sToolTipText = QT_TR_NOOP("Sets the camera to the default home view"); sWhatsThis = "Std_ViewHome"; - sStatusTip = QT_TR_NOOP("Set to default home view"); + sStatusTip = sToolTipText; sPixmap = "Std_ViewHome"; sAccel = "Home"; eType = Alter3DView; @@ -1301,9 +1301,9 @@ StdCmdViewBottom::StdCmdViewBottom() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&5 Bottom"); - sToolTipText = QT_TR_NOOP("Set to bottom view"); + sToolTipText = QT_TR_NOOP("Sets the camera to the bottom view"); sWhatsThis = "Std_ViewBottom"; - sStatusTip = QT_TR_NOOP("Set to bottom view"); + sStatusTip = sToolTipText; sPixmap = "view-bottom"; sAccel = "5"; eType = Alter3DView; @@ -1325,9 +1325,9 @@ StdCmdViewFront::StdCmdViewFront() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&1 Front"); - sToolTipText = QT_TR_NOOP("Set to front view"); + sToolTipText = QT_TR_NOOP("Sets the camera to the front view"); sWhatsThis = "Std_ViewFront"; - sStatusTip = QT_TR_NOOP("Set to front view"); + sStatusTip = sToolTipText; sPixmap = "view-front"; sAccel = "1"; eType = Alter3DView; @@ -1349,9 +1349,9 @@ StdCmdViewLeft::StdCmdViewLeft() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&6 Left"); - sToolTipText = QT_TR_NOOP("Set to left view"); + sToolTipText = QT_TR_NOOP("Sets the camera to the left view"); sWhatsThis = "Std_ViewLeft"; - sStatusTip = QT_TR_NOOP("Set to left view"); + sStatusTip = sToolTipText; sPixmap = "view-left"; sAccel = "6"; eType = Alter3DView; @@ -1373,9 +1373,9 @@ StdCmdViewRear::StdCmdViewRear() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&4 Rear"); - sToolTipText = QT_TR_NOOP("Set to rear view"); + sToolTipText = QT_TR_NOOP("Sets the camera to the rear view"); sWhatsThis = "Std_ViewRear"; - sStatusTip = QT_TR_NOOP("Set to rear view"); + sStatusTip = sToolTipText; sPixmap = "view-rear"; sAccel = "4"; eType = Alter3DView; @@ -1397,9 +1397,9 @@ StdCmdViewRight::StdCmdViewRight() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&3 Right"); - sToolTipText = QT_TR_NOOP("Set to right view"); + sToolTipText = QT_TR_NOOP("Sets the camera to the right view"); sWhatsThis = "Std_ViewRight"; - sStatusTip = QT_TR_NOOP("Set to right view"); + sStatusTip = sToolTipText; sPixmap = "view-right"; sAccel = "3"; eType = Alter3DView; @@ -1421,9 +1421,9 @@ StdCmdViewTop::StdCmdViewTop() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&2 Top"); - sToolTipText = QT_TR_NOOP("Set to top view"); + sToolTipText = QT_TR_NOOP("Sets the camera to the top view"); sWhatsThis = "Std_ViewTop"; - sStatusTip = QT_TR_NOOP("Set to top view"); + sStatusTip = sToolTipText; sPixmap = "view-top"; sAccel = "2"; eType = Alter3DView; @@ -1444,13 +1444,13 @@ DEF_3DV_CMD(StdCmdViewIsometric) StdCmdViewIsometric::StdCmdViewIsometric() : Command("Std_ViewIsometric") { - sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Isometric"); - sToolTipText= QT_TR_NOOP("Set to isometric view"); - sWhatsThis = "Std_ViewIsometric"; - sStatusTip = QT_TR_NOOP("Set to isometric view"); - sPixmap = "view-axonometric"; - sAccel = "0"; + sGroup = "Standard-View"; + sMenuText = QT_TR_NOOP("&Isometric"); + sToolTipText = QT_TR_NOOP("Sets the camera to the isometric view"); + sWhatsThis = "Std_ViewIsometric"; + sStatusTip = sToolTipText; + sPixmap = "view-axonometric"; + sAccel = "0"; eType = Alter3DView; } @@ -1468,11 +1468,11 @@ DEF_3DV_CMD(StdCmdViewDimetric) StdCmdViewDimetric::StdCmdViewDimetric() : Command("Std_ViewDimetric") { - sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Dimetric"); - sToolTipText= QT_TR_NOOP("Set to dimetric view"); - sWhatsThis = "Std_ViewDimetric"; - sStatusTip = QT_TR_NOOP("Set to dimetric view"); + sGroup = "Standard-View"; + sMenuText = QT_TR_NOOP("&Dimetric"); + sToolTipText = QT_TR_NOOP("Sets the camera to the dimetric view"); + sWhatsThis = "Std_ViewDimetric"; + sStatusTip = sToolTipText; sPixmap = "Std_ViewDimetric"; eType = Alter3DView; } @@ -1491,11 +1491,11 @@ DEF_3DV_CMD(StdCmdViewTrimetric) StdCmdViewTrimetric::StdCmdViewTrimetric() : Command("Std_ViewTrimetric") { - sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Trimetric"); - sToolTipText= QT_TR_NOOP("Set to trimetric view"); - sWhatsThis = "Std_ViewTrimetric"; - sStatusTip = QT_TR_NOOP("Set to trimetric view"); + sGroup = "Standard-View"; + sMenuText = QT_TR_NOOP("&Trimetric"); + sToolTipText = QT_TR_NOOP("Sets the camera to the trimetric view"); + sWhatsThis = "Std_ViewTrimetric"; + sStatusTip = sToolTipText; sPixmap = "Std_ViewTrimetric"; eType = Alter3DView; } @@ -1516,9 +1516,9 @@ StdCmdViewRotateLeft::StdCmdViewRotateLeft() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("Rotate &Left"); - sToolTipText = QT_TR_NOOP("Rotate the view by 90\xc2\xb0 counter-clockwise"); + sToolTipText = QT_TR_NOOP("Rotates the view by 90\xc2\xb0 counter-clockwise"); sWhatsThis = "Std_ViewRotateLeft"; - sStatusTip = QT_TR_NOOP("Rotate the view by 90\xc2\xb0 counter-clockwise"); + sStatusTip = sToolTipText; sPixmap = "view-rotate-left"; sAccel = "Shift+Left"; eType = Alter3DView; @@ -1540,10 +1540,10 @@ StdCmdViewRotateRight::StdCmdViewRotateRight() : Command("Std_ViewRotateRight") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Rotate &Right"); - sToolTipText = QT_TR_NOOP("Rotate the view by 90\xc2\xb0 clockwise"); + sMenuText = QT_TR_NOOP("Rotates &Right"); + sToolTipText = QT_TR_NOOP("Rotates the view by 90\xc2\xb0 clockwise"); sWhatsThis = "Std_ViewRotateRight"; - sStatusTip = QT_TR_NOOP("Rotate the view by 90\xc2\xb0 clockwise"); + sStatusTip = sToolTipText; sPixmap = "view-rotate-right"; sAccel = "Shift+Right"; eType = Alter3DView; @@ -1565,10 +1565,10 @@ StdCmdViewFitAll::StdCmdViewFitAll() : Command("Std_ViewFitAll") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Fit all"); - sToolTipText = QT_TR_NOOP("Fits the whole content on the screen"); + sMenuText = QT_TR_NOOP("&Fit All"); + sToolTipText = QT_TR_NOOP("Fits all content into the 3D view"); sWhatsThis = "Std_ViewFitAll"; - sStatusTip = QT_TR_NOOP("Fits the whole content on the screen"); + sStatusTip = sToolTipText; sPixmap = "zoom-all"; sAccel = "V, F"; eType = Alter3DView; @@ -1596,10 +1596,10 @@ StdCmdViewFitSelection::StdCmdViewFitSelection() : Command("Std_ViewFitSelection") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Fit &selection"); - sToolTipText = QT_TR_NOOP("Fits the selected content on the screen"); + sMenuText = QT_TR_NOOP("Fit &Selection"); + sToolTipText = QT_TR_NOOP("Fits the selected content into the 3D view"); sWhatsThis = "Std_ViewFitSelection"; - sStatusTip = QT_TR_NOOP("Fits the selected content on the screen"); + sStatusTip = sToolTipText; sAccel = "V, S"; sPixmap = "zoom-selection"; eType = Alter3DView; @@ -1626,9 +1626,9 @@ public: : GroupCommand("Std_ViewGroup") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Standard &views"); - sToolTipText = QT_TR_NOOP("Change to a standard view"); - sStatusTip = QT_TR_NOOP("Change to a standard view"); + sMenuText = QT_TR_NOOP("Standard &Views"); + sToolTipText = QT_TR_NOOP("Changes to a standard view"); + sStatusTip = sToolTipText; sWhatsThis = "Std_ViewGroup"; sPixmap = "view-isometric"; eType = Alter3DView; @@ -1666,9 +1666,9 @@ StdViewDock::StdViewDock() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&Docked"); - sToolTipText = QT_TR_NOOP("Display the active view either in fullscreen, in undocked or docked mode"); + sToolTipText = QT_TR_NOOP("Displays the active view either in fullscreen, undocked, or docked mode"); sWhatsThis = "Std_ViewDock"; - sStatusTip = QT_TR_NOOP("Display the active view either in fullscreen, in undocked or docked mode"); + sStatusTip = sToolTipText; sAccel = "V, D"; eType = Alter3DView; bCanLog = false; @@ -1695,9 +1695,9 @@ StdViewUndock::StdViewUndock() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&Undocked"); - sToolTipText = QT_TR_NOOP("Display the active view either in fullscreen, in undocked or docked mode"); + sToolTipText = QT_TR_NOOP("Displays the active view either in fullscreen, undocked, or docked mode"); sWhatsThis = "Std_ViewUndock"; - sStatusTip = QT_TR_NOOP("Display the active view either in fullscreen, in undocked or docked mode"); + sStatusTip = sToolTipText; sAccel = "V, U"; eType = Alter3DView; bCanLog = false; @@ -1724,9 +1724,9 @@ StdMainFullscreen::StdMainFullscreen() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("Fullscreen"); - sToolTipText = QT_TR_NOOP("Display the main window in fullscreen mode"); + sToolTipText = QT_TR_NOOP("Displays the main window in fullscreen mode"); sWhatsThis = "Std_MainFullscreen"; - sStatusTip = QT_TR_NOOP("Display the main window in fullscreen mode"); + sStatusTip = sToolTipText; sPixmap = "view-fullscreen"; sAccel = "Alt+F11"; eType = Alter3DView; @@ -1756,9 +1756,9 @@ StdViewFullscreen::StdViewFullscreen() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("&Fullscreen"); - sToolTipText = QT_TR_NOOP("Display the active view either in fullscreen, in undocked or docked mode"); + sToolTipText = QT_TR_NOOP("Displays the active view either in fullscreen, undocked, or docked mode"); sWhatsThis = "Std_ViewFullscreen"; - sStatusTip = QT_TR_NOOP("Display the active view either in fullscreen, in undocked or docked mode"); + sStatusTip = sToolTipText; sPixmap = "view-fullscreen"; sAccel = "F11"; eType = Alter3DView; @@ -1785,10 +1785,10 @@ StdViewDockUndockFullscreen::StdViewDockUndockFullscreen() : Command("Std_ViewDockUndockFullscreen") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("D&ocument window"); - sToolTipText = QT_TR_NOOP("Display the active view either in fullscreen, in undocked or docked mode"); + sMenuText = QT_TR_NOOP("D&ocument Window"); + sToolTipText = QT_TR_NOOP("Displays the active view either in fullscreen, undocked, or docked mode"); sWhatsThis = "Std_ViewDockUndockFullscreen"; - sStatusTip = QT_TR_NOOP("Display the active view either in fullscreen, in undocked or docked mode"); + sStatusTip = sToolTipText; eType = Alter3DView; CommandManager &rcCmdMgr = Application::Instance->commandManager(); @@ -1892,10 +1892,10 @@ StdCmdViewVR::StdCmdViewVR() : Command("Std_ViewVR") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("FreeCAD-VR"); - sToolTipText = QT_TR_NOOP("Extend the FreeCAD 3D Window to a Oculus Rift"); + sMenuText = QT_TR_NOOP("FreeCAD VR"); + sToolTipText = QT_TR_NOOP("Extends the FreeCAD 3D Window to a VR device"); sWhatsThis = "Std_ViewVR"; - sStatusTip = QT_TR_NOOP("Extend the FreeCAD 3D Window to a Oculus Rift"); + sStatusTip = sToolTipText; eType = Alter3DView; } @@ -1921,10 +1921,10 @@ StdViewScreenShot::StdViewScreenShot() : Command("Std_ViewScreenShot") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Save &image..."); + sMenuText = QT_TR_NOOP("Save &Image…"); sToolTipText= QT_TR_NOOP("Creates a screenshot of the active view"); sWhatsThis = "Std_ViewScreenShot"; - sStatusTip = QT_TR_NOOP("Creates a screenshot of the active view"); + sStatusTip = sToolTipText; sPixmap = "Std_ViewScreenShot"; eType = Alter3DView; } @@ -1962,7 +1962,7 @@ void StdViewScreenShot::activated(int iMsg) FileOptionsDialog fd(getMainWindow(), Qt::WindowFlags()); fd.setFileMode(QFileDialog::AnyFile); fd.setAcceptMode(QFileDialog::AcceptSave); - fd.setWindowTitle(QObject::tr("Save image")); + fd.setWindowTitle(QObject::tr("Save Image")); fd.setNameFilters(filter); if (!selFilter.isEmpty()) fd.selectNameFilter(selFilter); @@ -2089,10 +2089,10 @@ StdViewLoadImage::StdViewLoadImage() : Command("Std_ViewLoadImage") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Load image..."); + sMenuText = QT_TR_NOOP("&Load Image…"); sToolTipText= QT_TR_NOOP("Loads an image"); sWhatsThis = "Std_ViewLoadImage"; - sStatusTip = QT_TR_NOOP("Loads an image"); + sStatusTip = sToolTipText; sPixmap = "image-open"; eType = 0; } @@ -2110,7 +2110,7 @@ void StdViewLoadImage::activated(int iMsg) // Reading an image QFileDialog dialog(Gui::getMainWindow()); - dialog.setWindowTitle(QObject::tr("Choose an image file to open")); + dialog.setWindowTitle(QObject::tr("Choose an Image File to Open")); dialog.setMimeTypeFilters(mimeTypeFilters); dialog.selectMimeTypeFilter(QStringLiteral("image/png")); dialog.setDefaultSuffix(QStringLiteral("png")); @@ -2135,10 +2135,10 @@ StdCmdViewCreate::StdCmdViewCreate() : Command("Std_ViewCreate") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Create new view"); - sToolTipText= QT_TR_NOOP("Creates a new view window for the active document"); + sMenuText = QT_TR_NOOP("New 3D View"); + sToolTipText= QT_TR_NOOP("Opens a new 3D view window for the active document"); sWhatsThis = "Std_ViewCreate"; - sStatusTip = QT_TR_NOOP("Creates a new view window for the active document"); + sStatusTip = sToolTipText; sPixmap = "window-new"; eType = Alter3DView; } @@ -2164,9 +2164,9 @@ StdCmdToggleNavigation::StdCmdToggleNavigation() : Command("Std_ToggleNavigation") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle navigation/&Edit mode"); - sToolTipText = QT_TR_NOOP("Toggle between navigation and edit mode"); - sStatusTip = QT_TR_NOOP("Toggle between navigation and edit mode"); + sMenuText = QT_TR_NOOP("Toggle Navigation/&Edit Mode"); + sToolTipText = QT_TR_NOOP("Toggles between navigation and edit mode"); + sStatusTip = sToolTipText; sWhatsThis = "Std_ToggleNavigation"; //iAccel = Qt::SHIFT+Qt::Key_Space; sAccel = "Esc"; @@ -2213,9 +2213,9 @@ StdCmdAxisCross::StdCmdAxisCross() : Command("Std_AxisCross") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle a&xis cross"); - sToolTipText = QT_TR_NOOP("Turns on or off the axis cross at the origin"); - sStatusTip = QT_TR_NOOP("Turns on or off the axis cross at the origin"); + sMenuText = QT_TR_NOOP("Toggle A&xis Cross"); + sToolTipText = QT_TR_NOOP("Toggles the axis cross at the origin"); + sStatusTip = sToolTipText; sWhatsThis = "Std_AxisCross"; sPixmap = "Std_AxisCross"; sAccel = "A,C"; @@ -2259,10 +2259,10 @@ StdCmdViewExample1::StdCmdViewExample1() : Command("Std_ViewExample1") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Inventor example #1"); + sMenuText = QT_TR_NOOP("Inventor Example #1"); sToolTipText = QT_TR_NOOP("Shows a 3D texture with manipulator"); sWhatsThis = "Std_ViewExample1"; - sStatusTip = QT_TR_NOOP("Shows a 3D texture with manipulator"); + sStatusTip = sToolTipText; sPixmap = "Std_Tool1"; eType = Alter3DView; } @@ -2287,10 +2287,10 @@ StdCmdViewExample2::StdCmdViewExample2() : Command("Std_ViewExample2") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Inventor example #2"); + sMenuText = QT_TR_NOOP("Inventor Example #2"); sToolTipText = QT_TR_NOOP("Shows spheres and drag-lights"); sWhatsThis = "Std_ViewExample2"; - sStatusTip = QT_TR_NOOP("Shows spheres and drag-lights"); + sStatusTip = sToolTipText; sPixmap = "Std_Tool2"; eType = Alter3DView; } @@ -2315,10 +2315,10 @@ StdCmdViewExample3::StdCmdViewExample3() : Command("Std_ViewExample3") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Inventor example #3"); - sToolTipText = QT_TR_NOOP("Shows a animated texture"); + sMenuText = QT_TR_NOOP("Inventor Example #3"); + sToolTipText = QT_TR_NOOP("Shows an animated texture"); sWhatsThis = "Std_ViewExample3"; - sStatusTip = QT_TR_NOOP("Shows a animated texture"); + sStatusTip = sToolTipText; sPixmap = "Std_Tool3"; eType = Alter3DView; } @@ -2345,9 +2345,9 @@ StdCmdViewIvStereoOff::StdCmdViewIvStereoOff() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("Stereo &Off"); - sToolTipText = QT_TR_NOOP("Switch stereo viewing off"); + sToolTipText = QT_TR_NOOP("Switches stereo viewing off"); sWhatsThis = "Std_ViewIvStereoOff"; - sStatusTip = QT_TR_NOOP("Switch stereo viewing off"); + sStatusTip = sToolTipText; sPixmap = "Std_ViewIvStereoOff"; eType = Alter3DView; } @@ -2373,10 +2373,10 @@ StdCmdViewIvStereoRedGreen::StdCmdViewIvStereoRedGreen() : Command("Std_ViewIvStereoRedGreen") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Stereo re&d/cyan"); - sToolTipText = QT_TR_NOOP("Switch stereo viewing to red/cyan"); + sMenuText = QT_TR_NOOP("Stereo Re&d/Cyan"); + sToolTipText = QT_TR_NOOP("Switches stereo viewing to red/cyan"); sWhatsThis = "Std_ViewIvStereoRedGreen"; - sStatusTip = QT_TR_NOOP("Switch stereo viewing to red/cyan"); + sStatusTip = sToolTipText; sPixmap = "Std_ViewIvStereoRedGreen"; eType = Alter3DView; } @@ -2401,10 +2401,10 @@ StdCmdViewIvStereoQuadBuff::StdCmdViewIvStereoQuadBuff() : Command("Std_ViewIvStereoQuadBuff") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Stereo &quad buffer"); - sToolTipText = QT_TR_NOOP("Switch stereo viewing to quad buffer"); + sMenuText = QT_TR_NOOP("Stereo &Quad Buffer"); + sToolTipText = QT_TR_NOOP("Switches stereo viewing to quad buffer"); sWhatsThis = "Std_ViewIvStereoQuadBuff"; - sStatusTip = QT_TR_NOOP("Switch stereo viewing to quad buffer"); + sStatusTip = sToolTipText; sPixmap = "Std_ViewIvStereoQuadBuff"; eType = Alter3DView; } @@ -2430,9 +2430,9 @@ StdCmdViewIvStereoInterleavedRows::StdCmdViewIvStereoInterleavedRows() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("Stereo Interleaved &Rows"); - sToolTipText = QT_TR_NOOP("Switch stereo viewing to Interleaved Rows"); + sToolTipText = QT_TR_NOOP("Switches stereo viewing to interleaved rows"); sWhatsThis = "Std_ViewIvStereoInterleavedRows"; - sStatusTip = QT_TR_NOOP("Switch stereo viewing to Interleaved Rows"); + sStatusTip = sToolTipText; sPixmap = "Std_ViewIvStereoInterleavedRows"; eType = Alter3DView; } @@ -2458,9 +2458,9 @@ StdCmdViewIvStereoInterleavedColumns::StdCmdViewIvStereoInterleavedColumns() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("Stereo Interleaved &Columns"); - sToolTipText = QT_TR_NOOP("Switch stereo viewing to Interleaved Columns"); + sToolTipText = QT_TR_NOOP("Switches stereo viewing to interleaved columns"); sWhatsThis = "Std_ViewIvStereoInterleavedColumns"; - sStatusTip = QT_TR_NOOP("Switch stereo viewing to Interleaved Columns"); + sStatusTip = sToolTipText; sPixmap = "Std_ViewIvStereoInterleavedColumns"; eType = Alter3DView; } @@ -2486,10 +2486,10 @@ StdCmdViewIvIssueCamPos::StdCmdViewIvIssueCamPos() : Command("Std_ViewIvIssueCamPos") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Issue camera &position"); - sToolTipText = QT_TR_NOOP("Issue the camera position to the console and to a macro, to easily recall this position"); + sMenuText = QT_TR_NOOP("Issue Camera &Position"); + sToolTipText = QT_TR_NOOP("Issues the camera position to the console and to a macro, to easily recall this position"); sWhatsThis = "Std_ViewIvIssueCamPos"; - sStatusTip = QT_TR_NOOP("Issue the camera position to the console and to a macro, to easily recall this position"); + sStatusTip = sToolTipText; sPixmap = "Std_ViewIvIssueCamPos"; eType = Alter3DView; } @@ -2537,9 +2537,9 @@ StdViewZoomIn::StdViewZoomIn() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("Zoom &In"); - sToolTipText = QT_TR_NOOP("Increase the zoom factor by a fixed amount"); + sToolTipText = QT_TR_NOOP("Increases the zoom factor by a fixed amount"); sWhatsThis = "Std_ViewZoomIn"; - sStatusTip = QT_TR_NOOP("Increase the zoom factor by a fixed amount"); + sStatusTip = sToolTipText; sPixmap = "zoom-in"; sAccel = keySequenceToAccel(QKeySequence::ZoomIn); eType = Alter3DView; @@ -2566,9 +2566,9 @@ StdViewZoomOut::StdViewZoomOut() { sGroup = "Standard-View"; sMenuText = QT_TR_NOOP("Zoom &Out"); - sToolTipText = QT_TR_NOOP("Decrease the zoom factor by a fixed amount"); + sToolTipText = QT_TR_NOOP("Decreases the zoom factor by a fixed amount"); sWhatsThis = "Std_ViewZoomOut"; - sStatusTip = QT_TR_NOOP("Decrease the zoom factor by a fixed amount"); + sStatusTip = sToolTipText; sPixmap = "zoom-out"; sAccel = keySequenceToAccel(QKeySequence::ZoomOut); eType = Alter3DView; @@ -2708,10 +2708,10 @@ StdViewBoxZoom::StdViewBoxZoom() : Command("Std_ViewBoxZoom") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Box zoom"); - sToolTipText = QT_TR_NOOP("Activate the box zoom tool"); + sMenuText = QT_TR_NOOP("&Box Zoom"); + sToolTipText = QT_TR_NOOP("Activates the box zoom tool"); sWhatsThis = "Std_ViewBoxZoom"; - sStatusTip = QT_TR_NOOP("Activate the box zoom tool"); + sStatusTip = sToolTipText; sPixmap = "zoom-border"; sAccel = "Ctrl+B"; eType = Alter3DView; @@ -2742,10 +2742,10 @@ StdBoxSelection::StdBoxSelection() : Command("Std_BoxSelection") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Box selection"); - sToolTipText = QT_TR_NOOP("Activate the box selection tool"); + sMenuText = QT_TR_NOOP("&Box Selection"); + sToolTipText = QT_TR_NOOP("Activates the box selection tool"); sWhatsThis = "Std_BoxSelection"; - sStatusTip = QT_TR_NOOP("Activate the box selection tool"); + sStatusTip = sToolTipText; sPixmap = "edit-select-box"; sAccel = "Shift+B"; eType = AlterSelection; @@ -2968,10 +2968,10 @@ StdBoxElementSelection::StdBoxElementSelection() : Command("Std_BoxElementSelection") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Bo&x element selection"); - sToolTipText = QT_TR_NOOP("Box element selection"); + sMenuText = QT_TR_NOOP("Bo&x Element Selection"); + sToolTipText = QT_TR_NOOP("Activates box element selection"); sWhatsThis = "Std_BoxElementSelection"; - sStatusTip = QT_TR_NOOP("Box element selection"); + sStatusTip = sToolTipText; sPixmap = "edit-element-select-box"; sAccel = "Shift+E"; eType = AlterSelection; @@ -3013,10 +3013,10 @@ StdTreeSelection::StdTreeSelection() : Command("Std_TreeSelection") { sGroup = "TreeView"; - sMenuText = QT_TR_NOOP("&Go to selection"); - sToolTipText = QT_TR_NOOP("Scroll to first selected item"); + sMenuText = QT_TR_NOOP("&Go to Selection"); + sToolTipText = QT_TR_NOOP("Scrolls to the first selected item"); sWhatsThis = "Std_TreeSelection"; - sStatusTip = QT_TR_NOOP("Scroll to first selected item"); + sStatusTip = sToolTipText; eType = Alter3DView; sPixmap = "tree-goto-sel"; sAccel = "T,G"; @@ -3038,10 +3038,10 @@ StdCmdTreeCollapse::StdCmdTreeCollapse() : Command("Std_TreeCollapse") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Collapse selected item"); - sToolTipText = QT_TR_NOOP("Collapse currently selected tree items"); + sMenuText = QT_TR_NOOP("Collapse Selected Items"); + sToolTipText = QT_TR_NOOP("Collapses the currently selected tree items"); sWhatsThis = "Std_TreeCollapse"; - sStatusTip = QT_TR_NOOP("Collapse currently selected tree items"); + sStatusTip = sToolTipText; eType = Alter3DView; } @@ -3063,10 +3063,10 @@ StdCmdTreeExpand::StdCmdTreeExpand() : Command("Std_TreeExpand") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Expand selected item"); - sToolTipText = QT_TR_NOOP("Expand currently selected tree items"); + sMenuText = QT_TR_NOOP("Expand Selected Items"); + sToolTipText = QT_TR_NOOP("Expands the currently selected tree items"); sWhatsThis = "Std_TreeExpand"; - sStatusTip = QT_TR_NOOP("Expand currently selected tree items"); + sStatusTip = sToolTipText; eType = Alter3DView; } @@ -3088,10 +3088,10 @@ StdCmdTreeSelectAllInstances::StdCmdTreeSelectAllInstances() : Command("Std_TreeSelectAllInstances") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Select all instances"); - sToolTipText = QT_TR_NOOP("Select all instances of the current selected object"); + sMenuText = QT_TR_NOOP("Select all Instances"); + sToolTipText = QT_TR_NOOP("Selects all instances of the currently selected object"); sWhatsThis = "Std_TreeSelectAllInstances"; - sStatusTip = QT_TR_NOOP("Select all instances of the current selected object"); + sStatusTip = sToolTipText; sPixmap = "sel-instance"; eType = AlterSelection; } @@ -3141,10 +3141,10 @@ StdCmdSceneInspector::StdCmdSceneInspector() { // setting the sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Scene i&nspector..."); - sToolTipText = QT_TR_NOOP("Scene inspector"); + sMenuText = QT_TR_NOOP("Scene I&nspector…"); + sToolTipText = QT_TR_NOOP("Opens the scene inspector"); sWhatsThis = "Std_SceneInspector"; - sStatusTip = QT_TR_NOOP("Scene inspector"); + sStatusTip = sToolTipText; eType = Alter3DView; sPixmap = "Std_SceneInspector"; } @@ -3174,10 +3174,10 @@ StdCmdTextureMapping::StdCmdTextureMapping() { // setting the sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Text&ure mapping..."); - sToolTipText = QT_TR_NOOP("Texture mapping"); + sMenuText = QT_TR_NOOP("Text&ure Mapping…"); + sToolTipText = QT_TR_NOOP("Maps textures to shapes"); sWhatsThis = "Std_TextureMapping"; - sStatusTip = QT_TR_NOOP("Texture mapping"); + sStatusTip = sToolTipText; sPixmap = "Std_TextureMapping"; eType = Alter3DView; } @@ -3201,10 +3201,10 @@ StdCmdDemoMode::StdCmdDemoMode() : Command("Std_DemoMode") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("View &turntable..."); - sToolTipText = QT_TR_NOOP("View turntable"); + sMenuText = QT_TR_NOOP("View &Turntable…"); + sToolTipText = QT_TR_NOOP("Opens a turntable view"); sWhatsThis = "Std_DemoMode"; - sStatusTip = QT_TR_NOOP("View turntable"); + sStatusTip = sToolTipText; eType = Alter3DView; sPixmap = "Std_DemoMode"; } @@ -3230,10 +3230,10 @@ StdCmdSelBack::StdCmdSelBack() :Command("Std_SelBack") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Selection &back"); + sMenuText = QT_TR_NOOP("Selection &Back"); static std::string toolTip = std::string("

") - + QT_TR_NOOP("Restore the previous Tree view selection. " - "Only works if Tree RecordSelection mode is switched on.") + + QT_TR_NOOP("Restores the previous tree view selection. " + "Only works if tree RecordSelection mode is switched on.") + "

"; sToolTipText = toolTip.c_str(); sWhatsThis = "Std_SelBack"; @@ -3264,10 +3264,10 @@ StdCmdSelForward::StdCmdSelForward() :Command("Std_SelForward") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Selection &forward"); + sMenuText = QT_TR_NOOP("Selection &Forward"); static std::string toolTip = std::string("

") - + QT_TR_NOOP("Restore the next Tree view selection. " - "Only works if Tree RecordSelection mode is switched on.") + + QT_TR_NOOP("Restores the next tree view selection. " + "Only works if tree RecordSelection mode is switched on.") + "

"; sToolTipText = toolTip.c_str(); sWhatsThis = "Std_SelForward"; @@ -3318,10 +3318,10 @@ StdTreeSingleDocument::StdTreeSingleDocument() : Command("Std_TreeSingleDocument") { sGroup = "TreeView"; - sMenuText = QT_TR_NOOP("&Single document"); - sToolTipText = QT_TR_NOOP("Only display the active document in the tree view"); + sMenuText = QT_TR_NOOP("&Single Document"); + sToolTipText = QT_TR_NOOP("Displays only the active document in the tree view"); sWhatsThis = "Std_TreeSingleDocument"; - sStatusTip = QT_TR_NOOP("Only display the active document in the tree view"); + sStatusTip = sToolTipText; sPixmap = "tree-doc-single"; eType = 0; } @@ -3335,10 +3335,10 @@ StdTreeMultiDocument::StdTreeMultiDocument() : Command("Std_TreeMultiDocument") { sGroup = "TreeView"; - sMenuText = QT_TR_NOOP("&Multi document"); - sToolTipText = QT_TR_NOOP("Display all documents in the tree view"); + sMenuText = QT_TR_NOOP("&Multi Document"); + sToolTipText = QT_TR_NOOP("Displays all documents in the tree view"); sWhatsThis = "Std_TreeMultiDocument"; - sStatusTip = QT_TR_NOOP("Display all documents in the tree view"); + sStatusTip = sToolTipText; sPixmap = "tree-doc-multi"; eType = 0; } @@ -3353,9 +3353,9 @@ StdTreeCollapseDocument::StdTreeCollapseDocument() { sGroup = "TreeView"; sMenuText = QT_TR_NOOP("Collapse/E&xpand"); - sToolTipText = QT_TR_NOOP("Expand active document and collapse all others"); + sToolTipText = QT_TR_NOOP("Expands the active document and collapses all others"); sWhatsThis = "Std_TreeCollapseDocument"; - sStatusTip = QT_TR_NOOP("Expand active document and collapse all others"); + sStatusTip = sToolTipText; sPixmap = "tree-doc-collapse"; eType = 0; } @@ -3391,8 +3391,8 @@ StdTreeSyncView::StdTreeSyncView() : Command("Std_TreeSyncView") { sGroup = "TreeView"; - sMenuText = QT_TR_NOOP("&1 Sync view"); - sToolTipText = QT_TR_NOOP("Auto switch to the 3D view containing the selected item"); + sMenuText = QT_TR_NOOP("&1 Sync View"); + sToolTipText = QT_TR_NOOP("Switches to the 3D view containing the selected item from the tree view"); sStatusTip = sToolTipText; sWhatsThis = "Std_TreeSyncView"; sPixmap = "tree-sync-view"; @@ -3409,8 +3409,8 @@ StdTreeSyncSelection::StdTreeSyncSelection() : Command("Std_TreeSyncSelection") { sGroup = "TreeView"; - sMenuText = QT_TR_NOOP("&2 Sync selection"); - sToolTipText = QT_TR_NOOP("Auto expand tree item when the corresponding object is selected in 3D view"); + sMenuText = QT_TR_NOOP("&2 Sync Selection"); + sToolTipText = QT_TR_NOOP("Expands the tree item when the corresponding object is selected in the 3D view"); sStatusTip = sToolTipText; sWhatsThis = "Std_TreeSyncSelection"; sPixmap = "tree-sync-sel"; @@ -3427,8 +3427,8 @@ StdTreeSyncPlacement::StdTreeSyncPlacement() : Command("Std_TreeSyncPlacement") { sGroup = "TreeView"; - sMenuText = QT_TR_NOOP("&3 Sync placement"); - sToolTipText = QT_TR_NOOP("Auto adjust placement on drag and drop objects across coordinate systems"); + sMenuText = QT_TR_NOOP("&3 Sync Placement"); + sToolTipText = QT_TR_NOOP("Adjusts the placement on drag-and-drop of objects across coordinate systems (e.g. in part containers)"); sStatusTip = sToolTipText; sWhatsThis = "Std_TreeSyncPlacement"; sPixmap = "tree-sync-pla"; @@ -3446,7 +3446,7 @@ StdTreePreSelection::StdTreePreSelection() { sGroup = "TreeView"; sMenuText = QT_TR_NOOP("&4 Preselection"); - sToolTipText = QT_TR_NOOP("Preselect the object in 3D view when hovering the cursor over the tree item"); + sToolTipText = QT_TR_NOOP("Pre-selects the object in 3D view when hovering the cursor over the tree item"); sStatusTip = sToolTipText; sWhatsThis = "Std_TreePreSelection"; sPixmap = "tree-pre-sel"; @@ -3463,8 +3463,8 @@ StdTreeRecordSelection::StdTreeRecordSelection() : Command("Std_TreeRecordSelection") { sGroup = "TreeView"; - sMenuText = QT_TR_NOOP("&5 Record selection"); - sToolTipText = QT_TR_NOOP("Record selection in tree view in order to go back/forward using navigation button"); + sMenuText = QT_TR_NOOP("&5 Record Selection"); + sToolTipText = QT_TR_NOOP("Records the selection in the tree view in order to go back/forward using the navigation buttons"); sStatusTip = sToolTipText; sWhatsThis = "Std_TreeRecordSelection"; sPixmap = "tree-rec-sel"; @@ -3481,8 +3481,8 @@ StdTreeDrag::StdTreeDrag() : Command("Std_TreeDrag") { sGroup = "TreeView"; - sMenuText = QT_TR_NOOP("Initiate &dragging"); - sToolTipText = QT_TR_NOOP("Initiate dragging of current selected tree items"); + sMenuText = QT_TR_NOOP("Initiate &Dragging"); + sToolTipText = QT_TR_NOOP("Initiates dragging of the currently selected tree items"); sStatusTip = sToolTipText; sWhatsThis = "Std_TreeDrag"; sPixmap = "tree-item-drag"; @@ -3514,10 +3514,10 @@ public: :GroupCommand("Std_TreeViewActions") { sGroup = "TreeView"; - sMenuText = QT_TR_NOOP("TreeView actions"); - sToolTipText = QT_TR_NOOP("TreeView behavior options and actions"); + sMenuText = QT_TR_NOOP("Tree View Actions"); + sToolTipText = QT_TR_NOOP("Tree view behavior options and actions"); sWhatsThis = "Std_TreeViewActions"; - sStatusTip = QT_TR_NOOP("TreeView behavior options and actions"); + sStatusTip = sToolTipText; eType = 0; bCanLog = false; @@ -3556,10 +3556,10 @@ StdCmdSelBoundingBox::StdCmdSelBoundingBox() :Command("Std_SelBoundingBox") { sGroup = "View"; - sMenuText = QT_TR_NOOP("&Bounding box"); - sToolTipText = QT_TR_NOOP("Show selection bounding box"); + sMenuText = QT_TR_NOOP("&Bounding Box"); + sToolTipText = QT_TR_NOOP("Shows selection bounding box"); sWhatsThis = "Std_SelBoundingBox"; - sStatusTip = QT_TR_NOOP("Show selection bounding box"); + sStatusTip = sToolTipText; sPixmap = "sel-bbox"; eType = Alter3DView; } @@ -3601,8 +3601,8 @@ StdCmdDockOverlayAll::StdCmdDockOverlayAll() :Command("Std_DockOverlayAll") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Toggle overl&ay for all"); - sToolTipText = QT_TR_NOOP("Toggle overlay mode for all docked windows"); + sMenuText = QT_TR_NOOP("Toggle Overl&ay for all Panels"); + sToolTipText = QT_TR_NOOP("Toggled overlay mode for all docked panels"); sWhatsThis = "Std_DockOverlayAll"; sStatusTip = sToolTipText; sAccel = "F4"; @@ -3625,9 +3625,9 @@ StdCmdDockOverlayTransparentAll::StdCmdDockOverlayTransparentAll() :Command("Std_DockOverlayTransparentAll") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Toggle tra&nsparent for all"); - sToolTipText = QT_TR_NOOP("Toggle transparent mode for all docked overlay windows.\n" - "This makes the docked windows stay transparent at all times."); + sMenuText = QT_TR_NOOP("Toggle Tra&nsparent Panels"); + sToolTipText = QT_TR_NOOP("Toggles transparent mode for all docked overlay panels.\n" + "This makes the docked panels stay transparent at all times."); sWhatsThis = "Std_DockOverlayTransparentAll"; sStatusTip = sToolTipText; sAccel = "SHIFT+F4"; @@ -3650,8 +3650,8 @@ StdCmdDockOverlayToggle::StdCmdDockOverlayToggle() :Command("Std_DockOverlayToggle") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Toggle &overlay"); - sToolTipText = QT_TR_NOOP("Toggle overlay mode for the docked window under the cursor"); + sMenuText = QT_TR_NOOP("Toggle &Overlay"); + sToolTipText = QT_TR_NOOP("Toggles overlay mode for the docked window under the cursor"); sWhatsThis = "Std_DockOverlayToggle"; sStatusTip = sToolTipText; sAccel = "F3"; @@ -3674,9 +3674,9 @@ StdCmdDockOverlayToggleTransparent::StdCmdDockOverlayToggleTransparent() :Command("Std_DockOverlayToggleTransparent") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle tran&sparent mode"); - sToolTipText = QT_TR_NOOP("Toggle transparent mode for the docked window under cursor.\n" - "This makes the docked window stay transparent at all times."); + sMenuText = QT_TR_NOOP("Toggle Tran&sparent Mode"); + sToolTipText = QT_TR_NOOP("Toggles transparent mode for the docked panel under cursor.\n" + "This makes the docked panel stay transparent at all times."); sWhatsThis = "Std_DockOverlayToggleTransparent"; sStatusTip = sToolTipText; sAccel = "SHIFT+F3"; @@ -3699,8 +3699,8 @@ StdCmdDockOverlayToggleLeft::StdCmdDockOverlayToggleLeft() :Command("Std_DockOverlayToggleLeft") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle &left"); - sToolTipText = QT_TR_NOOP("Show/hide left overlay panel"); + sMenuText = QT_TR_NOOP("Toggle &Left"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the left overlay panel"); sWhatsThis = "Std_DockOverlayToggleLeft"; sStatusTip = sToolTipText; sAccel = "Ctrl+Left"; @@ -3724,8 +3724,8 @@ StdCmdDockOverlayToggleRight::StdCmdDockOverlayToggleRight() :Command("Std_DockOverlayToggleRight") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle &right"); - sToolTipText = QT_TR_NOOP("Show/hide right overlay panel"); + sMenuText = QT_TR_NOOP("Toggle &Right"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the right overlay panel"); sWhatsThis = "Std_DockOverlayToggleRight"; sStatusTip = sToolTipText; sAccel = "Ctrl+Right"; @@ -3749,8 +3749,8 @@ StdCmdDockOverlayToggleTop::StdCmdDockOverlayToggleTop() :Command("Std_DockOverlayToggleTop") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle &top"); - sToolTipText = QT_TR_NOOP("Show/hide top overlay panel"); + sMenuText = QT_TR_NOOP("Toggle &Top"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the top overlay panel"); sWhatsThis = "Std_DockOverlayToggleTop"; sStatusTip = sToolTipText; sAccel = "Ctrl+Up"; @@ -3774,8 +3774,8 @@ StdCmdDockOverlayToggleBottom::StdCmdDockOverlayToggleBottom() :Command("Std_DockOverlayToggleBottom") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Toggle &bottom"); - sToolTipText = QT_TR_NOOP("Show/hide bottom overlay panel"); + sMenuText = QT_TR_NOOP("Toggle &Bottom"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the bottom overlay panel"); sWhatsThis = "Std_DockOverlayToggleBottom"; sStatusTip = sToolTipText; sAccel = "Ctrl+Down"; @@ -3799,8 +3799,8 @@ StdCmdDockOverlayMouseTransparent::StdCmdDockOverlayMouseTransparent() :Command("Std_DockOverlayMouseTransparent") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Bypass &mouse events in docked overlay windows"); - sToolTipText = QT_TR_NOOP("Bypass all mouse events in docked overlay windows"); + sMenuText = QT_TR_NOOP("Bypass &Mouse Events in Overlay Panels"); + sToolTipText = QT_TR_NOOP("Bypasses all mouse events in docked overlay panels"); sWhatsThis = "Std_DockOverlayMouseTransparent"; sStatusTip = sToolTipText; sAccel = "T, T"; @@ -3841,8 +3841,8 @@ public: :GroupCommand("Std_DockOverlay") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Dock panel overlay"); - sToolTipText = QT_TR_NOOP("Setting docked panel overlay mode"); + sMenuText = QT_TR_NOOP("Overlay Docked Panel"); + sToolTipText = QT_TR_NOOP("Sets the docked panel in overlay mode"); sWhatsThis = "Std_DockOverlay"; sStatusTip = sToolTipText; eType = 0; @@ -3873,9 +3873,9 @@ StdStoreWorkingView::StdStoreWorkingView() : Command("Std_StoreWorkingView") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("St&ore working view"); - sToolTipText = QT_TR_NOOP("Store a document-specific temporary working view"); - sStatusTip = QT_TR_NOOP("Store a document-specific temporary working view"); + sMenuText = QT_TR_NOOP("St&ore Working View"); + sToolTipText = QT_TR_NOOP("Stores a temporary working view for the current document"); + sStatusTip = sToolTipText; sWhatsThis = "Std_StoreWorkingView"; sAccel = "Shift+End"; eType = NoTransaction; @@ -3903,9 +3903,9 @@ StdRecallWorkingView::StdRecallWorkingView() : Command("Std_RecallWorkingView") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("R&ecall working view"); - sToolTipText = QT_TR_NOOP("Recall previously stored temporary working view"); - sStatusTip = QT_TR_NOOP("Recall previously stored temporary working view"); + sMenuText = QT_TR_NOOP("R&ecall Working View"); + sToolTipText = QT_TR_NOOP("Recalls a previously stored temporary working view"); + sStatusTip = sToolTipText; sWhatsThis = "Std_RecallWorkingView"; sAccel = "End"; eType = NoTransaction; @@ -3935,8 +3935,8 @@ StdCmdAlignToSelection::StdCmdAlignToSelection() : Command("Std_AlignToSelection") { sGroup = "View"; - sMenuText = QT_TR_NOOP("&Align to selection"); - sToolTipText = QT_TR_NOOP("Align the view with the selection"); + sMenuText = QT_TR_NOOP("&Align to Selection"); + sToolTipText = QT_TR_NOOP("Aligns the camera view to the selected elements in the 3D view"); sWhatsThis = "Std_AlignToSelection"; sPixmap = "align-to-selection"; eType = Alter3DView; diff --git a/src/Gui/CommandWindow.cpp b/src/Gui/CommandWindow.cpp index 284299abdb..43b1cd5078 100644 --- a/src/Gui/CommandWindow.cpp +++ b/src/Gui/CommandWindow.cpp @@ -54,9 +54,9 @@ StdCmdTileWindows::StdCmdTileWindows() { sGroup = "Window"; sMenuText = QT_TR_NOOP("&Tile"); - sToolTipText = QT_TR_NOOP("Tile the windows"); + sToolTipText = QT_TR_NOOP("Tiles the windows"); sWhatsThis = "Std_TileWindows"; - sStatusTip = QT_TR_NOOP("Tile the windows"); + sStatusTip = sToolTipText; sPixmap = "Std_WindowTileVer"; eType = 0; } @@ -82,9 +82,9 @@ StdCmdCascadeWindows::StdCmdCascadeWindows() { sGroup = "Window"; sMenuText = QT_TR_NOOP("&Cascade"); - sToolTipText = QT_TR_NOOP("Tile pragmatic"); + sToolTipText = QT_TR_NOOP("Tiles pragmatic"); sWhatsThis = "Std_CascadeWindows"; - sStatusTip = QT_TR_NOOP("Tile pragmatic"); + sStatusTip = sToolTipText; sPixmap = "Std_WindowCascade"; eType = 0; } @@ -110,9 +110,9 @@ StdCmdCloseActiveWindow::StdCmdCloseActiveWindow() { sGroup = "Window"; sMenuText = QT_TR_NOOP("&Close"); - sToolTipText = QT_TR_NOOP("Close active window"); + sToolTipText = QT_TR_NOOP("Closes the active window"); sWhatsThis = "Std_CloseActiveWindow"; - sStatusTip = QT_TR_NOOP("Close active window"); + sStatusTip = sToolTipText; // In QMdiSubWindow the 'QKeySequence::Close' shortcut is set which will // collide with this shortcut. Thus the shortcut of QMdiSubWindow will be // reset in MainWindow::addWindow() (#0002631) @@ -142,9 +142,9 @@ StdCmdCloseAllWindows::StdCmdCloseAllWindows() { sGroup = "Window"; sMenuText = QT_TR_NOOP("Close A&ll"); - sToolTipText = QT_TR_NOOP("Close all windows"); + sToolTipText = QT_TR_NOOP("Closes all windows"); sWhatsThis = "Std_CloseAllWindows"; - sStatusTip = QT_TR_NOOP("Close all windows"); + sStatusTip = sToolTipText; sPixmap = "Std_CloseAllWindows"; eType = NoTransaction; } @@ -170,9 +170,9 @@ StdCmdActivateNextWindow::StdCmdActivateNextWindow() { sGroup = "Window"; sMenuText = QT_TR_NOOP("&Next"); - sToolTipText = QT_TR_NOOP("Activate next window"); + sToolTipText = QT_TR_NOOP("Activates the next window"); sWhatsThis = "Std_ActivateNextWindow"; - sStatusTip = QT_TR_NOOP("Activate next window"); + sStatusTip = sToolTipText; sPixmap = "Std_WindowNext"; sAccel = keySequenceToAccel(QKeySequence::NextChild); eType = 0; @@ -199,9 +199,9 @@ StdCmdActivatePrevWindow::StdCmdActivatePrevWindow() { sGroup = "Window"; sMenuText = QT_TR_NOOP("&Previous"); - sToolTipText = QT_TR_NOOP("Activate previous window"); + sToolTipText = QT_TR_NOOP("Switches to the previously active window"); sWhatsThis = "Std_ActivatePrevWindow"; - sStatusTip = QT_TR_NOOP("Activate previous window"); + sStatusTip = sToolTipText; sPixmap = "Std_WindowPrev"; // Depending on the OS 'QKeySequence::PreviousChild' gives // Ctrl+Shift+Backtab instead of Ctrl+Shift+Tab which leads @@ -232,10 +232,11 @@ StdCmdWindows::StdCmdWindows() : Command("Std_Windows") { sGroup = "Window"; - sMenuText = QT_TR_NOOP("&Windows..."); - sToolTipText = QT_TR_NOOP("Windows list"); + sMenuText = QT_TR_NOOP("Choose Open &Window"); + + sToolTipText = QT_TR_NOOP("Displays the open windows"); sWhatsThis = "Std_Windows"; - sStatusTip = QT_TR_NOOP("Windows list"); + sStatusTip = sToolTipText; sPixmap = "Std_Windows"; eType = 0; } @@ -256,10 +257,10 @@ StdCmdUserInterface::StdCmdUserInterface() : Command("Std_UserInterface") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Dock views"); - sToolTipText = QT_TR_NOOP("Dock all top-level views"); + sMenuText = QT_TR_NOOP("Dock Views"); + sToolTipText = QT_TR_NOOP("Docks all top-level views"); sWhatsThis = "Std_UserInterface"; - sStatusTip = QT_TR_NOOP("Dock all top-level views"); + sStatusTip = sToolTipText; eType = 0; } @@ -279,9 +280,9 @@ StdCmdDockViewMenu::StdCmdDockViewMenu() { sGroup = "View"; sMenuText = QT_TR_NOOP("&Panels"); - sToolTipText = QT_TR_NOOP("List of available dock panels"); + sToolTipText = QT_TR_NOOP("Lists available dock panels"); sWhatsThis = "Std_DockViewMenu"; - sStatusTip = QT_TR_NOOP("List of available dock panels"); + sStatusTip = sToolTipText; eType = 0; } @@ -317,7 +318,7 @@ StdCmdToolBarMenu::StdCmdToolBarMenu() sMenuText = QT_TR_NOOP("&Toolbars"); sToolTipText = QT_TR_NOOP("Toggles this window"); sWhatsThis = "Std_ToolBarMenu"; - sStatusTip = QT_TR_NOOP("Toggles this window"); + sStatusTip = sToolTipText; eType = 0; } @@ -349,10 +350,10 @@ StdCmdToggleToolBarLock::StdCmdToggleToolBarLock() :Command("Std_ToggleToolBarLock") { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Lock toolbars"); - sToolTipText = QT_TR_NOOP("Lock toolbars so they are no longer moveable"); + sMenuText = QT_TR_NOOP("Lock Toolbars"); + sToolTipText = QT_TR_NOOP("Locks toolbars so they are no longer moveable"); sWhatsThis = "Std_ToggleToolBarLock"; - sStatusTip = QT_TR_NOOP("Lock toolbars so they are no longer moveable"); + sStatusTip = sToolTipText; eType = 0; } @@ -409,10 +410,10 @@ StdCmdStatusBar::StdCmdStatusBar() : Command("Std_ViewStatusBar") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Status bar"); + sMenuText = QT_TR_NOOP("Status Bar"); sToolTipText = QT_TR_NOOP("Toggles the status bar"); sWhatsThis = "Std_ViewStatusBar"; - sStatusTip = QT_TR_NOOP("Toggles the status bar"); + sStatusTip = sToolTipText; eType = 0; } @@ -455,10 +456,10 @@ StdCmdWindowsMenu::StdCmdWindowsMenu() : Command("Std_WindowsMenu") { sGroup = "Window"; - sMenuText = QT_TR_NOOP("Activate window"); // Replaced with the name of the window + sMenuText = QT_TR_NOOP("Activate Window"); // Replaced with the name of the window sToolTipText = QT_TR_NOOP("Activates this window"); sWhatsThis = "Std_WindowsMenu"; - sStatusTip = QT_TR_NOOP("Activates this window"); + sStatusTip = sToolTipText; eType = 0; } diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp index 4428d44d70..43d69b24b8 100644 --- a/src/Gui/DAGView/DAGModel.cpp +++ b/src/Gui/DAGView/DAGModel.cpp @@ -125,15 +125,15 @@ Model::Model(QObject *parentIn, const Gui::Document &documentIn) : QGraphicsScen renameAction = new QAction(this); renameAction->setText(tr("Rename")); - renameAction->setStatusTip(tr("Rename object")); + renameAction->setStatusTip(tr("Renames the object")); #ifndef Q_OS_MAC renameAction->setShortcut(Qt::Key_F2); #endif connect(renameAction, &QAction::triggered, this, &Model::renameAcceptedSlot); editingFinishedAction = new QAction(this); - editingFinishedAction->setText(tr("Finish editing")); - editingFinishedAction->setStatusTip(tr("Finish editing object")); + editingFinishedAction->setText(tr("Finish Editing")); + editingFinishedAction->setStatusTip(tr("Finishes editing the object")); connect(this->editingFinishedAction, &QAction::triggered, this, &Model::editingFinishedSlot); diff --git a/src/Gui/Dialogs/AboutApplication.ui b/src/Gui/Dialogs/AboutApplication.ui index d8b4daa7fd..34d61cc78b 100644 --- a/src/Gui/Dialogs/AboutApplication.ui +++ b/src/Gui/Dialogs/AboutApplication.ui @@ -222,7 +222,7 @@ - Copy to clipboard + Copy to Clipboard diff --git a/src/Gui/Dialogs/DlgActions.ui b/src/Gui/Dialogs/DlgActions.ui index 126fc46f1f..391da2ab09 100644 --- a/src/Gui/Dialogs/DlgActions.ui +++ b/src/Gui/Dialogs/DlgActions.ui @@ -57,42 +57,42 @@ - Macro: + Macro - Menu text: + Menu text - Tool tip: + Tooltip - Status text: + Status text - What's this: + What's this - Accelerator: + Accelerator @@ -142,7 +142,7 @@
- ... + Choose Icon
diff --git a/src/Gui/Dialogs/DlgActionsImp.cpp b/src/Gui/Dialogs/DlgActionsImp.cpp index b0b9c98895..3ad15b3322 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("Sorry, couldn't 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("Please specify the macro first.")); + QMessageBox::warning(this, tr("Empty macro"), tr("First, specify the macro.")); return; } if (ui->actionMenu->text().isEmpty()) { - QMessageBox::warning(this, tr("Empty text"), tr("Please specify the menu text first.")); + QMessageBox::warning(this, tr("Empty text"), tr("Fisrst, specify the menu text.")); return; } @@ -305,12 +305,12 @@ void DlgCustomActionsImp::onButtonReplaceActionClicked() { QTreeWidgetItem* item = ui->actionListWidget->currentItem(); if (!item) { - QMessageBox::warning(this, tr("No item selected"), tr("Please select a macro item first.")); + QMessageBox::warning(this, tr("No item selected"), tr("First, select a macro item.")); return; } if (ui->actionMenu->text().isEmpty()) { - QMessageBox::warning(this, tr("Empty text"), tr("Please specify the menu text first.")); + QMessageBox::warning(this, tr("Empty text"), tr("First, specify the menu text.")); return; } @@ -457,7 +457,7 @@ void IconDialog::onAddIconPath() } IconFolders dlg(pathList, this); - dlg.setWindowTitle(tr("Icon folders")); + dlg.setWindowTitle(tr("Icon Folders")); if (dlg.exec()) { QStringList paths = dlg.getPaths(); diff --git a/src/Gui/Dialogs/DlgAddProperty.cpp b/src/Gui/Dialogs/DlgAddProperty.cpp index 330949e3cc..963a4cb295 100644 --- a/src/Gui/Dialogs/DlgAddProperty.cpp +++ b/src/Gui/Dialogs/DlgAddProperty.cpp @@ -104,7 +104,7 @@ void DlgAddProperty::accept() { QMessageBox::critical(getMainWindow(), QObject::tr("Invalid name"), - QObject::tr("The property name or group name must only contain alpha numericals,\n" + QObject::tr("The property or group name must only contain alphanumericals,\n" "underscore, and must not start with a digit.")); return; } diff --git a/src/Gui/Dialogs/DlgAddProperty.ui b/src/Gui/Dialogs/DlgAddProperty.ui index ef45352f9b..a80dd8036b 100644 --- a/src/Gui/Dialogs/DlgAddProperty.ui +++ b/src/Gui/Dialogs/DlgAddProperty.ui @@ -11,7 +11,7 @@ - Add property + Add Property @@ -47,7 +47,7 @@ - Verbose description of the new property. + Verbose description of the new property Documentation @@ -57,7 +57,7 @@ - Verbose description of the new property. + Verbose description of the new property @@ -68,7 +68,7 @@ In this case the prefix will be automatically trimmed when shown in the property editor. However, the property is still used in a script with the full name, like 'obj.Group_Name'. -If this is not ticked, then the property must be uniquely named, and it is accessed like 'obj.Name'. +If this is not checked, the property must be uniquely named, and it is accessed like 'obj.Name'. Prefix group name diff --git a/src/Gui/Dialogs/DlgAddPropertyVarSet.cpp b/src/Gui/Dialogs/DlgAddPropertyVarSet.cpp index 821217327b..3ec99ecec7 100644 --- a/src/Gui/Dialogs/DlgAddPropertyVarSet.cpp +++ b/src/Gui/Dialogs/DlgAddPropertyVarSet.cpp @@ -183,7 +183,7 @@ void DlgAddPropertyVarSet::setWidgetForLabel(const char* labelName, QWidget* wid int labelRow = findLabelRow(labelName, formLayout); if (labelRow < 0) { - FC_ERR("Couldn't find row for '" << labelName << "'"); + FC_ERR("Could not find row for '" << labelName << "'"); return; } @@ -439,7 +439,7 @@ void DlgAddPropertyVarSet::initializeValue() void DlgAddPropertyVarSet::setTitle() { - setWindowTitle(tr("Add a property to %1").arg(QString::fromStdString(varSet->getFullName()))); + setWindowTitle(tr("Add a Property to %1").arg(QString::fromStdString(varSet->getFullName()))); } void DlgAddPropertyVarSet::setOkEnabled(bool enabled) diff --git a/src/Gui/Dialogs/DlgAddPropertyVarSet.ui b/src/Gui/Dialogs/DlgAddPropertyVarSet.ui index 651c8fc452..b662a108e9 100644 --- a/src/Gui/Dialogs/DlgAddPropertyVarSet.ui +++ b/src/Gui/Dialogs/DlgAddPropertyVarSet.ui @@ -11,7 +11,7 @@ - Add property + Add Property diff --git a/src/Gui/Dialogs/DlgAuthorization.ui b/src/Gui/Dialogs/DlgAuthorization.ui index 52eaa3ecf3..82ddd33c4a 100644 --- a/src/Gui/Dialogs/DlgAuthorization.ui +++ b/src/Gui/Dialogs/DlgAuthorization.ui @@ -20,7 +20,7 @@ - Site: + Site @@ -43,7 +43,7 @@ - Username: + Username @@ -53,7 +53,7 @@ - Password: + Password diff --git a/src/Gui/Dialogs/DlgChooseIcon.ui b/src/Gui/Dialogs/DlgChooseIcon.ui index c2b569d7e2..e220a9d83d 100644 --- a/src/Gui/Dialogs/DlgChooseIcon.ui +++ b/src/Gui/Dialogs/DlgChooseIcon.ui @@ -35,7 +35,7 @@ - Icon folders... + Icon Folders diff --git a/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp b/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp index 565723900e..cd12d0260f 100644 --- a/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp +++ b/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp @@ -160,7 +160,7 @@ void DlgCreateNewPreferencePackImp::onLineEditTextEdited(const QString& text) void DlgCreateNewPreferencePackImp::onBrowseButtonClicked() { - _cfgFileDirectory = FileDialog::getExistingDirectory(this, tr("Export Config"), _cfgFileDirectory); + _cfgFileDirectory = FileDialog::getExistingDirectory(this, tr("Export configuration"), _cfgFileDirectory); } void Gui::Dialog::DlgCreateNewPreferencePackImp::accept() @@ -169,7 +169,7 @@ void Gui::Dialog::DlgCreateNewPreferencePackImp::accept() if (const auto chosenName = ui->lineEdit->text().toStdString(); std::ranges::find(_existingPackNames, chosenName) != _existingPackNames.end()) { const auto result = QMessageBox::warning(this, tr("Pack already exists"), - tr("A preference pack with that name already exists. Do you want to overwrite it?"), + tr("A preference pack with that name already exists. Overwrite it?"), QMessageBox::Yes | QMessageBox::Cancel); if (result == QMessageBox::Cancel) return; diff --git a/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp index 8ee96ead45..8270fe3017 100644 --- a/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp +++ b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp @@ -42,7 +42,7 @@ DlgCustomizeSpNavSettings::DlgCustomizeSpNavSettings(QWidget* parent) } if (!app->isSpaceballPresent()) { this->setWindowTitle(tr("Spaceball Motion")); - this->setMessage(tr("No Spaceball Present")); + this->setMessage(tr("No Spaceball present")); return; } this->init = true; @@ -131,7 +131,7 @@ void DlgCustomizeSpNavSettings::changeEvent(QEvent* e) this->setWindowTitle(tr("Spaceball Motion")); QLabel* messageLabel = this->findChild(); if (messageLabel) { - messageLabel->setText(tr("No Spaceball Present")); + messageLabel->setText(tr("No Spaceball present")); } } } diff --git a/src/Gui/Dialogs/DlgCustomizeSpNavSettings.ui b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.ui index 06665c5de3..bb4c93e21e 100644 --- a/src/Gui/Dialogs/DlgCustomizeSpNavSettings.ui +++ b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.ui @@ -19,7 +19,7 @@ - Global Sensitivity: + Global sensitivity @@ -51,7 +51,7 @@ - Dominant Mode + Dominant mode @@ -69,7 +69,7 @@ - Enable Translations + Enable translations true @@ -79,7 +79,7 @@ - Enable Rotations + Enable rotations true diff --git a/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp b/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp index 2dea8e547c..1983913df0 100644 --- a/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp +++ b/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp @@ -285,7 +285,7 @@ QString ButtonModel::getLabel(const int &number) const desc = QStringLiteral(" \"") + desc + QStringLiteral("\""); return tr("Button %1").arg(number + 1) + desc; } else - return tr("Out Of Range"); + return tr("Out of range"); } void ButtonModel::loadConfig(const char *RequiredDeviceName) @@ -675,7 +675,7 @@ DlgCustomizeSpaceball::DlgCustomizeSpaceball(QWidget *parent) return; if (!app->isSpaceballPresent()) { - this->setMessage(tr("No Spaceball Present")); + this->setMessage(tr("No Spaceball present")); return; } diff --git a/src/Gui/Dialogs/DlgExpressionInput.cpp b/src/Gui/Dialogs/DlgExpressionInput.cpp index 0f45d60c86..70f384ebd7 100644 --- a/src/Gui/Dialogs/DlgExpressionInput.cpp +++ b/src/Gui/Dialogs/DlgExpressionInput.cpp @@ -441,7 +441,7 @@ static bool isNamePropOk(const QString& nameProp, App::DocumentObject* obj, std::string name = nameProp.toStdString(); if (name.empty()) { - message << "Please provide a name for the property."; + message << "Provide a name for the property."; return false; } @@ -696,7 +696,7 @@ void DlgExpressionInput::reportVarSetInfo(const char* message) bool DlgExpressionInput::reportGroup(QString& nameGroup) { if (nameGroup.isEmpty()) { - reportVarSetInfo("Please provide a group."); + reportVarSetInfo("Provide a group."); return true; } @@ -767,7 +767,7 @@ void DlgExpressionInput::updateVarSetInfo(bool checkExpr) } else { okBtn->setEnabled(false); - reportVarSetInfo("Please select a variable set."); + reportVarSetInfo("Select a variable set."); } } diff --git a/src/Gui/Dialogs/DlgExpressionInput.ui b/src/Gui/Dialogs/DlgExpressionInput.ui index 6b33d3cd25..705ea44a45 100644 --- a/src/Gui/Dialogs/DlgExpressionInput.ui +++ b/src/Gui/Dialogs/DlgExpressionInput.ui @@ -23,7 +23,7 @@ - Expression editor + Expression Editor @@ -46,7 +46,7 @@ - Group: + Group @@ -72,7 +72,7 @@ - Variable Set: + Variable set @@ -82,14 +82,14 @@ - Info: + Info - New Property: + New property @@ -146,7 +146,7 @@ - Result: + Result diff --git a/src/Gui/Dialogs/DlgKeyboard.ui b/src/Gui/Dialogs/DlgKeyboard.ui index 2c0ba36062..52126007c4 100644 --- a/src/Gui/Dialogs/DlgKeyboard.ui +++ b/src/Gui/Dialogs/DlgKeyboard.ui @@ -45,7 +45,7 @@ - &Category: + &Category categoryBox @@ -97,7 +97,7 @@ - Current shortcut: + Current shortcut @@ -116,7 +116,7 @@ - &New shortcut: + &New shortcut editShortcut @@ -134,7 +134,7 @@ - Multi-key sequence delay: + Multi-key sequence delay @@ -188,7 +188,7 @@ to low. If more than one command with the same shortcut are active at the same time. The one with the highest priority will be triggered. - Shortcut priority list: + Shortcut priority list diff --git a/src/Gui/Dialogs/DlgKeyboardImp.cpp b/src/Gui/Dialogs/DlgKeyboardImp.cpp index c394bff10f..5360dd4a44 100644 --- a/src/Gui/Dialogs/DlgKeyboardImp.cpp +++ b/src/Gui/Dialogs/DlgKeyboardImp.cpp @@ -149,7 +149,7 @@ void DlgCustomKeyboardImp::initCommandCompleter(QLineEdit* edit, QTreeWidget* commandTreeWidget, QTreeWidgetItem* separatorItem) { - edit->setPlaceholderText(tr("Type to search...")); + edit->setPlaceholderText(tr("Type to search…")); auto completer = new CommandCompleter(edit, edit); QObject::connect(completer, &CommandCompleter::commandActivated, [=](const QByteArray& name) { diff --git a/src/Gui/Dialogs/DlgLocationAngle.ui b/src/Gui/Dialogs/DlgLocationAngle.ui index d63b17bd18..c64d637a45 100644 --- a/src/Gui/Dialogs/DlgLocationAngle.ui +++ b/src/Gui/Dialogs/DlgLocationAngle.ui @@ -19,7 +19,7 @@ - A: + A @@ -40,7 +40,7 @@ - B: + B @@ -61,7 +61,7 @@ - C: + C @@ -83,7 +83,7 @@ - Angle Snap + Angle snap diff --git a/src/Gui/Dialogs/DlgLocationPos.ui b/src/Gui/Dialogs/DlgLocationPos.ui index e862a92455..7b8a40e584 100644 --- a/src/Gui/Dialogs/DlgLocationPos.ui +++ b/src/Gui/Dialogs/DlgLocationPos.ui @@ -19,7 +19,7 @@ - X: + X @@ -40,7 +40,7 @@ - Y: + Y @@ -61,7 +61,7 @@ - Z: + Z @@ -83,7 +83,7 @@ - Grid Snap in + Grid snap in diff --git a/src/Gui/Dialogs/DlgMacroExecute.ui b/src/Gui/Dialogs/DlgMacroExecute.ui index 8ddbff5ac7..e509502676 100644 --- a/src/Gui/Dialogs/DlgMacroExecute.ui +++ b/src/Gui/Dialogs/DlgMacroExecute.ui @@ -11,7 +11,7 @@ - Execute macro + Execute Macro true @@ -52,7 +52,7 @@ - Macro name: + Macro Name @@ -82,7 +82,7 @@ - Find file: + Find file @@ -96,7 +96,7 @@ - Find in files: + Find in files @@ -278,7 +278,7 @@ false - Launch a guide on how to set up a macro in a custom global toolbar. + Launches a guide on how to set up a macro in a custom global toolbar Toolbar @@ -304,7 +304,7 @@ true - Open Addon Manager where macros created by the community and other addons can be downloaded. + Opens the Addon Manager to download macros created by the community Download @@ -318,7 +318,7 @@ - User macros location: + User Macros Location @@ -352,10 +352,10 @@ true - Open folder with macros in system file manager. + Opens the macros folder in the system file manager - Open folder + Open Folder diff --git a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp index 1c7649a24b..b24d8517f9 100644 --- a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp +++ b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp @@ -448,7 +448,7 @@ void DlgMacroExecuteImp::onEditButtonClicked() if (mitem->systemWide) { editor->setReadOnly(true); QString shownName; - shownName = QStringLiteral("%1[*] - [%2]").arg(item->text(0), tr("Read-only")); + shownName = QStringLiteral("%1[*] - [%2]").arg(item->text(0), tr("Read-Only")); edit->setWindowTitle(shownName); } close(); @@ -467,7 +467,7 @@ void DlgMacroExecuteImp::onCreateButtonClicked() QString fn = QInputDialog::getText(this, tr("Macro file"), - tr("Enter a file name, please:"), + tr("Enter a file name:"), QLineEdit::Normal, QString(), nullptr, @@ -537,7 +537,7 @@ void DlgMacroExecuteImp::onDeleteButtonClicked() QString fn = item->text(0); auto ret = QMessageBox::question(this, tr("Delete macro"), - tr("Do you really want to delete the macro '%1'?").arg(fn), + tr("Delete the macro '%1'?").arg(fn), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (ret == QMessageBox::Yes) { @@ -628,7 +628,7 @@ Note: your changes will be applied when you next switch workbenches\n")); Gui::Dialog::DlgCustomizeImp dlg(this); /** title is normally "Customize" **/ - dlg.setWindowTitle(tr("Walkthrough, dialog 1 of 2")); + dlg.setWindowTitle(tr("Walkthrough, Dialog 1 of 2")); tabWidget = dlg.findChild(QStringLiteral("Gui__Dialog__TabWidget")); if (!tabWidget) { @@ -693,8 +693,8 @@ Note: your changes will be applied when you next switch workbenches\n")); /** now for the toolbar selection dialog **/ Gui::Dialog::DlgCustomizeImp dlg(this); - dlg.setWindowTitle(hasMacroCommand ? tr("Walkthrough, dialog 1 of 1") - : tr("Walkthrough, dialog 2 of 2")); + dlg.setWindowTitle(hasMacroCommand ? tr("Walkthrough, Dialog 1 of 1") + : tr("Walkthrough, Dialog 2 of 2")); tabWidget = nullptr; tabWidget = dlg.findChild(QStringLiteral("Gui__Dialog__TabWidget")); diff --git a/src/Gui/Dialogs/DlgMacroRecord.ui b/src/Gui/Dialogs/DlgMacroRecord.ui index b42d58246b..0e05dbee80 100644 --- a/src/Gui/Dialogs/DlgMacroRecord.ui +++ b/src/Gui/Dialogs/DlgMacroRecord.ui @@ -11,7 +11,7 @@ - Macro recording + Record Macro @@ -32,7 +32,7 @@ - Macro name: + Macro Name @@ -59,7 +59,7 @@ - Macro path: + Macro Path @@ -93,7 +93,7 @@ - ... + Choose Folder diff --git a/src/Gui/Dialogs/DlgMacroRecordImp.cpp b/src/Gui/Dialogs/DlgMacroRecordImp.cpp index 01ae153a2b..53badd5ed7 100644 --- a/src/Gui/Dialogs/DlgMacroRecordImp.cpp +++ b/src/Gui/Dialogs/DlgMacroRecordImp.cpp @@ -103,7 +103,7 @@ void DlgMacroRecordImp::onButtonStartClicked() if (ui->lineEditPath->text().isEmpty()) { QMessageBox::information(getMainWindow(), tr("Macro recorder"), - tr("Specify first a place to save.")); + tr("Specify a place to save first.")); return; } @@ -112,7 +112,7 @@ void DlgMacroRecordImp::onButtonStartClicked() QMessageBox::information( getMainWindow(), tr("Macro recorder"), - tr("The macro directory doesn't exist. Please, choose another one.")); + tr("The macro directory does not exist. Choose another one.")); return; } @@ -127,7 +127,7 @@ void DlgMacroRecordImp::onButtonStartClicked() if (QMessageBox::question( this, tr("Existing macro"), - tr("The macro '%1' already exists. Do you want to overwrite?").arg(fn), + tr("The macro '%1' already exists. Overwrite it?").arg(fn), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) { @@ -140,7 +140,7 @@ void DlgMacroRecordImp::onButtonStartClicked() QMessageBox::information( getMainWindow(), tr("Macro recorder"), - tr("You have no write permission for the directory. Please, choose another one.")); + tr("You have no write permission for the directory. Choose another one.")); return; } file.close(); diff --git a/src/Gui/Dialogs/DlgMaterialProperties.ui b/src/Gui/Dialogs/DlgMaterialProperties.ui index 3f2b1835e3..1de2e032f8 100644 --- a/src/Gui/Dialogs/DlgMaterialProperties.ui +++ b/src/Gui/Dialogs/DlgMaterialProperties.ui @@ -11,7 +11,7 @@ - Material properties + Material Properties true @@ -44,14 +44,14 @@ - Diffuse color: + Diffuse color - Shininess: + Shininess @@ -75,7 +75,7 @@ - Ambient color: + Ambient color @@ -111,7 +111,7 @@ - Specular color: + Specular color @@ -145,14 +145,14 @@ - Emissive color: + Emissive color - Transparency: + Transparency diff --git a/src/Gui/Dialogs/DlgObjectSelection.ui b/src/Gui/Dialogs/DlgObjectSelection.ui index b6180d4491..e7ed7f1c63 100644 --- a/src/Gui/Dialogs/DlgObjectSelection.ui +++ b/src/Gui/Dialogs/DlgObjectSelection.ui @@ -11,7 +11,7 @@ - Object selection + Object Selection true @@ -29,7 +29,7 @@ - The selected objects contain other dependencies. Please select which objects to export. All dependencies are auto selected by default. + The selected objects contain other dependencies. Select which objects to export. All dependencies are auto-selected by default. true diff --git a/src/Gui/Dialogs/DlgOnlineHelp.ui b/src/Gui/Dialogs/DlgOnlineHelp.ui index 3dcacbf08b..81ebd990c2 100644 --- a/src/Gui/Dialogs/DlgOnlineHelp.ui +++ b/src/Gui/Dialogs/DlgOnlineHelp.ui @@ -11,7 +11,7 @@ - On-line help + Online Help @@ -23,7 +23,7 @@ - Help viewer + Help Viewer diff --git a/src/Gui/Dialogs/DlgOnlineHelpImp.cpp b/src/Gui/Dialogs/DlgOnlineHelpImp.cpp index c76cd2abf5..99d18e90ff 100644 --- a/src/Gui/Dialogs/DlgOnlineHelpImp.cpp +++ b/src/Gui/Dialogs/DlgOnlineHelpImp.cpp @@ -100,7 +100,7 @@ void DlgOnlineHelpImp::onLineEditDownloadFileNameSelected( const QString& url ) QDir dir(url); if (dir.exists() && dir.isEmpty()) { QMessageBox::critical(this, tr("Access denied"), tr("Access denied to '%1'\n\n" - "Specify another directory, please.").arg(url)); + "Specify another directory.").arg(url)); } } diff --git a/src/Gui/Dialogs/DlgParameter.ui b/src/Gui/Dialogs/DlgParameter.ui index 30af027efe..b52db358d5 100644 --- a/src/Gui/Dialogs/DlgParameter.ui +++ b/src/Gui/Dialogs/DlgParameter.ui @@ -70,7 +70,7 @@ Type in a group name to find it - Search Group + Search group @@ -83,7 +83,7 @@ - Find... + Find… @@ -106,7 +106,7 @@ - Save to disk + Save to Disk Alt+C diff --git a/src/Gui/Dialogs/DlgParameterFind.cpp b/src/Gui/Dialogs/DlgParameterFind.cpp index 1fb2dcdc8c..5e059789c8 100644 --- a/src/Gui/Dialogs/DlgParameterFind.cpp +++ b/src/Gui/Dialogs/DlgParameterFind.cpp @@ -308,7 +308,7 @@ void DlgParameterFind::accept() else { QMessageBox::warning(this, tr("Not found"), - tr("Can't find the text: %1").arg(opt.text)); + tr("Cannot find the text: %1").arg(opt.text)); } } } diff --git a/src/Gui/Dialogs/DlgParameterFind.ui b/src/Gui/Dialogs/DlgParameterFind.ui index 1ac820fbf9..8cbd19dd35 100644 --- a/src/Gui/Dialogs/DlgParameterFind.ui +++ b/src/Gui/Dialogs/DlgParameterFind.ui @@ -29,7 +29,7 @@ - Find what: + Find What @@ -52,7 +52,7 @@ - Look at + Look At @@ -91,7 +91,7 @@ - Match whole string only + Match exact string true diff --git a/src/Gui/Dialogs/DlgParameterImp.cpp b/src/Gui/Dialogs/DlgParameterImp.cpp index 957d7992ef..597ab4f957 100644 --- a/src/Gui/Dialogs/DlgParameterImp.cpp +++ b/src/Gui/Dialogs/DlgParameterImp.cpp @@ -124,7 +124,7 @@ DlgParameterImp::DlgParameterImp(QWidget* parent, Qt::WindowFlags fl) boldFont.setBold(true); defaultColor = paramGroup->topLevelItem(0)->foreground(0); - ui->findGroupLE->setPlaceholderText(tr("Search Group")); + ui->findGroupLE->setPlaceholderText(tr("Search group")); } /** @@ -491,15 +491,15 @@ ParameterGroup::ParameterGroup(QWidget* parent) menuEdit = new QMenu(this); expandAct = menuEdit->addAction(tr("Expand"), this, &ParameterGroup::onToggleSelectedItem); menuEdit->addSeparator(); - subGrpAct = menuEdit->addAction(tr("Add sub-group"), this, &ParameterGroup::onCreateSubgroup); + subGrpAct = menuEdit->addAction(tr("Add Sub-Group"), this, &ParameterGroup::onCreateSubgroup); removeAct = - menuEdit->addAction(tr("Remove group"), this, &ParameterGroup::onDeleteSelectedItem); + menuEdit->addAction(tr("Remove Group"), this, &ParameterGroup::onDeleteSelectedItem); renameAct = - menuEdit->addAction(tr("Rename group"), this, &ParameterGroup::onRenameSelectedItem); + menuEdit->addAction(tr("Rename Group"), this, &ParameterGroup::onRenameSelectedItem); menuEdit->addSeparator(); - exportAct = menuEdit->addAction(tr("Export parameter"), this, &ParameterGroup::onExportToFile); + exportAct = menuEdit->addAction(tr("Export Parameter"), this, &ParameterGroup::onExportToFile); importAct = - menuEdit->addAction(tr("Import parameter"), this, &ParameterGroup::onImportFromFile); + menuEdit->addAction(tr("Import Parameter"), this, &ParameterGroup::onImportFromFile); menuEdit->setDefaultAction(expandAct); } @@ -539,7 +539,7 @@ void ParameterGroup::onDeleteSelectedItem() if (sel && sel->isSelected() && sel->parent()) { if (QMessageBox::question(this, tr("Remove group"), - tr("Do you really want to remove this parameter group?"), + tr("Remove this parameter group?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) { @@ -647,7 +647,7 @@ void ParameterGroup::onImportFromFile() } catch (const Base::Exception&) { QMessageBox::critical(this, - tr("Import Error"), + tr("Import error"), tr("Reading from '%1' failed.").arg(file)); } } @@ -685,22 +685,22 @@ ParameterValue::ParameterValue(QWidget* parent) : QTreeWidget(parent) { menuEdit = new QMenu(this); - changeAct = menuEdit->addAction(tr("Change value"), + changeAct = menuEdit->addAction(tr("Change Value"), this, qOverload<>(&ParameterValue::onChangeSelectedItem)); menuEdit->addSeparator(); - removeAct = menuEdit->addAction(tr("Remove key"), this, &ParameterValue::onDeleteSelectedItem); - renameAct = menuEdit->addAction(tr("Rename key"), this, &ParameterValue::onRenameSelectedItem); + removeAct = menuEdit->addAction(tr("Remove Key"), this, &ParameterValue::onDeleteSelectedItem); + renameAct = menuEdit->addAction(tr("Rename Key"), this, &ParameterValue::onRenameSelectedItem); menuEdit->setDefaultAction(changeAct); menuEdit->addSeparator(); menuNew = menuEdit->addMenu(tr("New")); - newStrAct = menuNew->addAction(tr("New string item"), this, &ParameterValue::onCreateTextItem); - newFltAct = menuNew->addAction(tr("New float item"), this, &ParameterValue::onCreateFloatItem); - newIntAct = menuNew->addAction(tr("New integer item"), this, &ParameterValue::onCreateIntItem); + newStrAct = menuNew->addAction(tr("New String Item"), this, &ParameterValue::onCreateTextItem); + newFltAct = menuNew->addAction(tr("New Float Item"), this, &ParameterValue::onCreateFloatItem); + newIntAct = menuNew->addAction(tr("New Integer Item"), this, &ParameterValue::onCreateIntItem); newUlgAct = - menuNew->addAction(tr("New unsigned item"), this, &ParameterValue::onCreateUIntItem); - newBlnAct = menuNew->addAction(tr("New Boolean item"), this, &ParameterValue::onCreateBoolItem); + menuNew->addAction(tr("New Unsigned Item"), this, &ParameterValue::onCreateUIntItem); + newBlnAct = menuNew->addAction(tr("New Boolean Item"), this, &ParameterValue::onCreateBoolItem); connect(this, &ParameterValue::itemDoubleClicked, @@ -821,7 +821,7 @@ void ParameterValue::onCreateTextItem() QString val = QInputDialog::getText(this, QObject::tr("New text item"), - QObject::tr("Enter your text:"), + QObject::tr("Enter text:"), QLineEdit::Normal, QString(), &ok, @@ -860,7 +860,7 @@ void ParameterValue::onCreateIntItem() int val = QInputDialog::getInt(this, QObject::tr("New integer item"), - QObject::tr("Enter your number:"), + QObject::tr("Enter number:"), 0, -2147483647, 2147483647, @@ -900,11 +900,11 @@ void ParameterValue::onCreateUIntItem() } } - DlgInputDialogImp dlg(QObject::tr("Enter your number:"), + DlgInputDialogImp dlg(QObject::tr("Enter number:"), this, true, DlgInputDialogImp::UIntBox); - dlg.setWindowTitle(QObject::tr("New unsigned item")); + dlg.setWindowTitle(QObject::tr("New Unsigned Item")); UIntSpinBox* edit = dlg.getUIntBox(); edit->setRange(0, std::numeric_limits::max()); if (dlg.exec() == QDialog::Accepted) { @@ -946,7 +946,7 @@ void ParameterValue::onCreateFloatItem() double val = QInputDialog::getDouble(this, QObject::tr("New float item"), - QObject::tr("Enter your number:"), + QObject::tr("Enter number:"), 0, -2147483647, 2147483647, @@ -964,7 +964,7 @@ void ParameterValue::onCreateBoolItem() { bool ok; QString name = QInputDialog::getText(this, - QObject::tr("New Boolean item"), + QObject::tr("New boolean item"), QObject::tr("Enter the name:"), QLineEdit::Normal, QString(), @@ -1146,7 +1146,7 @@ void ParameterText::changeValue() bool ok; QString txt = QInputDialog::getText(treeWidget(), QObject::tr("Change value"), - QObject::tr("Enter your text:"), + QObject::tr("Enter text:"), QLineEdit::Normal, text(2), &ok, @@ -1195,7 +1195,7 @@ void ParameterInt::changeValue() bool ok; int num = QInputDialog::getInt(treeWidget(), QObject::tr("Change value"), - QObject::tr("Enter your number:"), + QObject::tr("Enter number:"), text(2).toInt(), -2147483647, 2147483647, @@ -1244,11 +1244,11 @@ ParameterUInt::~ParameterUInt() = default; void ParameterUInt::changeValue() { bool ok; - DlgInputDialogImp dlg(QObject::tr("Enter your number:"), + DlgInputDialogImp dlg(QObject::tr("Enter number:"), treeWidget(), true, DlgInputDialogImp::UIntBox); - dlg.setWindowTitle(QObject::tr("Change value")); + dlg.setWindowTitle(QObject::tr("Change Value")); UIntSpinBox* edit = dlg.getUIntBox(); edit->setRange(0, std::numeric_limits::max()); edit->setValue(text(2).toULong()); @@ -1301,7 +1301,7 @@ void ParameterFloat::changeValue() bool ok; double num = QInputDialog::getDouble(treeWidget(), QObject::tr("Change value"), - QObject::tr("Enter your number:"), + QObject::tr("Enter number:"), text(2).toDouble(), -2147483647, 2147483647, diff --git a/src/Gui/Dialogs/DlgPreferencePackManagement.ui b/src/Gui/Dialogs/DlgPreferencePackManagement.ui index 15cd346551..7697dc1f8c 100644 --- a/src/Gui/Dialogs/DlgPreferencePackManagement.ui +++ b/src/Gui/Dialogs/DlgPreferencePackManagement.ui @@ -53,7 +53,7 @@ - Open Addon Manager... + Open Addon Manager diff --git a/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp b/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp index 5f01f693fc..d1aab6e1ba 100644 --- a/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp +++ b/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp @@ -132,7 +132,7 @@ void DlgPreferencePackManagementImp::addTreeNode(const std::string &name, const break; case TreeWidgetType::USER: // The button is a "delete" button button->setIcon(QIcon(QLatin1String(":/icons/delete.svg"))); - button->setToolTip(tr("Delete user-saved preference pack '%1'").arg(item->text(0))); + button->setToolTip(tr("Deletes the user-saved preference pack '%1'").arg(item->text(0))); connect(button, &QPushButton::clicked, [this, item]() { this->deleteUserPack(item->text(0).toStdString()); }); @@ -142,7 +142,7 @@ void DlgPreferencePackManagementImp::addTreeNode(const std::string &name, const button->setIcon(iconIsVisible); else button->setIcon(iconIsInvisible); - button->setToolTip(tr("Toggle visibility of Addon preference pack '%1' (use Addon Manager to permanently remove)").arg(item->text(0))); + button->setToolTip(tr("Toggles the visibility of the addon preference pack '%1' (use the Addon Manager to remove permanently)").arg(item->text(0))); connect(button, &QPushButton::clicked, [this, name, item]() { this->hideInstalledPack(name, item->text(0).toStdString()); }); @@ -155,7 +155,7 @@ void DlgPreferencePackManagementImp::deleteUserPack(const std::string& name) { // Do the deletion here... auto result = QMessageBox::warning(this, tr("Delete saved preference pack?"), - tr("Are you sure you want to delete the preference pack named '%1'? This cannot be undone.").arg(QString::fromStdString(name)), + tr("Delete the preference pack named '%1'? This cannot be undone.").arg(QString::fromStdString(name)), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel); if (result == QMessageBox::Yes) { Application::Instance->prefPackManager()->deleteUserPack(name); diff --git a/src/Gui/Dialogs/DlgPreferencesImp.cpp b/src/Gui/Dialogs/DlgPreferencesImp.cpp index 75d9b1289d..0267f432d1 100644 --- a/src/Gui/Dialogs/DlgPreferencesImp.cpp +++ b/src/Gui/Dialogs/DlgPreferencesImp.cpp @@ -769,21 +769,23 @@ void DlgPreferencesImp::showResetOptions() auto groupText = currentGroupItem->text(); // Reset per page - QAction* pageAction = menu.addAction(tr("Reset page '%1'...").arg(pageText), - this, - [&] { restorePageDefaults(currentPageItem); }); + QAction* pageAction = menu.addAction(tr("Reset Page '%1'").arg(pageText), this, [&] { + + restorePageDefaults(currentPageItem); + }); pageAction->setToolTip(tr("Resets the user settings for the page '%1'").arg(pageText)); // Reset per group - QAction* groupAction = menu.addAction(tr("Reset group '%1'...").arg(groupText), + QAction* groupAction = menu.addAction(tr("Reset Group '%1'").arg(groupText), + this, [&] { restorePageDefaults(static_cast(currentPageItem->parent())); }); groupAction->setToolTip(tr("Resets the user settings for the group '%1'").arg(groupText)); // Reset all - QAction* allAction = menu.addAction(tr("Reset all..."), - this, - &DlgPreferencesImp::restoreDefaults); + QAction* allAction = + menu.addAction(tr("Reset All"), this, &DlgPreferencesImp::restoreDefaults); + allAction->setToolTip(tr("Resets the user settings entirely")); connect(&menu, &QMenu::hovered, [&menu](QAction* hover) { @@ -800,9 +802,9 @@ void DlgPreferencesImp::restoreDefaults() { QMessageBox box(this); box.setIcon(QMessageBox::Question); - box.setWindowTitle(tr("Clear user settings")); - box.setText(tr("Do you want to clear all your user settings?")); - box.setInformativeText(tr("If you agree all your settings will be cleared.")); + box.setWindowTitle(tr("Clear User Settings")); + box.setText(tr("Clear all your user settings?")); + box.setInformativeText(tr("All settings will be cleared.")); box.setStandardButtons(QMessageBox::Yes | QMessageBox::No); box.setDefaultButton(QMessageBox::No); @@ -945,8 +947,8 @@ void DlgPreferencesImp::restartIfRequired() QMessageBox restartBox(parentWidget()); // current window likely already closed, cant parent to it restartBox.setIcon(QMessageBox::Warning); - restartBox.setWindowTitle(tr("Restart required")); - restartBox.setText(tr("You must restart FreeCAD for changes to take effect.")); + restartBox.setWindowTitle(tr("Restart Required")); + restartBox.setText(tr("Restart FreeCAD for changes to take effect.")); restartBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); restartBox.setDefaultButton(QMessageBox::Cancel); auto okBtn = restartBox.button(QMessageBox::Ok); diff --git a/src/Gui/Dialogs/DlgProjectInformation.ui b/src/Gui/Dialogs/DlgProjectInformation.ui index 7e2a892cba..a73ae3fd8c 100644 --- a/src/Gui/Dialogs/DlgProjectInformation.ui +++ b/src/Gui/Dialogs/DlgProjectInformation.ui @@ -11,7 +11,7 @@ - Document information + Document Information true @@ -44,7 +44,7 @@ - &Name: + &Name Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -70,7 +70,7 @@ - Path: + Path Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -93,7 +93,7 @@ - UUID: + UUID Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -116,7 +116,7 @@ - Program version: + Program version Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -139,7 +139,7 @@ - Unit System: + Unit system Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -156,7 +156,7 @@ - Created &by: + Created &by Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -179,7 +179,7 @@ - Creation &date: + Creation &date Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -205,7 +205,7 @@ - &Last modified by: + &Last modified by Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -228,7 +228,7 @@ - Last &modification date: + Last &modification date Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -254,7 +254,7 @@ - Com&pany: + Com&pany Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -277,7 +277,7 @@ - License information: + License information Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -305,7 +305,7 @@ - Open in browser + Open in Browser @@ -314,7 +314,7 @@ - &Comment: + &Comment Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/Gui/Dialogs/DlgProjectUtility.ui b/src/Gui/Dialogs/DlgProjectUtility.ui index c6b3f3348e..f2f4714ed4 100644 --- a/src/Gui/Dialogs/DlgProjectUtility.ui +++ b/src/Gui/Dialogs/DlgProjectUtility.ui @@ -11,7 +11,7 @@ - Document utility + Document Utility @@ -19,7 +19,7 @@ - Extract document + Extract Document @@ -69,7 +69,7 @@ - Create document + Create Document diff --git a/src/Gui/Dialogs/DlgPropertyLink.ui b/src/Gui/Dialogs/DlgPropertyLink.ui index c038f50c9f..3c44202d49 100644 --- a/src/Gui/Dialogs/DlgPropertyLink.ui +++ b/src/Gui/Dialogs/DlgPropertyLink.ui @@ -50,7 +50,7 @@ - If enabled, then 3D view selection will be synchronized with full object hierarchy. + Synchronizes the 3D view selection with the full object hierarchy Sync sub-object selection diff --git a/src/Gui/Dialogs/DlgRevertToBackupConfig.ui b/src/Gui/Dialogs/DlgRevertToBackupConfig.ui index 460c0d6477..3f3871655b 100644 --- a/src/Gui/Dialogs/DlgRevertToBackupConfig.ui +++ b/src/Gui/Dialogs/DlgRevertToBackupConfig.ui @@ -23,7 +23,7 @@ - WARNING: this process will undo any preference changes made since the specified date, and will also reset your Recent files and Macros to their state on that date. + WARNING: this process will undo any preference changes made since the specified date, and will also reset your recent files and Macros to their state on that date. true @@ -49,7 +49,7 @@ - Available backup files: + Available backup files diff --git a/src/Gui/Dialogs/DlgRunExternal.ui b/src/Gui/Dialogs/DlgRunExternal.ui index 3251f693fb..ef6e80c56f 100644 --- a/src/Gui/Dialogs/DlgRunExternal.ui +++ b/src/Gui/Dialogs/DlgRunExternal.ui @@ -17,7 +17,7 @@ - Running external program + Running External Program @@ -84,7 +84,7 @@ - ... + Choose Program @@ -101,21 +101,21 @@ - Accept changes + Accept Changes - Discard changes + Discard Changes - Abort program + Abort Program diff --git a/src/Gui/Dialogs/DlgSettingsColorGradient.ui b/src/Gui/Dialogs/DlgSettingsColorGradient.ui index 1faf44b6f4..5a4741b2dd 100644 --- a/src/Gui/Dialogs/DlgSettingsColorGradient.ui +++ b/src/Gui/Dialogs/DlgSettingsColorGradient.ui @@ -11,7 +11,7 @@ - Color-gradient settings + Color Gradient Settings true @@ -23,13 +23,13 @@ - Color model + Color Model - &Gradient: + &Gradient comboBoxModel @@ -40,22 +40,22 @@ - red-yellow-green-cyan-blue + Red-yellow-green-cyan-blue - blue-cyan-green-yellow-red + Blue-cyan-green-yellow-red - white-black + White-black - black-white + Black-white @@ -187,13 +187,13 @@ will be displayed with transparency - Parameter range + Parameter Range - Ma&ximum: + Ma&ximum floatLineEditMax @@ -238,7 +238,7 @@ will be displayed with transparency - &Labels: + &Labels spinBoxLabel @@ -264,7 +264,7 @@ will be displayed with transparency - Mi&nimum: + Mi&nimum floatLineEditMin @@ -293,7 +293,7 @@ will be displayed with transparency - &Decimals: + &Decimals spinBoxDecimals diff --git a/src/Gui/Dialogs/DlgSettingsImage.ui b/src/Gui/Dialogs/DlgSettingsImage.ui index 275f51d7bd..697d4c14fe 100644 --- a/src/Gui/Dialogs/DlgSettingsImage.ui +++ b/src/Gui/Dialogs/DlgSettingsImage.ui @@ -11,7 +11,7 @@ - Image settings + Image Settings @@ -32,7 +32,7 @@ - Image dimensions + Image Dimensions @@ -70,7 +70,7 @@ - Standard sizes: + Standard sizes @@ -196,7 +196,7 @@ - &Width: + &Width spinWidth @@ -223,7 +223,7 @@ - &Height: + &Height spinHeight @@ -269,7 +269,7 @@ - Aspect ratio: + Aspect ratio @@ -321,7 +321,7 @@ - Image properties + Image Properties @@ -342,7 +342,7 @@ - Back&ground: + Back&ground comboBackground @@ -376,7 +376,7 @@ - Creation method: + Creation method @@ -392,7 +392,7 @@ false - Image comment + Image Comment diff --git a/src/Gui/Dialogs/DlgSettingsImageImp.cpp b/src/Gui/Dialogs/DlgSettingsImageImp.cpp index 85692b9246..96a0bd747a 100644 --- a/src/Gui/Dialogs/DlgSettingsImageImp.cpp +++ b/src/Gui/Dialogs/DlgSettingsImageImp.cpp @@ -54,8 +54,8 @@ DlgSettingsImageImp::DlgSettingsImageImp(QWidget* parent) _height = height(); _fRatio = (float)_width / (float)_height; - ui->comboMethod->addItem(tr("Offscreen (New)"), QByteArray("QtOffscreenRenderer")); - ui->comboMethod->addItem(tr("Offscreen (Old)"), QByteArray("CoinOffscreenRenderer")); + ui->comboMethod->addItem(tr("Offscreen (new)"), QByteArray("QtOffscreenRenderer")); + ui->comboMethod->addItem(tr("Offscreen (old)"), QByteArray("CoinOffscreenRenderer")); ui->comboMethod->addItem(tr("Framebuffer (custom)"), QByteArray("FramebufferObject")); ui->comboMethod->addItem(tr("Framebuffer (as is)"), QByteArray("GrabFramebuffer")); } diff --git a/src/Gui/Dialogs/DlgToolbars.ui b/src/Gui/Dialogs/DlgToolbars.ui index 0a4700fbc3..fe84665e40 100644 --- a/src/Gui/Dialogs/DlgToolbars.ui +++ b/src/Gui/Dialogs/DlgToolbars.ui @@ -54,7 +54,7 @@ - Category: + Category @@ -104,10 +104,10 @@ - Move right + Move Right - <b>Move the selected item one level down.</b><p>This will also change the level of the parent item.</p> + <b>Moves the selected item one level down.</b><p>This will also change the level of the parent item.</p> @@ -130,10 +130,10 @@ - Move left + Move Left - <b>Move the selected item one level up.</b><p>This will also change the level of the parent item.</p> + <b>Moves the selected item one level up.</b><p>This will also change the level of the parent item.</p> @@ -162,10 +162,10 @@ - Move up + Move Up - <b>Move the selected item up.</b><p>The item will be moved within the hierarchy level.</p> + <b>Moves the selected item up.</b><p>The item will be moved within the hierarchy level.</p> @@ -188,10 +188,10 @@ - Move down + Move Down - <b>Move the selected item down.</b><p>The item will be moved within the hierarchy level.</p> + <b>Moves the selected item down.</b><p>The item will be moved within the hierarchy level.</p> @@ -285,14 +285,14 @@ - New... + New - Rename... + Rename diff --git a/src/Gui/Dialogs/DlgToolbarsImp.cpp b/src/Gui/Dialogs/DlgToolbarsImp.cpp index 33edb6d115..98f80cb79f 100644 --- a/src/Gui/Dialogs/DlgToolbarsImp.cpp +++ b/src/Gui/Dialogs/DlgToolbarsImp.cpp @@ -873,7 +873,7 @@ void DlgCustomToolbarsImp::changeEvent(QEvent* e) DlgCustomToolBoxbarsImp::DlgCustomToolBoxbarsImp(QWidget* parent) : DlgCustomToolbars(DlgCustomToolbars::Toolboxbar, parent) { - setWindowTitle(tr("Toolbox bars")); + setWindowTitle(tr("Toolbox Bars")); } /** Destroys the object and frees any allocated resources */ @@ -882,7 +882,7 @@ DlgCustomToolBoxbarsImp::~DlgCustomToolBoxbarsImp() = default; void DlgCustomToolBoxbarsImp::changeEvent(QEvent* e) { if (e->type() == QEvent::LanguageChange) { - setWindowTitle(tr("Toolbox bars")); + setWindowTitle(tr("Toolbox Bars")); } DlgCustomToolbars::changeEvent(e); } diff --git a/src/Gui/Dialogs/DlgUnitsCalculator.ui b/src/Gui/Dialogs/DlgUnitsCalculator.ui index 36958a2669..537a4d1eaa 100644 --- a/src/Gui/Dialogs/DlgUnitsCalculator.ui +++ b/src/Gui/Dialogs/DlgUnitsCalculator.ui @@ -11,7 +11,7 @@ - Units converter + Units Converter @@ -32,7 +32,7 @@ - as: + as @@ -45,7 +45,7 @@ - Input here the unit for the result + Input the unit for the result @@ -97,7 +97,7 @@ To add a calculation press Return in the value input field - Quantity: + Quantity @@ -114,14 +114,14 @@ To add a calculation press Return in the value input field - Unit system: + Unit system - Unit system to be used for the Quantity + Unit system to be used for the Quantity. The preference system is the one set in the general preferences. @@ -129,14 +129,14 @@ The preference system is the one set in the general preferences. - Decimals: + Decimals - Decimals for the Quantity + Decimals for the quantity 2 @@ -152,7 +152,7 @@ The preference system is the one set in the general preferences. - Unit category: + Unit category @@ -165,7 +165,7 @@ The preference system is the one set in the general preferences. - Unit category for the Quantity + Unit category for the quantity @@ -190,7 +190,7 @@ The preference system is the one set in the general preferences. - Copy the result into the clipboard + Copies the result to the clipboard Copy diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 8fe1118b88..64bd82e68a 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -1344,8 +1344,7 @@ static bool checkCanonicalPath(const std::map &docs) FC_WARN(" Document: " << docName(d).toUtf8().constData() << ": " << d->FileName.getValue()); if (count == 3) { - ts << "\n\n" - << QObject::tr("Please check report view for more..."); + ts << "\n\n" << QObject::tr("Check report view for more…"); } else if (count < 3) { ts << "\n\n" << QObject::tr("Physical path:") << ' ' << v.first @@ -1482,7 +1481,7 @@ bool Document::save() /// Save the document under a new file name bool Document::saveAs() { - getMainWindow()->showMessage(QObject::tr("Save document under new filename...")); + getMainWindow()->showMessage(QObject::tr("Save document under new filename…")); QString exe = qApp->applicationName(); QString name = QString::fromUtf8(getDocument()->FileName.getValue()); @@ -1587,7 +1586,7 @@ void Document::saveAll() /// Save a copy of the document under a new file name bool Document::saveCopy() { - getMainWindow()->showMessage(QObject::tr("Save a copy of the document under new filename...")); + getMainWindow()->showMessage(QObject::tr("Save a copy of the document under new filename…")); QString exe = qApp->applicationName(); QString fn = FileDialog::getSaveFileName(getMainWindow(), QObject::tr("Save %1 Document").arg(exe), @@ -1806,8 +1805,9 @@ void Document::SaveDocFile (Base::Writer &writer) const { writer.Stream() << "" << std::endl << "" << std::endl; + << " FreeCAD Document, see https://www.freecad.org for more information…" + << std::endl + << "-->" << std::endl; writer.Stream() << " - Status of recovered documents: + Status of recovered documents @@ -63,7 +63,7 @@ The 'Status' column shows whether the document could be recovered. - Document Name + Document name @@ -79,7 +79,7 @@ The 'Status' column shows whether the document could be recovered. true - Cleanup... + Cleanup diff --git a/src/Gui/DownloadItem.cpp b/src/Gui/DownloadItem.cpp index 289f09f814..1f3bae4823 100644 --- a/src/Gui/DownloadItem.cpp +++ b/src/Gui/DownloadItem.cpp @@ -438,7 +438,7 @@ void DownloadItem::tryAgain() void DownloadItem::contextMenuEvent(QContextMenuEvent* e) { QMenu menu; - QAction* a = menu.addAction(tr("Open containing folder"), this, &DownloadItem::openFolder); + QAction* a = menu.addAction(tr("Open Containing Folder"), this, &DownloadItem::openFolder); a->setEnabled(m_output.exists()); menu.exec(e->globalPos()); } diff --git a/src/Gui/DownloadManager.ui b/src/Gui/DownloadManager.ui index e2d058dc96..9149552e77 100644 --- a/src/Gui/DownloadManager.ui +++ b/src/Gui/DownloadManager.ui @@ -31,7 +31,7 @@ false - Clean up + Clean Up diff --git a/src/Gui/EditorView.cpp b/src/Gui/EditorView.cpp index 69fda4a503..a8b744f965 100644 --- a/src/Gui/EditorView.cpp +++ b/src/Gui/EditorView.cpp @@ -212,7 +212,7 @@ void EditorView::checkTimestamp() switch (QMessageBox::question(this, tr("Modified file"), tr("%1.\n\nThis has been modified outside of the source " - "editor. Do you want to reload it?") + "editor. Reload it?") .arg(d->fileName), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) { @@ -349,7 +349,7 @@ bool EditorView::canClose() switch (QMessageBox::question(this, tr("Unsaved document"), tr("The document has been modified.\n" - "Do you want to save your changes?"), + "Save all changes?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Cancel)) { case QMessageBox::Yes: diff --git a/src/Gui/ExpressionCompleter.cpp b/src/Gui/ExpressionCompleter.cpp index 332cfbc692..6f3dc29f50 100644 --- a/src/Gui/ExpressionCompleter.cpp +++ b/src/Gui/ExpressionCompleter.cpp @@ -1055,7 +1055,7 @@ void ExpressionLineEdit::contextMenuEvent(QContextMenuEvent* event) if (completer) { menu->addSeparator(); - QAction* match = menu->addAction(tr("Exact match")); + QAction* match = menu->addAction(tr("Exact Match")); match->setCheckable(true); match->setChecked(completer->filterMode() == Qt::MatchStartsWith); QObject::connect(match, &QAction::toggled, this, &Gui::ExpressionLineEdit::setExactMatch); @@ -1159,7 +1159,7 @@ void ExpressionTextEdit::contextMenuEvent(QContextMenuEvent* event) { QMenu* menu = createStandardContextMenu(); menu->addSeparator(); - QAction* match = menu->addAction(tr("Exact match")); + QAction* match = menu->addAction(tr("Exact Match")); if (completer) { match->setCheckable(true); diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp index b45f505f3d..c7eeddb17f 100644 --- a/src/Gui/FileDialog.cpp +++ b/src/Gui/FileDialog.cpp @@ -212,7 +212,7 @@ QString FileDialog::getSaveFileName (QWidget * parent, const QString & caption, QString windowTitle = caption; if (windowTitle.isEmpty()) - windowTitle = FileDialog::tr("Save as"); + windowTitle = FileDialog::tr("Save As"); // NOTE: We must not change the specified file name afterwards as we may return the name of an already // existing file. Hence we must extract the first matching suffix from the filter list and append it @@ -672,7 +672,7 @@ FileChooser::FileChooser ( QWidget * parent ) connect(lineEdit, &QLineEdit::textChanged, this, &FileChooser::fileNameChanged); connect(lineEdit, &QLineEdit::editingFinished, this, &FileChooser::editingFinished); - button = new QPushButton(QLatin1String("..."), this); + button = new QPushButton(QLatin1String("…"), this); #if defined (Q_OS_MACOS) button->setAttribute(Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct @@ -818,7 +818,7 @@ void FileChooser::setButtonText(const QString& txt) { button->setText(txt); int w1 = 2 * QtTools::horizontalAdvance(button->fontMetrics(), txt); - int w2 = 2 * QtTools::horizontalAdvance(button->fontMetrics(), QLatin1String(" ... ")); + int w2 = 2 * QtTools::horizontalAdvance(button->fontMetrics(), QLatin1String(" … ")); button->setMinimumWidth(std::max(w1, w2)); Q_EMIT buttonTextChanged(txt); } @@ -839,7 +839,7 @@ QString FileChooser::buttonText() const SelectModule::SelectModule (const QString& type, const SelectModule::Dict& types, QWidget * parent) : QDialog(parent, Qt::WindowTitleHint) { - setWindowTitle(tr("Select module")); + setWindowTitle(tr("Select Module")); groupBox = new QGroupBox(this); groupBox->setTitle(tr("Open %1 as").arg(type)); diff --git a/src/Gui/Flag.cpp b/src/Gui/Flag.cpp index 71ed5b932f..8fa2865801 100644 --- a/src/Gui/Flag.cpp +++ b/src/Gui/Flag.cpp @@ -158,13 +158,13 @@ void Flag::contextMenuEvent(QContextMenuEvent * e) { QMenu menu(this); - QAction* topleft = menu.addAction(tr("Top left")); + QAction* topleft = menu.addAction(tr("Top Left")); topleft->setCheckable(true); - QAction* botleft = menu.addAction(tr("Bottom left")); + QAction* botleft = menu.addAction(tr("Bottom Left")); botleft->setCheckable(true); - QAction* topright = menu.addAction(tr("Top right")); + QAction* topright = menu.addAction(tr("Top Right")); topright->setCheckable(true); - QAction* botright = menu.addAction(tr("Bottom right")); + QAction* botright = menu.addAction(tr("Bottom Right")); botright->setCheckable(true); menu.addSeparator(); QAction* remove = menu.addAction(tr("Remove")); diff --git a/src/Gui/FreeCADGuiInit.py b/src/Gui/FreeCADGuiInit.py index 505cdcfcc5..60190e879f 100644 --- a/src/Gui/FreeCADGuiInit.py +++ b/src/Gui/FreeCADGuiInit.py @@ -195,7 +195,7 @@ def InitApplications(): # (additional module paths are already cached) ModDirs = FreeCAD.__ModDirs__ #print ModDirs - Log('Init: Searching modules...\n') + Log('Init: Searching modules\n') def RunInitGuiPy(Dir) -> bool: InstallFile = os.path.join(Dir,"InitGui.py") @@ -210,7 +210,7 @@ def InitApplications(): Log('-'*100+'\n') Err('During initialization the error "' + str(inst) + '" occurred in '\ + InstallFile + '\n') - Err('Please look into the log file for further information\n') + Err('Look into the log file for further information\n') else: Log('Init: Initializing ' + Dir + '... done\n') return True diff --git a/src/Gui/ImageView.cpp b/src/Gui/ImageView.cpp index b6bae8574d..bfc5603f22 100644 --- a/src/Gui/ImageView.cpp +++ b/src/Gui/ImageView.cpp @@ -176,15 +176,15 @@ bool ImageView::isDragging() const void ImageView::contextMenuEvent(QContextMenuEvent* event) { QMenu menu; - QAction* fitToWindowAct = menu.addAction(tr("Fit to window")); + QAction* fitToWindowAct = menu.addAction(tr("Fit to Window")); fitToWindowAct->setCheckable(true); fitToWindowAct->setChecked(isFitToWindow()); connect(fitToWindowAct, &QAction::toggled, this, &ImageView::fitToWindow); - QAction* zoomInAct = menu.addAction(tr("Zoom in"), this, &ImageView::zoomIn); + QAction* zoomInAct = menu.addAction(tr("Zoom In"), this, &ImageView::zoomIn); zoomInAct->setEnabled(canZoomIn()); - QAction* zoomOutAct = menu.addAction(tr("Zoom out"), this, &ImageView::zoomOut); + QAction* zoomOutAct = menu.addAction(tr("Zoom Out"), this, &ImageView::zoomOut); zoomOutAct->setEnabled(canZoomOut()); menu.exec(event->globalPos()); diff --git a/src/Gui/InputField.cpp b/src/Gui/InputField.cpp index ed418866a3..2b977a17a6 100644 --- a/src/Gui/InputField.cpp +++ b/src/Gui/InputField.cpp @@ -221,7 +221,7 @@ void InputField::contextMenuEvent(QContextMenuEvent *event) // add the save value portion of the menu menu->addSeparator(); - QAction *SaveValueAction = menu->addAction(tr("Save value")); + QAction *SaveValueAction = menu->addAction(tr("Save Value")); std::vector savedValues = getSavedValues(); for(const auto & savedValue : savedValues){ diff --git a/src/Gui/InputVector.cpp b/src/Gui/InputVector.cpp index 141583b994..999d4bc59e 100644 --- a/src/Gui/InputVector.cpp +++ b/src/Gui/InputVector.cpp @@ -106,7 +106,7 @@ void LocationWidget::retranslateUi() << QApplication::translate("Gui::LocationDialog", "X") << QApplication::translate("Gui::LocationDialog", "Y") << QApplication::translate("Gui::LocationDialog", "Z") - << QApplication::translate("Gui::LocationDialog", "User defined...") + << QApplication::translate("Gui::LocationDialog", "User defined…") ); dValue->setCurrentIndex(2); @@ -120,8 +120,8 @@ void LocationWidget::retranslateUi() dValue->setItemText(0, QApplication::translate("Gui::LocationDialog", "X")); dValue->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y")); dValue->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z")); - dValue->setItemText(dValue->count()-1, - QApplication::translate("Gui::LocationDialog", "User defined...")); + dValue->setItemText(dValue->count() - 1, + QApplication::translate("Gui::LocationDialog", "User defined…")); } } diff --git a/src/Gui/InputVector.h b/src/Gui/InputVector.h index 17419500c7..27e6088046 100644 --- a/src/Gui/InputVector.h +++ b/src/Gui/InputVector.h @@ -129,7 +129,7 @@ public: << QApplication::translate("Gui::LocationDialog", "X") << QApplication::translate("Gui::LocationDialog", "Y") << QApplication::translate("Gui::LocationDialog", "Z") - << QApplication::translate("Gui::LocationDialog", "User defined...") + << QApplication::translate("Gui::LocationDialog", "User defined…") ); this->direction->setCurrentIndex(2); @@ -144,7 +144,7 @@ public: this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y")); this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z")); this->direction->setItemText(this->direction->count()-1, - QApplication::translate("Gui::LocationDialog", "User defined...")); + QApplication::translate("Gui::LocationDialog", "User defined…")); } } @@ -258,7 +258,7 @@ public: << QApplication::translate("Gui::LocationDialog", "X") << QApplication::translate("Gui::LocationDialog", "Y") << QApplication::translate("Gui::LocationDialog", "Z") - << QApplication::translate("Gui::LocationDialog", "User defined...") + << QApplication::translate("Gui::LocationDialog", "User defined…") ); this->direction->setCurrentIndex(2); @@ -273,7 +273,7 @@ public: this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y")); this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z")); this->direction->setItemText(this->direction->count()-1, - QApplication::translate("Gui::LocationDialog", "User defined...")); + QApplication::translate("Gui::LocationDialog", "User defined…")); } } @@ -435,12 +435,12 @@ public: ui->retranslateUi(dlg); if (ui->direction->count() == 0) { - ui->direction->insertItems(0, QStringList() - << QApplication::translate("Gui::LocationDialog", "X") - << QApplication::translate("Gui::LocationDialog", "Y") - << QApplication::translate("Gui::LocationDialog", "Z") - << QApplication::translate("Gui::LocationDialog", "User defined...") - ); + ui->direction->insertItems( + 0, + QStringList() << QApplication::translate("Gui::LocationDialog", "X") + << QApplication::translate("Gui::LocationDialog", "Y") + << QApplication::translate("Gui::LocationDialog", "Z") + << QApplication::translate("Gui::LocationDialog", "User defined…")); ui->direction->setCurrentIndex(2); @@ -453,8 +453,9 @@ public: ui->direction->setItemText(0, QApplication::translate("Gui::LocationDialog", "X")); ui->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y")); ui->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z")); - ui->direction->setItemText(ui->direction->count()-1, - QApplication::translate("Gui::LocationDialog", "User defined...")); + ui->direction->setItemText( + ui->direction->count() - 1, + QApplication::translate("Gui::LocationDialog", "User defined…")); } } diff --git a/src/Gui/InputVector.ui b/src/Gui/InputVector.ui index 4119b203b4..6748edf6de 100644 --- a/src/Gui/InputVector.ui +++ b/src/Gui/InputVector.ui @@ -11,7 +11,7 @@ - Input vector + Input Vector @@ -29,7 +29,7 @@ - X: + X @@ -46,7 +46,7 @@ - Y: + Y @@ -63,7 +63,7 @@ - Z: + Z diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 7b166eaffb..70a1f660dc 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -417,7 +417,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) NotificationArea* notificationArea = new NotificationArea(statusBar()); notificationArea->setObjectName(QStringLiteral("notificationArea")); //: A context menu action used to show or hide the 'notificationArea' toolbar widget - notificationArea->setWindowTitle(tr("Notification area")); + notificationArea->setWindowTitle(tr("Notification Area")); notificationArea->setStyleSheet(QStringLiteral("text-align:center;")); statusBar()->addPermanentWidget(notificationArea); } @@ -798,15 +798,15 @@ int MainWindow::confirmSave(App::Document *doc, QWidget *parent, bool addCheckbo box.setObjectName(QStringLiteral("confirmSave")); box.setIcon(QMessageBox::Question); box.setWindowFlags(box.windowFlags() | Qt::WindowStaysOnTopHint); - box.setWindowTitle(QObject::tr("Unsaved document")); + box.setWindowTitle(QObject::tr("Unsaved Document")); const QString docName = QString::fromStdString(doc->Label.getStrValue()); const QString text = (!docName.isEmpty() - ? QObject::tr("Do you want to save your changes to document '%1' before closing?").arg(docName) - : QObject::tr("Do you want to save your changes to document before closing?")); + ? QObject::tr("Save all changes to document '%1' before closing?").arg(docName) + : QObject::tr("Save all changes to document before closing?")); box.setText(text); - box.setInformativeText(QObject::tr("If you don't save, your changes will be lost.")); + box.setInformativeText(QObject::tr("Otherwise, all changes will be lost.")); box.setStandardButtons(QMessageBox::Discard | QMessageBox::Cancel | QMessageBox::Save); box.setDefaultButton(QMessageBox::Save); box.setEscapeButton(QMessageBox::Cancel); @@ -925,7 +925,7 @@ bool MainWindow::closeAllDocuments (bool close) int ret = QMessageBox::question( getMainWindow(), QObject::tr("%1 Document(s) not saved").arg(QString::number(failedSaves)), - QObject::tr("Some documents could not be saved. Do you want to cancel closing?"), + QObject::tr("Some documents could not be saved. Cancel closing?"), QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard); if (ret == QMessageBox::Cancel) @@ -1987,7 +1987,7 @@ QMimeData * MainWindow::createMimeDataFromSelection () const bool hasXLink = App::PropertyXLink::hasXLink(sel,&unsaved); if(!unsaved.empty()) { QMessageBox::critical(getMainWindow(), tr("Unsaved document"), - tr("The exported object contains external link. Please save the document" + tr("The exported object contains external link. Save the document" "at least once before exporting.")); return nullptr; } @@ -2080,7 +2080,7 @@ void MainWindow::insertFromMimeData (const QMimeData * mimeData) if(hasXLink && !doc->isSaved()) { int ret = QMessageBox::question(getMainWindow(), tr("Unsaved document"), tr("To link to external objects, the document must be saved at least once.\n" - "Do you want to save the document now?"), + "Save the document now?"), QMessageBox::Yes,QMessageBox::No); if(ret != QMessageBox::Yes || !Application::Instance->getDocument(doc)->saveAs()) return; diff --git a/src/Gui/ManualAlignment.cpp b/src/Gui/ManualAlignment.cpp index 10d54bf429..10e87c2902 100644 --- a/src/Gui/ManualAlignment.cpp +++ b/src/Gui/ManualAlignment.cpp @@ -801,8 +801,8 @@ void ManualAlignment::startAlignment(Base::Type mousemodel) myViewer->showMaximized(); int n = this->myPickPoints; QString msg = n == 1 - ? tr("Please, select at least one point in the left and the right view") - : tr("Please, select at least %1 points in the left and the right view").arg(n); + ? tr("Select at least 1 point in the left and the right view") + : tr("Select at least %1 points in the left and the right view").arg(n); myViewer->myLabel->setText(msg); connect(myViewer, &QObject::destroyed, this, &ManualAlignment::reset); @@ -857,7 +857,7 @@ void ManualAlignment::continueAlignment() grp.addToViewer(myViewer->getViewer(0)); grp.setAlignable(true); - Gui::getMainWindow()->showMessage(tr("Please pick points in the left and right view")); + Gui::getMainWindow()->showMessage(tr("Select points in the left and right view")); myViewer->getViewer(0)->setEditingCursor(QCursor(Qt::PointingHandCursor)); myViewer->getViewer(1)->setEditingCursor(QCursor(Qt::PointingHandCursor)); @@ -1247,13 +1247,13 @@ void ManualAlignment::probePickedCallback(void * ud, SoEventCallback * n) nPoints = self->myFixedGroup.countPoints(); QMenu menu; QAction* fi = menu.addAction(tr("&Align")); - QAction* rem = menu.addAction(tr("&Remove last point")); + QAction* rem = menu.addAction(tr("&Remove Last Point")); //QAction* cl = menu.addAction("C&lear"); QAction* ca = menu.addAction(tr("&Cancel")); fi->setEnabled(self->canAlign()); rem->setEnabled(nPoints > 0); menu.addSeparator(); - QAction* sync = menu.addAction(tr("&Synchronize views")); + QAction* sync = menu.addAction(tr("&Synchronize Views")); sync->setCheckable(true); if (self->d->sensorCam1->getAttachedNode()) sync->setChecked(true); diff --git a/src/Gui/MouseButtons.ui b/src/Gui/MouseButtons.ui index 13c0af9949..419f3b2030 100644 --- a/src/Gui/MouseButtons.ui +++ b/src/Gui/MouseButtons.ui @@ -11,7 +11,7 @@ - Mouse buttons + Mouse Buttons @@ -25,7 +25,7 @@ - Selection: + Selection Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -45,7 +45,7 @@ - Panning: + Panning Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -65,7 +65,7 @@ - Rotation: + Rotation Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -85,7 +85,7 @@ - Zooming: + Zooming Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp index c095a4996c..36203572e4 100644 --- a/src/Gui/NaviCube.cpp +++ b/src/Gui/NaviCube.cpp @@ -1255,7 +1255,7 @@ NaviCubeDraggableCmd::NaviCubeDraggableCmd() : Command("NaviCubeDraggableCmd") { sGroup = ""; - sMenuText = QT_TR_NOOP("Movable navigation cube"); + sMenuText = QT_TR_NOOP("Movable Navigation Cube"); sToolTipText = QT_TR_NOOP("Drag and place NaviCube"); sWhatsThis = ""; sStatusTip = sToolTipText; diff --git a/src/Gui/Navigation/BlenderNavigationStyle.cpp b/src/Gui/Navigation/BlenderNavigationStyle.cpp index 3bc606585a..d18513f8f1 100644 --- a/src/Gui/Navigation/BlenderNavigationStyle.cpp +++ b/src/Gui/Navigation/BlenderNavigationStyle.cpp @@ -51,7 +51,7 @@ const char* BlenderNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::SELECTION: return QT_TR_NOOP("Press left mouse button"); case NavigationStyle::PANNING: - return QT_TR_NOOP("Press SHIFT and middle mouse button"); + return QT_TR_NOOP("Press Shift and middle mouse button"); case NavigationStyle::DRAGGING: return QT_TR_NOOP("Press middle mouse button"); case NavigationStyle::ZOOMING: diff --git a/src/Gui/Navigation/CADNavigationStyle.cpp b/src/Gui/Navigation/CADNavigationStyle.cpp index 301d80907e..af91f144ab 100644 --- a/src/Gui/Navigation/CADNavigationStyle.cpp +++ b/src/Gui/Navigation/CADNavigationStyle.cpp @@ -52,7 +52,7 @@ const char* CADNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::PANNING: return QT_TR_NOOP("Press middle mouse button"); case NavigationStyle::DRAGGING: - return QT_TR_NOOP("Press middle+left or middle+right button"); + 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" "while doing a left or right click and move the mouse up or down"); diff --git a/src/Gui/Navigation/InventorNavigationStyle.cpp b/src/Gui/Navigation/InventorNavigationStyle.cpp index e8bb21d176..d7ba4b68ec 100644 --- a/src/Gui/Navigation/InventorNavigationStyle.cpp +++ b/src/Gui/Navigation/InventorNavigationStyle.cpp @@ -48,7 +48,7 @@ const char* InventorNavigationStyle::mouseButtons(ViewerMode mode) { switch (mode) { case NavigationStyle::SELECTION: - return QT_TR_NOOP("Press CTRL and left mouse button"); + return QT_TR_NOOP("Press Ctrl and left mouse button"); case NavigationStyle::PANNING: return QT_TR_NOOP("Press middle mouse button"); case NavigationStyle::DRAGGING: diff --git a/src/Gui/Navigation/MayaGestureNavigationStyle.cpp b/src/Gui/Navigation/MayaGestureNavigationStyle.cpp index ccf6770fce..80e37805d5 100644 --- a/src/Gui/Navigation/MayaGestureNavigationStyle.cpp +++ b/src/Gui/Navigation/MayaGestureNavigationStyle.cpp @@ -93,11 +93,11 @@ const char* MayaGestureNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::SELECTION: return QT_TR_NOOP("Tap OR click left mouse button."); case NavigationStyle::PANNING: - return QT_TR_NOOP("Drag screen with two fingers OR press ALT + middle mouse button."); + return QT_TR_NOOP("Drag screen with two fingers OR press Alt + middle mouse button."); case NavigationStyle::DRAGGING: - return QT_TR_NOOP("Drag screen with one finger OR press ALT + left mouse button. In Sketcher and other edit modes, hold Alt in addition."); + 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 middle mouse button OR press Alt + right mouse button OR PgUp/PgDown on keyboard."); default: return "No description"; } diff --git a/src/Gui/Navigation/NavigationStyle.cpp b/src/Gui/Navigation/NavigationStyle.cpp index 8cfd690401..12b76c95f9 100644 --- a/src/Gui/Navigation/NavigationStyle.cpp +++ b/src/Gui/Navigation/NavigationStyle.cpp @@ -120,13 +120,13 @@ public: if (!tolPlane.intersect(projectLine, planeIntersection)) { #ifdef FC_DEBUG SoDebugError::post("SbSphereSheetProjector::project", - "Couldn't intersect working line with plane"); + "Could not intersect working line with plane"); #endif } } else if (!tolPlane.intersect(workingLine, planeIntersection)) { #ifdef FC_DEBUG - SoDebugError::post("SbSphereSheetProjector::project", "Couldn't intersect with plane"); + SoDebugError::post("SbSphereSheetProjector::project", "Could not intersect with plane"); #endif } diff --git a/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp b/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp index 0100f2c7c0..7af1705f5a 100644 --- a/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp +++ b/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp @@ -48,11 +48,11 @@ const char* OpenCascadeNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::SELECTION: return QT_TR_NOOP("Press left mouse button"); case NavigationStyle::PANNING: - return QT_TR_NOOP("Press CTRL and middle mouse button"); + return QT_TR_NOOP("Press Ctrl and middle mouse button"); case NavigationStyle::DRAGGING: - return QT_TR_NOOP("Press CTRL and right mouse button"); + return QT_TR_NOOP("Press Ctrl and right mouse button"); case NavigationStyle::ZOOMING: - return QT_TR_NOOP("Press CTRL and left mouse button"); + return QT_TR_NOOP("Press Ctrl and left mouse button"); default: return "No description"; } diff --git a/src/Gui/Navigation/RevitNavigationStyle.cpp b/src/Gui/Navigation/RevitNavigationStyle.cpp index 7efc1bf436..e22d0b4119 100644 --- a/src/Gui/Navigation/RevitNavigationStyle.cpp +++ b/src/Gui/Navigation/RevitNavigationStyle.cpp @@ -52,7 +52,7 @@ const char* RevitNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::PANNING: return QT_TR_NOOP("Press middle mouse button"); case NavigationStyle::DRAGGING: - return QT_TR_NOOP("Press SHIFT and middle mouse button"); + return QT_TR_NOOP("Press Shift and middle mouse button"); case NavigationStyle::ZOOMING: return QT_TR_NOOP("Scroll middle mouse button"); default: diff --git a/src/Gui/Navigation/SolidWorksNavigationStyle.cpp b/src/Gui/Navigation/SolidWorksNavigationStyle.cpp index aacebff1cd..50ba26e1ac 100644 --- a/src/Gui/Navigation/SolidWorksNavigationStyle.cpp +++ b/src/Gui/Navigation/SolidWorksNavigationStyle.cpp @@ -51,7 +51,7 @@ const char* SolidWorksNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::SELECTION: return QT_TR_NOOP("Press left mouse button"); case NavigationStyle::PANNING: - return QT_TR_NOOP("Press CTRL and middle mouse button"); + return QT_TR_NOOP("Press Ctrl and middle mouse button"); case NavigationStyle::DRAGGING: return QT_TR_NOOP("Press middle mouse button"); case NavigationStyle::ZOOMING: diff --git a/src/Gui/Navigation/TouchpadNavigationStyle.cpp b/src/Gui/Navigation/TouchpadNavigationStyle.cpp index 9300b4619e..1f8837511f 100644 --- a/src/Gui/Navigation/TouchpadNavigationStyle.cpp +++ b/src/Gui/Navigation/TouchpadNavigationStyle.cpp @@ -47,11 +47,11 @@ const char* TouchpadNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::SELECTION: return QT_TR_NOOP("Press left mouse button"); case NavigationStyle::PANNING: - return QT_TR_NOOP("Press SHIFT button"); + return QT_TR_NOOP("Press Shift button"); case NavigationStyle::DRAGGING: - return QT_TR_NOOP("Press ALT button"); + return QT_TR_NOOP("Press Alt button"); case NavigationStyle::ZOOMING: - return QT_TR_NOOP("Press CTRL and SHIFT buttons"); + return QT_TR_NOOP("Press Ctrl and Shift buttons"); default: return "No description"; } diff --git a/src/Gui/NetworkRetriever.cpp b/src/Gui/NetworkRetriever.cpp index d46ccecbf8..598fb12a7c 100644 --- a/src/Gui/NetworkRetriever.cpp +++ b/src/Gui/NetworkRetriever.cpp @@ -118,7 +118,7 @@ void NetworkRetriever::testFailure() if ( wget->state() == QProcess::Running ) { d->fail = false; - QString msg = tr("Download started..."); + QString msg = tr("Download started…"); Base::Console().message("%s\n", msg.toUtf8().constData()); } } @@ -388,10 +388,10 @@ StdCmdDownloadOnlineHelp::StdCmdDownloadOnlineHelp( QObject * parent) : QObject(parent), Command("Std_DownloadOnlineHelp") { sGroup ="Help"; - sMenuText = QT_TR_NOOP("Download online help"); - sToolTipText = QT_TR_NOOP("Download %1's online help"); + sMenuText = QT_TR_NOOP("Download Online Help"); + sToolTipText = QT_TR_NOOP("Downloads %1's online help"); sWhatsThis = "Std_DownloadOnlineHelp"; - sStatusTip = QT_TR_NOOP("Download %1's online help"); + sStatusTip = sToolTipText; sPixmap = "help"; wget = new NetworkRetriever( this ); @@ -494,7 +494,7 @@ void StdCmdDownloadOnlineHelp::activated(int iMsg) if (!fi.exists()) { if (QMessageBox::critical(getMainWindow(), tr("Non-existing directory"), tr("The directory '%1' does not exist.\n\n" - "Do you want to specify an existing directory?").arg(fi.filePath()), + "Specify an existing directory?").arg(fi.filePath()), QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) { @@ -512,7 +512,7 @@ void StdCmdDownloadOnlineHelp::activated(int iMsg) if (!fi.permission( QFile::WriteUser)) { if (QMessageBox::critical(getMainWindow(), tr("Missing permission"), tr("You don't have write permission to '%1'\n\n" - "Do you want to specify another directory?").arg(fi.filePath()), + "Specify another directory?").arg(fi.filePath()), QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) { @@ -535,7 +535,7 @@ void StdCmdDownloadOnlineHelp::activated(int iMsg) if (canStart) { bool ok = wget->startDownload(QString::fromLatin1(url.c_str())); if (!ok) - Base::Console().error("The tool 'wget' couldn't be found. Please check your installation."); + Base::Console().error("The tool 'wget' could not be found. Check the installation."); else if ( wget->isDownloading() && _pcAction ) _pcAction->setText(tr("Stop downloading")); } diff --git a/src/Gui/NotificationArea.cpp b/src/Gui/NotificationArea.cpp index 5a529e3de0..20755f2b1b 100644 --- a/src/Gui/NotificationArea.cpp +++ b/src/Gui/NotificationArea.cpp @@ -693,7 +693,7 @@ protected: menu.addSeparator(); QAction* delnotifications = - menu.addAction(tr("Delete user notifications"), + menu.addAction(tr("Delete User Notifications"), this, &NotificationsAction::deleteNotifications); @@ -975,7 +975,7 @@ void NotificationArea::mousePressEvent(QMouseEvent* e) //NOLINTBEGIN NotificationsAction* na = static_cast(pImp->notificationaction); - QAction* delnotifications = menu.addAction(tr("Delete user notifications"), [&]() { + QAction* delnotifications = menu.addAction(tr("Delete User Notifications"), [&]() { // guard to avoid modifying the notification list and indices while creating the tooltip lock_guard g(pImp->mutexNotification); na->deleteNotifications(); @@ -1086,11 +1086,11 @@ void NotificationArea::showConfirmationDialog(const QString& notifiername, const { 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 " + + QObject::tr("Skip confirmation of further critical message notifications " "while loading the file?"); auto button = QMessageBox::critical(getMainWindow()->activeWindow(), - QObject::tr("Critical Message"), + QObject::tr("Critical message"), confirmMsg, QMessageBox::Yes | QMessageBox::No, QMessageBox::No); diff --git a/src/Gui/OnlineDocumentation.cpp b/src/Gui/OnlineDocumentation.cpp index 2bbbbf9e81..76a297c1f4 100644 --- a/src/Gui/OnlineDocumentation.cpp +++ b/src/Gui/OnlineDocumentation.cpp @@ -322,7 +322,7 @@ StdCmdPythonHelp::StdCmdPythonHelp() , server(nullptr) { sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Automatic Python &Modules Documentation"); + sMenuText = QT_TR_NOOP("Python &Modules Documentation"); sToolTipText = QT_TR_NOOP("Opens the Python Modules documentation"); sWhatsThis = "Std_PythonHelp"; sStatusTip = sToolTipText; diff --git a/src/Gui/OverlayWidgets.cpp b/src/Gui/OverlayWidgets.cpp index 1ea7b88fc0..f66960c4da 100644 --- a/src/Gui/OverlayWidgets.cpp +++ b/src/Gui/OverlayWidgets.cpp @@ -114,7 +114,7 @@ OverlayProxyWidget::HitTest OverlayProxyWidget::hitTest(const QPoint &globalPt, QTabBar *tabbar = owner->tabBar(); if (tabbar->isVisible() && tabbar->tabAt(pt)>=0) { - ToolTip::showText(globalPt, QObject::tr("Press ESC to hide hint"), this); + ToolTip::showText(globalPt, QObject::tr("Press Esc to hide hint"), this); return HitTest::HitOuter; } @@ -144,7 +144,7 @@ OverlayProxyWidget::HitTest OverlayProxyWidget::hitTest(const QPoint &globalPt, } if (rect.contains(pt)) { hit = HitTest::HitInner; - ToolTip::showText(globalPt, QObject::tr("Press ESC to hide hint"), this); + ToolTip::showText(globalPt, QObject::tr("Press Esc to hide hint"), this); } else if (drawLine) ToolTip::hideText(); @@ -2015,7 +2015,7 @@ void OverlayTitleBar::paintEvent(QPaintEvent *) if (OverlayManager::instance()->isMouseTransparent()) { if (timerId == 0) timerId = startTimer(500); - title = blink ? tr("Mouse pass through, ESC to stop") : dock->windowTitle(); + title = blink ? tr("Mouse pass through, Esc to stop") : dock->windowTitle(); } else { if (timerId != 0) { killTimer(timerId); diff --git a/src/Gui/Placement.cpp b/src/Gui/Placement.cpp index 66411e8a1a..548af2c10d 100644 --- a/src/Gui/Placement.cpp +++ b/src/Gui/Placement.cpp @@ -636,7 +636,7 @@ void Placement::onSelectedVertexClicked() QApplication::clipboard()->setText(loc.toString(length,'g',8)); } else { - Base::Console().message("(Shift + click Selected points button to copy distance to clipboard)\n"); + Base::Console().message("(Shift + click selected points button to copy distance to clipboard)\n"); } axis.Normalize(); rot.setValue(axis, angle); @@ -691,7 +691,7 @@ void Placement::onSelectedVertexClicked() Base::Console().message("(Angle copied to clipboard, but you might need to use a negative (-) angle sometimes.)\n"); } else { - Base::Console().message("(Shift + click Selected points button to copy angle to clipboard)\n"); + Base::Console().message("(Shift + click selected points button to copy angle to clipboard)\n"); } rot.setValue(norm, angle); plm.setRotation(rot); @@ -709,7 +709,7 @@ void Placement::onSelectedVertexClicked() if (!success) { Base::Console().warning("Placement selection error. Select either 1 or 2 points.\n"); QMessageBox msgBox(this); - msgBox.setText(tr("Please select 1, 2, or 3 points before clicking this button. A point may be on a vertex, \ + msgBox.setText(tr("Select 1, 2, or 3 points before clicking this button. A point may be on a vertex, \ face, or edge. If on a face or edge the point used will be the point at the mouse position along \ face or edge. If 1 point is selected it will be used as the center of rotation. If 2 points are \ selected the midpoint between them will be the center of rotation and a new custom axis will be \ @@ -801,9 +801,9 @@ void Placement::onApplyButtonClicked() void Placement::showErrorMessage() { QMessageBox msg(this); - msg.setWindowTitle(tr("Incorrect quantity")); + msg.setWindowTitle(tr("Incorrect Quantity")); msg.setIcon(QMessageBox::Critical); - msg.setText(tr("There are input fields with incorrect input, please ensure valid placement values!")); + msg.setText(tr("There are input fields with incorrect input. Ensure valid placement values!")); msg.exec(); } diff --git a/src/Gui/Placement.ui b/src/Gui/Placement.ui index ffd978ab38..38f8f7229f 100644 --- a/src/Gui/Placement.ui +++ b/src/Gui/Placement.ui @@ -102,10 +102,10 @@ - Shift click for opposite direction + Shift-click for opposite direction - Apply axial + Apply Axial @@ -191,7 +191,7 @@ - Selected points + Selected Points @@ -228,7 +228,7 @@ - Euler angles (zy'x'') + Euler angles (Z–Y′–X″) diff --git a/src/Gui/PrefWidgets.cpp b/src/Gui/PrefWidgets.cpp index 5f71f0f19b..6806389442 100644 --- a/src/Gui/PrefWidgets.cpp +++ b/src/Gui/PrefWidgets.cpp @@ -724,8 +724,8 @@ void PrefQuantitySpinBox::contextMenuEvent(QContextMenuEvent *event) // add the save value portion of the menu menu->addSeparator(); - QAction *saveValueAction = menu->addAction(tr("Save value")); - QAction *clearListAction = menu->addAction(tr("Clear list")); + QAction *saveValueAction = menu->addAction(tr("Save Value")); + QAction *clearListAction = menu->addAction(tr("Clear List")); clearListAction->setDisabled(history.empty()); // call the menu diff --git a/src/Gui/PreferencePages/DlgSettings3DView.ui b/src/Gui/PreferencePages/DlgSettings3DView.ui index 23151a012d..6ea088f2d2 100644 --- a/src/Gui/PreferencePages/DlgSettings3DView.ui +++ b/src/Gui/PreferencePages/DlgSettings3DView.ui @@ -61,7 +61,7 @@ lower right corner within opened files - Relative size: + Relative size Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -72,7 +72,7 @@ lower right corner within opened files Size of main coordinate system representation -in the corner -- in % of height/width of viewport +in the corner in % of height/width of the viewport % @@ -97,7 +97,7 @@ in the corner -- in % of height/width of viewport - Letter color: + Letter color @@ -284,7 +284,6 @@ will be shown at the lower left corner in opened files This option is useful for troubleshooting graphics card and driver problems. - Changing this option requires a restart of the application. @@ -306,11 +305,11 @@ A VBO is an OpenGL feature that provides methods for uploading vertex data (position, normal vector, color, etc.) to the graphics card. VBOs offer substantial performance gains because the data resides in the graphics memory rather than the system memory and so it -can be rendered directly by GPU. +can be rendered directly by the GPU. Note: Sometimes this feature may lead to a host of different issues ranging from graphical anomalies to GPU crash bugs. Remember to -report this setting as enabled when seeking support on the FreeCAD forums +report this setting as enabled when seeking support. Use OpenGL VBO (Vertex Buffer Object) @@ -334,7 +333,7 @@ report this setting as enabled when seeking support on the FreeCAD forums - What kind of multisample anti-aliasing is used + Method of multisample anti-aliasing @@ -344,14 +343,14 @@ report this setting as enabled when seeking support on the FreeCAD forums - Marker size: + Marker size - Anti-Aliasing + Anti-aliasing @@ -361,7 +360,7 @@ report this setting as enabled when seeking support on the FreeCAD forums - Transparent objects: + Transparent objects @@ -403,7 +402,7 @@ report this setting as enabled when seeking support on the FreeCAD forums - 'Render Caching' is another way to say 'Rendering Acceleration'. + 'Render caching' is another way to say 'Rendering acceleration'. There are 3 options available to achieve this: 1) 'Auto' (default), let Coin3D decide where to cache. 2) 'Distributed', manually turn on cache for all view provider root node. @@ -502,7 +501,7 @@ bounding box size of the 3D object that is currently displayed. - Camera type + Camera Type @@ -539,7 +538,7 @@ bounding box size of the 3D object that is currently displayed. - Objects will be projected in orthographic projection + Objects will be in orthographic projection Or&thographic rendering diff --git a/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp b/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp index 875f8a4ed2..17b53643f3 100644 --- a/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp +++ b/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp @@ -450,7 +450,7 @@ void DlgSettingsAdvanced::retranslateUi() labelDockOverlayAlphaRadius->setText(QObject::tr("Alpha test radius")); labelDockOverlayAlphaRadius->setToolTip(DockOverlayAlphaRadius->toolTip()); DockOverlayCheckNaviCube->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayCheckNaviCube())); - DockOverlayCheckNaviCube->setText(QObject::tr("Check Navigation Cube")); + DockOverlayCheckNaviCube->setText(QObject::tr("Check navigation cube")); DockOverlayHintTriggerSize->setToolTip(QApplication::translate("OverlayParams", Gui::OverlayParams::docDockOverlayHintTriggerSize())); labelDockOverlayHintTriggerSize->setText(QObject::tr("Hint trigger size")); labelDockOverlayHintTriggerSize->setToolTip(DockOverlayHintTriggerSize->toolTip()); diff --git a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp index 1afea2d6c1..8be5d5aded 100644 --- a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp +++ b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp @@ -239,11 +239,11 @@ bool ApplicationCache::performAction(qint64 total) QString path = QString::fromStdString(App::Application::getUserCachePath()); QMessageBox msgBox(Gui::getMainWindow()); msgBox.setIcon(QMessageBox::Warning); - msgBox.setWindowTitle(tr("Cache directory")); + msgBox.setWindowTitle(tr("Cache Directory")); QString hint = tr("The cache directory %1 exceeds the size of %2.").arg(path, ApplicationCache::toString(limit)); - QString ask = tr("Do you want to clear it now?"); - QString warn = tr("Warning: Please make sure that this is the only running %1 instance " + QString ask = tr("Clear it now?"); + QString warn = tr("Warning: Make sure that this is the only running %1 instance " "and that no documents are opened as this may result into data loss!").arg(QCoreApplication::applicationName()); msgBox.setText(QStringLiteral("%1 %2\n\n\n%3").arg(hint, ask, warn)); diff --git a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.ui b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.ui index a7b4eb602f..ace51b4fe6 100644 --- a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.ui +++ b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.ui @@ -17,7 +17,7 @@ - Cache directory + Cache Directory @@ -25,7 +25,7 @@ - Location (read-only): + Location (read-only) @@ -56,7 +56,7 @@ - Check periodically at program start: + Check periodically at program start @@ -116,7 +116,7 @@ - Cache size limit: + Cache size limit @@ -154,14 +154,14 @@ - Current cache size: + Current cache size - Check now... + Check Now diff --git a/src/Gui/PreferencePages/DlgSettingsDocument.ui b/src/Gui/PreferencePages/DlgSettingsDocument.ui index c40187d0b7..c2bb4d27fe 100644 --- a/src/Gui/PreferencePages/DlgSettingsDocument.ui +++ b/src/Gui/PreferencePages/DlgSettingsDocument.ui @@ -129,7 +129,7 @@ All changes in documents are stored so that they can be undone/redone - Using Undo/Redo on documents + Using undo/redo in documents true @@ -162,14 +162,14 @@ - Maximum Undo/Redo steps + Maximum undo/redo steps - How many Undo/Redo steps should be recorded + How many undo/redo steps should be recorded 20 @@ -194,7 +194,7 @@ - Allow user aborting document recomputation by pressing ESC. + Allow user aborting document recomputation by pressing Esc. This feature may slightly increase recomputation time. @@ -278,7 +278,7 @@ This feature may slightly increase recomputation time. A thumbnail will be stored when document is saved - Save thumbnail into project file when saving document + Add thumbnail to project file when saving true @@ -318,7 +318,7 @@ This feature may slightly increase recomputation time. Sets the size of the thumbnail that is stored in the document. -Common sizes are 128, 256 and 512 +Common sizes are 128, 256 and 512. 64 @@ -409,8 +409,8 @@ Common sizes are 128, 256 and 512 - If there is a recovery file available the application will -automatically run a file recovery when it is started. + If there is a recovery file available, the application will +automatically run a file recovery when it is started Run AutoRecovery at startup @@ -445,10 +445,10 @@ automatically run a file recovery when it is started. - The program logo will be added to the thumbnail + The program icon will be added to the thumbnail - Add the program logo to the generated thumbnail + Add program icon to the generated thumbnail false @@ -469,7 +469,7 @@ automatically run a file recovery when it is started. How often a recovery file is written - Save AutoRecovery information every + Save auto-recovery information every true @@ -571,7 +571,7 @@ get date suffix according to the specified format - Document objects + Document Objects diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.ui b/src/Gui/PreferencePages/DlgSettingsEditor.ui index 3759737946..335ef92fbb 100644 --- a/src/Gui/PreferencePages/DlgSettingsEditor.ui +++ b/src/Gui/PreferencePages/DlgSettingsEditor.ui @@ -153,7 +153,7 @@ - Tab size: + Tab size @@ -179,7 +179,7 @@ - Indent size: + Indent size @@ -252,7 +252,7 @@ - Display items + Display Items @@ -288,7 +288,7 @@ - Family: + Family @@ -308,7 +308,7 @@ - Size: + Size @@ -343,7 +343,7 @@ - Color: + Color @@ -372,7 +372,7 @@ - Preview: + Preview diff --git a/src/Gui/PreferencePages/DlgSettingsGeneral.cpp b/src/Gui/PreferencePages/DlgSettingsGeneral.cpp index c1da64fbaa..48755f9f50 100644 --- a/src/Gui/PreferencePages/DlgSettingsGeneral.cpp +++ b/src/Gui/PreferencePages/DlgSettingsGeneral.cpp @@ -648,7 +648,7 @@ void DlgSettingsGeneral::recreatePreferencePackMenu() } } if (button->isEnabled()) { - button->setToolTip(tr("Apply the %1 preference pack").arg(QString::fromStdString(pack.first))); + button->setToolTip(tr("Applies the %1 preference pack").arg(QString::fromStdString(pack.first))); connect(button, &QPushButton::clicked, this, [this, pack]() { onLoadPreferencePackClicked(pack.first); }); } ui->PreferencePacks->setCellWidget(row, 2, button); diff --git a/src/Gui/PreferencePages/DlgSettingsGeneral.ui b/src/Gui/PreferencePages/DlgSettingsGeneral.ui index b91eea76a9..aa6a45121c 100644 --- a/src/Gui/PreferencePages/DlgSettingsGeneral.ui +++ b/src/Gui/PreferencePages/DlgSettingsGeneral.ui @@ -17,7 +17,7 @@ - Language and number format + Language and Number Format @@ -38,7 +38,7 @@ - Language: + Language @@ -52,7 +52,7 @@ - Default unit system: + Default unit system @@ -68,7 +68,7 @@ - Number of decimals: + Number of decimals @@ -90,7 +90,7 @@ - If enabled, document unit systems are ignored + Ignores document unit systems Ignore project unit system and use default @@ -100,7 +100,7 @@ - Minimum fractional inch: + Minimum fractional inch @@ -149,7 +149,7 @@ - Number format: + Number format @@ -166,10 +166,9 @@ - If enabled, numerical keypad decimal separator -will be substituted with locale separator, except -in Python Console and Macro Editor where a -dot/period will always be printed. + Substitutes numerical keypad decimal separator with locale separator, except +in the Python console and the macro editor where a +dot/period will always be printed Substitute decimal separator @@ -209,14 +208,14 @@ dot/period will always be printed. - Theme: + Theme - Customize how user interface will look like + Customize the appearance of the user interface @@ -228,7 +227,7 @@ dot/period will always be printed. - Looking for more themes? You can obtain them using <a href="freecad:Std_AddonMgr">Addon Manager</a>. + Looking for more themes? You can obtain them using the <a href="freecad:Std_AddonMgr">Addon Manager</a>. Qt::RichText @@ -238,39 +237,38 @@ dot/period will always be printed. - Size of toolbar icons: + Size of toolbar icons - Choose your preference for toolbar icon size. You can adjust -this according to your screen size or personal taste + Icon size in the toolbar - Tree view and Property view mode: + Tree view and property view mode - Customize how tree view is shown in the panel (restart required). + Customize how the tree view is shown in the panel (restart required). -'Combined': combine Tree view and Property view into one panel. -'Independent': split Tree view and Property view into separate panels. +'Combined': combine tree and property view into one panel. +'Independent': split tree and property view into separate panels. - Size of recent file list: + Size of recent file list @@ -293,8 +291,7 @@ this according to your screen size or personal taste - Background of the main window (when no document is opened) will consist of tiles of a special image. -See the FreeCAD Wiki for details about the image. + Background of the main window (when no document is opened) will consist of tiles of an image. Enable tiled background @@ -323,12 +320,12 @@ See the FreeCAD Wiki for details about the image. - A Splash screen is a small loading window that is shown + A splash screen is a small loading window that is shown when FreeCAD is launching. If this option is checked, FreeCAD will -display the splash screen +display the splash screen. - Enable splash screen at start up + Enable splash screen at start-up true @@ -344,10 +341,10 @@ display the splash screen - Activate overlay handling of dock windows + Activate overlay handling of docked panels - Activate overlay handling + Activate overlay panels true @@ -366,7 +363,7 @@ display the splash screen - Preference packs + Preference Packs @@ -477,14 +474,14 @@ display the splash screen - Import config... + Import Configuration… - Save new... + Save as New @@ -497,14 +494,14 @@ display the splash screen - Manage... + Manage - Revert... + Revert diff --git a/src/Gui/PreferencePages/DlgSettingsLightSources.ui b/src/Gui/PreferencePages/DlgSettingsLightSources.ui index 7f543a6c3a..c46761288b 100644 --- a/src/Gui/PreferencePages/DlgSettingsLightSources.ui +++ b/src/Gui/PreferencePages/DlgSettingsLightSources.ui @@ -65,7 +65,7 @@ Qt::FocusPolicy::NoFocus - Push In + Pushes in @@ -85,7 +85,7 @@ Qt::FocusPolicy::NoFocus - Pull Out + Pulls out @@ -136,7 +136,7 @@ - Light sources + Light Sources @@ -185,7 +185,7 @@ - Main Light + Main light true @@ -221,7 +221,7 @@ - Back Light + Backlight true @@ -247,7 +247,7 @@ - Vertical Angle + Vertical angle @@ -271,7 +271,7 @@ - Horizontal Angle + Horizontal angle @@ -336,7 +336,7 @@ - Fill Light + Fill light true @@ -435,7 +435,7 @@ - Ambient Light + Ambient light diff --git a/src/Gui/PreferencePages/DlgSettingsMacro.ui b/src/Gui/PreferencePages/DlgSettingsMacro.ui index 88cce8cdb3..c734a4e0ff 100644 --- a/src/Gui/PreferencePages/DlgSettingsMacro.ui +++ b/src/Gui/PreferencePages/DlgSettingsMacro.ui @@ -17,7 +17,7 @@ - General macro settings + General Macro Settings @@ -45,7 +45,7 @@ - Macro recording settings + Macro Recording Settings @@ -66,7 +66,7 @@ - Macro path + Macro Path @@ -106,7 +106,7 @@ - Gui commands + Gui Commands @@ -208,7 +208,7 @@ - Log all commands issued by menus to file: + Log all commands issued by menus to file ScriptToFile @@ -240,7 +240,7 @@ - Recent macros menu + Recent Macros Menu diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp index e1425348a4..8a179efa14 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp @@ -358,7 +358,7 @@ void DlgSettingsNavigation::onNewDocViewChanged(int index) CameraDialog::CameraDialog(QWidget* parent) : QDialog(parent) { - this->setWindowTitle(tr("Camera settings")); + this->setWindowTitle(tr("Camera Settings")); QGridLayout *gridLayout; gridLayout = new QGridLayout(this); @@ -418,7 +418,7 @@ CameraDialog::CameraDialog(QWidget* parent) layout->addWidget(sb3, 3, 1, 1, 1); auto currentViewButton = new QPushButton(this); - currentViewButton->setText(tr("Current view")); + currentViewButton->setText(tr("Current View")); currentViewButton->setObjectName(QStringLiteral("currentView")); layout->addWidget(currentViewButton, 4, 1, 2, 1); diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.ui b/src/Gui/PreferencePages/DlgSettingsNavigation.ui index 94f7983e97..53f463c8fe 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.ui +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.ui @@ -17,7 +17,7 @@ - Navigation cube + Navigation Cube true @@ -81,7 +81,7 @@ - Corner where navigation cube is shown + Corner where the navigation cube is displayed 1 @@ -117,7 +117,7 @@ - Rotates to nearest possible state when clicking a cube face + Rotates to nearest possible state when clicking a face of the cube Rotate to nearest @@ -279,7 +279,7 @@ - Rotation center indicator + Rotation Center Indicator true @@ -381,7 +381,7 @@ - 3D Navigation + 3D navigation @@ -418,11 +418,11 @@ - List the mouse button configs for each chosen navigation setting. + Lists the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. - Mouse... + Mouse Configuration @@ -740,7 +740,7 @@ Mouse tilting is not disabled by this setting. - Space mouse + Space Mouse diff --git a/src/Gui/PreferencePages/DlgSettingsNotificationArea.ui b/src/Gui/PreferencePages/DlgSettingsNotificationArea.ui index 9a800236dc..772619b5eb 100644 --- a/src/Gui/PreferencePages/DlgSettingsNotificationArea.ui +++ b/src/Gui/PreferencePages/DlgSettingsNotificationArea.ui @@ -20,7 +20,7 @@ <html><head/><body><p>If checked, show the notification area in the status bar: a button with the current notification count, which can expand the detailed notification list. Optionally, with additional pop-up notifications.</p></body></html> - Enable notification area + Enable Notification Area true @@ -29,12 +29,12 @@ - If checked, non-intrusive pop-up notifications will appear above the status bar, around the notification area. Pop-up notifications can be manually dismissed by clicking on them, and also automatically dismissed by specifying a maximum and minimum duration for them to be displayed. + Enables non-intrusive pop-up notifications above the status bar notification area. Pop-up notifications can be manually dismissed by clicking on them, and also automatically dismissed by specifying a maximum and minimum duration for them to be displayed. Additionally, pop-up notifications can be disabled. In this case the user can still use the notification area as a quick-access location to view notifications, without the distracton of an additional pop-up. - Enable pop-up notifications + Enable Pop-Up Notifications true @@ -46,7 +46,7 @@ Additionally, pop-up notifications can be disabled. In this case the user can st - Minimum duration: + Minimum duration @@ -56,7 +56,7 @@ Additionally, pop-up notifications can be disabled. In this case the user can st - Maximum duration: + Maximum duration @@ -107,7 +107,7 @@ Additionally, pop-up notifications can be disabled. In this case the user can st - Maximum concurrent notification count: + Maximum concurrent notification count @@ -130,7 +130,7 @@ Additionally, pop-up notifications can be disabled. In this case the user can st - Notification bubble width: + Notification bubble width @@ -209,7 +209,7 @@ Additionally, pop-up notifications can be disabled. In this case the user can st Additional notification sources to show in the notification area. - Additional data sources + Additional Data Sources @@ -259,7 +259,7 @@ Additionally, pop-up notifications can be disabled. In this case the user can st Controls the amount of notifications to show in the list. - Notifications list + Notifications List @@ -284,7 +284,7 @@ Additionally, pop-up notifications can be disabled. In this case the user can st - Maximum notification count: + Maximum notification count diff --git a/src/Gui/PreferencePages/DlgSettingsPDF.ui b/src/Gui/PreferencePages/DlgSettingsPDF.ui index 418ab3dcae..29760ea731 100644 --- a/src/Gui/PreferencePages/DlgSettingsPDF.ui +++ b/src/Gui/PreferencePages/DlgSettingsPDF.ui @@ -31,14 +31,14 @@ - PDF Version: + PDF version - This is the PDF Version FreeCAD will use to export to PDF. + This is the PDF Version FreeCAD will use to export to PDF PDFVersion diff --git a/src/Gui/PreferencePages/DlgSettingsPythonConsole.ui b/src/Gui/PreferencePages/DlgSettingsPythonConsole.ui index 91afbf2f21..77c1745a70 100644 --- a/src/Gui/PreferencePages/DlgSettingsPythonConsole.ui +++ b/src/Gui/PreferencePages/DlgSettingsPythonConsole.ui @@ -81,14 +81,14 @@ horizontal space in Python console - Python profiler interval (milliseconds): + Python profiler interval (ms) - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + The interval in milliseconds at which the profiler runs when there is Python code running (to keep the GUI responding). Set to 0 to disable. ms @@ -122,7 +122,7 @@ horizontal space in Python console - Path to external Python executable (optional): + Path to external Python executable (optional) diff --git a/src/Gui/PreferencePages/DlgSettingsReportView.ui b/src/Gui/PreferencePages/DlgSettingsReportView.ui index 11cc14e503..80e5847bab 100644 --- a/src/Gui/PreferencePages/DlgSettingsReportView.ui +++ b/src/Gui/PreferencePages/DlgSettingsReportView.ui @@ -11,7 +11,7 @@ - Report view + Report View @@ -245,7 +245,7 @@ on-screen while displaying the log message - Normal messages: + Normal messages @@ -303,7 +303,7 @@ on-screen while displaying the log message - Log messages: + Log messages @@ -361,7 +361,7 @@ on-screen while displaying the log message - Warnings: + Warnings @@ -419,7 +419,7 @@ on-screen while displaying the log message - Errors: + Errors @@ -498,7 +498,7 @@ on-screen while displaying the log message - Python interpreter + Python Interpreter diff --git a/src/Gui/PreferencePages/DlgSettingsSelection.ui b/src/Gui/PreferencePages/DlgSettingsSelection.ui index 4d7728e15f..dbda43c2df 100644 --- a/src/Gui/PreferencePages/DlgSettingsSelection.ui +++ b/src/Gui/PreferencePages/DlgSettingsSelection.ui @@ -17,7 +17,7 @@ - Viewport selection behavior + Viewport Selection Behavior @@ -64,7 +64,7 @@ - Radius: + Radius @@ -90,8 +90,8 @@ - Area for picking elements in 3D view. -Larger value eases to pick things, but can make small features impossible to select. + Area for selecting elements in the 3D view. +A larger value makes it easier to select elements, but may prevent selection of small features. @@ -170,7 +170,7 @@ Larger value eases to pick things, but can make small features impossible to sel - Preselect the object in 3D view when hovering the cursor over the tree item + Preselect the object in the 3D view when hovering the cursor over the tree item PreSelection @@ -186,7 +186,7 @@ Larger value eases to pick things, but can make small features impossible to sel - Tree selection behavior + Tree Selection Behavior @@ -205,7 +205,7 @@ Larger value eases to pick things, but can make small features impossible to sel - Auto expand tree item when the corresponding object is selected in 3D view + Auto expand tree item when the corresponding object is selected in the 3D view SyncSelection diff --git a/src/Gui/PreferencePages/DlgSettingsUI.ui b/src/Gui/PreferencePages/DlgSettingsUI.ui index 2f6f72d89e..f9910f251b 100644 --- a/src/Gui/PreferencePages/DlgSettingsUI.ui +++ b/src/Gui/PreferencePages/DlgSettingsUI.ui @@ -17,13 +17,13 @@ - Theme customization + Theme Customization - This section lets you customize your current theme. The offered settings are optional for theme developers so they may or may not have an effect in your current theme. + Customize the current theme. The offered settings are optional for theme developers so they may or may not have an effect in the current theme. true @@ -91,7 +91,7 @@ - Style sheet (advanced): + Style sheet (advanced) StyleSheets @@ -101,7 +101,7 @@ - Overlay style sheet: + Overlay style sheet OverlayStyleSheets @@ -204,16 +204,16 @@ - Tree view + Tree View - Hide extra tree view column - Internal Names. + Hide extra tree view column for internal names - Hide Internal Names + Hide internal names true @@ -303,7 +303,7 @@ - If enabled, show an eye icon before the tree view items, showing their visibility status. When clicked the visibility is toggled. + Displays an eye icon in front of the tree view items, showing their visibility status. When clicked the visibility is toggled. Show visibility icon @@ -439,10 +439,10 @@ - Automatically hide overlaid dock panels when in non 3D view (like TechDraw or Spreadsheet). + Automatically hide overlaid dock panels when in non 3D view (e.g. TechDraw or Spreadsheet) - Auto hide in non 3D view + Automatically hide in non-3D view true @@ -461,7 +461,7 @@ Auto mouse click through transparent part of dock overlay. - Auto mouse pass through + Automatically pass through of the mouse cursor true @@ -480,7 +480,7 @@ Auto pass through mouse wheel event on transparent dock overlay. - Auto mouse wheel pass through + Automatically pass through of the mouse wheel true diff --git a/src/Gui/PreferencePages/DlgSettingsViewColor.ui b/src/Gui/PreferencePages/DlgSettingsViewColor.ui index 63a8ad806b..9af73bb5bd 100644 --- a/src/Gui/PreferencePages/DlgSettingsViewColor.ui +++ b/src/Gui/PreferencePages/DlgSettingsViewColor.ui @@ -20,7 +20,7 @@ Background color for the model view - Background color + Background Color @@ -58,7 +58,7 @@ - Background will have selected color + Background will have the selected color Simple color @@ -74,7 +74,7 @@ - Background will have selected color gradient + Background will have the selected color gradient Linear gradient @@ -93,7 +93,7 @@ - Background will have selected color gradient + Background will have the selected color gradient Radial gradient @@ -120,7 +120,7 @@ - Background will have selected color + Background will have the selected color @@ -174,7 +174,7 @@ - Top: + Top @@ -201,7 +201,7 @@ - Middle: + Middle @@ -228,7 +228,7 @@ - Color gradient will get selected color as middle color + Color gradient will get the selected color as middle color Middle color @@ -244,7 +244,7 @@ - Bottom: + Bottom @@ -278,7 +278,7 @@ - Tree view + Tree View @@ -338,7 +338,7 @@ - Background color for objects in tree view that are currently edited + Background color for objects in the tree view that are currently edited @@ -358,7 +358,7 @@ - Active container + Active container object @@ -371,7 +371,7 @@ - Background color for active containers in tree view + Background color for active containers (e.g. part or body) in the tree view rgb(60, 145, 252) @@ -472,7 +472,7 @@ - Color Bar (used in Mesh and FEM Wbs) Label text color + Color bar label text color (e.g. in Mesh and FEM) @@ -499,7 +499,7 @@ - Color Bar (used in Mesh and FEM Wbs) Label Text Size + Color bar label text size (e.g. in Mesh and FEM) Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff --git a/src/Gui/PreferencePages/DlgSettingsWorkbenches.ui b/src/Gui/PreferencePages/DlgSettingsWorkbenches.ui index fffceab9c6..95f06a2b88 100644 --- a/src/Gui/PreferencePages/DlgSettingsWorkbenches.ui +++ b/src/Gui/PreferencePages/DlgSettingsWorkbenches.ui @@ -36,7 +36,7 @@ <html><head/><body><p>You can reorder workbenches by drag and drop or sort them by right-clicking on any workbench and select <span style=" font-weight:600; font-style:italic;">Sort alphabetically</span>. Additional workbenches can be installed through the addon manager.</p><p> -Currently, your system has the following workbenches:</p></body></html> +Currently installed workbenches:</p></body></html> true @@ -75,14 +75,14 @@ Currently, your system has the following workbenches:</p></body>< - Workbench selector items style: + Workbench selector items style - Customize how the items are displayed. + Customizes how the items are displayed @@ -108,14 +108,14 @@ Currently, your system has the following workbenches:</p></body>< - Workbench selector type: + Workbench selector type - Choose the workbench selector widget type (restart required). + Choose the workbench selector widget type (restart required) @@ -150,14 +150,14 @@ Currently, your system has the following workbenches:</p></body>< - Start up workbench: + Default workbench - Choose which workbench will be activated and shown + Changes which workbench will be activated and shown after FreeCAD launches @@ -167,7 +167,7 @@ after FreeCAD launches - If checked, application will remember which workbench is active for each tab of the viewport + Remembers which workbench is active for each tab of the viewport Remember active workbench by tab diff --git a/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp b/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp index 784e949e33..ba0b7cf295 100644 --- a/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp +++ b/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp @@ -84,12 +84,12 @@ wbListItem::wbListItem(const QString& wbName, bool enabled, bool startupWb, bool // 1: Enable checkbox enableCheckBox = new QCheckBox(this); - enableCheckBox->setToolTip(tr("If unchecked, %1 will not appear in the available workbenches.").arg(wbDisplayName)); + enableCheckBox->setToolTip(tr("Toggles the visibility of %1 in the available workbenches").arg(wbDisplayName)); enableCheckBox->setChecked(enabled); if (startupWb) { enableCheckBox->setChecked(true); enableCheckBox->setEnabled(false); - enableCheckBox->setToolTip(tr("This is the current startup module, and must be enabled.")); + enableCheckBox->setToolTip(tr("This is the current startup module, and must be enabled")); } connect(enableCheckBox, &QCheckBox::toggled, this, [this](bool checked) { onWbToggled(checked); }); @@ -112,7 +112,7 @@ wbListItem::wbListItem(const QString& wbName, bool enabled, bool startupWb, bool // 4: shortcut shortcutLabel = new QLabel(QStringLiteral("(W, %1)").arg(index + 1), this); - shortcutLabel->setToolTip(tr("Shortcut to activate this workbench.")); + shortcutLabel->setToolTip(tr("Shortcut to activate this workbench")); shortcutLabel->setEnabled(enableCheckBox->isChecked()); shortcutLabel->setVisible(index < 9); @@ -128,7 +128,7 @@ wbListItem::wbListItem(const QString& wbName, bool enabled, bool startupWb, bool // 5: Autoloaded checkBox. autoloadCheckBox = new QCheckBox(this); autoloadCheckBox->setText(tr("Auto-load")); - autoloadCheckBox->setToolTip(tr("If checked, %1 will be loaded automatically when FreeCAD starts up").arg(wbDisplayName)); + autoloadCheckBox->setToolTip(tr("Loads %1 automatically when FreeCAD starts").arg(wbDisplayName)); autoloadCheckBox->setEnabled(enableCheckBox->isChecked()); if (startupWb) { // Figure out whether to check and/or disable this checkBox: @@ -236,7 +236,7 @@ DlgSettingsWorkbenchesImp::DlgSettingsWorkbenchesImp( QWidget* parent ) ui->wbList->setDragEnabled(true); ui->wbList->setDefaultDropAction(Qt::MoveAction); - QAction* sortAction = new QAction(tr("Sort alphabetically"), this); + QAction* sortAction = new QAction(tr("Sort Alphabetically"), this); connect(sortAction, &QAction::triggered, this, &DlgSettingsWorkbenchesImp::sortEnabledWorkbenches); QMenu* contextMenu = new QMenu(ui->wbList); @@ -523,7 +523,7 @@ void DlgSettingsWorkbenchesImp::loadWorkbenchSelector() // workbench selector items style int itemStyleIndex = hGrp->GetInt("WorkbenchSelectorItem", 0); ui->WorkbenchSelectorItem->clear(); - ui->WorkbenchSelectorItem->addItem(tr("Icon & Text")); + ui->WorkbenchSelectorItem->addItem(tr("Icon and text")); ui->WorkbenchSelectorItem->addItem(tr("Icon")); ui->WorkbenchSelectorItem->addItem(tr("Text")); ui->WorkbenchSelectorItem->setCurrentIndex(itemStyleIndex); @@ -534,7 +534,7 @@ void DlgSettingsWorkbenchesImp::translateWorkbenchSelector() ui->WorkbenchSelectorType->setItemText(0, tr("ComboBox")); ui->WorkbenchSelectorType->setItemText(1, tr("TabBar")); - ui->WorkbenchSelectorItem->setItemText(0, tr("Icon & Text")); + ui->WorkbenchSelectorItem->setItemText(0, tr("Icon and text")); ui->WorkbenchSelectorItem->setItemText(1, tr("Icon")); ui->WorkbenchSelectorItem->setItemText(2, tr("Text")); } diff --git a/src/Gui/ProgressBar.cpp b/src/Gui/ProgressBar.cpp index cffff2082e..ddc1a6f06c 100644 --- a/src/Gui/ProgressBar.cpp +++ b/src/Gui/ProgressBar.cpp @@ -482,7 +482,7 @@ void ProgressBar::aboutToHide() bool ProgressBar::canAbort() const { auto ret = QMessageBox::question(getMainWindow(),tr("Aborting"), - tr("Do you really want to abort the operation?"), QMessageBox::Yes | QMessageBox::No, + tr("Abort the operation?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); return (ret == QMessageBox::Yes) ? true : false; diff --git a/src/Gui/ProgressDialog.cpp b/src/Gui/ProgressDialog.cpp index 90f531fb92..12b0e6c7f0 100644 --- a/src/Gui/ProgressDialog.cpp +++ b/src/Gui/ProgressDialog.cpp @@ -313,7 +313,7 @@ void ProgressDialog::onCancel() bool ProgressDialog::canAbort() const { auto ret = QMessageBox::question(getMainWindow(),tr("Aborting"), - tr("Do you really want to abort the operation?"), QMessageBox::Yes | QMessageBox::No, + tr("Abort the operation?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); return (ret == QMessageBox::Yes) ? true : false; diff --git a/src/Gui/PropertyView.cpp b/src/Gui/PropertyView.cpp index e8650a1165..5c6599750a 100644 --- a/src/Gui/PropertyView.cpp +++ b/src/Gui/PropertyView.cpp @@ -559,7 +559,7 @@ void PropertyView::changeEvent(QEvent *e) PropertyDockView::PropertyDockView(Gui::Document* pcDocument, QWidget *parent) : DockWindow(pcDocument,parent) { - setWindowTitle(tr("Property view")); + setWindowTitle(tr("Property View")); auto view = new PropertyView(this); auto pLayout = new QGridLayout(this); diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp index 8f76146fdc..d05d48fab6 100644 --- a/src/Gui/PythonConsole.cpp +++ b/src/Gui/PythonConsole.cpp @@ -827,7 +827,7 @@ void PythonConsole::runSource(const QString& line) int ret = QMessageBox::Yes; if (check) { ret = QMessageBox::question(this, tr("System exit"), - tr("The application is still running.\nDo you want to exit without saving your data?"), + tr("The application is still running.\nExit without saving all data?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); } if (ret == QMessageBox::Yes) { @@ -1297,16 +1297,16 @@ void PythonConsole::contextMenuEvent ( QContextMenuEvent * e ) a->setShortcut(QKeySequence(QStringLiteral("CTRL+C"))); a->setEnabled(textCursor().hasSelection()); - a = menu.addAction(tr("&Copy command"), this, &PythonConsole::onCopyCommand); + a = menu.addAction(tr("&Copy Command"), this, &PythonConsole::onCopyCommand); a->setEnabled(textCursor().hasSelection()); - a = menu.addAction(tr("&Copy history"), this, &PythonConsole::onCopyHistory); + a = menu.addAction(tr("&Copy History"), this, &PythonConsole::onCopyHistory); a->setEnabled(!d->history.isEmpty()); - a = menu.addAction( tr("Save history as..."), this, &PythonConsole::onSaveHistoryAs); + a = menu.addAction(tr("Save History As…"), this, &PythonConsole::onSaveHistoryAs); a->setEnabled(!d->history.isEmpty()); - QAction* saveh = menu.addAction(tr("Save history")); + QAction* saveh = menu.addAction(tr("Save History")); saveh->setToolTip(tr("Saves Python history across %1 sessions").arg(qApp->applicationName())); saveh->setCheckable(true); saveh->setChecked(d->hGrpSettings->GetBool("SavePythonHistory", false)); @@ -1322,14 +1322,14 @@ void PythonConsole::contextMenuEvent ( QContextMenuEvent * e ) a->setShortcut(QKeySequence(QStringLiteral("CTRL+A"))); a->setEnabled(!document()->isEmpty()); - a = menu.addAction(tr("Clear console"), this, &PythonConsole::onClearConsole); + a = menu.addAction(tr("Clear Console"), this, &PythonConsole::onClearConsole); a->setEnabled(!document()->isEmpty()); menu.addSeparator(); - menu.addAction( tr("Insert file name..."), this, &PythonConsole::onInsertFileName); + menu.addAction(tr("Insert File Name…"), this, &PythonConsole::onInsertFileName); menu.addSeparator(); - QAction* wrap = menu.addAction(tr("Word wrap")); + QAction* wrap = menu.addAction(tr("Word Wrap")); wrap->setCheckable(true); wrap->setChecked(d->hGrpSettings->GetBool("PythonWordWrap", true)); diff --git a/src/Gui/PythonEditor.cpp b/src/Gui/PythonEditor.cpp index 4154cc6a4d..7123e6b257 100644 --- a/src/Gui/PythonEditor.cpp +++ b/src/Gui/PythonEditor.cpp @@ -178,7 +178,7 @@ void PythonEditor::contextMenuEvent ( QContextMenuEvent * e ) comment->setShortcut(QKeySequence(QStringLiteral("ALT+C"))); QAction* uncomment = menu->addAction( tr("Uncomment"), this, &PythonEditor::onUncomment); uncomment->setShortcut(QKeySequence(QStringLiteral("ALT+U"))); - QAction* execInConsole = menu->addAction( tr("Execute in console"), + QAction* execInConsole = menu->addAction( tr("Execute in Console"), this, &PythonEditor::onExecuteInConsole); execInConsole->setShortcut(QKeySequence(QStringLiteral("ALT+Shift+P"))); } diff --git a/src/Gui/QuantitySpinBox_p.h b/src/Gui/QuantitySpinBox_p.h index 1abf8f6cf9..b7b1b9a351 100644 --- a/src/Gui/QuantitySpinBox_p.h +++ b/src/Gui/QuantitySpinBox_p.h @@ -60,8 +60,7 @@ Q_SIGNALS: void clicked(); private: - - const QString genericExpressionEditorTooltip = tr("Enter an expression... (=)"); + const QString genericExpressionEditorTooltip = tr("Enter expression… (=)"); const QString expressionEditorTooltipPrefix = tr("Expression:") + QLatin1String(" "); }; diff --git a/src/Gui/RemoteDebugger.ui b/src/Gui/RemoteDebugger.ui index f40327375a..2464316ec9 100644 --- a/src/Gui/RemoteDebugger.ui +++ b/src/Gui/RemoteDebugger.ui @@ -11,7 +11,7 @@ - Attach to remote debugger + Attach to Remote Debugger @@ -27,7 +27,7 @@ - Password: + Password @@ -61,7 +61,7 @@ - Address: + Address @@ -75,7 +75,7 @@ - Port: + Port diff --git a/src/Gui/ReportView.cpp b/src/Gui/ReportView.cpp index 22807edadd..1a2ea6381b 100644 --- a/src/Gui/ReportView.cpp +++ b/src/Gui/ReportView.cpp @@ -80,7 +80,7 @@ ReportView::ReportView( QWidget* parent ) // create the python console tabPython = new PythonConsole(); tabPython->setWordWrapMode(QTextOption::NoWrap); - tabPython->setWindowTitle(tr("Python console")); + tabPython->setWindowTitle(tr("Python Console")); tabPython->setWindowIcon(BitmapFactory().iconFromTheme("applications-python")); int python = tabWidget->addTab(tabPython, tabPython->windowTitle()); tabWidget->setTabIcon(python, tabPython->windowIcon()); @@ -102,7 +102,7 @@ void ReportView::changeEvent(QEvent *e) QWidget::changeEvent(e); if (e->type() == QEvent::LanguageChange) { tabOutput->setWindowTitle(tr("Output")); - tabPython->setWindowTitle(tr("Python console")); + tabPython->setWindowTitle(tr("Python Console")); for (int i=0; icount();i++) tabWidget->setTabText(i, tabWidget->widget(i)->windowTitle()); } @@ -593,11 +593,11 @@ void ReportOutput::contextMenuEvent ( QContextMenuEvent * e ) displayMenu->setTitle(tr("Display message types")); optionMenu->addMenu(displayMenu); - QAction* logMsg = displayMenu->addAction(tr("Normal messages"), this, &ReportOutput::onToggleNormalMessage); + QAction* logMsg = displayMenu->addAction(tr("Normal Messages"), this, &ReportOutput::onToggleNormalMessage); logMsg->setCheckable(true); logMsg->setChecked(bMsg); - QAction* logAct = displayMenu->addAction(tr("Log messages"), this, &ReportOutput::onToggleLogMessage); + QAction* logAct = displayMenu->addAction(tr("Log Messages"), this, &ReportOutput::onToggleLogMessage); logAct->setCheckable(true); logAct->setChecked(bLog); @@ -609,19 +609,19 @@ void ReportOutput::contextMenuEvent ( QContextMenuEvent * e ) errAct->setCheckable(true); errAct->setChecked(bErr); - QAction* logCritical = displayMenu->addAction(tr("Critical messages"), this, &ReportOutput::onToggleCritical); + QAction* logCritical = displayMenu->addAction(tr("Critical Messages"), this, &ReportOutput::onToggleCritical); logCritical->setCheckable(true); logCritical->setChecked(bCritical); auto showOnMenu = new QMenu (optionMenu); - showOnMenu->setTitle(tr("Show Report view on")); + showOnMenu->setTitle(tr("Show report view on")); optionMenu->addMenu(showOnMenu); - QAction* showNormAct = showOnMenu->addAction(tr("Normal messages"), this, &ReportOutput::onToggleShowReportViewOnNormalMessage); + QAction* showNormAct = showOnMenu->addAction(tr("Normal Messages"), this, &ReportOutput::onToggleShowReportViewOnNormalMessage); showNormAct->setCheckable(true); showNormAct->setChecked(bShowOnNormal); - QAction* showLogAct = showOnMenu->addAction(tr("Log messages"), this, &ReportOutput::onToggleShowReportViewOnLogMessage); + QAction* showLogAct = showOnMenu->addAction(tr("Log Messages"), this, &ReportOutput::onToggleShowReportViewOnLogMessage); showLogAct->setCheckable(true); showLogAct->setChecked(bShowOnLog); @@ -633,22 +633,22 @@ void ReportOutput::contextMenuEvent ( QContextMenuEvent * e ) showErrAct->setCheckable(true); showErrAct->setChecked(bShowOnError); - QAction* showCriticalAct = showOnMenu->addAction(tr("Critical messages"), this, SLOT(onToggleShowReportViewOnCritical())); + QAction* showCriticalAct = showOnMenu->addAction(tr("Critical Messages"), this, SLOT(onToggleShowReportViewOnCritical())); showCriticalAct->setCheckable(true); showCriticalAct->setChecked(bShowOnCritical); optionMenu->addSeparator(); - QAction* stdoutAct = optionMenu->addAction(tr("Redirect Python output"), this, &ReportOutput::onToggleRedirectPythonStdout); + QAction* stdoutAct = optionMenu->addAction(tr("Redirect Python Output"), this, &ReportOutput::onToggleRedirectPythonStdout); stdoutAct->setCheckable(true); stdoutAct->setChecked(d->redirected_stdout); - QAction* stderrAct = optionMenu->addAction(tr("Redirect Python errors"), this, &ReportOutput::onToggleRedirectPythonStderr); + QAction* stderrAct = optionMenu->addAction(tr("Redirect Python Errors"), this, &ReportOutput::onToggleRedirectPythonStderr); stderrAct->setCheckable(true); stderrAct->setChecked(d->redirected_stderr); optionMenu->addSeparator(); - QAction* botAct = optionMenu->addAction(tr("Go to end"), this, &ReportOutput::onToggleGoToEnd); + QAction* botAct = optionMenu->addAction(tr("Go to End"), this, &ReportOutput::onToggleGoToEnd); botAct->setCheckable(true); botAct->setChecked(gotoEnd); @@ -669,7 +669,7 @@ void ReportOutput::contextMenuEvent ( QContextMenuEvent * e ) menu->addAction(tr("Clear"), this, &ReportOutput::clear); menu->addSeparator(); - menu->addAction(tr("Save As..."), this, &ReportOutput::onSaveAs); + menu->addAction(tr("Save As…"), this, &ReportOutput::onSaveAs); menu->exec(e->globalPos()); delete menu; @@ -678,7 +678,7 @@ void ReportOutput::contextMenuEvent ( QContextMenuEvent * e ) void ReportOutput::onSaveAs() { QString fn = QFileDialog::getSaveFileName(this, tr("Save Report Output"), QString(), - QStringLiteral("%1 (*.txt *.log)").arg(tr("Plain Text Files"))); + QStringLiteral("%1 (*.txt *.log)").arg(tr("Plain text files"))); if (!fn.isEmpty()) { QFileInfo fi(fn); if (fi.completeSuffix().isEmpty()) diff --git a/src/Gui/Selection/SelectionView.cpp b/src/Gui/Selection/SelectionView.cpp index 83fc7109f2..c40a17fa1b 100644 --- a/src/Gui/Selection/SelectionView.cpp +++ b/src/Gui/Selection/SelectionView.cpp @@ -638,7 +638,7 @@ void SelectionView::onItemContextMenu(const QPoint& point) return; } QMenu menu; - QAction* selectAction = menu.addAction(tr("Select only"), this, [&] { + QAction* selectAction = menu.addAction(tr("Select Only"), this, [&] { this->select(nullptr); }); selectAction->setIcon(QIcon::fromTheme(QStringLiteral("view-select"))); @@ -648,19 +648,19 @@ void SelectionView::onItemContextMenu(const QPoint& point) deselectAction->setIcon(QIcon::fromTheme(QStringLiteral("view-unselectable"))); deselectAction->setToolTip(tr("Deselects this object")); - QAction* zoomAction = menu.addAction(tr("Zoom fit"), this, &SelectionView::zoom); + QAction* zoomAction = menu.addAction(tr("Zoom Fit"), this, &SelectionView::zoom); zoomAction->setIcon(QIcon::fromTheme(QStringLiteral("zoom-fit-best"))); zoomAction->setToolTip(tr("Selects and fits this object in the 3D window")); - QAction* gotoAction = menu.addAction(tr("Go to selection"), this, &SelectionView::treeSelect); + QAction* gotoAction = menu.addAction(tr("Go to Selection"), this, &SelectionView::treeSelect); gotoAction->setToolTip(tr("Selects and locates this object in the tree view")); - QAction* touchAction = menu.addAction(tr("Mark to recompute"), this, &SelectionView::touch); + QAction* touchAction = menu.addAction(tr("Mark to Recompute"), this, &SelectionView::touch); touchAction->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh"))); - touchAction->setToolTip(tr("Mark this object to be recomputed")); + touchAction->setToolTip(tr("Marks this object to be recomputed")); QAction* toPythonAction = - menu.addAction(tr("To Python console"), this, &SelectionView::toPython); + menu.addAction(tr("To Python Console"), this, &SelectionView::toPython); toPythonAction->setIcon(QIcon::fromTheme(QStringLiteral("applications-python"))); toPythonAction->setToolTip( tr("Reveals this object and its subelements in the Python console.")); @@ -669,7 +669,7 @@ void SelectionView::onItemContextMenu(const QPoint& point) if (elements.length() > 2) { // subshape-specific entries QAction* showPart = - menu.addAction(tr("Duplicate subshape"), this, &SelectionView::showPart); + menu.addAction(tr("Duplicate Subshape"), this, &SelectionView::showPart); showPart->setIcon(QIcon(QStringLiteral(":/icons/ClassBrowser/member.svg"))); showPart->setToolTip(tr("Creates a standalone copy of this subshape in the document")); } diff --git a/src/Gui/SoFCColorBar.cpp b/src/Gui/SoFCColorBar.cpp index a1a3645161..eab9e67c40 100644 --- a/src/Gui/SoFCColorBar.cpp +++ b/src/Gui/SoFCColorBar.cpp @@ -350,7 +350,7 @@ void SoFCColorBar::handleEvent (SoHandleEventAction *action) } menu.addSeparator(); - QAction* option = menu.addAction(QObject::tr("Options...")); + QAction* option = menu.addAction(QObject::tr("Options…")); QAction* select = menu.exec(QCursor::pos()); if (select == option) { diff --git a/src/Gui/SplashScreen.cpp b/src/Gui/SplashScreen.cpp index 04a0e00adc..7ac9b9fc8c 100644 --- a/src/Gui/SplashScreen.cpp +++ b/src/Gui/SplashScreen.cpp @@ -187,7 +187,7 @@ static void renderDevBuildWarning(QPainter& painter, // Construct the lines of text and figure out how much space they need const auto devWarningLine1 = QObject::tr("WARNING: This is a development version."); - const auto devWarningLine2 = QObject::tr("Please do not use it in a production environment."); + const auto devWarningLine2 = QObject::tr("Do not use it in a production environment."); QFontMetrics fontMetrics(painter.font()); // Try to use the existing font int padding = QtTools::horizontalAdvance(fontMetrics, QLatin1String("M")); // Arbitrary int line1Width = QtTools::horizontalAdvance(fontMetrics, devWarningLine1); diff --git a/src/Gui/StartupProcess.cpp b/src/Gui/StartupProcess.cpp index 88252c059b..c26bf72a24 100644 --- a/src/Gui/StartupProcess.cpp +++ b/src/Gui/StartupProcess.cpp @@ -332,7 +332,7 @@ void StartupPostProcess::checkOpenGL() auto message = QObject::tr("This system is running OpenGL %1.%2. " "FreeCAD requires OpenGL 2.0 or above. " - "Please upgrade your graphics driver and/or card as required.") + "Upgrade the graphics driver and/or card as required.") .arg(major) .arg(minor) + QStringLiteral("\n"); diff --git a/src/Gui/TaskElementColors.ui b/src/Gui/TaskElementColors.ui index 08235f680d..31fa73a556 100644 --- a/src/Gui/TaskElementColors.ui +++ b/src/Gui/TaskElementColors.ui @@ -11,7 +11,7 @@ - Set element color + Set Element Color @@ -58,14 +58,14 @@ - Remove all + Remove All - Box select + Box Select @@ -81,7 +81,7 @@ - On-top when selected + On top when selected diff --git a/src/Gui/TaskTransform.cpp b/src/Gui/TaskTransform.cpp index b4e67ec3b2..c6567b4271 100644 --- a/src/Gui/TaskTransform.cpp +++ b/src/Gui/TaskTransform.cpp @@ -172,7 +172,7 @@ void TaskTransform::loadPlacementModeItems() const QVariant::fromValue(PlacementMode::ObjectOrigin)); if (centerOfMassProvider->ofDocumentObject(vp->getObject()).has_value()) { - ui->placementComboBox->addItem(tr("Center of mass / Centroid"), + ui->placementComboBox->addItem(tr("Center of mass / centroid"), QVariant::fromValue(PlacementMode::Centroid)); } @@ -397,15 +397,15 @@ void TaskTransform::setSelectionMode(SelectionMode mode) SoPickStyle* draggerPickStyle = SO_GET_PART(dragger, "pickStyle", SoPickStyle); - ui->pickTransformOriginButton->setText(tr("Pick reference")); - ui->alignToOtherObjectButton->setText(tr("Move to other object")); + ui->pickTransformOriginButton->setText(tr("Pick Reference")); + ui->alignToOtherObjectButton->setText(tr("Move to Other Object")); switch (mode) { case SelectionMode::SelectTransformOrigin: draggerPickStyle->style = SoPickStyle::UNPICKABLE; draggerPickStyle->setOverride(true); blockSelection(false); - ui->referenceLineEdit->setText(tr("Select face, edge or vertex...")); + ui->referenceLineEdit->setText(tr("Select face, edge, or vertex…")); ui->pickTransformOriginButton->setText(tr("Cancel")); break; diff --git a/src/Gui/TaskTransform.ui b/src/Gui/TaskTransform.ui index 18d5e30cb3..08aaf058a1 100644 --- a/src/Gui/TaskTransform.ui +++ b/src/Gui/TaskTransform.ui @@ -22,7 +22,7 @@ - Coordinate System + Coordinate system positionModeComboBox @@ -33,12 +33,12 @@ - Local Coordinate System + Local coordinate system - Global Coordinate System + Global coordinate system @@ -53,7 +53,7 @@ - align dragger rotation with selected coordinate system + Align dragger rotation with selected coordinate system @@ -207,7 +207,7 @@ - Move to other object + Move to Other Object @@ -551,7 +551,7 @@ - pick reference + Pick Reference diff --git a/src/Gui/TaskView/TaskAppearance.ui b/src/Gui/TaskView/TaskAppearance.ui index 57c5e1aae5..0c113ddd73 100644 --- a/src/Gui/TaskView/TaskAppearance.ui +++ b/src/Gui/TaskView/TaskAppearance.ui @@ -34,7 +34,7 @@ - Document window: + Document window @@ -57,7 +57,7 @@ false - Plot mode: + Plot mode @@ -81,7 +81,7 @@ - Point size: + Point size @@ -127,7 +127,7 @@ - Line width: + Line width @@ -165,7 +165,7 @@ - Transparency: + Transparency diff --git a/src/Gui/TaskView/TaskDialog.cpp b/src/Gui/TaskView/TaskDialog.cpp index aba148c36d..b220d46557 100644 --- a/src/Gui/TaskView/TaskDialog.cpp +++ b/src/Gui/TaskView/TaskDialog.cpp @@ -99,7 +99,7 @@ bool TaskDialog::canClose() const { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Gui/TaskView/TaskImage.ui b/src/Gui/TaskView/TaskImage.ui index 37aac262c7..9dd686bbc9 100644 --- a/src/Gui/TaskView/TaskImage.ui +++ b/src/Gui/TaskView/TaskImage.ui @@ -11,7 +11,7 @@ - Image plane settings + Image Plane Settings @@ -25,21 +25,21 @@ - XY-Plane + XY-plane - XZ-Plane + XZ-plane - YZ-Plane + YZ-plane @@ -77,7 +77,7 @@ - Offset: + Offset @@ -97,7 +97,7 @@ - X distance: + X distance @@ -117,7 +117,7 @@ - Y distance: + Y distance @@ -137,7 +137,7 @@ - Rotation : + Rotation @@ -153,7 +153,7 @@ - Transparency : + Transparency @@ -185,13 +185,13 @@ - Image size + Image Size - Width: + Width @@ -211,7 +211,7 @@ - Height: + Height @@ -241,7 +241,7 @@ - Interactively scale the image by setting a length between two points of the image. + Scales the image interactively by setting a length between two points of the image Calibrate diff --git a/src/Gui/TaskView/TaskOrientation.ui b/src/Gui/TaskView/TaskOrientation.ui index f09dc30e07..7e5faecea4 100644 --- a/src/Gui/TaskView/TaskOrientation.ui +++ b/src/Gui/TaskView/TaskOrientation.ui @@ -11,7 +11,7 @@ - Choose orientation + Choose Orientation @@ -23,7 +23,7 @@ - XY-Plane + XY-plane true @@ -33,14 +33,14 @@ - XZ-Plane + XZ-plane - YZ-Plane + YZ-plane @@ -78,7 +78,7 @@ - Offset: + Offset diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.ui b/src/Gui/TaskView/TaskSelectLinkProperty.ui index 545aa602b5..b6f2e421f0 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.ui +++ b/src/Gui/TaskView/TaskSelectLinkProperty.ui @@ -19,21 +19,21 @@ - ... + - ... + - ... + @@ -53,7 +53,7 @@ - ... + diff --git a/src/Gui/TextureMapping.ui b/src/Gui/TextureMapping.ui index 2a01dd9366..1e9e7e9160 100644 --- a/src/Gui/TextureMapping.ui +++ b/src/Gui/TextureMapping.ui @@ -17,7 +17,7 @@ - Texture mapping + Texture Mapping diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index 0bb3c931ee..5573779acf 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -1131,14 +1131,14 @@ void TreeWidget::contextMenuEvent(QContextMenuEvent* e) if (docs.size() >= 2) { contextMenu.addSeparator(); App::Document* activeDoc = App::GetApplication().getActiveDocument(); - subMenu.setTitle(tr("Activate document")); + subMenu.setTitle(tr("Activate Document")); contextMenu.addMenu(&subMenu); QAction* active = nullptr; for (auto it = docs.begin(); it != docs.end(); ++it) { QString label = QString::fromUtf8((*it)->Label.getValue()); QAction* action = subMenuGroup.addAction(label); action->setCheckable(true); - action->setStatusTip(tr("Activate document %1").arg(label)); + action->setStatusTip(tr("Activates document %1").arg(label)); action->setData(QByteArray((*it)->getName())); if (*it == activeDoc) active = action; } @@ -1150,13 +1150,13 @@ void TreeWidget::contextMenuEvent(QContextMenuEvent* e) // add a submenu to present the settings of the tree. QMenu settingsMenu; - settingsMenu.setTitle(tr("Tree settings")); + settingsMenu.setTitle(tr("Tree Settings")); contextMenu.addSeparator(); contextMenu.addMenu(&settingsMenu); - QAction* action = new QAction(tr("Show description"), this); - QAction* internalNameAction = new QAction(tr("Show internal name"), this); - action->setStatusTip(tr("Show a description column for items. An item's description can be set by pressing F2 (or your OS's edit button) or by editing the 'label2' property.")); + QAction* action = new QAction(tr("Show Description"), this); + QAction* internalNameAction = new QAction(tr("Show Internal Name"), this); + action->setStatusTip(tr("Shows a description column for items. An item's description can be set by by editing the 'label2' property.")); action->setCheckable(true); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/TreeView"); @@ -1171,7 +1171,7 @@ void TreeWidget::contextMenuEvent(QContextMenuEvent* e) }); - internalNameAction->setStatusTip(tr("Show an internal name column for items.")); + internalNameAction->setStatusTip(tr("Shows an internal name column for items.")); internalNameAction->setCheckable(true); internalNameAction->setChecked(!hGrp->GetBool("HideInternalNames", true)); @@ -3360,50 +3360,50 @@ void TreeWidget::setupText() this->headerItem()->setText(2, tr("Internal name")); this->showHiddenAction->setText(tr("Show items hidden in tree view")); - this->showHiddenAction->setStatusTip(tr("Show items that are marked as 'hidden' in the tree view")); + this->showHiddenAction->setStatusTip(tr("Shows items that are marked as 'hidden' in the tree view")); this->toggleVisibilityInTreeAction->setText(tr("Toggle visibility in tree view")); this->toggleVisibilityInTreeAction->setStatusTip(tr("Toggles the visibility of selected items in the tree view")); this->createGroupAction->setText(tr("Create group")); - this->createGroupAction->setStatusTip(tr("Create a group")); + this->createGroupAction->setStatusTip(tr("Creates a group")); this->relabelObjectAction->setText(tr("Rename")); - this->relabelObjectAction->setStatusTip(tr("Rename object")); + this->relabelObjectAction->setStatusTip(tr("Renames object")); this->finishEditingAction->setText(tr("Finish editing")); - this->finishEditingAction->setStatusTip(tr("Finish editing object")); + this->finishEditingAction->setStatusTip(tr("Finishes editing object")); this->selectDependentsAction->setText(tr("Add dependent objects to selection")); this->selectDependentsAction->setStatusTip(tr("Adds all dependent objects to the selection")); this->closeDocAction->setText(tr("Close document")); - this->closeDocAction->setStatusTip(tr("Close the document")); + this->closeDocAction->setStatusTip(tr("Closes the document")); #ifdef Q_OS_MAC this->openFileLocationAction->setText(tr("Reveal in Finder")); - this->openFileLocationAction->setStatusTip(tr("Reveal the current file location in Finder")); + this->openFileLocationAction->setStatusTip(tr("Reveals the current file location in Finder")); #else this->openFileLocationAction->setText(tr("Open File Location")); - this->openFileLocationAction->setStatusTip(tr("Open the current file location")); + this->openFileLocationAction->setStatusTip(tr("Opens the current file location")); #endif this->reloadDocAction->setText(tr("Reload document")); - this->reloadDocAction->setStatusTip(tr("Reload a partially loaded document")); + this->reloadDocAction->setStatusTip(tr("Reloads a partially loaded document")); this->skipRecomputeAction->setText(tr("Skip recomputes")); - this->skipRecomputeAction->setStatusTip(tr("Enable or disable recomputations of document")); + this->skipRecomputeAction->setStatusTip(tr("Enables or disables the recomputations of document")); this->allowPartialRecomputeAction->setText(tr("Allow partial recomputes")); this->allowPartialRecomputeAction->setStatusTip( - tr("Enable or disable recomputating editing object when 'skip recomputation' is enabled")); + tr("Enables or disables the recomputating editing object when 'skip recomputation' is enabled")); this->markRecomputeAction->setText(tr("Mark to recompute")); - this->markRecomputeAction->setStatusTip(tr("Mark this object to be recomputed")); + this->markRecomputeAction->setStatusTip(tr("Marks this object to be recomputed")); this->markRecomputeAction->setIcon(BitmapFactory().iconFromTheme("Std_MarkToRecompute")); this->recomputeObjectAction->setText(tr("Recompute object")); - this->recomputeObjectAction->setStatusTip(tr("Recompute the selected object")); + this->recomputeObjectAction->setStatusTip(tr("Recomputes the selected object")); this->recomputeObjectAction->setIcon(BitmapFactory().iconFromTheme("view-refresh")); } @@ -3746,7 +3746,7 @@ void TreePanel::itemSearch(const QString& text) TreeDockWidget::TreeDockWidget(Gui::Document* pcDocument, QWidget* parent) : DockWindow(pcDocument, parent) { - setWindowTitle(tr("Tree view")); + setWindowTitle(tr("Tree View")); auto panel = new TreePanel("TreeView", this); auto pLayout = new QGridLayout(this); pLayout->setSpacing(0); diff --git a/src/Gui/TreeParams.cpp b/src/Gui/TreeParams.cpp index 2f7a633f6e..89e50c6138 100644 --- a/src/Gui/TreeParams.cpp +++ b/src/Gui/TreeParams.cpp @@ -1470,7 +1470,7 @@ void TreeParams::removeTreeToolTipIcon() { // Auto generated code (Tools/params_utils.py:350) const char *TreeParams::docVisibilityIcon() { return QT_TRANSLATE_NOOP("TreeParams", -"If enabled, show an eye icon before the tree view items, showing the items visibility status. When clicked the visibility is toggled"); +"Displays an eye icon in front of the tree view items, showing the items visibility status. When clicked the visibility is toggled"); } // Auto generated code (Tools/params_utils.py:358) diff --git a/src/Gui/TreeParams.py b/src/Gui/TreeParams.py index abc2b592fa..7caa64be22 100644 --- a/src/Gui/TreeParams.py +++ b/src/Gui/TreeParams.py @@ -84,7 +84,7 @@ Params = [ ParamInt('ColumnSize3', 0), ParamBool('TreeToolTipIcon', False, title='Show icon in tool tip'), ParamBool('VisibilityIcon', True, on_change=True, title='Show visibility icon', - doc = "If enabled, show an eye icon before the tree view items, showing the items visibility status. When clicked the visibility is toggled"), + doc = "Displays an eye icon in front of the tree view items, showing the items visibility status. When clicked the visibility is toggled"), ] def declare_begin(): diff --git a/src/Gui/VectorListEditor.cpp b/src/Gui/VectorListEditor.cpp index 00eb6f603d..b921a3076d 100644 --- a/src/Gui/VectorListEditor.cpp +++ b/src/Gui/VectorListEditor.cpp @@ -334,11 +334,11 @@ VectorListEditor::~VectorListEditor() = default; void VectorListEditor::showContextMenu(const QPoint& pos) { QMenu contextMenu(ui->tableWidget); - QAction *copyAction = contextMenu.addAction(tr("Copy table")); + QAction *copyAction = contextMenu.addAction(tr("Copy Table")); connect(copyAction, &QAction::triggered, model, &VectorTableModel::copyToClipboard); copyAction->setEnabled(!data.empty()); - QAction *pasteAction = contextMenu.addAction(tr("Paste table")); + QAction *pasteAction = contextMenu.addAction(tr("Paste Table")); connect(pasteAction, &QAction::triggered, model, &VectorTableModel::pasteFromClipboard); pasteAction->setEnabled(QApplication::clipboard()->mimeData()->hasText()); diff --git a/src/Gui/VectorListEditor.ui b/src/Gui/VectorListEditor.ui index cfc0bd15e2..7f0a17cda2 100644 --- a/src/Gui/VectorListEditor.ui +++ b/src/Gui/VectorListEditor.ui @@ -22,7 +22,7 @@ - Id: + Id @@ -36,7 +36,7 @@ - x: + X @@ -46,7 +46,7 @@ - y: + Y @@ -56,7 +56,7 @@ - z: + Z @@ -120,7 +120,7 @@ - ... + @@ -131,7 +131,7 @@ - ... + @@ -142,7 +142,7 @@ - ... + @@ -153,7 +153,7 @@ - ... + diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index 06ea16a6ee..653f905481 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -569,7 +569,7 @@ bool View3DInventor::setCamera(const char* pCamera) { SoCamera * CamViewer = _viewer->getSoRenderManager()->getCamera(); if (!CamViewer) { - throw Base::RuntimeError("No camera set so far..."); + throw Base::RuntimeError("No camera set so far…"); } SoInput in; diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp index 45fca8baf4..05f374370d 100644 --- a/src/Gui/ViewProvider.cpp +++ b/src/Gui/ViewProvider.cpp @@ -244,7 +244,7 @@ void ViewProvider::eventCallback(void * ud, SoEventCallback * node) } } else if (press) { - FC_WARN("Please release all mouse buttons before exiting editing"); + FC_WARN("Release all mouse buttons before exiting editing"); } break; default: diff --git a/src/Gui/ViewProviderImagePlane.cpp b/src/Gui/ViewProviderImagePlane.cpp index 24435d9593..b48f5adbcd 100644 --- a/src/Gui/ViewProviderImagePlane.cpp +++ b/src/Gui/ViewProviderImagePlane.cpp @@ -166,7 +166,7 @@ void ViewProviderImagePlane::onChanged(const App::Property* prop) void ViewProviderImagePlane::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { Gui::ActionFunction* func = new Gui::ActionFunction(menu); - QAction* action = menu->addAction(QObject::tr("Change image...")); + QAction* action = menu->addAction(QObject::tr("Change Image…")); action->setIcon(QIcon(QLatin1String("images:image-scaling.svg"))); func->trigger(action, [this](){ this->manipulateImage(); diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp index 8073c7b51e..1233c1051d 100644 --- a/src/Gui/ViewProviderLink.cpp +++ b/src/Gui/ViewProviderLink.cpp @@ -2466,9 +2466,9 @@ void ViewProviderLink::setupContextMenu(QMenu* menu, QObject* receiver, const ch if (!src) src = ext->getLinkedObjectValue(); if (src && !ext->getOnChangeCopyObjects(nullptr, src).empty()) { QAction *act = menu->addAction( - QObject::tr("Setup configurable object")); + QObject::tr("Setup Configurable Object")); act->setToolTip(QObject::tr( - "Select which object to copy or exclude when configuration changes. " + "Selects which object to copy or exclude when configuration changes. " "All external linked objects are excluded by default.")); act->setData(-1); if (!func) func = new Gui::ActionFunction(menu); @@ -2483,10 +2483,9 @@ void ViewProviderLink::setupContextMenu(QMenu* menu, QObject* receiver, const ch return; DlgObjectSelection dlg({src}, excludes, getMainWindow()); dlg.setMessage(QObject::tr( - "Please select which objects to copy when the configuration is changed")); + "Select which objects to copy when the configuration is changed")); auto box = new QCheckBox(QObject::tr("Apply to all"), &dlg); - box->setToolTip(QObject::tr("Apply the setting to all links. Or, uncheck this\n" - "option to apply only to this link.")); + box->setToolTip(QObject::tr("Applies the setting to all links")); box->setChecked(App::LinkParams::getCopyOnChangeApplyToAll()); dlg.addCheckBox(box); if(dlg.exec()!=QDialog::Accepted) @@ -2530,7 +2529,7 @@ void ViewProviderLink::setupContextMenu(QMenu* menu, QObject* receiver, const ch } if (ext->getLinkCopyOnChangeValue() == 0) { - auto submenu = menu->addMenu(QObject::tr("Copy on change")); + auto submenu = menu->addMenu(QObject::tr("Copy on Change")); auto act = submenu->addAction(QObject::tr("Enable")); act->setToolTip(QObject::tr( "Enable auto copy of linked object when its configuration is changed")); @@ -2547,7 +2546,7 @@ void ViewProviderLink::setupContextMenu(QMenu* menu, QObject* receiver, const ch }); act = submenu->addAction(QObject::tr("Tracking")); act->setToolTip(QObject::tr( - "Copy the linked object when its configuration is changed.\n" + "Copies the linked object when its configuration is changed.\n" "Also auto redo the copy if the original linked object is changed.\n")); act->setData(-1); func->trigger(act, [ext](){ @@ -2565,7 +2564,7 @@ void ViewProviderLink::setupContextMenu(QMenu* menu, QObject* receiver, const ch if (ext->getLinkCopyOnChangeValue() != 2 && ext->getLinkCopyOnChangeValue() != 0) { QAction *act = menu->addAction( - QObject::tr("Disable copy on change")); + QObject::tr("Disable Copy on Change")); act->setData(-1); if (!func) func = new Gui::ActionFunction(menu); func->trigger(act, [ext](){ @@ -2580,10 +2579,10 @@ void ViewProviderLink::setupContextMenu(QMenu* menu, QObject* receiver, const ch } if (ext->isLinkMutated()) { - QAction* act = menu->addAction(QObject::tr("Refresh configurable object")); + QAction* act = menu->addAction(QObject::tr("Refresh Configurable Object")); act->setToolTip(QObject::tr( - "Synchronize the original configurable source object by\n" - "creating a new deep copy. Note that any changes made to\n" + "Synchronizes the original configurable source object by\n" + "creating a new deep copy. Any changes made to\n" "the current copy will be lost.\n")); act->setData(-1); if (!func) func = new Gui::ActionFunction(menu); @@ -2613,7 +2612,7 @@ void ViewProviderLink::_setupContextMenu( && ext->_getShowElementProperty() && ext->_getElementCountValue() > 1) { - auto action = menu->addAction(QObject::tr("Toggle array elements"), [ext] { + auto action = menu->addAction(QObject::tr("Toggle Array Elements"), [ext] { try { App::AutoTransaction guard(QT_TRANSLATE_NOOP("Command", "Toggle array elements")); ext->getShowElementProperty()->setValue(!ext->getShowElementValue()); @@ -2623,7 +2622,7 @@ void ViewProviderLink::_setupContextMenu( } }); action->setToolTip(QObject::tr( - "Change whether show each link array element as individual objects")); + "Changes whether to show each link array element as individual objects")); } if((ext->getPlacementProperty() && !ext->getPlacementProperty()->isReadOnly()) @@ -2640,7 +2639,7 @@ void ViewProviderLink::_setupContextMenu( if (!found) { QIcon iconObject = mergeGreyableOverlayIcons(Gui::BitmapFactory().pixmap("Std_TransformManip.svg")); QAction* act = menu->addAction(iconObject, QObject::tr("Transform"), receiver, member); - act->setToolTip(QObject::tr("Transform at the origin of the placement")); + act->setToolTip(QObject::tr("Transforms the object at the origin of the placement")); act->setData(QVariant((int)ViewProvider::Transform)); } } @@ -2650,13 +2649,13 @@ void ViewProviderLink::_setupContextMenu( const auto actions = menu->actions(); for(auto action : actions) { if(action->data().toInt() == ViewProvider::Color) { - action->setText(QObject::tr("Override colors...")); + action->setText(QObject::tr("Override Colors…")); found = true; break; } } if(!found) { - QAction* act = menu->addAction(QObject::tr("Override colors..."), receiver, member); + QAction* act = menu->addAction(QObject::tr("Override Colors…"), receiver, member); act->setData(QVariant((int)ViewProvider::Color)); } } diff --git a/src/Gui/ViewProviderPart.cpp b/src/Gui/ViewProviderPart.cpp index 1d5a3c5fdd..79f501a7de 100644 --- a/src/Gui/ViewProviderPart.cpp +++ b/src/Gui/ViewProviderPart.cpp @@ -70,7 +70,7 @@ void ViewProviderPart::setupContextMenu(QMenu* menu, QObject* receiver, const ch { auto func = new Gui::ActionFunction(menu); - QAction* act = menu->addAction(QObject::tr("Active object")); + QAction* act = menu->addAction(QObject::tr("Active Object")); act->setCheckable(true); act->setChecked(isActivePart()); func->trigger(act, [this](){ diff --git a/src/Gui/ViewProviderTextDocument.cpp b/src/Gui/ViewProviderTextDocument.cpp index e5517fc5bf..7d3c36d632 100644 --- a/src/Gui/ViewProviderTextDocument.cpp +++ b/src/Gui/ViewProviderTextDocument.cpp @@ -73,7 +73,7 @@ ViewProviderTextDocument::ViewProviderTextDocument() void ViewProviderTextDocument::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { auto func = new Gui::ActionFunction(menu); - QAction* act = menu->addAction(QObject::tr("Edit text")); + QAction* act = menu->addAction(QObject::tr("Edit Text")); func->trigger(act, [this](){ this->doubleClicked(); }); diff --git a/src/Gui/WhatsThis.cpp b/src/Gui/WhatsThis.cpp index ddbaf01991..0d253dd7dd 100644 --- a/src/Gui/WhatsThis.cpp +++ b/src/Gui/WhatsThis.cpp @@ -46,7 +46,7 @@ StdCmdDescription::StdCmdDescription() sMenuText = QT_TR_NOOP("Des&cription"); sToolTipText = QT_TR_NOOP("Long description of commands"); sWhatsThis = "Std_DescriptionMode"; - sStatusTip = QT_TR_NOOP("Long description of commands"); + sStatusTip = sToolTipText; sAccel = "F1"; } diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp index 0c4854d85e..7bf54da9e9 100644 --- a/src/Gui/Widgets.cpp +++ b/src/Gui/Widgets.cpp @@ -995,7 +995,7 @@ LabelButton::LabelButton (QWidget * parent) label->setAutoFillBackground(true); layout->addWidget(label); - button = new QPushButton(QLatin1String("..."), this); + button = new QPushButton(QLatin1String("…"), this); #if defined (Q_OS_MACOS) button->setAttribute(Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct #endif @@ -1383,7 +1383,7 @@ LabelEditor::LabelEditor (QWidget * parent) connect(lineEdit, &QLineEdit::textChanged, this, &LabelEditor::validateText); - button = new QPushButton(QLatin1String("..."), this); + button = new QPushButton(QLatin1String("…"), this); #if defined (Q_OS_MACOS) button->setAttribute(Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct #endif @@ -1459,7 +1459,7 @@ void LabelEditor::setButtonText(const QString& txt) { button->setText(txt); int w1 = 2 * QtTools::horizontalAdvance(button->fontMetrics(), txt); - int w2 = 2 * QtTools::horizontalAdvance(button->fontMetrics(), QLatin1String(" ... ")); + int w2 = 2 * QtTools::horizontalAdvance(button->fontMetrics(), QLatin1String(" … ")); button->setFixedWidth((w1 > w2 ? w1 : w2)); } diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index 5adecc1ce0..eb2648cd1d 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -335,7 +335,7 @@ void Workbench::createLinkMenu(MenuItem *item) { } auto linkMenu = new MenuItem; - linkMenu->setCommand("Link actions"); + linkMenu->setCommand("Link Actions"); *linkMenu << "Std_LinkMakeGroup" << "Std_LinkMake"; auto &rMgr = Application::Instance->commandManager(); @@ -535,7 +535,7 @@ std::list Workbench::listCommandbars() const qApp->translate("CommandGroup", "Structure"); qApp->translate("CommandGroup", "Standard-Test"); qApp->translate("CommandGroup", "Standard-View"); - qApp->translate("CommandGroup", "TreeView"); + qApp->translate("CommandGroup", "Tree View"); qApp->translate("CommandGroup", "Measure"); qApp->translate("Workbench", "&File"); @@ -544,8 +544,8 @@ std::list Workbench::listCommandbars() const qApp->translate("Workbench", "Clipboard"); qApp->translate("Workbench", "Workbench"); qApp->translate("Workbench", "Structure"); - qApp->translate("Workbench", "Standard &views"); - qApp->translate("Workbench", "Individual views"); + qApp->translate("Workbench", "Standard &Views"); + qApp->translate("Workbench", "Individual Views"); qApp->translate("Workbench", "A&xonometric"); qApp->translate("Workbench", "&Stereo"); qApp->translate("Workbench", "&Zoom"); @@ -554,7 +554,7 @@ std::list Workbench::listCommandbars() const qApp->translate("Workbench", "&Tools"); qApp->translate("Workbench", "&Macro"); qApp->translate("Workbench", "&Windows"); - qApp->translate("Workbench", "&On-line help"); + qApp->translate("Workbench", "&Online Help"); qApp->translate("Workbench", "&Help"); qApp->translate("Workbench", "Help"); qApp->translate("Workbench", "File"); @@ -562,7 +562,7 @@ std::list Workbench::listCommandbars() const qApp->translate("Workbench", "View"); qApp->translate("Workbench", "Special Ops"); // needed for Structure toolbar - qApp->translate("Workbench", "Link actions"); + qApp->translate("Workbench", "Link Actions"); #endif #if 0 // needed for the application menu on OSX @@ -570,7 +570,7 @@ std::list Workbench::listCommandbars() const qApp->translate("MAC_APPLICATION_MENU", "Hide %1"); qApp->translate("MAC_APPLICATION_MENU", "Hide Others"); qApp->translate("MAC_APPLICATION_MENU", "Show All"); - qApp->translate("MAC_APPLICATION_MENU", "Preferences..."); + qApp->translate("MAC_APPLICATION_MENU", "Preferences…"); qApp->translate("MAC_APPLICATION_MENU", "Quit %1"); qApp->translate("MAC_APPLICATION_MENU", "About %1"); #endif @@ -592,7 +592,7 @@ void StdWorkbench::setupContextMenu(const char* recipient, MenuItem* item) const *item << "Separator"; auto StdViews = new MenuItem; - StdViews->setCommand( "Standard views" ); + StdViews->setCommand( "Standard Views" ); *StdViews << "Std_ViewIsometric" << "Separator" << "Std_ViewHome" << "Std_ViewFront" << "Std_ViewTop" << "Std_ViewRight" << "Std_ViewRear" << "Std_ViewBottom" << "Std_ViewLeft" @@ -661,7 +661,7 @@ MenuItem* StdWorkbench::setupMenuBar() const // Standard views auto stdviews = new MenuItem; - stdviews->setCommand("Standard &views"); + stdviews->setCommand("Standard &Views"); *stdviews << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_AlignToSelection" << axoviews << "Separator" << "Std_ViewHome" << "Std_ViewFront" << "Std_ViewTop" << "Std_ViewRight" << "Std_ViewRear" << "Std_ViewBottom" << "Std_ViewLeft" @@ -816,7 +816,7 @@ ToolBarItem* StdWorkbench::setupToolBars() const // Individual views auto individualViews = new ToolBarItem(root, ToolBarItem::DefaultVisibility::Hidden); - individualViews->setCommand("Individual views"); + individualViews->setCommand("Individual Views"); *individualViews << "Std_ViewIsometric" << "Std_ViewFront" << "Std_ViewTop" @@ -844,7 +844,7 @@ ToolBarItem* StdWorkbench::setupCommandBars() const // View auto view = new ToolBarItem( root ); - view->setCommand("Standard views"); + view->setCommand("Standard Views"); *view << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_ViewIsometric" << "Separator" << "Std_ViewFront" << "Std_ViewRight" << "Std_ViewTop" << "Std_ViewRear" << "Std_ViewLeft" << "Std_ViewBottom"; diff --git a/src/Gui/propertyeditor/PropertyEditor.cpp b/src/Gui/propertyeditor/PropertyEditor.cpp index d86b5ab60a..e560325569 100644 --- a/src/Gui/propertyeditor/PropertyEditor.cpp +++ b/src/Gui/propertyeditor/PropertyEditor.cpp @@ -747,12 +747,12 @@ void PropertyEditor::contextMenuEvent(QContextMenuEvent*) } // add property - menu.addAction(tr("Add property"))->setData(QVariant(MA_AddProp)); + menu.addAction(tr("Add Property"))->setData(QVariant(MA_AddProp)); if (!props.empty() && std::all_of(props.begin(), props.end(), [](auto prop) { return prop->testStatus(App::Property::PropDynamic) && !boost::starts_with(prop->getName(), prop->getGroup()); })) { - menu.addAction(tr("Rename property group"))->setData(QVariant(MA_EditPropGroup)); + menu.addAction(tr("Rename Property Group"))->setData(QVariant(MA_EditPropGroup)); } // remove property @@ -768,20 +768,20 @@ void PropertyEditor::contextMenuEvent(QContextMenuEvent*) } } if (canRemove) { - menu.addAction(tr("Remove property"))->setData(QVariant(MA_RemoveProp)); + menu.addAction(tr("Remove Property"))->setData(QVariant(MA_RemoveProp)); } // add a separator between adding/removing properties and the rest menu.addSeparator(); // show all - QAction* showHidden = menu.addAction(tr("Show hidden")); + QAction* showHidden = menu.addAction(tr("Show Hidden")); showHidden->setCheckable(true); showHidden->setChecked(PropertyView::showAll()); showHidden->setData(QVariant(MA_ShowHidden)); // auto expand - autoExpand = menu.addAction(tr("Auto expand")); + autoExpand = menu.addAction(tr("Auto-Expand")); autoExpand->setCheckable(true); autoExpand->setChecked(autoexpand); autoExpand->setData(QVariant(MA_AutoExpand)); @@ -796,7 +796,7 @@ void PropertyEditor::contextMenuEvent(QContextMenuEvent*) contextIndex = propertyModel->buddy(contextIndex); setCurrentIndex(contextIndex); // menu.addSeparator(); - menu.addAction(tr("Expression..."))->setData(QVariant(MA_Expression)); + menu.addAction(tr("Expression…"))->setData(QVariant(MA_Expression)); } } diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index f8df0c3a41..7e0098a46c 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -1580,7 +1580,7 @@ PropertyEditorWidget::PropertyEditorWidget(QWidget* parent) lineEdit->setReadOnly(true); layout->addWidget(lineEdit); - button = new QPushButton(QLatin1String("..."), this); + button = new QPushButton(QLatin1String("…"), this); #if defined(Q_OS_MACOS) button->setAttribute( Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct @@ -4543,12 +4543,12 @@ LinkLabel::LinkLabel(QWidget* parent, const App::Property* prop) label->setTextInteractionFlags(Qt::TextBrowserInteraction); layout->addWidget(label); - editButton = new QPushButton(QLatin1String("..."), this); + editButton = new QPushButton(QLatin1String("…"), this); #if defined(Q_OS_MACOS) editButton->setAttribute( Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct #endif - editButton->setToolTip(tr("Change the linked object")); + editButton->setToolTip(tr("Changes the linked object")); layout->addWidget(editButton); this->setFocusPolicy(Qt::StrongFocus); diff --git a/src/Mod/Assembly/CommandCreateAssembly.py b/src/Mod/Assembly/CommandCreateAssembly.py index 6a9af33bc7..c3ee92e51f 100644 --- a/src/Mod/Assembly/CommandCreateAssembly.py +++ b/src/Mod/Assembly/CommandCreateAssembly.py @@ -46,11 +46,11 @@ class CommandCreateAssembly: def GetResources(self): return { "Pixmap": "Geoassembly", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateAssembly", "Create Assembly"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateAssembly", "New Assembly"), "Accel": "A", "ToolTip": QT_TRANSLATE_NOOP( "Assembly_CreateAssembly", - "Create an assembly object in the current document, or in the current active assembly (if any). Limit of one root assembly per file.", + "Creates an assembly object in the current document, or in the current active assembly (if any). Limit of one root assembly per file.", ), "CmdType": "ForEdit", } @@ -68,7 +68,7 @@ class CommandCreateAssembly: return App.ActiveDocument is not None def Activated(self): - App.setActiveTransaction("Create assembly") + App.setActiveTransaction("New Assembly") activeAssembly = UtilsAssembly.activeAssembly() Gui.addModule("UtilsAssembly") diff --git a/src/Mod/Assembly/CommandCreateBom.py b/src/Mod/Assembly/CommandCreateBom.py index af4eee28a1..d679f869eb 100644 --- a/src/Mod/Assembly/CommandCreateBom.py +++ b/src/Mod/Assembly/CommandCreateBom.py @@ -66,17 +66,17 @@ class CommandCreateBom: def GetResources(self): return { "Pixmap": "Assembly_BillOfMaterials", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateBom", "Create Bill of Materials"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateBom", "Bill of Materials"), "Accel": "O", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateBom", - "Create a bill of materials of the current assembly. If an assembly is active, it will be a BOM of this assembly. Else it will be a BOM of the whole document.", + "Creates a bill of materials of the current assembly. If an assembly is active, it will be a BOM of this assembly. Else it will be a BOM of the whole document.", ) + "

" + QT_TRANSLATE_NOOP( "Assembly_CreateBom", - "The BOM object is a document object that stores the settings of your BOM. It is also a spreadsheet object so you can easily visualize the BOM. If you don't need the BOM object to be saved as a document object, you can simply export and cancel the task.", + "The BOM object is a document object that stores the settings of your BOM. It is also a spreadsheet object so you can easily visualize the BOM. If you do not need the BOM object to be saved as a document object, you can simply export and cancel the task.", ) + "

" + QT_TRANSLATE_NOOP( @@ -370,28 +370,28 @@ class TaskAssemblyCreateBom(QtCore.QObject): layout = QtWidgets.QVBoxLayout() layout.setContentsMargins(10, 10, 10, 10) - options_title = QtWidgets.QLabel("" + translate("Assembly", "Options:") + "") + options_title = QtWidgets.QLabel("" + translate("Assembly", "Options") + "") options_text = QtWidgets.QLabel( " - " + translate( "Assembly", - "Sub-assemblies children : If checked, Sub assemblies children will be added to the bill of materials.", + "Sub-assembly children: the children of sub-assemblies will be included in the bill of materials", ) + "\n" " - " + translate( "Assembly", - "Parts children : If checked, Parts children will be added to the bill of materials.", + "Parts children: the children of parts will be added to the bill of materials", ) + "\n" " - " + translate( "Assembly", - "Only parts : If checked, only Part containers and sub-assemblies will be added to the bill of materials. Solids like PartDesign Bodies, fasteners or Part workbench primitives will be ignored.", + "Only parts: adds only part containers and sub-assemblies to the bill of materials. Solids like Part Design bodies, fasteners, or Part workbench primitives are ignored.", ) + "\n" ) - columns_title = QtWidgets.QLabel("" + translate("Assembly", "Columns:") + "") + columns_title = QtWidgets.QLabel("" + translate("Assembly", "Columns") + "") columns_text = QtWidgets.QLabel( " - " + translate( @@ -402,22 +402,22 @@ class TaskAssemblyCreateBom(QtCore.QObject): " - " + translate( "Assembly", - "Custom columns : 'Description' and other custom columns you add by clicking on 'Add column' will not have their data overwritten. If a column name starts with '.' followed by a property name (e.g. '.Length'), it will be auto-populated with that property value. These columns can be renamed by double-clicking or pressing F2 (Renaming a column will currently lose its data).", + "Custom columns : 'Description' and other custom columns you add by clicking on 'Add column' will not have their data overwritten. If a column name starts with '.' followed by a property name (e.g. '.Length'), it will be auto-populated with that property value. These columns can be renamed by double-clicking or pressing F2 (renaming a column will currently lose its data).", ) + "\n" "\n" + translate( "Assembly", - "Any column (custom or not) can be deleted by pressing Del.", + "Any column (custom or not), can be deleted by pressing the Delete key", ) + "\n" ) - export_title = QtWidgets.QLabel("" + translate("Assembly", "Export:") + "") + export_title = QtWidgets.QLabel("" + translate("Assembly", "Export") + "") export_text = QtWidgets.QLabel( " - " + translate( "Assembly", - "The exported file format can be customized in the Spreadsheet workbench preferences.", + "The exported file format can be customized in the Spreadsheet workbench preferences", ) + "\n" ) diff --git a/src/Mod/Assembly/CommandCreateJoint.py b/src/Mod/Assembly/CommandCreateJoint.py index e4ba97910c..57ddbfb863 100644 --- a/src/Mod/Assembly/CommandCreateJoint.py +++ b/src/Mod/Assembly/CommandCreateJoint.py @@ -68,24 +68,23 @@ class CommandCreateJointFixed: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointFixed", "MenuText": QT_TRANSLATE_NOOP( "Assembly_CreateJointFixed", - "Create Fixed Joint", + "Fixed Joint", ), "Accel": "F", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointFixed", - "1 - If an assembly is active : Create a joint permanently locking two parts together, preventing any movement or rotation.", + "1 - If an assembly is active : Creates a joint permanently locking two parts together, preventing any movement or rotation", ) + "

" + "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointFixed", - "2 - If a part is active : Position sub parts by matching selected coordinate systems. The second part selected will move.", + "2 - If a part is active: Positions sub-parts by matching selected coordinate systems. The second part selected will move.", ) + "

", "CmdType": "ForEdit", @@ -106,15 +105,14 @@ class CommandCreateJointRevolute: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointRevolute", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointRevolute", "Create Revolute Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointRevolute", "Revolute Joint"), "Accel": "R", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointRevolute", - "Create a Revolute Joint: Allows rotation around a single axis between selected parts.", + "Creates a revolute joint allowing rotation around a single axis between selected parts", ) + "

", "CmdType": "ForEdit", @@ -132,17 +130,14 @@ class CommandCreateJointCylindrical: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointCylindrical", - "MenuText": QT_TRANSLATE_NOOP( - "Assembly_CreateJointCylindrical", "Create Cylindrical Joint" - ), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointCylindrical", "Cylindrical Joint"), "Accel": "C", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointCylindrical", - "Create a Cylindrical Joint: Enables rotation along one axis while permitting movement along the same axis between assembled parts.", + "Creates a cylindrical joint that allows rotation around and translation along a single axis between assembled parts", ) + "

", "CmdType": "ForEdit", @@ -160,15 +155,14 @@ class CommandCreateJointSlider: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointSlider", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointSlider", "Create Slider Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointSlider", "Slider Joint"), "Accel": "S", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointSlider", - "Create a Slider Joint: Allows linear movement along a single axis but restricts rotation between selected parts.", + "Creates a slider joint that allows linear movement along a single axis, but restricts rotation between selected parts", ) + "

", "CmdType": "ForEdit", @@ -186,15 +180,14 @@ class CommandCreateJointBall: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointBall", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointBall", "Create Ball Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointBall", "Ball Joint"), "Accel": "B", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointBall", - "Create a Ball Joint: Connects parts at a point, allowing unrestricted movement as long as the connection points remain in contact.", + "Creates a ball joint that connects parts at a point, allowing unrestricted movement as long as the connection points remain in contact", ) + "

", "CmdType": "ForEdit", @@ -212,20 +205,19 @@ class CommandCreateJointDistance: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointDistance", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointDistance", "Create Distance Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointDistance", "Distance Joint"), "Accel": "D", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointDistance", - "Create a Distance Joint: Fix the distance between the selected objects.", + "Creates a distance joint that fixes the distance between the selected objects", ) + "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointDistance", - "Create one of several different joints based on the selection. " + "Creates one of several different joints based on the selection" "For example, a distance of 0 between a plane and a cylinder creates a tangent joint. A distance of 0 between planes will make them co-planar.", ) + "

", @@ -244,15 +236,14 @@ class CommandCreateJointParallel: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointParallel", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointParallel", "Create Parallel Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointParallel", "Parallel Joint"), "Accel": "N", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointParallel", - "Create an Parallel Joint: Make the Z axis of selected coordinate systems parallel.", + "Creates a parallel joint that makes the Z-axis of the selected coordinate systems parallel", ) + "

", "CmdType": "ForEdit", @@ -270,17 +261,16 @@ class CommandCreateJointPerpendicular: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointPerpendicular", "MenuText": QT_TRANSLATE_NOOP( - "Assembly_CreateJointPerpendicular", "Create Perpendicular Joint" + "Assembly_CreateJointPerpendicular", "Perpendicular Joint" ), "Accel": "M", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointPerpendicular", - "Create an Perpendicular Joint: Make the Z axis of selected coordinate systems perpendicular.", + "Creates a perpendicular joint that makes the Z-axis of the selected coordinate systems perpendicular", ) + "

", "CmdType": "ForEdit", @@ -298,15 +288,14 @@ class CommandCreateJointAngle: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointAngle", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointAngle", "Create Angle Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointAngle", "Angle Joint"), "Accel": "X", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointAngle", - "Create an Angle Joint: Fix the angle between the Z axis of selected coordinate systems.", + "Creates an angle joint that fixes the angle between the Z-axis of the selected coordinate systems", ) + "

", "CmdType": "ForEdit", @@ -324,22 +313,21 @@ class CommandCreateJointRackPinion: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointRackPinion", "MenuText": QT_TRANSLATE_NOOP( - "Assembly_CreateJointRackPinion", "Create Rack and Pinion Joint" + "Assembly_CreateJointRackPinion", "Rack and Pinion Joint" ), "Accel": "Q", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointRackPinion", - "Create a Rack and Pinion Joint: Links a part with a sliding joint with a part with a revolute joint.", + "Creates a rack and pinion joint that links a part with a sliding joint to a part with a revolute joint", ) + "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointRackPinion", - "Select the same coordinate systems as the revolute and sliding joints. The pitch radius defines the movement ratio between the rack and the pinion.", + "Selects the same coordinate systems as the revolute and sliding joints. The pitch radius defines the movement ratio between the rack and the pinion.", ) + "

", "CmdType": "ForEdit", @@ -357,15 +345,14 @@ class CommandCreateJointScrew: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointScrew", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointScrew", "Create Screw Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointScrew", "Screw Joint"), "Accel": "W", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointScrew", - "Create a Screw Joint: Links a part with a sliding joint with a part with a revolute joint.", + "Creates a screw joint that links a part with a sliding joint to a part with a revolute joint", ) + "

" + QT_TRANSLATE_NOOP( @@ -388,15 +375,14 @@ class CommandCreateJointGears: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointGears", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointGears", "Create Gears Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointGears", "Gears Joint"), "Accel": "T", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointGears", - "Create a Gears Joint: Links two rotating gears together. They will have inverse rotation direction.", + "Creates a gears joint that links 2 rotating gears together. They will have inverse rotation direction.", ) + "

" + QT_TRANSLATE_NOOP( @@ -419,15 +405,14 @@ class CommandCreateJointBelt: pass def GetResources(self): - return { "Pixmap": "Assembly_CreateJointPulleys", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointBelt", "Create Belt Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointBelt", "Belt Joint"), "Accel": "L", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointBelt", - "Create a Belt Joint: Links two rotating objects together. They will have the same rotation direction.", + "Creates a belt joint that links 2 rotating objects together. They will have the same rotation direction.", ) + "

" + QT_TRANSLATE_NOOP( @@ -451,14 +436,13 @@ class CommandGroupGearBelt: def GetResources(self): """Set icon, menu and tooltip.""" - return { "Pixmap": "Assembly_CreateJointGears", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointGearBelt", "Create Gear/Belt Joint"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateJointGearBelt", "Gears/Belt Joint"), "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateJointGearBelt", - "Create a Gears/Belt Joint: Links two rotating gears together.", + "Creates a gears or belt joint that links 2 rotating gears together", ) + "

" + QT_TRANSLATE_NOOP( @@ -496,15 +480,14 @@ class CommandToggleGrounded: pass def GetResources(self): - return { "Pixmap": "Assembly_ToggleGrounded", - "MenuText": QT_TRANSLATE_NOOP("Assembly_ToggleGrounded", "Toggle grounded"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_ToggleGrounded", "Toggle Grounded"), "Accel": "G", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_ToggleGrounded", - "Grounding a part permanently locks its position in the assembly, preventing any movement or rotation. You need at least one grounded part before starting to assemble.", + "Toggles the grounding of a part.\nGrounding a part permanently locks its position in the assembly, preventing any movement or rotation. You need at least one grounded part before starting to assemble.", ) + "

", "CmdType": "ForEdit", diff --git a/src/Mod/Assembly/CommandCreateSimulation.py b/src/Mod/Assembly/CommandCreateSimulation.py index b074172d2a..3e04debab6 100644 --- a/src/Mod/Assembly/CommandCreateSimulation.py +++ b/src/Mod/Assembly/CommandCreateSimulation.py @@ -64,12 +64,12 @@ class CommandCreateSimulation: def GetResources(self): return { "Pixmap": "Assembly_CreateSimulation", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateSimulation", "Create Simulation"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateSimulation", "Simulation"), "Accel": "V", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateSimulation", - "Create a simulation of the current assembly.", + "Creates a new simulation of the current assembly", ) + "

", "CmdType": "ForEdit", @@ -495,13 +495,13 @@ class MotionEditDialog: layout = QGridLayout(self.dialog) # Add labels and widgets to the layout - layout.addWidget(QLabel("Joint:"), 0, 0) + layout.addWidget(QLabel("Joint"), 0, 0) layout.addWidget(self.joint_combo, 0, 1) - layout.addWidget(QLabel("Motion Type:"), 1, 0) + layout.addWidget(QLabel("Motion Type"), 1, 0) layout.addWidget(self.motion_type_combo, 1, 1) - layout.addWidget(QLabel("Formula:"), 2, 0) + layout.addWidget(QLabel("Formula"), 2, 0) layout.addWidget(formula_edit, 2, 1) # Add the help label above the buttons diff --git a/src/Mod/Assembly/CommandCreateView.py b/src/Mod/Assembly/CommandCreateView.py index 6cbac7cad6..3c8964d767 100644 --- a/src/Mod/Assembly/CommandCreateView.py +++ b/src/Mod/Assembly/CommandCreateView.py @@ -51,12 +51,12 @@ class CommandCreateView: def GetResources(self): return { "Pixmap": "Assembly_ExplodedView", - "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateView", "Create Exploded View"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_CreateView", "Exploded View"), "Accel": "E", "ToolTip": "

" + QT_TRANSLATE_NOOP( "Assembly_CreateView", - "Create an exploded view of the current assembly.", + "Creates an exploded view of the current assembly", ) + "

", "CmdType": "ForEdit", diff --git a/src/Mod/Assembly/CommandInsertLink.py b/src/Mod/Assembly/CommandInsertLink.py index ff2b694ab7..46d160acf1 100644 --- a/src/Mod/Assembly/CommandInsertLink.py +++ b/src/Mod/Assembly/CommandInsertLink.py @@ -46,7 +46,7 @@ tooltip = ( "

" + QT_TRANSLATE_NOOP( "Assembly_InsertLink", - "Insert a component into the active assembly. This will create dynamic links to parts, bodies, primitives, and assemblies. To insert external components, make sure that the file is open in the current session", + "Inserts a component into the active assembly. This will create dynamic links to parts, bodies, primitives, and assemblies. To insert external components, make sure that the file is open in the current session", ) + "

  • " + QT_TRANSLATE_NOOP("Assembly_InsertLink", "Insert by left clicking items in the list.") @@ -70,7 +70,7 @@ class CommandGroupInsert: return { "Pixmap": "Assembly_InsertLink", - "MenuText": QT_TRANSLATE_NOOP("Assembly_Insert", "Insert"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_Insert", "Insert Component"), "ToolTip": tooltip, "CmdType": "ForEdit", } @@ -86,7 +86,7 @@ class CommandInsertLink: def GetResources(self): return { "Pixmap": "Assembly_InsertLink", - "MenuText": QT_TRANSLATE_NOOP("Assembly_InsertLink", "Insert Component"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_InsertLink", "Component"), "Accel": "I", "ToolTip": tooltip, "CmdType": "ForEdit", diff --git a/src/Mod/Assembly/CommandInsertNewPart.py b/src/Mod/Assembly/CommandInsertNewPart.py index c802fe3e68..482c888641 100644 --- a/src/Mod/Assembly/CommandInsertNewPart.py +++ b/src/Mod/Assembly/CommandInsertNewPart.py @@ -51,7 +51,7 @@ class CommandInsertNewPart: def GetResources(self): return { "Pixmap": "Geofeaturegroup", - "MenuText": QT_TRANSLATE_NOOP("Assembly_InsertNewPart", "Insert New Part"), + "MenuText": QT_TRANSLATE_NOOP("Assembly_InsertNewPart", "New Part"), "Accel": "P", "ToolTip": "

    " + QT_TRANSLATE_NOOP( @@ -137,7 +137,7 @@ class TaskAssemblyNewPart(JointObject.TaskAssemblyCreateJoint): translate("Assembly", "Save"), QtWidgets.QMessageBox.AcceptRole ) cancelButton = msgBox.addButton( - translate("Assembly", "Don't link"), QtWidgets.QMessageBox.RejectRole + translate("Assembly", "Do not link"), QtWidgets.QMessageBox.RejectRole ) msgBox.exec_() diff --git a/src/Mod/Assembly/CommandSolveAssembly.py b/src/Mod/Assembly/CommandSolveAssembly.py index 84b708fa27..4622655ead 100644 --- a/src/Mod/Assembly/CommandSolveAssembly.py +++ b/src/Mod/Assembly/CommandSolveAssembly.py @@ -52,7 +52,7 @@ class CommandSolveAssembly: "ToolTip": "

    " + QT_TRANSLATE_NOOP( "Assembly_SolveAssembly", - "Solve the currently active assembly.", + "Solves the currently active assembly.", ) + "

    ", "CmdType": "ForEdit", diff --git a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateBom.ui b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateBom.ui index 6e58c74302..f6ad30d533 100644 --- a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateBom.ui +++ b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateBom.ui @@ -11,13 +11,13 @@ - Create Bill Of Materials + Bill of Materials - If checked, Sub assemblies children will be added to the bill of materials. + Includes children of sub-assemblies in the bill of materials Sub-assemblies children @@ -36,7 +36,7 @@ - If checked, Parts children will be added to the bill of materials. + Include child parts in the bill of materials Parts children @@ -55,7 +55,7 @@ - If checked, only Part containers and sub-assemblies will be added to the bill of materials. Solids like PartDesign Bodies, fasteners or Part workbench primitives will be ignored. + Adds only part containers and sub-assemblies to the bill of materials. Solids (e.g. bodies, fasteners, primitives) are excluded. Only parts @@ -83,7 +83,7 @@ - Add column + Add Column diff --git a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateJoint.ui b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateJoint.ui index feeaf817b8..a422933907 100644 --- a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateJoint.ui +++ b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateJoint.ui @@ -11,7 +11,7 @@ - Create Joint + Joint @@ -141,7 +141,7 @@ - By clicking this button, you can set the attachment offset of the first marker (coordinate system) of the joint. + Sets the attachment offset of the joint’s first marker (coordinate system) @@ -162,7 +162,7 @@ - By clicking this button, you can set the attachment offset of the second marker (coordinate system) of the joint. + Sets the attachment offset of the second marker (coordinate system) of the joint @@ -190,7 +190,7 @@ - Reverse the direction of the joint. + Reverse the direction of the joint Reverse diff --git a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateSimulation.ui b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateSimulation.ui index ac4f575bcb..d0e095264a 100644 --- a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateSimulation.ui +++ b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateSimulation.ui @@ -11,7 +11,7 @@ - Create Simulation + Simulation @@ -86,7 +86,7 @@ - Simulation settings + Simulation Settings @@ -129,14 +129,14 @@ Step - Time Step + Time step - Time Step + Time step @@ -146,14 +146,14 @@ Tolerance - Global Error Tolerance + Global error tolerance - Global Error Tolerance + Global error tolerance @@ -170,7 +170,7 @@ - Animation player + Animation Player @@ -209,7 +209,7 @@ - Frames Per Second + Frames per second diff --git a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateView.ui b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateView.ui index 1788e8c496..c7752153a1 100644 --- a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateView.ui +++ b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateView.ui @@ -11,13 +11,13 @@ - Create Exploded View + Exploded View - If checked, Parts will be selected as a single solid. + If checked, parts will be selected as a single solid Parts as single solid @@ -39,23 +39,21 @@ - Align dragger + Align Dragger - Aligning dragger: -Select a feature. -Press ESC to cancel. + Select a feature to align. Press Esc to cancel. - Explode radially + Explode Radially diff --git a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyInsertLink.ui b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyInsertLink.ui index 16904fd8bb..8103254343 100644 --- a/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyInsertLink.ui +++ b/src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyInsertLink.ui @@ -11,13 +11,13 @@ - Insert Component + Insert - Search parts... + Search parts… @@ -36,14 +36,14 @@ - Don't find your part? + Cannot find the part? - Open file + Open File @@ -52,7 +52,7 @@ - If checked, the list will show only Parts. + Shows only parts in the list Show only parts @@ -75,7 +75,7 @@ Rigid means that the added sub-assembly will be considered as a solid unit within the parent assembly. Flexible means that the added sub-assembly will allow movement of its individual components' joints within the parent assembly. You can change this behavior at any time by either right-clicking the sub-assembly on the document tree and toggling the -Turn rigid/Turn flexible command there, or by editing its Rigid property in the Property Editor. +'Turn rigid'/'Turn flexible' command there, or by editing its Rigid property in the property editor. Rigid sub-assemblies diff --git a/src/Mod/Assembly/Gui/Resources/preferences/Assembly.ui b/src/Mod/Assembly/Gui/Resources/preferences/Assembly.ui index 27d5fa29f6..10ebe705fe 100644 --- a/src/Mod/Assembly/Gui/Resources/preferences/Assembly.ui +++ b/src/Mod/Assembly/Gui/Resources/preferences/Assembly.ui @@ -17,7 +17,7 @@ - Allows leaving edit mode when pressing Esc button + Allows leaving edit mode when pressing the Esc key Esc leaves edit mode @@ -36,7 +36,7 @@ - Log the dragging steps of the solver. Useful if you want to report a bug. + Log the dragging steps of the solver. Useful to report a bug. The files are named "runPreDrag.asmt" and "dragging.log" and are located in the default directory of std::ofstream (on Windows it's the desktop) @@ -56,14 +56,14 @@ The files are named "runPreDrag.asmt" and "dragging.log" and are located in the - Ground first part: + Ground first part - When you insert the first part in the assembly, you can choose to ground the part automatically. + When inserting the first part in the assembly, it can be grounded automatically 0 diff --git a/src/Mod/BIM/ArchBuildingPart.py b/src/Mod/BIM/ArchBuildingPart.py index 78aed908ba..bfb7a49959 100644 --- a/src/Mod/BIM/ArchBuildingPart.py +++ b/src/Mod/BIM/ArchBuildingPart.py @@ -836,7 +836,7 @@ class ViewProviderBuildingPart: self.writeCamera) menu.addAction(actionWriteCamera) - actionCreateGroup = QtGui.QAction(translate("Arch", "Create group..."), + actionCreateGroup = QtGui.QAction(translate("Arch", "New Group"), menu) QtCore.QObject.connect(actionCreateGroup, QtCore.SIGNAL("triggered()"), @@ -943,7 +943,7 @@ class ViewProviderBuildingPart: if hasattr(self,"Object"): if not self.Object.Height.Value: - FreeCAD.Console.PrintError("This level has no height value. Please define a height before using this function.\n") + FreeCAD.Console.PrintError("This level has no height value. Define a height before using this function.\n") return height = self.Object.Height.Value ng = [] diff --git a/src/Mod/BIM/ArchCommands.py b/src/Mod/BIM/ArchCommands.py index 57420587bf..4ba5f27564 100644 --- a/src/Mod/BIM/ArchCommands.py +++ b/src/Mod/BIM/ArchCommands.py @@ -707,7 +707,7 @@ def download(url,force=False): if os.path.exists(filepath) and not(force): return filepath try: - FreeCAD.Console.PrintMessage("downloading "+url+" ...\n") + FreeCAD.Console.PrintMessage("Downloading "+url+" …\n") response = urlopen(url) s = response.read() f = open(filepath,'wb') @@ -734,7 +734,7 @@ def check(objectslist,includehidden=False): elif not s.isValid(): bad.append([o,translate("Arch","is not valid")]) elif (not s.Solids) and (not (Draft.getType(o) == "Axis")): - bad.append([o,translate("Arch","doesn't contain any solid")]) + bad.append([o,translate("Arch","does not contain any solid")]) else: f = 0 for sol in s.Solids: @@ -1315,7 +1315,7 @@ def toggleIfcBrepFlag(obj): """toggleIfcBrepFlag(obj): toggles the IFC brep flag of the given object, forcing it to be exported as brep geometry or not.""" if not hasattr(obj,"IfcData"): - FreeCAD.Console.PrintMessage(translate("Arch","Object doesn't have settable IFC attributes")) + FreeCAD.Console.PrintMessage(translate("Arch","Object does not have settable IFC attributes")) else: d = obj.IfcData if "FlagForceBrep" in d: @@ -1525,7 +1525,7 @@ def makeIfcSpreadsheet(archobj=None): archobj.IfcProperties = ifc_spreadsheet return ifc_spreadsheet else : - FreeCAD.Console.PrintWarning(translate("Arch", "The object doesn't have an IfcProperties attribute. Cancel spreadsheet creation for object:")+ ' ' + archobj.Label) + FreeCAD.Console.PrintWarning(translate("Arch", "The object does not have an IfcProperties attribute. Cancel spreadsheet creation for object:")+ ' ' + archobj.Label) FreeCAD.ActiveDocument.removeObject(ifc_spreadsheet) else : return ifc_spreadsheet diff --git a/src/Mod/BIM/ArchComponent.py b/src/Mod/BIM/ArchComponent.py index 836ff2c01b..c78a412dba 100644 --- a/src/Mod/BIM/ArchComponent.py +++ b/src/Mod/BIM/ArchComponent.py @@ -211,7 +211,7 @@ class Component(ArchIFC.IfcProduct): if not "Tag" in pl: obj.addProperty("App::PropertyString","Tag","Component",QT_TRANSLATE_NOOP("App::Property","An optional tag for this component"), locked=True) if not "StandardCode" in pl: - obj.addProperty("App::PropertyString","StandardCode","Component",QT_TRANSLATE_NOOP("App::Property","An optional standard (OmniClass, etc...) code for this component"), locked=True) + obj.addProperty("App::PropertyString","StandardCode","Component",QT_TRANSLATE_NOOP("App::Property","An optional standard (OmniClass, etc…) code for this component"), locked=True) if not "Material" in pl: obj.addProperty("App::PropertyLink","Material","Component",QT_TRANSLATE_NOOP("App::Property","A material for this object"), locked=True) if "BaseMaterial" in pl: @@ -1804,7 +1804,7 @@ class SelectionTaskPanel: def __init__(self): self.baseform = QtGui.QLabel() - self.baseform.setText(QtGui.QApplication.translate("Arch", "Please select a base object", None)) + self.baseform.setText(QtGui.QApplication.translate("Arch", "Select a base object", None)) def getStandardButtons(self): """Adds the cancel button.""" @@ -2157,8 +2157,8 @@ class ComponentTaskPanel: QtGui.QApplication.translate("Arch", "Value", None)]) # set combos - self.ifcEditor.comboProperty.addItems([QtGui.QApplication.translate("Arch", "Add property...", None)]+self.plabels) - self.ifcEditor.comboPset.addItems([QtGui.QApplication.translate("Arch", "Add property set...", None), + self.ifcEditor.comboProperty.addItems([QtGui.QApplication.translate("Arch", "Add property", None)]+self.plabels) + self.ifcEditor.comboPset.addItems([QtGui.QApplication.translate("Arch", "Add property set", None), QtGui.QApplication.translate("Arch", "New...", None)]+self.psetkeys) # set UUID diff --git a/src/Mod/BIM/ArchEquipment.py b/src/Mod/BIM/ArchEquipment.py index ecc819cf55..1d3357b697 100644 --- a/src/Mod/BIM/ArchEquipment.py +++ b/src/Mod/BIM/ArchEquipment.py @@ -190,7 +190,7 @@ class _Equipment(ArchComponent.Component): if not "ProductURL" in pl: obj.addProperty("App::PropertyString","ProductURL","Equipment",QT_TRANSLATE_NOOP("App::Property","The URL of the product page of this equipment"), locked=True) if not "StandardCode" in pl: - obj.addProperty("App::PropertyString","StandardCode","Equipment",QT_TRANSLATE_NOOP("App::Property","A standard code (MasterFormat, OmniClass,...)"), locked=True) + obj.addProperty("App::PropertyString","StandardCode","Equipment",QT_TRANSLATE_NOOP("App::Property","A standard code (MasterFormat, OmniClass,…)"), locked=True) if not "SnapPoints" in pl: obj.addProperty("App::PropertyVectorList","SnapPoints","Equipment",QT_TRANSLATE_NOOP("App::Property","Additional snap points for this equipment"), locked=True) if not "EquipmentPower" in pl: diff --git a/src/Mod/BIM/ArchMaterial.py b/src/Mod/BIM/ArchMaterial.py index 6f589c7e2d..08a976adf2 100644 --- a/src/Mod/BIM/ArchMaterial.py +++ b/src/Mod/BIM/ArchMaterial.py @@ -170,7 +170,7 @@ class _ArchMaterial: if not "Description" in obj.PropertiesList: obj.addProperty("App::PropertyString","Description","Material",QT_TRANSLATE_NOOP("App::Property","A description for this material"), locked=True) if not "StandardCode" in obj.PropertiesList: - obj.addProperty("App::PropertyString","StandardCode","Material",QT_TRANSLATE_NOOP("App::Property","A standard code (MasterFormat, OmniClass,...)"), locked=True) + obj.addProperty("App::PropertyString","StandardCode","Material",QT_TRANSLATE_NOOP("App::Property","A standard code (MasterFormat, OmniClass,…)"), locked=True) if not "ProductURL" in obj.PropertiesList: obj.addProperty("App::PropertyString","ProductURL","Material",QT_TRANSLATE_NOOP("App::Property","A URL where to find information about this material"), locked=True) if not "Transparency" in obj.PropertiesList: diff --git a/src/Mod/BIM/ArchNesting.py b/src/Mod/BIM/ArchNesting.py index d7bb6c2d19..9ffa8acc98 100644 --- a/src/Mod/BIM/ArchNesting.py +++ b/src/Mod/BIM/ArchNesting.py @@ -138,28 +138,28 @@ class Nester: # general conformity tests - print("Executing conformity tests ... ",end="") + print("Executing conformity tests… ",end="") if not self.container: - print("Empty container. Aborting") + print("Empty container. Aborting.") return if not self.shapes: - print("Empty shapes. Aborting") + print("Empty shapes. Aborting.") return if not isinstance(self.container,Part.Face): - print("Container is not a face. Aborting") + print("Container is not a face. Aborting.") return normal = self.container.normalAt(0,0) for s in self.shapes: if not self.update(): return if len(s.Faces) != 1: - print("One of the shapes does not contain exactly one face. Aborting") + print("One of the shapes does not contain exactly one face. Aborting.") return # check if all faces correctly oriented (same normal) if s.Faces[0].normalAt(0,0).getAngle(normal) > TOLERANCE: # let pass faces with inverted normal if s.Faces[0].normalAt(0,0).getAngle(normal)-math.pi > TOLERANCE: - print("One of the face doesn't have the same orientation as the container. Aborting") + print("One of the face does not have the same orientation as the container. Aborting.") return # TODO @@ -208,9 +208,9 @@ class Nester: f = Part.Face(Part.Wire(nedges)) if not f.isValid(): if allLines: - print("Invalid face found in set. Aborting") + print("Invalid face found in set. Aborting.") else: - print("Face distretizing failed. Aborting") + print("Face distretizing failed. Aborting.") return nfaces.append([face[0],f]) faces = nfaces @@ -374,7 +374,7 @@ class Nester: # create the polygon if len(pts) < 3: - print("Error calculating a no-fit polygon. Aborting") + print("Error calculating a no-fit polygon. Aborting.") return pts = [p[0] for p in pts] pol = Part.Face(Part.makePolygon(pts+[pts[0]])) @@ -418,7 +418,7 @@ class Nester: if ff: pol = ff else: - print("Unable to fix invalid no-fit polygon. Aborting") + print("Unable to fix invalid no-fit polygon. Aborting.") Part.show(pol) return @@ -426,7 +426,7 @@ class Nester: # none of the fixes worked. Epic fail. - print("Invalid no-fit polygon. Aborting") + print("Invalid no-fit polygon. Aborting.") Part.show(pol.OuterWire) for p in sheet: Part.show(p[1]) @@ -472,7 +472,7 @@ class Nester: try: pol = Part.Face(w[0]) except Exception: - print("Error merging polygons. Aborting") + print("Error merging polygons. Aborting.") try: Part.show(Part.Wire(edges)) except Exception: @@ -529,7 +529,7 @@ class Nester: rotface = trface break else: - print("Couldn't determine location on sheet. Aborting") + print("Could not determine location on sheet. Aborting.") return # check the X space occupied by this solution @@ -540,7 +540,7 @@ class Nester: available.append([sheetnumber,[hashcode,rotface],bb.XMax,fitpol]) if unfit: - print("One face doesn't fit in the container. Aborting") + print("One face does not fit in the container. Aborting.") return if available: @@ -646,7 +646,7 @@ class Nester: to be given to the final object.""" if not self.indexedfaces: - print("error: shapes were not indexed. Please run() first") + print("error: shapes were not indexed. Use run() first") return if not result: result = [] diff --git a/src/Mod/BIM/ArchPanel.py b/src/Mod/BIM/ArchPanel.py index 2a7008ffc2..77abc9512c 100644 --- a/src/Mod/BIM/ArchPanel.py +++ b/src/Mod/BIM/ArchPanel.py @@ -442,7 +442,7 @@ class _Panel(ArchComponent.Component): if base.Volume < 0: base.reverse() if base.Volume < 0: - FreeCAD.Console.PrintError(translate("Arch","Couldn't compute a shape")) + FreeCAD.Console.PrintError(translate("Arch","Could not compute a shape")) return base = base.removeSplitter() obj.Shape = base diff --git a/src/Mod/BIM/ArchReference.py b/src/Mod/BIM/ArchReference.py index 3374cc730b..17213405b3 100644 --- a/src/Mod/BIM/ArchReference.py +++ b/src/Mod/BIM/ArchReference.py @@ -883,7 +883,7 @@ class ArchReferenceTaskPanel: if self.obj.File: self.fileButton.setText(os.path.basename(self.obj.File)) else: - self.fileButton.setText(translate("Arch","Choose file...")) + self.fileButton.setText(translate("Arch","Choose File")) self.partCombo = QtGui.QComboBox(self.form) self.partCombo.setEnabled(False) layout.addWidget(self.partCombo) diff --git a/src/Mod/BIM/ArchSectionPlane.py b/src/Mod/BIM/ArchSectionPlane.py index a001e44a30..a7073c78d9 100644 --- a/src/Mod/BIM/ArchSectionPlane.py +++ b/src/Mod/BIM/ArchSectionPlane.py @@ -1281,7 +1281,7 @@ class SectionPlaneTaskPanel: if added: self.update() else: - FreeCAD.Console.PrintWarning("Please select objects in the 3D view or in the model tree before pressing the button\n") + FreeCAD.Console.PrintWarning("Select objects in the 3D view or in the model tree before pressing the button\n") def removeElement(self): if self.obj: diff --git a/src/Mod/BIM/ArchStructure.py b/src/Mod/BIM/ArchStructure.py index 72865ccbaa..29291419e0 100644 --- a/src/Mod/BIM/ArchStructure.py +++ b/src/Mod/BIM/ArchStructure.py @@ -203,7 +203,7 @@ class CommandStructuresFromSelection: def GetResources(self): return {'Pixmap': 'Arch_MultipleStructures', 'MenuText': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Multiple Structures"), - 'ToolTip': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Create multiple BIM Structures from a selected base, using each selected edge as an extrusion path")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Creates multiple BIM Structures from a selected base, using each selected edge as an extrusion path")} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -229,7 +229,7 @@ class CommandStructuresFromSelection: FreeCAD.ActiveDocument.commitTransaction() FreeCAD.ActiveDocument.recompute() else: - FreeCAD.Console.PrintError(translate("Arch", "Please select the base object first and then the edges to use as extrusion paths") + "\n") + FreeCAD.Console.PrintError(translate("Arch", "Select the base object first and then the edges to use as extrusion paths") + "\n") class CommandStructuralSystem: @@ -263,7 +263,7 @@ class CommandStructuralSystem: FreeCAD.ActiveDocument.commitTransaction() FreeCAD.ActiveDocument.recompute() else: - FreeCAD.Console.PrintError(translate("Arch", "Please select at least an axis object") + "\n") + FreeCAD.Console.PrintError(translate("Arch", "Select at least an axis object") + "\n") class _CommandStructure: @@ -856,7 +856,7 @@ class _Structure(ArchComponent.Component): try: shi = evi.makePipe(shi) except Part.OCCError: - FreeCAD.Console.PrintError(translate("Arch","Error: The base shape couldn't be extruded along this tool object")+"\n") + FreeCAD.Console.PrintError(translate("Arch","Error: The base shape could not be extruded along this tool object")+"\n") return base.append(shi) extrusion_length += evi.Length @@ -1364,7 +1364,7 @@ class StructureTaskPanel(ArchComponent.ComponentTaskPanel): self.selectToolButton = QtGui.QPushButton(self.extrusion_widget) self.selectToolButton.setIcon(QtGui.QIcon()) - self.selectToolButton.setText(QtGui.QApplication.translate("Arch", "Select tool...", None)) + self.selectToolButton.setText(QtGui.QApplication.translate("Arch", "Select Tool", None)) self.selectToolButton.setToolTip(QtGui.QApplication.translate("Arch", "Select object or edges to be used as a Tool (extrusion path)", None)) lay.addWidget(self.selectToolButton) QtCore.QObject.connect(self.selectToolButton, QtCore.SIGNAL("clicked()"), self.setSelectionFromTool) @@ -1498,7 +1498,7 @@ class StructureTaskPanel(ArchComponent.ComponentTaskPanel): self.Object.Tool = objectList QtCore.QObject.disconnect(self.selectToolButton, QtCore.SIGNAL("clicked()"), self.setToolFromSelection) QtCore.QObject.connect(self.selectToolButton, QtCore.SIGNAL("clicked()"), self.setSelectionFromTool) - self.selectToolButton.setText(QtGui.QApplication.translate("Arch", "Select tool...", None)) + self.selectToolButton.setText(QtGui.QApplication.translate("Arch", "Select Tool", None)) def accept(self): @@ -1588,7 +1588,7 @@ class _StructuralSystem(ArchComponent.Component): # OBSOLETE - All Arch objects if base.Volume < 0: base.reverse() if base.Volume < 0: - FreeCAD.Console.PrintError(translate("Arch","Couldn't compute a shape")) + FreeCAD.Console.PrintError(translate("Arch","Could not compute a shape")) return base = base.removeSplitter() obj.Shape = base @@ -1648,7 +1648,7 @@ if FreeCAD.GuiUp: def GetCommands(self): return ("Arch_Structure", "Arch_StructuralSystem", "Arch_StructuresFromSelection") def GetResources(self): - return { "MenuText": QT_TRANSLATE_NOOP("Arch_StructureTools", "Structure tools"), + return { "MenuText": QT_TRANSLATE_NOOP("Arch_StructureTools", "Structure Tools"), "ToolTip": QT_TRANSLATE_NOOP("Arch_StructureTools", "Structure tools") } def IsActive(self): diff --git a/src/Mod/BIM/BimStatus.py b/src/Mod/BIM/BimStatus.py index 24f1e031e1..577eeb3e84 100644 --- a/src/Mod/BIM/BimStatus.py +++ b/src/Mod/BIM/BimStatus.py @@ -42,7 +42,7 @@ def setStatusIcons(show=True): from PySide import QtCore, QtGui nudgeLabelsI = [ - translate("BIM", "Custom..."), + translate("BIM", "Custom…"), '1/16"', '1/8"', '1/4"', @@ -52,7 +52,7 @@ def setStatusIcons(show=True): translate("BIM", "Auto"), ] nudgeLabelsM = [ - translate("BIM", "Custom..."), + translate("BIM", "Custom…"), "1 mm", "5 mm", "1 cm", diff --git a/src/Mod/BIM/Dice3DS/dom3ds.py b/src/Mod/BIM/Dice3DS/dom3ds.py index 278dcd4888..38d6bbc126 100644 --- a/src/Mod/BIM/Dice3DS/dom3ds.py +++ b/src/Mod/BIM/Dice3DS/dom3ds.py @@ -707,7 +707,7 @@ class TrackChunk(ChunkBase): for typ,attr in self.keyframe_fields: flo.write("%s %s = %r\n" % (indent,attr,getattr(kf,attr))) if n < self.nkeys: - flo.write("%s ...\n" % indent) + flo.write("%s …\n" % indent) # @@ -1008,7 +1008,7 @@ class POINT_ARRAY(ArrayChunk): % (indent,self.array[i,0],self.array[i,1], self.array[i,2])) if n < self.npoints: - flo.write("%s ...\n" % indent) + flo.write("%s …\n" % indent) def write_array(self): s = numpy.array(self.array).astype(numpy.float32) return array_to_string_destructive(s) @@ -1048,7 +1048,7 @@ class FACE_ARRAY(ArrayChunk): % (indent,self.array[i,0],self.array[i,1], self.array[i,2],self.array[i,3])) if n < self.nfaces: - flo.write("%s ...\n" % indent) + flo.write("%s …\n" % indent) def write_array(self): s = numpy.array(self.array).astype(numpy.uint16) return array_to_string_destructive(s) @@ -1070,7 +1070,7 @@ class MSH_MAT_GROUP(ArrayChunk): for i in range(n): flo.write("%s %10d\n" % (indent,self.array[i])) if n < self.mfaces: - flo.write("%s ...\n" % indent) + flo.write("%s …\n" % indent) def write_array(self): s = numpy.array(self.array).astype(numpy.uint16) return array_to_string_destructive(s) @@ -1096,7 +1096,7 @@ class TEX_VERTS(ArrayChunk): flo.write("%s %12.4g%12.4g\n" % (indent,self.array[i,0],self.array[i,1])) if n < self.npoints: - flo.write("%s ...\n" % indent) + flo.write("%s …\n" % indent) def write_array(self): s = numpy.array(self.array).astype(numpy.float32) return array_to_string_destructive(s) @@ -1117,7 +1117,7 @@ class SMOOTH_GROUP(ArrayChunk): for i in range(n): flo.write("%s %10d\n" % (indent,self.array[i])) if n < len(self.array): - flo.write("%s ...\n" % indent) + flo.write("%s …\n" % indent) def write_array(self): s = numpy.array(self.array).astype(numpy.uint32) return array_to_string_destructive(s) diff --git a/src/Mod/BIM/InitGui.py b/src/Mod/BIM/InitGui.py index 96f028c7d9..368523ad73 100644 --- a/src/Mod/BIM/InitGui.py +++ b/src/Mod/BIM/InitGui.py @@ -56,7 +56,7 @@ class BIMWorkbench(Workbench): # Load Arch & Draft preference pages self.loadPreferences() - Log("Loading BIM module... done\n") + Log("Loading BIM module… done\n") FreeCADGui.updateLocale() @@ -265,7 +265,7 @@ class BIMWorkbench(Workbench): def GetCommands(self): return self.tools def GetResources(self): - t = QT_TRANSLATE_NOOP("BIM_GenericTools", "Generic 3D tools") + t = QT_TRANSLATE_NOOP("BIM_GenericTools", "Generic 3D Tools") return { "MenuText": t, "ToolTip": t, "Icon": "BIM_Box"} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -280,7 +280,7 @@ class BIMWorkbench(Workbench): def GetCommands(self): return self.tools def GetResources(self): - t = QT_TRANSLATE_NOOP("BIM_Create2DViews", "Create 2D views") + t = QT_TRANSLATE_NOOP("BIM_Create2DViews", "Create 2D Views") return { "MenuText": t, "ToolTip": t, "Icon": "BIM_DrawingView"} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -304,7 +304,7 @@ class BIMWorkbench(Workbench): def GetResources(self): return { "MenuText": QT_TRANSLATE_NOOP( - "Arch_RebarTools", "Reinforcement tools" + "Arch_RebarTools", "Reinforcement Tools" ), "ToolTip": QT_TRANSLATE_NOOP( "Arch_RebarTools", "Reinforcement tools" @@ -319,7 +319,7 @@ class BIMWorkbench(Workbench): FreeCADGui.addCommand("Arch_RebarTools", RebarGroupCommand()) self.bimtools[self.bimtools.index("Arch_Rebar")] = "Arch_RebarTools" RebarTools.load_translations() - Log("Load Reinforcement Module...done\n") + Log("Load Reinforcement Module… done\n") if hasattr(RebarTools, "updateLocale"): RebarTools.updateLocale() #self.rebar = RebarTools.RebarCommands + ["Arch_Rebar"] @@ -412,15 +412,15 @@ class BIMWorkbench(Workbench): # create toolbars - t1 = QT_TRANSLATE_NOOP("Workbench", "Drafting tools") - t2 = QT_TRANSLATE_NOOP("Workbench", "Draft snap") - t3 = QT_TRANSLATE_NOOP("Workbench", "3D/BIM tools") - t4 = QT_TRANSLATE_NOOP("Workbench", "Annotation tools") - t5 = QT_TRANSLATE_NOOP("Workbench", "2D modification tools") - t6 = QT_TRANSLATE_NOOP("Workbench", "Manage tools") - t7 = QT_TRANSLATE_NOOP("Workbench", "General modification tools") - t8 = QT_TRANSLATE_NOOP("Workbench", "Object modification tools") - t9 = QT_TRANSLATE_NOOP("Workbench", "3D modification tools") + t1 = QT_TRANSLATE_NOOP("Workbench", "Drafting Tools") + t2 = QT_TRANSLATE_NOOP("Workbench", "Draft Snap") + t3 = QT_TRANSLATE_NOOP("Workbench", "3D/BIM Tools") + t4 = QT_TRANSLATE_NOOP("Workbench", "Annotation Tools") + t5 = QT_TRANSLATE_NOOP("Workbench", "2D Tools") + t6 = QT_TRANSLATE_NOOP("Workbench", "Manage Tools") + t7 = QT_TRANSLATE_NOOP("Workbench", "General Tools") + t8 = QT_TRANSLATE_NOOP("Workbench", "Object Tools") + t9 = QT_TRANSLATE_NOOP("Workbench", "3D Tools") self.appendToolbar(t1, self.draftingtools) self.appendToolbar(t2, self.snapbar) self.appendToolbar(t3, self.bimtools) @@ -435,7 +435,7 @@ class BIMWorkbench(Workbench): t1 = QT_TRANSLATE_NOOP("Workbench", "&2D Drafting") t2 = QT_TRANSLATE_NOOP("Workbench", "&3D/BIM") - t3 = QT_TRANSLATE_NOOP("Workbench", "Reinforcement tools") + t3 = QT_TRANSLATE_NOOP("Workbench", "Reinforcement Tools") t4 = QT_TRANSLATE_NOOP("Workbench", "&Annotation") t5 = QT_TRANSLATE_NOOP("Workbench", "&Snapping") t6 = QT_TRANSLATE_NOOP("Workbench", "&Modify") diff --git a/src/Mod/BIM/OfflineRenderingUtils.py b/src/Mod/BIM/OfflineRenderingUtils.py index 5e1b866f6f..5bede0d08c 100755 --- a/src/Mod/BIM/OfflineRenderingUtils.py +++ b/src/Mod/BIM/OfflineRenderingUtils.py @@ -582,7 +582,7 @@ def save(document,filename=None,guidata=None,colors=None,camera=None): filename = document.FileName document.save() else: - print("Unable to save this document. Please provide a file name") + print("Unable to save this document. Provide a file name") return if guidata: @@ -636,7 +636,7 @@ def buildGuiDocumentFromColors(document,colors,camera=None): guidoc = "\n" guidoc += "\n" guidoc += "\n" @@ -715,7 +715,7 @@ def buildGuiDocumentFromGuiData(document,guidata): guidoc = "\n" guidoc += "\n" guidoc += "\n" diff --git a/src/Mod/BIM/Resources/ui/ArchMaterial.ui b/src/Mod/BIM/Resources/ui/ArchMaterial.ui index 5b9220a932..e83e7dfbb5 100644 --- a/src/Mod/BIM/Resources/ui/ArchMaterial.ui +++ b/src/Mod/BIM/Resources/ui/ArchMaterial.ui @@ -11,7 +11,7 @@ - BIM material + BIM Material @@ -27,7 +27,7 @@ - Choose preset... + Choose preset @@ -45,7 +45,7 @@ - Copy existing... + Copy existing… @@ -136,7 +136,7 @@ - Section Color + Section color @@ -188,7 +188,7 @@ - A standard (MasterFormat, Omniclass...) code for this material + A standard (MasterFormat, Omniclass…) code for this material diff --git a/src/Mod/BIM/Resources/ui/ArchMultiMaterial.ui b/src/Mod/BIM/Resources/ui/ArchMultiMaterial.ui index 92266191c8..74599be952 100644 --- a/src/Mod/BIM/Resources/ui/ArchMultiMaterial.ui +++ b/src/Mod/BIM/Resources/ui/ArchMultiMaterial.ui @@ -11,14 +11,14 @@ - Multi-material definition + Multi-Material Definition - Copy existing... + Copy existing… @@ -34,7 +34,7 @@ - Name: + Name @@ -46,7 +46,7 @@ - Composition: + Composition diff --git a/src/Mod/BIM/Resources/ui/ArchNest.ui b/src/Mod/BIM/Resources/ui/ArchNest.ui index 0047ce211a..5c7a943a4b 100644 --- a/src/Mod/BIM/Resources/ui/ArchNest.ui +++ b/src/Mod/BIM/Resources/ui/ArchNest.ui @@ -33,7 +33,7 @@ - Pick selected + Pick Selected @@ -54,7 +54,7 @@ - Add selected + Add Selected @@ -106,7 +106,7 @@ - The number of segments to divide non-linear edges into, for calculations. If curved shapes overlap, try raising this value + The number of segments to divide non-linear edges into for calculations. If curved shapes overlap, try raising this value diff --git a/src/Mod/BIM/Resources/ui/ArchSchedule.ui b/src/Mod/BIM/Resources/ui/ArchSchedule.ui index d915300fc4..83eb2e75d9 100644 --- a/src/Mod/BIM/Resources/ui/ArchSchedule.ui +++ b/src/Mod/BIM/Resources/ui/ArchSchedule.ui @@ -11,7 +11,7 @@ - Schedule definition + Schedule Definition @@ -19,7 +19,7 @@ - Schedule name: + Schedule name @@ -82,7 +82,7 @@ retrieved. Unit - An optional unit to express the resulting value. Ex: m^3 (you can also write m³ or m3) + Optional unit for the result, e.g. m³, m^3, or m3 @@ -111,7 +111,7 @@ of that project, no matter if they are expanded or not. An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. -Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied +Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DO NOT have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied When dealing with native IFC objects, you can use FreeCAD properties name, ex: 'Class:IfcWall' or any other IFC attribute (ex. 'IsTypedBy:#455'). If the 'Objects' column has been set to an IFC project or document, all the IFC entities of that project will be considered. @@ -146,7 +146,7 @@ When dealing with native IFC objects, you can use FreeCAD properties name, ex: ' If this is enabled, the schedule and the associated spreadsheet are updated whenever the document is recomputed. - Auto update + Auto-update @@ -160,7 +160,7 @@ When dealing with native IFC objects, you can use FreeCAD properties name, ex: ' Adds a line below the selected line/cell - Add row + Add Row @@ -174,7 +174,7 @@ When dealing with native IFC objects, you can use FreeCAD properties name, ex: ' Deletes the selected line - Del row + Del Row @@ -202,7 +202,7 @@ When dealing with native IFC objects, you can use FreeCAD properties name, ex: ' Put selected objects into the 'Objects' column of the selected row - Add selection + Add Selection @@ -223,7 +223,7 @@ When dealing with native IFC objects, you can use FreeCAD properties name, ex: ' - This exports the results to a CSV or Markdown file. Note for CSV export: In Libreoffice, you can keep this CSV file linked by right-clicking the Sheets tab bar, New sheet, From file, Link (Note: as of LibreOffice v6.x the correct path now is: Sheet, Insert Sheet..., From file, Browse...) + Exports results to a CSV or Markdown file. For CSV export in LibreOffice: maintain a live link by right-clicking the Sheets tab bar → New Sheet → From File → Link. In LibreOffice v6.x and later: use Sheet → Insert Sheet… → From File → Browse… Export diff --git a/src/Mod/BIM/Resources/ui/BimServerTaskPanel.ui b/src/Mod/BIM/Resources/ui/BimServerTaskPanel.ui index c1a86f66f2..d20181499c 100644 --- a/src/Mod/BIM/Resources/ui/BimServerTaskPanel.ui +++ b/src/Mod/BIM/Resources/ui/BimServerTaskPanel.ui @@ -11,7 +11,7 @@ - BimServer + BIM Server @@ -25,7 +25,7 @@ - The name of the BIM Server you are currently connecting to. Change settings in the BIM preferences + Name of the currently connected BIM Server. Settings can be adjusted in BIM preferences. BIM Server @@ -76,7 +76,7 @@ - Open in browser + Open in Browser @@ -112,7 +112,7 @@ - Available revisions: + Available revisions @@ -161,7 +161,7 @@ - Root object: + Root object diff --git a/src/Mod/BIM/Resources/ui/DialogBimServerLogin.ui b/src/Mod/BIM/Resources/ui/DialogBimServerLogin.ui index a1676cacaf..663e728383 100644 --- a/src/Mod/BIM/Resources/ui/DialogBimServerLogin.ui +++ b/src/Mod/BIM/Resources/ui/DialogBimServerLogin.ui @@ -19,7 +19,7 @@ - BimServer URL: + BIM server URL @@ -33,7 +33,7 @@ - Login (email): + Login (email) @@ -47,7 +47,7 @@ - Password: + Password @@ -59,7 +59,7 @@ - Keep me logged in across FreeCAD sessions + Stay logged in across FreeCAD sessions diff --git a/src/Mod/BIM/Resources/ui/GitTaskPanel.ui b/src/Mod/BIM/Resources/ui/GitTaskPanel.ui index 8781adc2f4..00287ebd42 100644 --- a/src/Mod/BIM/Resources/ui/GitTaskPanel.ui +++ b/src/Mod/BIM/Resources/ui/GitTaskPanel.ui @@ -61,7 +61,7 @@ - List of files to be committed: + List of files to be committed @@ -97,7 +97,7 @@ - Select all + Select All diff --git a/src/Mod/BIM/Resources/ui/dialogAddProperty.ui b/src/Mod/BIM/Resources/ui/dialogAddProperty.ui index ffaf8c8c79..846a4c43d1 100644 --- a/src/Mod/BIM/Resources/ui/dialogAddProperty.ui +++ b/src/Mod/BIM/Resources/ui/dialogAddProperty.ui @@ -11,7 +11,7 @@ - Add IFC property + Add IFC Property diff --git a/src/Mod/BIM/Resources/ui/dialogClasses.ui b/src/Mod/BIM/Resources/ui/dialogClasses.ui index 4699d258f5..424fc8147e 100644 --- a/src/Mod/BIM/Resources/ui/dialogClasses.ui +++ b/src/Mod/BIM/Resources/ui/dialogClasses.ui @@ -11,7 +11,7 @@ - classManager + Class Manager diff --git a/src/Mod/BIM/Resources/ui/dialogClassification.ui b/src/Mod/BIM/Resources/ui/dialogClassification.ui index de2ce45e70..3a5b385c1e 100644 --- a/src/Mod/BIM/Resources/ui/dialogClassification.ui +++ b/src/Mod/BIM/Resources/ui/dialogClassification.ui @@ -11,7 +11,7 @@ - Classification manager + Classification Manager @@ -57,7 +57,7 @@ - Sort by: + Sort by @@ -117,7 +117,7 @@ - Object / Material + Object/Material @@ -176,7 +176,7 @@ Apply the selected class to selected objects - << Apply to selected + << Apply to Selected @@ -186,7 +186,7 @@ Use this class as object name - << Set as name + << Set as Name diff --git a/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui b/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui index ba3e083a58..fa6de9c122 100644 --- a/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui +++ b/src/Mod/BIM/Resources/ui/dialogConvertDocument.ui @@ -11,13 +11,13 @@ - Single IFC document + Single IFC Document - Do you wish to convert this document to an IFC document? Replying 'Yes' will automatically turn all new objects to IFC, while 'No' will allow you to have both IFC and non-IFC elements in the file. + Convert this document to an IFC document? Selecting 'Yes' will enable automatic creation of IFC objects. Selecting 'No' will allow a mix of IFC and non-IFC elements within the file. true @@ -27,7 +27,7 @@ - Add a default building structure (IfcSite, IfcBuilding and IfcBuildingStorey). You can also add the structure manually later. + Adds a default building structure consisting of IfcSite, IfcBuilding, and IfcBuildingStorey. The structure can also be added manually at a later stage. Also create a default structure @@ -37,10 +37,7 @@ - If this is checked, you won't be asked again when creating a new FreeCAD document, -and that document won't be turned into an IFC document automatically. -You can still turn a FreeCAD document into an IFC document manually, using -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 → Make IFC Project. Do not ask again diff --git a/src/Mod/BIM/Resources/ui/dialogConvertType.ui b/src/Mod/BIM/Resources/ui/dialogConvertType.ui index d846f5f083..f6c8e1b4f8 100644 --- a/src/Mod/BIM/Resources/ui/dialogConvertType.ui +++ b/src/Mod/BIM/Resources/ui/dialogConvertType.ui @@ -11,7 +11,7 @@ - Convert to IFC type + Convert to IFC Type diff --git a/src/Mod/BIM/Resources/ui/dialogCreateProject.ui b/src/Mod/BIM/Resources/ui/dialogCreateProject.ui index d1fb7d546b..fb0491083e 100644 --- a/src/Mod/BIM/Resources/ui/dialogCreateProject.ui +++ b/src/Mod/BIM/Resources/ui/dialogCreateProject.ui @@ -11,13 +11,13 @@ - Default structure + Default Structure - Create a default structure (IfcProject, IfcSite, IfcBuilding and IfcBuildingStorey)? Replying "No" will only create an IfcProject. You can then add the structure manually later. + Create a default structure (IfcProject, IfcSite, IfcBuilding and IfcBuildingStorey)? Replying "No" will only create an IfcProject. The structure can be added manually later. true diff --git a/src/Mod/BIM/Resources/ui/dialogCustomProperties.ui b/src/Mod/BIM/Resources/ui/dialogCustomProperties.ui index d9efe96209..dba0a94f7d 100644 --- a/src/Mod/BIM/Resources/ui/dialogCustomProperties.ui +++ b/src/Mod/BIM/Resources/ui/dialogCustomProperties.ui @@ -11,7 +11,7 @@ - Custom properties + Custom Properties @@ -41,14 +41,14 @@ - A description for this property, can be in any language. + A description of this property. Supports any language. - The property will be hidden in the interface, and can only be modified via Python script + The property will be hidden in the interface, and can only be modified via Python scripting Hidden diff --git a/src/Mod/BIM/Resources/ui/dialogDiff.ui b/src/Mod/BIM/Resources/ui/dialogDiff.ui index ced4c738a9..189e51cecc 100644 --- a/src/Mod/BIM/Resources/ui/dialogDiff.ui +++ b/src/Mod/BIM/Resources/ui/dialogDiff.ui @@ -11,7 +11,7 @@ - IFC diff + IFC Difference diff --git a/src/Mod/BIM/Resources/ui/dialogExport.ui b/src/Mod/BIM/Resources/ui/dialogExport.ui index 2b2fd8701d..6f9467aea4 100644 --- a/src/Mod/BIM/Resources/ui/dialogExport.ui +++ b/src/Mod/BIM/Resources/ui/dialogExport.ui @@ -17,7 +17,7 @@ - One or more IFC documents contained in this FreeCAD document have been modified, but were not saved. They will automatically be saved now. + One or more IFC documents contained in this FreeCAD document have been modified, but were not saved. They will automatically be saved now. true @@ -27,7 +27,7 @@ - Ask me again next time + Ask again next time true diff --git a/src/Mod/BIM/Resources/ui/dialogIfcElements.ui b/src/Mod/BIM/Resources/ui/dialogIfcElements.ui index dc86e7cbce..c954966694 100644 --- a/src/Mod/BIM/Resources/ui/dialogIfcElements.ui +++ b/src/Mod/BIM/Resources/ui/dialogIfcElements.ui @@ -27,7 +27,7 @@ - only visible BIM objects + Only visible BIM objects @@ -36,7 +36,7 @@ - order by: + Order by @@ -98,14 +98,14 @@ - Change type to: + Change type - Change material to: + Change material diff --git a/src/Mod/BIM/Resources/ui/dialogIfcProperties.ui b/src/Mod/BIM/Resources/ui/dialogIfcProperties.ui index 784f5d0277..3074158b44 100644 --- a/src/Mod/BIM/Resources/ui/dialogIfcProperties.ui +++ b/src/Mod/BIM/Resources/ui/dialogIfcProperties.ui @@ -17,7 +17,7 @@ - This dialog allows you to display and manage IFC properties attached to BIM objects. Only properties and sets present in all selected objects will be displayed and editable. + Display and manage IFC properties common to all selected BIM objects true @@ -47,7 +47,7 @@ - Order by: + Order by @@ -108,7 +108,7 @@ - Search for a property or property set: + Search for a property or property set @@ -147,7 +147,7 @@ - List of IFC properties for the selected objects. Double-click to edit, drag and drop to reorganize + List of IFC properties for the selected objects. Double-click to edit. Drag and drop to reorganize. true @@ -179,7 +179,7 @@ - Delete selected property/set + Delete Selected Property/Set diff --git a/src/Mod/BIM/Resources/ui/dialogIfcPropertiesRedux.ui b/src/Mod/BIM/Resources/ui/dialogIfcPropertiesRedux.ui index 7a7efcf2d1..22c9175e5f 100644 --- a/src/Mod/BIM/Resources/ui/dialogIfcPropertiesRedux.ui +++ b/src/Mod/BIM/Resources/ui/dialogIfcPropertiesRedux.ui @@ -11,7 +11,7 @@ - IFC properties editor + IFC Properties Editor @@ -19,7 +19,7 @@ - IFC UUID: + IFC UUID @@ -35,7 +35,7 @@ - List of IFC properties for this object. Double-click to edit, drag and drop to reorganize + List of IFC properties for this object. Double-click to edit. Drag and drop to reorganize. true @@ -80,7 +80,7 @@ - Force export full FreeCAD parametric data + Force export of full FreeCAD parametric data diff --git a/src/Mod/BIM/Resources/ui/dialogIfcQuantities.ui b/src/Mod/BIM/Resources/ui/dialogIfcQuantities.ui index d41cb08ba9..db56ffa540 100644 --- a/src/Mod/BIM/Resources/ui/dialogIfcQuantities.ui +++ b/src/Mod/BIM/Resources/ui/dialogIfcQuantities.ui @@ -27,7 +27,7 @@ - only visible BIM objects + Only visible BIM objects @@ -77,7 +77,7 @@ - Select all + Select All diff --git a/src/Mod/BIM/Resources/ui/dialogImport.ui b/src/Mod/BIM/Resources/ui/dialogImport.ui index e4609879d8..e5ce66ebd4 100644 --- a/src/Mod/BIM/Resources/ui/dialogImport.ui +++ b/src/Mod/BIM/Resources/ui/dialogImport.ui @@ -11,7 +11,7 @@ - IFC import options + IFC Import Options @@ -48,7 +48,7 @@ - This defines how the IFC data is stored in the FreeCAD document. 'Single IFC document' means that the FreeCAD document is the IFC document, anything you create in it belongs to the IFC document too. 'Use IFC document object' means that an object will be created inside the FreeCAD document to represent the IFC document. You will be able to add non-IFC objects alongside. + 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. @@ -96,7 +96,7 @@ - No 3D representation at all + No 3D representation @@ -156,10 +156,10 @@ - If this is unchecked, these settings will be applied automatically next time. You can change this later under menu Edit -> Preferences -> BIM -> Native IFC + If this is unchecked, these settings will be applied automatically next time. This can be changed later under menu Edit -> Preferences -> BIM -> Native IFC - Ask me again next time + Ask again next time false diff --git a/src/Mod/BIM/Resources/ui/dialogLayersIFC.ui b/src/Mod/BIM/Resources/ui/dialogLayersIFC.ui index 20af47b065..06b531b990 100644 --- a/src/Mod/BIM/Resources/ui/dialogLayersIFC.ui +++ b/src/Mod/BIM/Resources/ui/dialogLayersIFC.ui @@ -11,7 +11,7 @@ - Layers manager + Layers Manager @@ -50,14 +50,14 @@ - Select all + Select All - Toggle on/off + Toggle On/Off diff --git a/src/Mod/BIM/Resources/ui/dialogLibrary.ui b/src/Mod/BIM/Resources/ui/dialogLibrary.ui index a9e58d3063..f383d12643 100644 --- a/src/Mod/BIM/Resources/ui/dialogLibrary.ui +++ b/src/Mod/BIM/Resources/ui/dialogLibrary.ui @@ -11,7 +11,7 @@ - Library browser + Library Browser @@ -46,7 +46,7 @@ - Links the selected object in the current document. Only works in Offline mode + Links the selected object in the current document. Only works in offline mode. Link @@ -60,7 +60,7 @@ - Search: + Search @@ -80,7 +80,7 @@ - ... + @@ -190,7 +190,7 @@ - If this is checked, the library doesn't need to be installed. Contents will be fetched online. + Allows the library to be fetched online instead of requiring local installation. Online mode @@ -206,14 +206,14 @@ Open the search results inside FreeCAD's web browser instead of the system browser - Open search in FreeCAD web view + Search using FreeCAD's web view - Opens a 3D preview of the selected file. + Opens a 3D preview of the selected file Preview model in 3D view @@ -259,7 +259,7 @@ - Save as... + Save As… diff --git a/src/Mod/BIM/Resources/ui/dialogMaterialChooser.ui b/src/Mod/BIM/Resources/ui/dialogMaterialChooser.ui index ed052beb12..63ab313303 100644 --- a/src/Mod/BIM/Resources/ui/dialogMaterialChooser.ui +++ b/src/Mod/BIM/Resources/ui/dialogMaterialChooser.ui @@ -11,7 +11,7 @@ - Choose a material + Choose a Material diff --git a/src/Mod/BIM/Resources/ui/dialogNudgeValue.ui b/src/Mod/BIM/Resources/ui/dialogNudgeValue.ui index 5239550bee..f61094ef7d 100644 --- a/src/Mod/BIM/Resources/ui/dialogNudgeValue.ui +++ b/src/Mod/BIM/Resources/ui/dialogNudgeValue.ui @@ -17,7 +17,7 @@ - New nudge value: + New nudge value diff --git a/src/Mod/BIM/Resources/ui/dialogPhases.ui b/src/Mod/BIM/Resources/ui/dialogPhases.ui index 8a638231cd..f2974e869a 100644 --- a/src/Mod/BIM/Resources/ui/dialogPhases.ui +++ b/src/Mod/BIM/Resources/ui/dialogPhases.ui @@ -17,7 +17,7 @@ - Below are the phases currently configured for this model: + Below are the phases currently configured for this model true @@ -45,7 +45,7 @@ - Add... + Add diff --git a/src/Mod/BIM/Resources/ui/dialogPreflight.ui b/src/Mod/BIM/Resources/ui/dialogPreflight.ui index 9783414966..56e5dbfc11 100644 --- a/src/Mod/BIM/Resources/ui/dialogPreflight.ui +++ b/src/Mod/BIM/Resources/ui/dialogPreflight.ui @@ -17,7 +17,7 @@ - <html><head/><body><p>The following test will check your model or the selected object(s) and their children for conformity to some IFC standards.</p><p><span style=" font-weight:600;">Important</span>: None of the failed tests below will prevent exporting IFC files, nor do these tests guarantee that your IFC files meets some specific quality or standard requirement. They are there to help you assess what is and what is not in your exported file. It's for you to choose which item is of importance to you or not. Hovering the mouse over each description will give you more information to decide.</p><p>After a test is run, clicking the corresponding button will give you more information to help you to fix problems.</p><p>The <a href="http://www.buildingsmart-tech.org/specifications"><span style=" text-decoration: underline; color:#0000ff;">official IFC website</span></a> contains a lot of useful information about IFC standards.</p></body></html> + <html><head/><body><p>The following test will check the model or the selected object(s) and their children for conformity to IFC standards.</p><p><span style=" font-weight:600;">Important</span>: None of the failed tests below will prevent exporting IFC files, nor do these tests guarantee that the IFC files meets some specific quality or standard requirement. They are there to assess which elements are included or excluded from the exported file. Choose which item is of importance manually. Hovering the mouse over each description will show more information.</p><p>After a test is run, clicking the corresponding button will show more information to help fix the problems.</p><p>The <a href="http://www.buildingsmart-tech.org/specifications"><span style=" text-decoration: underline; color:#0000ff;">official IFC website</span></a> contains a lot of useful information about IFC standards.</p></body></html> true @@ -27,10 +27,10 @@ - Warning, this can take some time! + Warning, this may take a large amount of time! - Run all tests + Run All Tests @@ -70,13 +70,13 @@ - IFC export + IFC Export - <html><head/><body><p>IFC export in FreeCAD is performed by an open-source third-party library called IfcOpenShell. To be able to export to the newer IFC4 standard, IfcOpenShell must have been compiled with IFC4 support enabled. This test will check if IFC4 support is available in your version of IfcOpenShell. If not, you will only be able to export IFC files in the older IFC2x3 standard. Note that some applications out there still have incomplete or inexistent IFC4 support, so in some cases IFC2x3 might still work better.</p></body></html> + <html><head/><body><p>IFC export in FreeCAD is performed by an open-source third-party library called IfcOpenShell. To be able to export to the newer IFC4 standard, IfcOpenShell must have been compiled with IFC4 support enabled. This test will check if IFC4 support is available in the installed version of IfcOpenShell. If not, FreeCAD will only export IFC files in the older IFC2x3 standard. Note that some applications out there still have incomplete or inexistent IFC4 support, so in some cases IFC2x3 might still work better.</p></body></html> Is IFC4 support enabled? @@ -99,7 +99,7 @@ - Project structure + Project Structure @@ -112,7 +112,7 @@ - <html><head/><body><p>All IfcBuildingStorey (levels) elements are required to be inside an IfcBuilding element. This is a mandatory requirement of the IFC standard. When exporting your FreeCAD model to IFC, a default IfcBuilding will be created for all level objects (BuildingPart objects with their IFC role set as Building Storey) found that are not inside a Building. However, it is best if you create that building yourself, so you have more control over its name and properties. This test is here to help you to find those levels without buildings.</p></body></html> + <html><head/><body><p>All IfcBuildingStorey (levels) elements are required to be inside an IfcBuilding element. This is a mandatory requirement of the IFC standard. When exporting the FreeCAD model to IFC, a default IfcBuilding will be created for all level objects (BuildingPart objects with their IFC role set as Building Storey) found that are not inside a Building. However, it is best to manually create that building, to have more control over its name and properties. This test is here to help find those levels without buildings.</p></body></html> Are all storeys part of a building? @@ -125,7 +125,7 @@ - <html><head/><body><p>All elements derived from IfcProduct (that is, all the BIM elements that compose your model) are required to be inside an IfcBuildingStorey (level) element. This is a mandatory requirement of the IFC standard. When exporting your FreeCAD model to IFC, a default IfcBuildingStorey will be created for all BIM objects found that are not inside one already. However, it is best if you make sure yourself that all elements are correctly located inside a level, so you have more control over it. This test is here to help you to find those BIM objects without a level.</p></body></html> + <html><head/><body><p>All elements derived from IfcProduct (that is, all the BIM elements that compose the model) are required to be inside an IfcBuildingStorey (level) element. This is a mandatory requirement of the IFC standard. When exporting the FreeCAD model to IFC, a default IfcBuildingStorey will be created for all BIM objects found that are not inside one already. However, it is best to check that all elements are correctly located inside a level to have more control over it. This test is here to help find those BIM objects without a level.</p></body></html> Are all BIM objects part of a level? @@ -145,7 +145,7 @@ - <html><head/><body><p>All IfcBuilding elements are required to be inside an IfcSite element. This is a mandatory requirement of the IFC standard. When exporting your FreeCAD model to IFC, a default IfcSite will be created for all Building objects found that are not inside a Site. However, it is best if you create that site yourself, so you have more control over its name and properties. This test is here to help you to find those buildings without sites.</p></body></html> + <html><head/><body><p>All IfcBuilding elements are required to be inside an IfcSite element. This is a mandatory requirement of the IFC standard. When exporting the FreeCAD model to IFC, a default IfcSite will be created for all Building objects found that are not inside a Site. However, it is best to manually create that site to have more control over its name and properties. This test is here to help find those buildings without sites.</p></body></html> Are all buildings part of a site? @@ -165,7 +165,7 @@ - <html><head/><body><p>The IFC standard requires at least one site, one building and one level or building storey per project. This test will ensure that at least one object of each of these 3 types exists in the model.</p><p>Note that, as this is a mandatory requirement, FreeCAD will automatically add a default site, a default building and/or a default building storey if any of these is missing. So even if this test didn't pass, your exported IFC file will meet the requirements.</p><p>However, it is always better to create these objects yourself, as you get more control over naming and properties.</p></body></html> + <html><head/><body><p>The IFC standard requires at least one site, one building and one level or building storey per project. This test will ensure that at least one object of each of these 3 types exists in the model.</p><p>Note that, as this is a mandatory requirement, FreeCAD will automatically add a default site, a default building and/or a default building storey if any of these is missing. So even if this test did not pass, the exported IFC file will meet the requirements.</p><p>However, it is always better to manually create these projects to gain more control over naming and properties.</p></body></html> Is there at least one site, one building and one level in the model? @@ -201,7 +201,7 @@ - <html><head/><body><p>Although it is not a requirement for IFC objects to have fully clean and solid geometry (and you will more than often find IFC files with bad geometry out there, oh boy if you find!), it is of course better if they do. You will reduce chances of problems with other applications, and after all, in real life, all objects have solid shapes.</p><p>FreeCAD has a lot of tools to check for geometry quality, and most parametric objects, including BIM objects, will usually warn you if their geometry becomes unclean or not solid at some point. This test makes sure everything is OK.</p></body></html> + <html><head/><body><p>Although it is not a requirement for IFC objects to have fully clean and solid geometry, it is better if they do. This will reduce chances of problems with other applications. In real life, all objects have solid shapes.</p><p>FreeCAD has a lot of tools to check for geometry quality, and most parametric objects, including BIM objects, will usually warn the user if their geometry becomes unclean or not solid at some point. This test makes validates the solidity of the geometry.</p></body></html> Are all BIM objects solid and valid? @@ -214,7 +214,7 @@ - <html><head/><body><p>The IFC format provides a defined type for most of the objects that compose a building, for example walls, columns, doors, or sinks. But it also supports undefined objects, which are given the generic BuildingElementProxy type. This test will check that all objects have a defined type.</p><p><br/></p><p>Note that failing this test is not necessarily bad, as you might specifically want some object to not have any defined type. In some cases, this might even give better results, as some applications like Revit might add possibly unwanted additional constraints or transformations to some known types such as structural elements (beams or columns). Exporting them as BuildingElementProxies will prevent that.</p></body></html> + <html><head/><body><p>The IFC format provides a defined type for most of the objects that compose a building, for example walls, columns, doors, or sinks. But it also supports undefined objects, which are given the generic BuildingElementProxy type. This test will check that all objects have a defined type.</p><p><br/></p><p>Note that failing this test is not necessarily bad, as it may be desirable for some object to not have any defined type. In some cases, this might even give better results, as some applications like Revit might add unwanted additional constraints or transformations to some known types such as structural elements (beams or columns). Exporting them as BuildingElementProxies will prevent that.</p></body></html> Are all BIM objects of a defined IFC type? @@ -243,7 +243,7 @@ - <html><head/><body><p>Classification systems, such as UniClass or MasterFormat, or even your own custom system, are in some cases an important part of a building project. This test will ensure that all BIM objects and materials found in the model have their standard code property dutifully filled.</p></body></html> + <html><head/><body><p>Classification systems, such as UniClass or MasterFormat, or even a custom system, are in some cases an important part of a building project. This test will ensure that all BIM objects and materials found in the model have their standard code property dutifully filled.</p></body></html> Do all BIM objects and materials have a standard classification code defined? @@ -270,7 +270,7 @@ - <html><head/><body><p>The IFC standard offers standard, predefined property sets for many object types. for example, the property set Pset_WallCommon contains properties that the IFC standard thinks all walls should have. This test will check that all BIM objects have the right property set, if available.</p><p>Note that this is by no means a formal requirement, and these will inflate the size of your IFC file consequently. We suggest you add standard property sets only if you are actually using any of them.</p></body></html> + <html><head/><body><p>The IFC standard offers standard, predefined property sets for many object types. For example, the property set Pset_WallCommon contains properties that the IFC standard thinks all walls should have. This test will check that all BIM objects have the right property set, if available.</p><p>Note that this is by no means a formal requirement, and these will inflate the size of the IFC file consequently. It is recommended to add standard property sets only if they are in use.</p></body></html> Do all common IFC types have the corresponding Property Set? @@ -283,7 +283,7 @@ - <html><head/><body><p>IFC objects have a geometry representation, which defines the shape of the object, but can also have some or their dimensions, such as height, width or area, explicitly stated. This is very useful for BIM applications that don't process the geometry, such as spreadsheets. Those applications are still able to get and estimate quantities from IFC objects without the need to analyze the geometry.</p><p>It is also a possibility for errors (or even fraud), as nothing guarantees that those explicitly stated dimensions match what is inside the geometry.</p><p>This test will find any BIM object that has available dimension properties such as width or height, for example walls and structures, but such properties are not marked for explicit export to IFC.</p></body></html> + <html><head/><body><p>IFC objects have a geometry representation, which defines the shape of the object, but can also have some or their dimensions, such as height, width or area, explicitly stated. This is very useful for BIM applications that do not process the geometry, such as spreadsheets. Those applications are still able to get and estimate quantities from IFC objects without the need to analyze the geometry.</p><p>It is also a possibility for errors (or even fraud), as nothing guarantees that those explicitly stated dimensions match what is inside the geometry.</p><p>This test will find any BIM object that has available dimension properties such as width or height, for example walls and structures, but such properties are not marked for explicit export to IFC.</p></body></html> Do all geometric BIM objects have explicit dimensions set? @@ -296,7 +296,7 @@ - <html><head/><body><p>Although there is no requirement for IFC objects to have a material defined, in the real world, it is an important layer of information to be added to you model. This test will find BIM objects without a material defined.</p><p>If a BIM object is exported without a material, it will nevertheless be assigned an IfcSurfaceStyle, which will be created from the object color. Some BIM applications actually disregard materials, and only consider the surface style of an object. No IfcMaterial will be attributed to that object.</p><p>If a BIM object has a material defined, a surface style will still be created (an IfcMaterial too) but its surface style will take the same name and properties as the material, thus giving more consistency to your file, no matter what other BIM consider, surface style, material, or both.</p></body></html> + <html><head/><body><p>Although there is no requirement for IFC objects to have a material defined, in the real world, it is an important layer of information to be added to the model. This test will find BIM objects without a material defined.</p><p>If a BIM object is exported without a material, it will nevertheless be assigned an IfcSurfaceStyle, which will be created from the object color. Some BIM applications disregard materials, and only consider the surface style of an object. No IfcMaterial will be attributed to that object.</p><p>If a BIM object has a material defined, a surface style will still be created (an IfcMaterial too), but its surface style will take the same name and properties as the material, thus giving more consistency to the file.</p></body></html> Do all BIM objects have a material? @@ -372,7 +372,7 @@ - <html><head/><body><p>Walls, columns and beams in FreeCAD can be constructed in a wide number of ways. But some simpler BIM applications might have difficulties with walls that are not of the most simple type, that is, a single, straight piece of wall (which correspond to the IfcWallStandardCase type) or beams and columns that are not based on a straight extrusion of a flat profile (BeamStandardCase, ColumnStandardCase)</p><p>This test will find any wall which is not such a standard case.</p><p><span style=" font-weight:600;">Note</span>: At the moment, BIM objects that meet the requirements to be of a standard case, are still exported as IfcWall, IfcBeam, IfcColumn.</p></body></html> + <html><head/><body><p>Walls, columns and beams in FreeCAD can be constructed in a wide number of ways, but some simpler BIM applications might have difficulties with walls that are not of the most simple type. That is, a single, straight piece of wall (which correspond to the IfcWallStandardCase type) or beams and columns that are not based on a straight extrusion of a flat profile (BeamStandardCase, ColumnStandardCase)</p><p>This test will find any wall which is not such a standard case.</p><p><span style=" font-weight:600;">Note</span>: At the moment, BIM objects that meet the requirements to be of a standard case, are still exported as IfcWall, IfcBeam, IfcColumn.</p></body></html> Are all walls, beams and columns based on a single line or profile (standard case)? @@ -412,7 +412,7 @@ - <html><head/><body><p>When exporting a model to IFC, all BIM objects that are an extrusion of a rectangular profile will use an IfcRectangleProfileDef entity as their extrusion profile. However, Revit won't import these correctly. If you are going to use the IFC file in Revit, we recommend you to disable this behavior by checking the option under menu <span style=" font-weight:600;">Edit -&gt; Preferences -&gt; BIM -&gt; Native IFC -&gt; Disable IfcRectangularProfileDef</span>.</p><p>When that option is checked, all extrusion profiles will be exported as generic IfcArbitraryProfileDef entities, regardless of if they are rectangular or not, which will contain a little less information, but will open correctly in Revit.</p></body></html> + <html><head/><body><p>When exporting a model to IFC, all BIM objects that are an extrusion of a rectangular profile will use an IfcRectangleProfileDef entity as their extrusion profile. However, Revit will not import these correctly. If using the IFC file in Revit, it is recommended to disable this behavior by checking the option under menu <span style=" font-weight:600;">Edit -&gt; Preferences -&gt; BIM -&gt; Native IFC -&gt; Disable IfcRectangularProfileDef</span>.</p><p>When that option is checked, all extrusion profiles will be exported as generic IfcArbitraryProfileDef entities, regardless of if they are rectangular or not, which will contain a little less information, but will open correctly in Revit.</p></body></html> Is IfcRectangleProfileDef export disabled? (Revit only) diff --git a/src/Mod/BIM/Resources/ui/dialogPreflightResults.ui b/src/Mod/BIM/Resources/ui/dialogPreflightResults.ui index 90d16e8829..783dfd9e92 100644 --- a/src/Mod/BIM/Resources/ui/dialogPreflightResults.ui +++ b/src/Mod/BIM/Resources/ui/dialogPreflightResults.ui @@ -11,7 +11,7 @@ - Test results + Test Results @@ -40,7 +40,7 @@ - Results of test: + Results of test true @@ -88,7 +88,7 @@ - to Report panel + To Report Panel diff --git a/src/Mod/BIM/Resources/ui/dialogProjectManager.ui b/src/Mod/BIM/Resources/ui/dialogProjectManager.ui index 4a280670be..ebcd194564 100644 --- a/src/Mod/BIM/Resources/ui/dialogProjectManager.ui +++ b/src/Mod/BIM/Resources/ui/dialogProjectManager.ui @@ -17,7 +17,7 @@ - This screen allows you to create and configure a new BIM project in FreeCAD. + This screen assists in creating and configuring a new BIM project in FreeCAD true @@ -39,7 +39,7 @@ - Use preset... + Use preset @@ -53,7 +53,7 @@ - The settings below can be saved as a preset. Presets are stored as .txt files in your FreeCAD user folder + The settings below can be saved as a preset. Presets are stored as .txt files in the local FreeCAD user folder Save preset @@ -84,10 +84,10 @@ - Create a new BIM project + Creates a new BIM project - Create a new BIM project + Create a New BIM Project true @@ -111,10 +111,10 @@ - This will create a new FreeCAD document that allows you to build a BIM model, but with no specific IFC structure yet. This is the most flexible option when you start working ona BIM project. You can convert this project to IFC anytime later. + This will create a new FreeCAD document for the construction of a BIM model, but initially with no specific IFC structure. This is the most flexible option when starting working on a BIM project. This project can be converted to IFC anytime later. - Create a new document without IFC support yet + Create a new document without IFC support false @@ -124,10 +124,10 @@ - This will create an IFC project. All the BIM objects you will add to that IFC project will immediately become IFC objects. This is less flexible, but allows you to stick more strictly to the IFC standard. + This will create an IFC project. All the BIM objects added to the IFC project will immediately become IFC objects. This is less flexible, but helps to strictly adhere to the IFC standard. - Create a Native IFC project in the current document + Create a native IFC project in the current document true @@ -137,10 +137,10 @@ - The new IFC project will be created as a new FreeCAD document. In that mode, the IFC project is the FreeCAD document, anything you create in that document becomes part of the IFC project. This is extremely restrictive as no non-IFC object can be added to the document. + The new IFC project will be created as a new FreeCAD document. In that mode, the IFC project is the FreeCAD document, anything created in that document becomes part of the IFC project. This is extremely restrictive as no non-IFC object can be added to the document. - Create a locked Native IFC project as a new document + Create a locked native IFC project as a new document @@ -176,7 +176,7 @@ Create a new site - Create site + Create Site false @@ -188,7 +188,7 @@ - The site object contains all the data relative to the project location. Later on, you can attach a physical object representing the terrain. + The site object contains all the data relative to the project location. Later on, is it possible to attach a physical object representing the terrain. true @@ -200,7 +200,7 @@ - The East longitude of this site + The east longitude of this site E @@ -250,7 +250,7 @@ - The difference between the up direction of this site and the true North direction + The difference between the up direction of this site and the true north direction ° @@ -301,7 +301,7 @@ - The North latitude of this site + The north latitude of this site N @@ -325,10 +325,10 @@ - Create a new building + Creates a new building - Create building + Create Building true @@ -337,7 +337,7 @@ - This will configure a single building for this project. If your project is made of several buildings, you can duplicate it after creation and update its properties. + This will configure a single building for this project. If the project is made of several buildings, it can be duplicated after creation and its properties updated. true @@ -370,7 +370,7 @@ - Default Building + Default building @@ -404,7 +404,7 @@ - The main use of this building + The primary function of this building 0 @@ -434,7 +434,7 @@ - Main use + Primary function @@ -451,7 +451,7 @@ - An estimate building width. Keep 0 if you don't want to specify this now + An estimate building width. Keep the value as 0 to not specify this now. 0 @@ -487,7 +487,7 @@ - An estimate building length. Keep 0 if you don't want to specify this now + An estimate building length. Keep the value as 0 to not specify this now. 0 @@ -549,7 +549,7 @@ Add a human figure to the document - Add a human figure + Add Human Figure true @@ -558,7 +558,7 @@ - A human figure will be added to the document, which helps giving a sense of scale + A human figure will be added to the document, which helps give a sense of scale true @@ -577,7 +577,7 @@ - BIM projects are typically organized into levels, that represents the different storeys of a building. Although it is not mandatory to work with levels in FreeCAD, you can set up default levels here + BIM projects are typically organized into levels that represent the different storeys of a building. Although it is not mandatory to work with levels in FreeCAD, the default levels can be set here. true @@ -631,7 +631,7 @@ - Default groups to be added to each level. Default groups such as walls, windows,... are useful to organize the different building elements inside a level + Default groups to be added to each level. Default groups such as walls and windows are useful to organize the different building elements inside a level. true @@ -641,7 +641,7 @@ - A list of grouls to add under each level + A list of groups to add under each level true @@ -659,7 +659,7 @@ - Add a new group + Add New Group Add @@ -676,7 +676,7 @@ Delete a selected group - Del + Delete diff --git a/src/Mod/BIM/Resources/ui/dialogQuantitySurveying.ui b/src/Mod/BIM/Resources/ui/dialogQuantitySurveying.ui index 6564537712..92494caac2 100644 --- a/src/Mod/BIM/Resources/ui/dialogQuantitySurveying.ui +++ b/src/Mod/BIM/Resources/ui/dialogQuantitySurveying.ui @@ -59,7 +59,7 @@ - This screen lists all the components of the current document. You can select them to create a FreeCAD spreadsheet containing information from them. + This display lists all the components of the current document. Select them to create a FreeCAD spreadsheet containing information from them. true @@ -75,7 +75,7 @@ - This dialogue window will help you to generate list of components, dimensions, materials from a opened BIM file for Quantity Surveyor purposes. + This dialog window will help generate a list of components, dimensions, and materials from an opened BIM file for quantity surveyor purposes. true @@ -91,7 +91,7 @@ - Select from these options the values you want from each component. FreeCAD will generate a line in the spreadsheet with these values (if they are present). + Select from these options the values desired from each component. FreeCAD will generate a line in the spreadsheet with these values (if they are present). true @@ -172,7 +172,7 @@ - Select these components from the list if you want to hide the rest of them and move to Survey mode. + Select these components from the list to hide the rest of them and move to survey mode. true @@ -214,7 +214,7 @@ - Select these components from the list if you want to hide the rest of them and move to schedule definition mode. + Select these components from the list to hide the rest of them and move to schedule definition mode. true diff --git a/src/Mod/BIM/Resources/ui/dialogReorder.ui b/src/Mod/BIM/Resources/ui/dialogReorder.ui index 36a8d1bfe3..53c36d4df8 100644 --- a/src/Mod/BIM/Resources/ui/dialogReorder.ui +++ b/src/Mod/BIM/Resources/ui/dialogReorder.ui @@ -17,7 +17,7 @@ - Drag items to reorder then press OK to accept + Drag items to reorder them true @@ -34,7 +34,7 @@ - Order alphabetically + Order Alphabetically diff --git a/src/Mod/BIM/Resources/ui/dialogSetup.ui b/src/Mod/BIM/Resources/ui/dialogSetup.ui index 705f9cbc52..0a37f5dac0 100644 --- a/src/Mod/BIM/Resources/ui/dialogSetup.ui +++ b/src/Mod/BIM/Resources/ui/dialogSetup.ui @@ -20,7 +20,7 @@ - This dialog will help you to set FreeCAD up for efficient BIM workflow by setting a couple of typical FreeCAD options. This dialog can be accessed again anytime from menu Manage -> Setup, and more options are available under menu Edit -> Preferences. + This dialog will help set FreeCAD up for efficient BIM workflow by setting a couple FreeCAD options. This dialog can be accessed again anytime from menu Manage -> Setup, and more options are available under the edit -> preferences menu. true @@ -30,7 +30,7 @@ - Hover your mouse on each setting for additional info. + Hover the mouse on each setting for additional info @@ -78,11 +78,11 @@ - Choose one of the presets in this list to fill all the settings below with predetermined values. Then, adjust to your likings + Choose one of the presets in this list to fill all the settings below with predetermined values - Choose your preferred working unit... + Choose the preferred working unit @@ -97,7 +97,7 @@ - US / Imperial + US/Imperial @@ -112,36 +112,36 @@ - <html><head/><body><p>The unit you prefer to work with, that will be used everywhere: in dialogs, measurements and dimensions. However, you can enter any other unit anytime. For example, if you configured FreeCAD to work in millimeters, you can still enter measures as &quot;10m&quot; or &quot;5ft&quot;. You can also change the default unit system anytime without causing any modification to your model. Location in preferences: <span style=" font-weight:600;">General &gt; Default unit system</span></p></body></html> + <html><head/><body><p>The preferred unit that will be used everywhere: in dialogs, measurements and dimensions. However, any other unit can be entered anytime. Changing the default unit system anytime will not cause any modification to the model. Location in preferences: <span style=" font-weight:600;">General &gt; Default unit system</span></p></body></html> - millimeters + Millimeters - centimeters + Centimeters - meters + Meters - inches + Inches - feet + Feet - architectural + Architectural @@ -163,7 +163,7 @@ - <html><head/><body><p>The number of decimals you wish to see used in the interface controls and measurements. Location in preferences: <span style=" font-weight:600;">General &gt; Units &gt; Number of decimals</span></p></body></html> + <html><head/><body><p>The number of decimals preferred in the interface controls and measurements. Location in preferences: <span style=" font-weight:600;">General &gt; Units &gt; Number of decimals</span></p></body></html> 2 @@ -360,21 +360,21 @@ - Construction: + Construction - Helpers: + Helpers - Faces: + Faces @@ -388,7 +388,7 @@ - Lines: + Lines @@ -416,7 +416,7 @@ - Gradient bottom: + Gradient bottom @@ -430,21 +430,21 @@ - Plain background: + Plain background - Text: + Text - The background color when switched to simple color + The background color when simple color is enabled @@ -460,7 +460,7 @@ - This is the altitude of the camera when you create a blank file. Good values are between 5 (view a few centimeters wide) and 5000 (view a few meters wide) + The altitude of the camera when a blank file is created. Recommended values are between 5 (view a few centimeters wide) and 5000 (view a few meters wide) 99999 @@ -473,7 +473,7 @@ - <html><head/><body><p>Your name (optional). You can also add your email like this: John Doe &lt;john@doe.com&gt;. Location in preferences: <span style=" font-weight:600;">General &gt; Document &gt; Author name</span></p></body></html> + <html><head/><body><p>Name (optional). You can also add an email address like this: John Doe &lt;john@doe.com&gt;. Location in preferences: <span style=" font-weight:600;">General &gt; Document &gt; Author name</span></p></body></html> @@ -503,7 +503,7 @@ - <html><head/><body><p>Optional license you wish to use for new files. Keep &quot;All rights reserved&quot; if you don't wish to use any particular license. Location in preferences: <span style=" font-weight:600;">General &gt; Document &gt; Default license</span></p></body></html> + <html><head/><body><p>Optional license to use for new files. Keep &quot;All rights reserved&quot; if no license is preferred. Location in preferences: <span style=" font-weight:600;">General &gt; Document &gt; Default license</span></p></body></html> @@ -600,7 +600,7 @@ - <html><head/><body><p><span style=" font-weight:600;">Tip</span>: You might also want to set the appropriate snapping modes on the Snapping toolbar. Enabling only the snap positions that you need will make drawing in FreeCAD considerably faster.</p></body></html> + <html><head/><body><p><span style=" font-weight:600;">Tip</span>: The appropriate snapping modes on the Snapping toolbar can be set. Enabling only the snap positions needed will make drawing in FreeCAD considerably faster.</p></body></html> true @@ -610,7 +610,7 @@ - <html><head/><body><p><b>Tip</b>: You are currently using FreeCAD version %1. Consider using the <a href="https://github.com/FreeCAD/FreeCAD/releases"><span style=" text-decoration: underline; color:#0000ff;">latest development version %2</span></a>, which brings all the latest improvements to FreeCAD.</p></body></html> + <html><head/><body><p><b>Tip</b>: The currently installed FreeCAD version is %1. Consider using the <a href="https://github.com/FreeCAD/FreeCAD/releases"><span style=" text-decoration: underline; color:#0000ff;">latest development version %2</span></a>, which brings all the latest improvements to FreeCAD.</p></body></html> true diff --git a/src/Mod/BIM/Resources/ui/dialogSpaces.ui b/src/Mod/BIM/Resources/ui/dialogSpaces.ui index 640ca185b9..0a6902c4e3 100644 --- a/src/Mod/BIM/Resources/ui/dialogSpaces.ui +++ b/src/Mod/BIM/Resources/ui/dialogSpaces.ui @@ -11,13 +11,13 @@ - Spaces manager + Spaces Manager - This screen will allow you to check the spaces configuration of your project and change some attributes. + This screen enables checking the spaces configuration and editing of attributes in the project. true @@ -112,7 +112,7 @@ - Space information + Space Information diff --git a/src/Mod/BIM/Resources/ui/dialogTree.ui b/src/Mod/BIM/Resources/ui/dialogTree.ui index 12102188a2..5d974b8b89 100644 --- a/src/Mod/BIM/Resources/ui/dialogTree.ui +++ b/src/Mod/BIM/Resources/ui/dialogTree.ui @@ -11,7 +11,7 @@ - IFC representation of + IFC Representation diff --git a/src/Mod/BIM/Resources/ui/dialogTutorial.ui b/src/Mod/BIM/Resources/ui/dialogTutorial.ui index f38817a481..affb98fbdf 100644 --- a/src/Mod/BIM/Resources/ui/dialogTutorial.ui +++ b/src/Mod/BIM/Resources/ui/dialogTutorial.ui @@ -11,7 +11,7 @@ - BIM tutorial + BIM Tutorial @@ -21,11 +21,10 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Fira Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Loading tutorials contents from the FreeCAD wiki. Please wait...</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Loading tutorial contents from the FreeCAD wiki. Please wait…</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If this is the first time you are using the tutorial, this can take a while, since we need to download many images. On next runs, this will be faster as the images are cached locally.</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">When the tutorial is fully written, we'll think of a faster system to avoid this annoying loading time. Please bear with us in the meantime! ;)</p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If this is the first time viewing the tutorial, this can take a while. Subsequent runs will complete more quickly.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> @@ -38,7 +37,7 @@ p, li { white-space: pre-wrap; } - Tasks to complete: + Tasks to complete diff --git a/src/Mod/BIM/Resources/ui/dialogWelcome.ui b/src/Mod/BIM/Resources/ui/dialogWelcome.ui index 5229afc4eb..75cf4b7874 100644 --- a/src/Mod/BIM/Resources/ui/dialogWelcome.ui +++ b/src/Mod/BIM/Resources/ui/dialogWelcome.ui @@ -75,7 +75,7 @@ - <html><head/><body><p>This appears to be the first time that you are using the BIM workbench. If you press OK, the next screen will propose you to set a couple of typical FreeCAD options that are suitable for BIM work. You can change these options anytime later under menu <span style=" font-weight:600;">Manage -&gt; BIM Setup...</span></p></body></html> + <html><head/><body><p>This appears to be the first time BIM workbench is used. electing OK will open a setup screen with a few recommended FreeCAD options tailored for BIM workflows. These settings can be modified later under <span style=" font-weight:600;">Manage -&gt; BIM Setup…</span></p></body></html> true @@ -97,7 +97,7 @@ - FreeCAD is a complex application. If this is your first contact with FreeCAD, or you have never worked with 3D or BIM before, you might want to take our <a href="https://wiki.freecad.org/BIM_ingame_tutorial">BIM tutorial</a> first (Also available 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 @@ -107,7 +107,7 @@ - The BIM workbench also has a <a href="https://wiki.freecad.org/BIM_Workbench">complete documentation</a> available under the Help menu. The "what's this?" button will also open the help page of any tool from the toolbars. + The BIM workbench also has a <a href="https://wiki.freecad.org/BIM_Workbench">complete documentation</a> available under the Help menu. The "What's This?" button will open the help page of any tool from the toolbars. true @@ -117,7 +117,7 @@ - A good way to start building a BIM model is by setting up basic characteristics of your project, under menu <span style=" font-weight:600;">Manage -&gt; Project setup</span>. You can also directly configure different floor plans for your project, under menu <span style=" font-weight:600;">Manage -&gt; Levels.</span> + A good way to start building a BIM model is by setting up basic characteristics of the project, under menu <span style=" font-weight:600;">Manage -&gt; Project setup</span>. Different floor plans for the project can be configured via <span style=" font-weight:600;">Manage -&gt; Levels.</span> true @@ -127,7 +127,7 @@ - There is no mandatory behaviour here though, and you can also start creating walls and columns directly, and care about organizing things in levels later. + There is no required workflow; walls and columns can be created directly, with levels organised later if preferred. true @@ -137,7 +137,7 @@ - <html><head/><body><p>You might also want to start from an existing floor plan or 3D model made in another application. Under menu <span style=" font-weight:600;">File -&gt; Import</span>, you will find a wide range of file formats that can be imported into FreeCAD.</p></body></html> + <html><head/><body><p>An existing floor plan or 3D model created in another application can also be used as a starting point. Under menu <span style=" font-weight:600;">File -&gt; Import</span>, a wide range of file formats that can be imported into FreeCAD.</p></body></html> true diff --git a/src/Mod/BIM/Resources/ui/dialogWindows.ui b/src/Mod/BIM/Resources/ui/dialogWindows.ui index 23b28a0063..1ba9dd48c9 100644 --- a/src/Mod/BIM/Resources/ui/dialogWindows.ui +++ b/src/Mod/BIM/Resources/ui/dialogWindows.ui @@ -11,13 +11,13 @@ - Doors and windows + Doors and Windows - This screen lists all the windows of the current document. You can modify them individually or together + This screen lists all the windows of the current document. They can modified individually or together true @@ -29,7 +29,7 @@ - Group by: + Group by @@ -94,14 +94,14 @@ - Total number of doors: + Total number of doors - Total number of windows: + Total number of windows diff --git a/src/Mod/BIM/Resources/ui/preferences-arch.ui b/src/Mod/BIM/Resources/ui/preferences-arch.ui index 0e4a209308..2264607a11 100644 --- a/src/Mod/BIM/Resources/ui/preferences-arch.ui +++ b/src/Mod/BIM/Resources/ui/preferences-arch.ui @@ -11,13 +11,13 @@ - General settings + General Settings - Object creation + Object Creation @@ -39,7 +39,7 @@ - If this is checked, when 2 similar walls are being connected, their underlying sketches will be joined into one, and the two walls will become one + When two similar walls are connected, their underlying sketches are merged and the walls are combined into a single object Join base sketches of walls if possible @@ -90,7 +90,7 @@ - If this is checked, when an object becomes Subtraction or Addition of an Arch object, it will receive the Draft Construction color. + If this is checked, when an object becomes subtraction or addition of an Arch object, it will receive the Draft construction color. Apply Draft construction style to subcomponents @@ -106,7 +106,7 @@ - By default, new objects will have their "Move with host" property set to False, which means they won't move when their host object is moved. + By default, new objects will have their "Move with host" property set to False, which means they will not move when their host object is moved Set "Move with host" property to True by default @@ -368,7 +368,7 @@ - 2D rendering + 2D Rendering @@ -484,7 +484,7 @@ to projections of hidden objects. Scaling factor for patterns used by objects that have -a Footprint display mode +a footprint display mode 4 @@ -512,7 +512,7 @@ a Footprint display mode - BIM server + BIM Server diff --git a/src/Mod/BIM/Resources/ui/preferences-dae.ui b/src/Mod/BIM/Resources/ui/preferences-dae.ui index cd31ece43f..bc8b18cbaa 100644 --- a/src/Mod/BIM/Resources/ui/preferences-dae.ui +++ b/src/Mod/BIM/Resources/ui/preferences-dae.ui @@ -23,7 +23,7 @@ - Export options + Export Options @@ -120,7 +120,7 @@ If using Netgen, make sure that it is available. - Tessellation value to use with the Builtin and the Mefisto meshing program. + Tessellation value to use with the Builtin and the Mefisto meshing program 4 diff --git a/src/Mod/BIM/Resources/ui/preferences-ifc-export.ui b/src/Mod/BIM/Resources/ui/preferences-ifc-export.ui index 3565343523..01eb18e9db 100644 --- a/src/Mod/BIM/Resources/ui/preferences-ifc-export.ui +++ b/src/Mod/BIM/Resources/ui/preferences-ifc-export.ui @@ -11,7 +11,7 @@ - IFC export + IFC Export @@ -32,7 +32,7 @@ - General options + General Options @@ -54,7 +54,7 @@ - Export options + Export Options @@ -62,10 +62,10 @@ - The type of objects that you wish to export: -- Standard model: solid objects. -- Structural analysis: wireframe model for structural calculations. -- Standard + structural: both types of models. + The type of objects to export: +- Standard model: solid objects +- Structural analysis: wireframe model for structural calculations +- Standard + structural: both types of models Export type @@ -75,10 +75,10 @@ - The type of objects that you wish to export: -- Standard model: solid objects. -- Structural analysis: wireframe model for structural calculations. -- Standard + structural: both types of models. + The type of objects to export: +- Standard model: solid objects +- Structural analysis: wireframe model for structural calculations +- Standard + structural: both types of models ifcExportModel @@ -108,11 +108,11 @@ - Some IFC viewers don't like objects exported as extrusions. + Some IFC viewers do not like objects exported as extrusions. Use this to force all objects to be exported as BREP geometry. - Force export as Brep + Force export as BREP ifcExportAsBrep @@ -236,7 +236,7 @@ allowing to recreate a full parametric model on reimport. When possible, similar entities will be used only once in the file if possible. -This can reduce the file size a lot, but will make it less easily readable. +This can reduce the file size considerably, but will make it less easily readable. Reuse similar entities @@ -258,7 +258,7 @@ This can reduce the file size a lot, but will make it less easily readable.When possible, IFC objects that are extruded rectangles will be exported as IfcRectangleProfileDef. However, some other applications might have problems importing that entity. -If this is your case, you can disable this and then all profiles will be exported as IfcArbitraryClosedProfileDef. +If this is the case, it can disabled and then all profiles will be exported as IfcArbitraryClosedProfileDef. Disable IfcRectangleProfileDef @@ -327,7 +327,7 @@ A building storey is not mandatory but a common practice to have at least one in - The units you want your IFC file to be exported to. + Desired units in the exported IFC file. Note that IFC files are ALWAYS written in metric units; imperial units are only a conversion factor applied on top of them. @@ -342,7 +342,7 @@ unit to work with when opening the file. - The units you want your IFC file to be exported to. + Desired units in the exported IFC file. Note that IFC files are ALWAYS written in metric units; imperial units are only a conversion factor applied on top of them. @@ -389,8 +389,7 @@ unit to work with when opening the file. If no building is found in the FreeCAD document, a default one will be added. -Warning: The IFC standard asks for at least one building in each file. By turning this option off, you will produce a non-standard IFC file. -However, at FreeCAD, we believe having a building should not be mandatory, and this option is there to have a chance to demonstrate our point of view. +Warning: The IFC standard asks for at least one building in each file. By turning this option off, a non-standard IFC file will be produced. Add default building if one is not found in the document @@ -412,7 +411,7 @@ However, at FreeCAD, we believe having a building should not be mandatory, and t If not checked, standard FreeCAD groups (App::DocumentObjectGroup) will not be exported as IfcGroup or IfcElementAssembly.\nTheir children will be re-parented to the container of the skipped group in the IFC structure. - Export FreeCAD groups + Export FreeCAD Groups true @@ -430,7 +429,7 @@ However, at FreeCAD, we believe having a building should not be mandatory, and t - In FreeCAD, it is possible to nest groups inside buildings or storeys. If this option is disabled, FreeCAD groups will be saved as IfcGroups and aggregated to the building structure. Aggregating non-building elements such as IfcGroups is however not recommended by the IFC standards. It is therefore also possible to export these groups as IfcElementAssemblies, which produces an IFC-compliant file. However, at FreeCAD, we believe nesting groups inside structures should be possible, and this option is there to have a chance to demonstrate our point of view. + In FreeCAD, it is possible to nest groups inside buildings or storeys. If this option is disabled, FreeCAD groups will be saved as IfcGroups and aggregated to the building structure. Aggregating non-building elements such as IfcGroups is however not recommended by the IFC standards. It is therefore also possible to export these groups as IfcElementAssemblies, which produces an IFC-compliant file. Export nested groups as assemblies diff --git a/src/Mod/BIM/Resources/ui/preferences-ifc.ui b/src/Mod/BIM/Resources/ui/preferences-ifc.ui index 6bbbdbee18..ab883ae7bd 100644 --- a/src/Mod/BIM/Resources/ui/preferences-ifc.ui +++ b/src/Mod/BIM/Resources/ui/preferences-ifc.ui @@ -11,7 +11,7 @@ - IFC import + IFC Import @@ -23,7 +23,7 @@ - General options + General Options @@ -90,11 +90,11 @@ One object is the base object, the others are clones. EXPERIMENTAL The number of cores to use in multicore mode. Keep 0 to disable multicore mode. -The maximum value should be your number of cores minus 1, -for example, 3 if you have a 4-core CPU. +The maximum value should be the number of cores in the CPU minus 1, +for example, 3 cores for a 4-core CPU. Set it to 1 to use multicore mode in single-core mode; this is safer -if you start getting crashes when you set multiple cores. +if crashes occur when multiple cores are set. ifcMulticore @@ -110,11 +110,11 @@ if you start getting crashes when you set multiple cores. EXPERIMENTAL The number of cores to use in multicore mode. Keep 0 to disable multicore mode. -The maximum value should be your number of cores minus 1, -for example, 3 if you have a 4-core CPU. +The maximum value should be the number of cores in the CPU minus 1, +for example, 3 cores for a 4-core CPU. Set it to 1 to use multicore mode in single-core mode; this is safer -if you start getting crashes when you set multiple cores. +if crashes occur when multiple cores are set. Number of cores to use (experimental) @@ -145,7 +145,7 @@ if you start getting crashes when you set multiple cores. - Import options + Import Options @@ -389,7 +389,7 @@ they will be treated as one. - Exclude list: + Exclude list diff --git a/src/Mod/BIM/Resources/ui/preferences-sh3d-import.ui b/src/Mod/BIM/Resources/ui/preferences-sh3d-import.ui index b29ae434cc..88eb2adf8a 100644 --- a/src/Mod/BIM/Resources/ui/preferences-sh3d-import.ui +++ b/src/Mod/BIM/Resources/ui/preferences-sh3d-import.ui @@ -11,7 +11,7 @@ - SH3D import + SH3D Import @@ -23,7 +23,7 @@ - General options + General Options @@ -45,10 +45,10 @@ - DEBUG: keep the construction geometries in the ActiveDocument. Useful when debugging a failed import + DEBUG: keep the construction geometries in the active document. Useful when debugging a failed import - Debug Geometry + Debug geometry sh3dDebugGeometry @@ -64,13 +64,13 @@ - Import options + Import Options - Merge imported element with existing FC object + Merge imported element with existing FreeCAD object Merge into existing document @@ -190,10 +190,10 @@ - Create a default Render project with the newly created Site + Create a default Render project with the newly created site (requires the Render workbench to be installed) - Create Render Project (requires Render) + Create render project sh3dCreateRenderProject @@ -209,7 +209,7 @@ - Default Floor Color + Default floor color sh3dDefaultFloorColor @@ -225,7 +225,7 @@ - This color might be used when a room does not define its own color. + This color might be used when a room does not define its own color @@ -249,7 +249,7 @@ - Default Ceiling Color + Default ceiling color sh3dDefaultCeilingColor @@ -265,7 +265,7 @@ - This color might be used when a room does not define its own color. + This color might be used when a room does not define its own color @@ -287,10 +287,10 @@ - Create a default IFC project with the newly created Site. + Create a default IFC project with the newly created site - Create IFC Project + Create IFC project sh3dCreateIFCProject @@ -303,10 +303,10 @@ - Create a Mesh to represent the default ground level. + Create a mesh to represent the default ground level - Create ground level Mesh + Create ground level mesh sh3dCreateGroundMesh @@ -324,7 +324,7 @@ - Default ground Color + Default ground color sh3dDefaultGroundColor @@ -340,7 +340,7 @@ - This color might be used when the environment does not define a color for the ground. + This color might be used when the environment does not define a color for the ground @@ -364,7 +364,7 @@ - Default sky Color + Default sky color sh3dDefaultSkyColor @@ -380,7 +380,7 @@ - This color might be used when the environment does not define a color for the sky. + This color might be used when the environment does not define a color for the sky @@ -402,7 +402,7 @@ - Create Facebinders, Baseboards for walls, floors and ceilings for Rooms + Create face binders and baseboards for walls, and floors and ceilings for rooms Decorate surfaces @@ -423,7 +423,7 @@ - Default furniture Color + Default furniture color sh3dDefaultFurnitureColor @@ -439,7 +439,7 @@ - This color is used when a furniture does not define its own color. + This color is used when a furniture does not define its own color @@ -461,7 +461,7 @@ - Fit view while importing. + Fit view while importing Fit view while importing diff --git a/src/Mod/BIM/Resources/ui/preferencesNativeIFC.ui b/src/Mod/BIM/Resources/ui/preferencesNativeIFC.ui index 43e9771878..e5ec2f0652 100644 --- a/src/Mod/BIM/Resources/ui/preferencesNativeIFC.ui +++ b/src/Mod/BIM/Resources/ui/preferencesNativeIFC.ui @@ -67,7 +67,7 @@ - The type of object created at import. Coin only is much faster, but you don't get the full shape information. You can convert between the two anytime by right-clicking the object tree + The type of object created at import. Coin only is much faster, but does not provide the full shape information. Convert between the two anytime by right-clicking the object tree 1 @@ -90,7 +90,7 @@ - No 3D representation at all + No 3D representation @@ -180,7 +180,7 @@ - When enabling this, the original version of objects dropped onto an IFC project tree will not be deleted. + When enabling this, the original version of objects dropped onto an IFC project tree will not be deleted Keep original version of aggregated objects @@ -243,7 +243,7 @@ - New document + New Document @@ -281,7 +281,7 @@ - New project + New Project @@ -303,7 +303,7 @@ - Check this to ask the above question every time a project is created + Enables asking the above question every time a project is created Ask every time @@ -325,7 +325,7 @@ - New type + New Type diff --git a/src/Mod/BIM/TestArchGui.py b/src/Mod/BIM/TestArchGui.py index c631c6bceb..d08f0b7fe9 100644 --- a/src/Mod/BIM/TestArchGui.py +++ b/src/Mod/BIM/TestArchGui.py @@ -56,7 +56,7 @@ class ArchTest(unittest.TestCase): App.setActiveDocument("ArchTest") def testRebar(self): - App.Console.PrintLog ('Checking Arch Rebar...\n') + App.Console.PrintLog ('Checking Arch Rebar…\n') s = Arch.makeStructure(length=2,width=3,height=5) sk = App.ActiveDocument.addObject('Sketcher::SketchObject','Sketch') sk.AttachmentSupport = (s,["Face6"]) diff --git a/src/Mod/BIM/bimcommands/BimArchUtils.py b/src/Mod/BIM/bimcommands/BimArchUtils.py index da440f3ec5..1c96fd543f 100644 --- a/src/Mod/BIM/bimcommands/BimArchUtils.py +++ b/src/Mod/BIM/bimcommands/BimArchUtils.py @@ -38,7 +38,7 @@ class Arch_Add: def GetResources(self): return {'Pixmap' : 'Arch_Add', - 'MenuText': QT_TRANSLATE_NOOP("Arch_Add","Add component"), + 'MenuText': QT_TRANSLATE_NOOP("Arch_Add","Add Component"), 'ToolTip': QT_TRANSLATE_NOOP("Arch_Add","Adds the selected components to the active object")} def IsActive(self): @@ -78,8 +78,8 @@ class Arch_Remove: def GetResources(self): return {'Pixmap' : 'Arch_Remove', - 'MenuText': QT_TRANSLATE_NOOP("Arch_Remove","Remove component"), - 'ToolTip': QT_TRANSLATE_NOOP("Arch_Remove","Remove the selected components from their parents, or create a hole in a component")} + 'MenuText': QT_TRANSLATE_NOOP("Arch_Remove","Remove Component"), + 'ToolTip': QT_TRANSLATE_NOOP("Arch_Remove","Removes the selected components from their parents, or creates a hole in a component")} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -149,7 +149,7 @@ class Arch_MeshToShape: def GetResources(self): return {'Pixmap' : 'Arch_MeshToShape', 'MenuText': QT_TRANSLATE_NOOP("Arch_MeshToShape","Mesh to Shape"), - 'ToolTip': QT_TRANSLATE_NOOP("Arch_MeshToShape","Turns selected meshes into Part Shape objects")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_MeshToShape","Turns selected meshes into Part shape objects")} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -174,7 +174,7 @@ class Arch_MeshToShape: tol = params.get_param_arch("ConversionTolerance") flat = params.get_param_arch("ConversionFlat") cut = params.get_param_arch("ConversionCut") - FreeCAD.ActiveDocument.openTransaction(translate("Arch","Mesh to Shape")) + FreeCAD.ActiveDocument.openTransaction(translate("Arch","Mesh to shape")) for obj in FreeCADGui.Selection.getSelection(): newobj = Arch.meshToShape(obj,True,fast,tol,flat,cut) if g and newobj: @@ -186,7 +186,7 @@ class Arch_SelectNonSolidMeshes: def GetResources(self): return {'Pixmap': 'Arch_SelectNonManifold.svg', - 'MenuText': QT_TRANSLATE_NOOP("Arch_SelectNonSolidMeshes","Select non-manifold meshes"), + 'MenuText': QT_TRANSLATE_NOOP("Arch_SelectNonSolidMeshes","Select Non-Manifold Meshes"), 'ToolTip': QT_TRANSLATE_NOOP("Arch_SelectNonSolidMeshes","Selects all non-manifold meshes from the document or from the selected groups")} def IsActive(self): @@ -216,7 +216,7 @@ class Arch_RemoveShape: "the Arch RemoveShape command definition" def GetResources(self): return {'Pixmap' : 'Arch_RemoveShape', - 'MenuText': QT_TRANSLATE_NOOP("Arch_RemoveShape","Remove Shape from BIM"), + 'MenuText': QT_TRANSLATE_NOOP("Arch_RemoveShape","Remove Shape From BIM"), 'ToolTip': QT_TRANSLATE_NOOP("Arch_RemoveShape","Removes cubic shapes from BIM components")} def IsActive(self): @@ -234,7 +234,7 @@ class Arch_CloseHoles: def GetResources(self): return {'Pixmap' : 'Arch_CloseHoles', - 'MenuText': QT_TRANSLATE_NOOP("Arch_CloseHoles","Close holes"), + 'MenuText': QT_TRANSLATE_NOOP("Arch_CloseHoles","Close Holes"), 'ToolTip': QT_TRANSLATE_NOOP("Arch_CloseHoles","Closes holes in open shapes, turning them solids")} def IsActive(self): @@ -264,7 +264,7 @@ class Arch_Check: import Arch result = Arch.check(FreeCADGui.Selection.getSelection()) if not result: - FreeCAD.Console.PrintMessage(str(translate("Arch","All good! No problems found"))) + FreeCAD.Console.PrintMessage(str(translate("Arch","No problems found!"))) else: FreeCADGui.Selection.clearSelection() for i in result: @@ -294,8 +294,8 @@ class Arch_ToggleIfcBrepFlag: def GetResources(self): return {'Pixmap' : 'Arch_ToggleIfcBrepFlag', - 'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Toggle IFC B-rep flag"), - 'ToolTip': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Force an object to be exported as B-rep or not")} + 'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Toggle IFC B-rep Flag"), + 'ToolTip': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Forces an object to be exported as B-rep or not")} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -339,7 +339,7 @@ class Arch_CloneComponent: def GetResources(self): return {'Pixmap' : 'Arch_Component_Clone', - 'MenuText': QT_TRANSLATE_NOOP("Arch_CloneComponent","Clone component"), + 'MenuText': QT_TRANSLATE_NOOP("Arch_CloneComponent","Clone Component"), 'Accel': "C, C", 'ToolTip': QT_TRANSLATE_NOOP("Arch_CloneComponent","Clones an object as an undefined architectural component")} @@ -366,9 +366,9 @@ class Arch_IfcSpreadsheet: def GetResources(self): return {'Pixmap': 'Arch_Schedule', - 'MenuText': QT_TRANSLATE_NOOP("Arch_IfcSpreadsheet","Create IFC spreadsheet..."), + 'MenuText': QT_TRANSLATE_NOOP("Arch_IfcSpreadsheet","New IFC Spreadsheet"), 'Accel': "I, P", - 'ToolTip': QT_TRANSLATE_NOOP("Arch_IfcSpreadsheet","Creates a spreadsheet to store IFC properties of an object.")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_IfcSpreadsheet","Creates a spreadsheet to store IFC properties of an object")} def IsActive(self): v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph") @@ -394,7 +394,7 @@ class Arch_ToggleSubs: def GetResources(self): return {'Pixmap' : 'Arch_ToggleSubs', 'Accel' : 'Ctrl+Space', - 'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleSubs","Toggle subcomponents"), + 'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleSubs","Toggle Subcomponents"), 'ToolTip' : QT_TRANSLATE_NOOP("Arch_ToggleSubs","Shows or hides the subcomponents of this object")} def IsActive(self): @@ -474,11 +474,11 @@ class Arch_MergeWalls: FreeCAD.Console.PrintWarning(translate("Arch","The selected wall contains no subwall to merge")) return else: - FreeCAD.Console.PrintWarning(translate("Arch","Please select only wall objects")) + FreeCAD.Console.PrintWarning(translate("Arch","Select only wall objects")) return for w in walls: if Draft.getType(w) != "Wall": - FreeCAD.Console.PrintMessage(translate("Arch","Please select only wall objects")) + FreeCAD.Console.PrintMessage(translate("Arch","Select only wall objects")) return FreeCAD.ActiveDocument.openTransaction(translate("Arch","Merge Walls")) FreeCADGui.addModule("Arch") diff --git a/src/Mod/BIM/bimcommands/BimAxis.py b/src/Mod/BIM/bimcommands/BimAxis.py index b9c37af90f..878cd422f3 100644 --- a/src/Mod/BIM/bimcommands/BimAxis.py +++ b/src/Mod/BIM/bimcommands/BimAxis.py @@ -87,7 +87,7 @@ class Arch_AxisSystem: FreeCADGui.doCommand("Arch.makeAxisSystem("+s+")") FreeCAD.ActiveDocument.commitTransaction() else: - FreeCAD.Console.PrintError(translate("Arch","Please select at least one axis")+"\n") + FreeCAD.Console.PrintError(translate("Arch","Select at least one axis")+"\n") def IsActive(self): @@ -128,7 +128,7 @@ class Arch_AxisTools: return tuple(['Arch_Axis','Arch_AxisSystem','Arch_Grid']) def GetResources(self): - return { 'MenuText': QT_TRANSLATE_NOOP("Arch_AxisTools",'Axis tools'), + return { 'MenuText': QT_TRANSLATE_NOOP("Arch_AxisTools",'Axis Tools'), 'ToolTip': QT_TRANSLATE_NOOP("Arch_AxisTools",'Axis tools') } diff --git a/src/Mod/BIM/bimcommands/BimBackground.py b/src/Mod/BIM/bimcommands/BimBackground.py index 02a6b072bb..406cacc978 100644 --- a/src/Mod/BIM/bimcommands/BimBackground.py +++ b/src/Mod/BIM/bimcommands/BimBackground.py @@ -35,7 +35,7 @@ class BIM_Background: def GetResources(self): return { "Pixmap": "BIM_Background", - "MenuText": QT_TRANSLATE_NOOP("BIM_Background", "Toggle background"), + "MenuText": QT_TRANSLATE_NOOP("BIM_Background", "Toggle Background"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_Background", "Toggles the background of the 3D view between simple and gradient", diff --git a/src/Mod/BIM/bimcommands/BimBuilder.py b/src/Mod/BIM/bimcommands/BimBuilder.py index c45b445a82..6f9b2b7d25 100644 --- a/src/Mod/BIM/bimcommands/BimBuilder.py +++ b/src/Mod/BIM/bimcommands/BimBuilder.py @@ -35,7 +35,7 @@ class BIM_Builder: def GetResources(self): return { "Pixmap": "Part_Shapebuilder", - "MenuText": QT_TRANSLATE_NOOP("Part_Builder", "Shape builder..."), + "MenuText": QT_TRANSLATE_NOOP("Part_Builder", "Shape Builder"), "ToolTip": QT_TRANSLATE_NOOP( "Part_Builder", "Advanced utility to create shapes" ), diff --git a/src/Mod/BIM/bimcommands/BimBuildingPart.py b/src/Mod/BIM/bimcommands/BimBuildingPart.py index 9766fa4161..a096179232 100644 --- a/src/Mod/BIM/bimcommands/BimBuildingPart.py +++ b/src/Mod/BIM/bimcommands/BimBuildingPart.py @@ -45,7 +45,7 @@ class Arch_Level: return {'Pixmap' : 'Arch_Floor', 'MenuText': QT_TRANSLATE_NOOP("Arch_Level","Level"), 'Accel': "L, V", - 'ToolTip': QT_TRANSLATE_NOOP("Arch_Level","Creates a Building Part object that represents a level.")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_Level","Creates a building part object that represents a level")} def IsActive(self): @@ -74,7 +74,7 @@ class Arch_Building: return {'Pixmap' : 'Arch_Building', 'MenuText': QT_TRANSLATE_NOOP("Arch_Building","Building"), 'Accel': "B, U", - 'ToolTip': QT_TRANSLATE_NOOP("Arch_Building","Creates a building object.")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_Building","Creates a building object")} def IsActive(self): diff --git a/src/Mod/BIM/bimcommands/BimClassification.py b/src/Mod/BIM/bimcommands/BimClassification.py index 18853365d9..f4e97108fb 100644 --- a/src/Mod/BIM/bimcommands/BimClassification.py +++ b/src/Mod/BIM/bimcommands/BimClassification.py @@ -41,11 +41,11 @@ class BIM_Classification: return { "Pixmap": "BIM_Classification", "MenuText": QT_TRANSLATE_NOOP( - "BIM_Classification", "Manage classification..." + "BIM_Classification", "Manage Classification" ), "ToolTip": QT_TRANSLATE_NOOP( "BIM_Classification", - "Manage classification systems and apply classification to objects", + "Manages classification systems and apply classification to objects", ), } diff --git a/src/Mod/BIM/bimcommands/BimCommon.py b/src/Mod/BIM/bimcommands/BimCommon.py index 17e0ee2539..f5d69e2043 100644 --- a/src/Mod/BIM/bimcommands/BimCommon.py +++ b/src/Mod/BIM/bimcommands/BimCommon.py @@ -37,7 +37,7 @@ class BIM_Common: "Pixmap": "Part_Common", "MenuText": QT_TRANSLATE_NOOP("Part_Common", "Intersection"), "ToolTip": QT_TRANSLATE_NOOP( - "Part_Common", "Make an intersection of two shapes" + "Part_Common", "Creates an intersection of two shapes" ), } diff --git a/src/Mod/BIM/bimcommands/BimCompound.py b/src/Mod/BIM/bimcommands/BimCompound.py index dd18bdd0fc..33d9e605b8 100644 --- a/src/Mod/BIM/bimcommands/BimCompound.py +++ b/src/Mod/BIM/bimcommands/BimCompound.py @@ -35,9 +35,9 @@ class BIM_Compound: def GetResources(self): return { "Pixmap": "Part_Compound", - "MenuText": QT_TRANSLATE_NOOP("BIM_Compound", "Make compound"), + "MenuText": QT_TRANSLATE_NOOP("BIM_Compound", "Create Compound"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_Compound", "Make a compound of several shapes" + "BIM_Compound", "Create a compound of several shapes" ), } diff --git a/src/Mod/BIM/bimcommands/BimCurtainwall.py b/src/Mod/BIM/bimcommands/BimCurtainwall.py index 739fc1005c..6cfd5a2f6a 100644 --- a/src/Mod/BIM/bimcommands/BimCurtainwall.py +++ b/src/Mod/BIM/bimcommands/BimCurtainwall.py @@ -55,7 +55,7 @@ class Arch_CurtainWall: self.doc = FreeCAD.ActiveDocument sel = FreeCADGui.Selection.getSelection() if len(sel) > 1: - FreeCAD.Console.PrintError(translate("Arch","Please select only one base object or none")+"\n") + FreeCAD.Console.PrintError(translate("Arch","Select only one base object or none")+"\n") elif len(sel) == 1: # build on selection FreeCADGui.Control.closeDialog() diff --git a/src/Mod/BIM/bimcommands/BimCut.py b/src/Mod/BIM/bimcommands/BimCut.py index 0b4f5ac940..44d5ed8bf7 100644 --- a/src/Mod/BIM/bimcommands/BimCut.py +++ b/src/Mod/BIM/bimcommands/BimCut.py @@ -36,7 +36,7 @@ class BIM_Cut: "Pixmap": "Part_Cut", "MenuText": QT_TRANSLATE_NOOP("BIM_Cut", "Difference"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_Cut", "Make a difference between two shapes" + "BIM_Cut", "Creates a difference between two shapes" ), } diff --git a/src/Mod/BIM/bimcommands/BimCutPlane.py b/src/Mod/BIM/bimcommands/BimCutPlane.py index 97007403b4..6b6a76c1ac 100644 --- a/src/Mod/BIM/bimcommands/BimCutPlane.py +++ b/src/Mod/BIM/bimcommands/BimCutPlane.py @@ -41,7 +41,7 @@ class Arch_CutPlane: def GetResources(self): return {"Pixmap": "Arch_CutPlane", - "MenuText": QT_TRANSLATE_NOOP("Arch_CutPlane", "Cut with plane"), + "MenuText": QT_TRANSLATE_NOOP("Arch_CutPlane", "Cut With Plane"), "ToolTip": QT_TRANSLATE_NOOP("Arch_CutPlane", "Cut an object with a plane")} def IsActive(self): @@ -124,7 +124,7 @@ class CutPlaneTaskPanel: def retranslateUi(self, TaskPanel): TaskPanel.setWindowTitle(translate("Arch", "Cut Plane")) - self.title.setText(translate("Arch", "Cut Plane options")) + self.title.setText(translate("Arch", "Cut Plane Options")) self.infoText.setText(translate("Arch", "Which side to cut")) self.combobox.addItems([translate("Arch", "Behind"), translate("Arch", "Front")]) diff --git a/src/Mod/BIM/bimcommands/BimDiff.py b/src/Mod/BIM/bimcommands/BimDiff.py index dad3b7620c..18020150a4 100644 --- a/src/Mod/BIM/bimcommands/BimDiff.py +++ b/src/Mod/BIM/bimcommands/BimDiff.py @@ -65,7 +65,7 @@ class BIM_Diff: "", translate( "BIM", - "The document currently viewed must be your main one. The other contains newer objects that you wish to merge into this one. Make sure only the objects you wish to compare are visible in both. Proceed?", + "The current document must be the main one. The other contains newer objects to merge into it. Ensure that only the objects intended for comparison are visible in both documents. Proceed?", ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.No, @@ -210,7 +210,7 @@ class BIM_Diff: ) toselect.append(obj) else: - print("Object", obj.Label, "doesn't exist yet in main doc") + print("Object", obj.Label, "does not exist yet in main document") toselect.append(obj) additions.append(obj) @@ -220,7 +220,7 @@ class BIM_Diff: "Part::Feature" ): # don't count building parts print( - "Object", obj.Label, "doesn't exist anymore in new doc" + "Object", obj.Label, "does not exist anymore in new document" ) subtractions.append(obj) @@ -262,7 +262,7 @@ class BIM_Diff: print( "Object", obj.Label, - "has no ID and wasn't found in the new doc", + "has no ID and was not found in the new document", ) subtractions.append(obj) @@ -275,7 +275,7 @@ class BIM_Diff: for obj in otherdoc.Objects: if Draft.getType(obj) == "Material": if not obj.Label in matnames: - print("Material", obj.Label, "doesn't exist in main doc") + print("Material", obj.Label, "does not exist in main document") toselect.append(obj) newmats[obj.Label] = obj @@ -347,7 +347,7 @@ class BIM_Diff: + " " + translate( "BIM", - "objects still have the same shape but have a different material. Do you wish to update them in the main document?", + "objects still have the same shape but have a different material. Update them in the main document?", ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.No, @@ -413,7 +413,7 @@ class BIM_Diff: for name, id in newids.items(): obj = activedoc.getObject(name) if obj: - print("Transferring new id to object", obj.Label) + print("Transferring new ID to object", obj.Label) a = obj.IfcData a["IfcUID"] = id obj.IfcData = a @@ -482,7 +482,7 @@ class BIM_Diff: "", translate( "BIM", - "Do you wish to colorize the objects that have moved in yellow in the other file (to serve as a diff)?", + "Colorize the objects that have moved in yellow in the other file (to serve as a diff)?", ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.No, @@ -503,7 +503,7 @@ class BIM_Diff: "", translate( "BIM", - "Do you wish to colorize the objects that have been modified in orange in the other file (to serve as a diff)?", + "Colorize the objects that have been modified in orange in the other file (to serve as a diff)?", ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.No, @@ -526,7 +526,7 @@ class BIM_Diff: + " " + translate( "BIM", - "objects don't exist anymore in the new document. Move them to a 'To Delete' group?", + "objects do not exist anymore in the new document. Move them to a 'To Delete' group?", ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.No, @@ -543,7 +543,7 @@ class BIM_Diff: "", translate( "BIM", - "Do you wish to colorize the objects that have been removed in red in the other file (to serve as a diff)?", + "Colorize the objects that have been removed in red in the other file (to serve as a diff)?", ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.No, @@ -562,7 +562,7 @@ class BIM_Diff: "", translate( "BIM", - "Do you wish to colorize the objects that have been added in green in the other file (to serve as a diff)?", + "Colorize the objects that have been added in green in the other file (to serve as a diff)?", ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.No, @@ -583,7 +583,7 @@ class BIM_Diff: "", translate( "BIM", - "You need two documents open to run this tool. One which is your main document, and one that contains new objects that you wish to compare against the existing one. Make sure only the objects you wish to compare in both documents are visible.", + "Two documents are required to be open to run this tool. One which is the main document, and one that contains new objects to compare against the existing one. Make sure only the objects to compare in both documents are visible.", ), ) diff --git a/src/Mod/BIM/bimcommands/BimDimensions.py b/src/Mod/BIM/bimcommands/BimDimensions.py index 569343519e..fae43083e6 100644 --- a/src/Mod/BIM/bimcommands/BimDimensions.py +++ b/src/Mod/BIM/bimcommands/BimDimensions.py @@ -40,9 +40,9 @@ class BIM_DimensionAligned(gui_dimensions.Dimension): def GetResources(self): return { "Pixmap": "BIM_DimensionAligned", - "MenuText": QT_TRANSLATE_NOOP("BIM_DimensionAligned", "Aligned dimension"), + "MenuText": QT_TRANSLATE_NOOP("BIM_DimensionAligned", "Aligned Dimension"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_DimensionAligned", "Create an aligned dimension" + "BIM_DimensionAligned", "Creates an aligned dimension" ), "Accel": "D, I", } @@ -57,10 +57,10 @@ class BIM_DimensionHorizontal(gui_dimensions.Dimension): return { "Pixmap": "BIM_DimensionHorizontal.svg", "MenuText": QT_TRANSLATE_NOOP( - "BIM_DimensionHorizontal", "Horizontal dimension" + "BIM_DimensionHorizontal", "Horizontal Dimension" ), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_DimensionHorizontal", "Create an horizontal dimension" + "BIM_DimensionHorizontal", "Creates an horizontal dimension" ), "Accel": "D, H", } @@ -81,10 +81,10 @@ class BIM_DimensionVertical(gui_dimensions.Dimension): return { "Pixmap": "BIM_DimensionVertical", "MenuText": QT_TRANSLATE_NOOP( - "BIM_DimensionVertical", "Vertical dimension" + "BIM_DimensionVertical", "Vertical Dimension" ), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_DimensionVertical", "Create a vertical dimension" + "BIM_DimensionVertical", "Creates a vertical dimension" ), "Accel": "D, V", } diff --git a/src/Mod/BIM/bimcommands/BimEmptyTrash.py b/src/Mod/BIM/bimcommands/BimEmptyTrash.py index 62ca3f0443..eda7af31de 100644 --- a/src/Mod/BIM/bimcommands/BimEmptyTrash.py +++ b/src/Mod/BIM/bimcommands/BimEmptyTrash.py @@ -35,10 +35,10 @@ class BIM_EmptyTrash: def GetResources(self): return { "Pixmap": "BIM_Trash", - "MenuText": QT_TRANSLATE_NOOP("BIM_EmptyTrash", "Clean Trash"), + "MenuText": QT_TRANSLATE_NOOP("BIM_EmptyTrash", "Empty Trash"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_EmptyTrash", - "Deletes from the trash bin all objects that are not used by any other", + "Deletes all objects from the trash bin that are not used by any other", ), } diff --git a/src/Mod/BIM/bimcommands/BimEquipment.py b/src/Mod/BIM/bimcommands/BimEquipment.py index 7abc5aa1e1..ccf2eeaa99 100644 --- a/src/Mod/BIM/bimcommands/BimEquipment.py +++ b/src/Mod/BIM/bimcommands/BimEquipment.py @@ -54,7 +54,7 @@ class Arch_Equipment: s = FreeCADGui.Selection.getSelection() if not s: - FreeCAD.Console.PrintError(translate("Arch","You must select a base shape object and optionally a mesh object")) + FreeCAD.Console.PrintError(translate("Arch","Select a base shape object and optionally a mesh object")) else: base = "" mesh = "" @@ -91,4 +91,4 @@ class Arch_Equipment: return -FreeCADGui.addCommand('Arch_Equipment',Arch_Equipment()) \ No newline at end of file +FreeCADGui.addCommand('Arch_Equipment',Arch_Equipment()) diff --git a/src/Mod/BIM/bimcommands/BimExtrude.py b/src/Mod/BIM/bimcommands/BimExtrude.py index 3fc3091fff..c042d1a3d4 100644 --- a/src/Mod/BIM/bimcommands/BimExtrude.py +++ b/src/Mod/BIM/bimcommands/BimExtrude.py @@ -35,7 +35,7 @@ class BIM_Extrude: def GetResources(self): return { "Pixmap": "Part_Extrude", - "MenuText": QT_TRANSLATE_NOOP("BIM_Extrude", "Extrude..."), + "MenuText": QT_TRANSLATE_NOOP("BIM_Extrude", "Extrude"), "ToolTip": QT_TRANSLATE_NOOP("BIM_Extrude", "Extrudes a selected 2D shape"), } diff --git a/src/Mod/BIM/bimcommands/BimFuse.py b/src/Mod/BIM/bimcommands/BimFuse.py index 717c3b9ff4..301672d784 100644 --- a/src/Mod/BIM/bimcommands/BimFuse.py +++ b/src/Mod/BIM/bimcommands/BimFuse.py @@ -35,7 +35,7 @@ class BIM_Fuse: return { "Pixmap": "Part_Fuse", "MenuText": QT_TRANSLATE_NOOP("Part_Fuse", "Union"), - "ToolTip": QT_TRANSLATE_NOOP("Part_Fuse", "Make a union of several shapes"), + "ToolTip": QT_TRANSLATE_NOOP("Part_Fuse", "Creates a union of several shapes"), } def IsActive(self): diff --git a/src/Mod/BIM/bimcommands/BimIfcElements.py b/src/Mod/BIM/bimcommands/BimIfcElements.py index 736f488e82..2b0140362d 100644 --- a/src/Mod/BIM/bimcommands/BimIfcElements.py +++ b/src/Mod/BIM/bimcommands/BimIfcElements.py @@ -36,10 +36,10 @@ class BIM_IfcElements: def GetResources(self): return { "Pixmap": "BIM_IfcElements", - "MenuText": QT_TRANSLATE_NOOP("BIM_IfcElements", "Manage IFC elements..."), + "MenuText": QT_TRANSLATE_NOOP("BIM_IfcElements", "Manage IFC Elements"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_IfcElements", - "Manage how the different elements of of your BIM project will be exported to IFC", + "Manages how the different elements of the BIM project will be exported to IFC", ), } diff --git a/src/Mod/BIM/bimcommands/BimIfcExplorer.py b/src/Mod/BIM/bimcommands/BimIfcExplorer.py index d0bbbb2225..9f80eba0a7 100644 --- a/src/Mod/BIM/bimcommands/BimIfcExplorer.py +++ b/src/Mod/BIM/bimcommands/BimIfcExplorer.py @@ -41,8 +41,8 @@ class BIM_IfcExplorer: return { "Pixmap": "IFC", - "MenuText": QT_TRANSLATE_NOOP("BIM_IfcExplorer", "IFC explorer"), - "ToolTip": QT_TRANSLATE_NOOP("BIM_IfcExplorer", "IFC explorer utility"), + "MenuText": QT_TRANSLATE_NOOP("BIM_IfcExplorer", "IFC Explorer"), + "ToolTip": QT_TRANSLATE_NOOP("BIM_IfcExplorer", "Opens the IFC explorer utility"), } def Activated(self): @@ -123,7 +123,7 @@ class BIM_IfcExplorer: # draw the toolbar buttons self.openAction = QtGui.QAction(translate("BIM", "Open"), None) - self.openAction.setToolTip(translate("BIM", "Open another IFC file...")) + self.openAction.setToolTip(translate("BIM", "Open another IFC file")) self.openAction.triggered.connect(self.open) self.openAction.setIcon(QtGui.QIcon(":/icons/document-open.svg")) toolbar.addAction(self.openAction) diff --git a/src/Mod/BIM/bimcommands/BimIfcProperties.py b/src/Mod/BIM/bimcommands/BimIfcProperties.py index 42b107974b..4966c31f99 100644 --- a/src/Mod/BIM/bimcommands/BimIfcProperties.py +++ b/src/Mod/BIM/bimcommands/BimIfcProperties.py @@ -42,11 +42,11 @@ class BIM_IfcProperties: return { "Pixmap": "BIM_IfcProperties", "MenuText": QT_TRANSLATE_NOOP( - "BIM_IfcProperties", "Manage IFC properties..." + "BIM_IfcProperties", "Manage IFC Properties" ), "ToolTip": QT_TRANSLATE_NOOP( "BIM_IfcProperties", - "Manage the different IFC properties of your BIM objects", + "Manages the different IFC properties of the BIM objects", ), } @@ -122,17 +122,17 @@ class BIM_IfcProperties: self.form.labelinfo.setText( self.form.labelinfo.text() + " " - + translate("BIM", "Custom properties sets can be defined in") + + translate("BIM", "Custom property sets can be defined in") + " " + custompath ) # set combos self.form.comboProperty.addItems( - [translate("BIM", "Add property...")] + self.plabels + [translate("BIM", "Add property")] + self.plabels ) self.form.comboPset.addItems( - [translate("BIM", "Add property set..."), translate("BIM", "New...")] + [translate("BIM", "Add property set"), translate("BIM", "New")] + self.psetkeys ) diff --git a/src/Mod/BIM/bimcommands/BimIfcQuantities.py b/src/Mod/BIM/bimcommands/BimIfcQuantities.py index f85f8b61ca..7a0767b30b 100644 --- a/src/Mod/BIM/bimcommands/BimIfcQuantities.py +++ b/src/Mod/BIM/bimcommands/BimIfcQuantities.py @@ -70,11 +70,11 @@ class BIM_IfcQuantities: return { "Pixmap": "BIM_IfcQuantities", "MenuText": QT_TRANSLATE_NOOP( - "BIM_IfcQuantities", "Manage IFC quantities..." + "BIM_IfcQuantities", "Manage IFC Quantities" ), "ToolTip": QT_TRANSLATE_NOOP( "BIM_IfcQuantities", - "Manage how the quantities of different elements of of your BIM project will be exported to IFC", + "Manages how the quantities of different elements of the BIM project will be exported to IFC", ), } diff --git a/src/Mod/BIM/bimcommands/BimImagePlane.py b/src/Mod/BIM/bimcommands/BimImagePlane.py index ec6056ee9f..44486ed9f3 100644 --- a/src/Mod/BIM/bimcommands/BimImagePlane.py +++ b/src/Mod/BIM/bimcommands/BimImagePlane.py @@ -35,7 +35,7 @@ class BIM_ImagePlane: def GetResources(self): return { "Pixmap": "BIM_ImagePlane.svg", - "MenuText": QT_TRANSLATE_NOOP("BIM_ImagePlane", "Image plane"), + "MenuText": QT_TRANSLATE_NOOP("BIM_ImagePlane", "Image Plane"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_ImagePlane", "Creates a plane from an image" ), @@ -55,7 +55,7 @@ class BIM_ImagePlane: self.opposite = None (filename, _filter) = QtGui.QFileDialog.getOpenFileName( QtGui.QApplication.activeWindow(), - translate("BIM", "Select image"), + translate("BIM", "Select Image"), None, translate("BIM", "Image file (*.png *.jpg *.bmp)"), ) diff --git a/src/Mod/BIM/bimcommands/BimLayers.py b/src/Mod/BIM/bimcommands/BimLayers.py index f7c3daea5b..cd459e954f 100644 --- a/src/Mod/BIM/bimcommands/BimLayers.py +++ b/src/Mod/BIM/bimcommands/BimLayers.py @@ -54,9 +54,9 @@ class BIM_Layers: return { "Pixmap": "BIM_Layers", - "MenuText": QT_TRANSLATE_NOOP("BIM_Layers", "Manage layers..."), + "MenuText": QT_TRANSLATE_NOOP("BIM_Layers", "Manage Layers"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_Layers", "Set/modify the different layers of your BIM project" + "BIM_Layers", "Sets/modifies the different layers of your BIM project" ), } diff --git a/src/Mod/BIM/bimcommands/BimLibrary.py b/src/Mod/BIM/bimcommands/BimLibrary.py index 717fc59ec4..1c75fba37d 100644 --- a/src/Mod/BIM/bimcommands/BimLibrary.py +++ b/src/Mod/BIM/bimcommands/BimLibrary.py @@ -85,7 +85,7 @@ class BIM_Library: def GetResources(self): return { "Pixmap": "BIM_Library", - "MenuText": QT_TRANSLATE_NOOP("BIM_Library", "Objects library"), + "MenuText": QT_TRANSLATE_NOOP("BIM_Library", "Objects Library"), "ToolTip": QT_TRANSLATE_NOOP("BIM_Library", "Opens the objects library"), } @@ -308,7 +308,7 @@ class BIM_Library_TaskPanel: try: # check if the working document is saved if FreeCAD.getDocument(self.mainDocName).FileName == "": - FreeCAD.Console.PrintWarning(translate("BIM","Please save the working file before linking.")+"\n") + FreeCAD.Console.PrintWarning(translate("BIM","Save the working file before linking.")+"\n") else: self.previewOn = PARAMS.GetBool("3DPreview", False) self.linked = True @@ -501,7 +501,7 @@ class BIM_Library_TaskPanel: templibfile = os.path.join(TEMPLIBPATH, LIBINDEXFILE) if not os.path.exists(templibfile): FreeCAD.Console.PrintError( - translate("BIM", "No structure in cache. Please refresh.") + "\n" + translate("BIM", "No structure in cache. Refresh required.") + "\n" ) return {} import sys @@ -794,7 +794,7 @@ class BIM_Library_TaskPanel: j = json.loads(r.content) if j["truncated"]: print( - "WARNING: The fetched content exceeds maximum Github allowance and is truncated" + "WARNING: The fetched content exceeds maximum GitHub allowance and is truncated" ) t = j["tree"] for f in t: @@ -1029,7 +1029,7 @@ if FreeCAD.GuiUp: from PySide import QtCore, QtGui class LibraryModel(QtGui.QFileSystemModel): - "a custom QFileSystemModel that displays freecad file icons" + "a custom QFileSystemModel that displays FreeCAD file icons" def __init__(self): diff --git a/src/Mod/BIM/bimcommands/BimMaterial.py b/src/Mod/BIM/bimcommands/BimMaterial.py index 68fd274deb..dcbbd9f018 100644 --- a/src/Mod/BIM/bimcommands/BimMaterial.py +++ b/src/Mod/BIM/bimcommands/BimMaterial.py @@ -102,7 +102,7 @@ class BIM_Material: searchLayout = QtGui.QHBoxLayout() searchLayout.setSpacing(2) searchBox = MatLineEdit(self.dlg) - searchBox.setPlaceholderText(translate("BIM", "Search...")) + searchBox.setPlaceholderText(translate("BIM", "Search…")) searchBox.setToolTip(translate("BIM", "Searches object labels")) self.dlg.searchBox = searchBox searchLayout.addWidget(searchBox) @@ -184,7 +184,7 @@ class BIM_Material: context1.triggered.connect(self.onStartRename) context2 = self.contextMenu.addAction(translate("BIM", "Duplicate")) context2.triggered.connect(self.onDuplicate) - context3 = self.contextMenu.addAction(translate("BIM", "Merge to...")) + context3 = self.contextMenu.addAction(translate("BIM", "Merge To…")) context3.triggered.connect(self.onMergeTo) context4 = self.contextMenu.addAction(translate("BIM", "Delete")) context4.triggered.connect(self.onDelete) @@ -629,7 +629,7 @@ class Arch_MaterialToolsCommand: def GetCommands(self): return tuple(['Arch_Material','Arch_MultiMaterial']) def GetResources(self): - return { 'MenuText': QT_TRANSLATE_NOOP("Arch_MaterialTools",'Material tools'), + return { 'MenuText': QT_TRANSLATE_NOOP("Arch_MaterialTools",'Material Tools'), 'ToolTip': QT_TRANSLATE_NOOP("Arch_MaterialTools",'Material tools') } def IsActive(self): diff --git a/src/Mod/BIM/bimcommands/BimMoveView.py b/src/Mod/BIM/bimcommands/BimMoveView.py index 8047aed758..1c64ac763b 100644 --- a/src/Mod/BIM/bimcommands/BimMoveView.py +++ b/src/Mod/BIM/bimcommands/BimMoveView.py @@ -35,7 +35,7 @@ class BIM_MoveView: def GetResources(self): return { "Pixmap": "BIM_MoveView", - "MenuText": QT_TRANSLATE_NOOP("BIM_MoveView", "Move view..."), + "MenuText": QT_TRANSLATE_NOOP("BIM_MoveView", "Move View"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_MoveView", "Moves this view to an existing page" ), diff --git a/src/Mod/BIM/bimcommands/BimOffset.py b/src/Mod/BIM/bimcommands/BimOffset.py index ed21b974c1..975ff2c0e5 100644 --- a/src/Mod/BIM/bimcommands/BimOffset.py +++ b/src/Mod/BIM/bimcommands/BimOffset.py @@ -34,7 +34,7 @@ class BIM_Offset2D: def GetResources(self): return {"Pixmap":"Part_Offset2D", - "MenuText": QT_TRANSLATE_NOOP("Part_Offset2D", "2D Offset..."), + "MenuText": QT_TRANSLATE_NOOP("Part_Offset2D", "2D Offset"), "ToolTip": QT_TRANSLATE_NOOP( "Part_Offset2D", "Utility to offset planar shapes" ), diff --git a/src/Mod/BIM/bimcommands/BimPanel.py b/src/Mod/BIM/bimcommands/BimPanel.py index bd9d8dff3b..66d3dee306 100644 --- a/src/Mod/BIM/bimcommands/BimPanel.py +++ b/src/Mod/BIM/bimcommands/BimPanel.py @@ -478,7 +478,7 @@ class Arch_PanelGroup: return tuple(['Arch_Panel','Arch_Panel_Cut','Arch_Panel_Sheet','Arch_Nest']) def GetResources(self): - return { 'MenuText': QT_TRANSLATE_NOOP("Arch_PanelTools",'Panel tools'), + return { 'MenuText': QT_TRANSLATE_NOOP("Arch_PanelTools",'Panel Tools'), 'ToolTip': QT_TRANSLATE_NOOP("Arch_PanelTools",'Panel tools') } diff --git a/src/Mod/BIM/bimcommands/BimPipe.py b/src/Mod/BIM/bimcommands/BimPipe.py index 4b6be50799..69d37cc682 100644 --- a/src/Mod/BIM/bimcommands/BimPipe.py +++ b/src/Mod/BIM/bimcommands/BimPipe.py @@ -42,7 +42,7 @@ class Arch_Pipe: return {'Pixmap' : 'Arch_Pipe', 'MenuText': QT_TRANSLATE_NOOP("Arch_Pipe","Pipe"), 'Accel': "P, I", - 'ToolTip': QT_TRANSLATE_NOOP("Arch_Pipe","Creates a pipe object from a given Wire or Line")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_Pipe","Creates a pipe object from a given wire or line")} def IsActive(self): @@ -93,12 +93,12 @@ class Arch_PipeConnector: import Draft s = FreeCADGui.Selection.getSelection() if not (len(s) in [2,3]): - FreeCAD.Console.PrintError(translate("Arch","Please select exactly 2 or 3 Pipe objects")+"\n") + FreeCAD.Console.PrintError(translate("Arch","Select exactly 2 or 3 pipe objects")+"\n") return o = "[" for obj in s: if Draft.getType(obj) != "Pipe": - FreeCAD.Console.PrintError(translate("Arch","Please select only Pipe objects")+"\n") + FreeCAD.Console.PrintError(translate("Arch","Select only pipe objects")+"\n") return o += "FreeCAD.ActiveDocument."+obj.Name+"," o += "]" @@ -116,7 +116,7 @@ class Arch_PipeGroupCommand: def GetCommands(self): return tuple(['Arch_Pipe','Arch_PipeConnector']) def GetResources(self): - return { 'MenuText': QT_TRANSLATE_NOOP("Arch_PipeTools",'Pipe tools'), + return { 'MenuText': QT_TRANSLATE_NOOP("Arch_PipeTools",'Pipe Tools'), 'ToolTip': QT_TRANSLATE_NOOP("Arch_PipeTools",'Pipe tools') } def IsActive(self): diff --git a/src/Mod/BIM/bimcommands/BimPreflight.py b/src/Mod/BIM/bimcommands/BimPreflight.py index 5f29d28b3a..00b178e02d 100644 --- a/src/Mod/BIM/bimcommands/BimPreflight.py +++ b/src/Mod/BIM/bimcommands/BimPreflight.py @@ -61,7 +61,7 @@ class BIM_Preflight: def GetResources(self): return { "Pixmap": "BIM_Preflight", - "MenuText": QT_TRANSLATE_NOOP("BIM_Preflight", "Preflight checks..."), + "MenuText": QT_TRANSLATE_NOOP("BIM_Preflight", "Preflight Checks"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_Preflight", "Checks several characteristics of this model before exporting to IFC", @@ -315,7 +315,7 @@ class BIM_Preflight_TaskPanel: msg = ( translate( "BIM", - "ifcopenshell is not installed on your system or not available to FreeCAD. This library is responsible for IFC support in FreeCAD, and therefore IFC support is currently disabled. Check %1 to obtain more information.", + "ifcopenshell is not installed on the system or not available to FreeCAD. This library is responsible for IFC support in FreeCAD, and therefore IFC support is currently disabled. Check %1 to obtain more information.", ).replace("%1", "https://www.freecadweb.org/wiki/Extra_python_modules#IfcOpenShell") + " " ) @@ -342,7 +342,7 @@ class BIM_Preflight_TaskPanel: msg = ( translate( "BIM", - "The version of Ifcopenshell installed on your system could not be parsed", + "The version of Ifcopenshell installed on the system could not be parsed", ) + " " ) @@ -354,7 +354,7 @@ class BIM_Preflight_TaskPanel: msg += ( translate( "BIM", - "The version of Ifcopenshell installed on your system will produce files with this schema version:", + "The version of Ifcopenshell installed on the system will produce files with this schema version:", ) + "\n\n" ) @@ -466,7 +466,7 @@ class BIM_Preflight_TaskPanel: msg += ( translate( "BIM", - "The following Building objects have been found to not be included in any Site. You can resolve the situation by creating a Site object, if none is present in your model, and drag and drop the Building objects into it in the tree view:", + "The following building objects have been found to not be included in any Site. You can resolve the situation by creating a Site object, if none is present in your model, and drag and drop the building objects into it in the tree view:", ) + "\n\n" ) @@ -516,7 +516,7 @@ class BIM_Preflight_TaskPanel: msg += ( translate( "BIM", - 'The following Building Storey (BuildingParts with their IFC role set as "Building Storey") objects have been found to not be included in any Building. You can resolve the situation by creating a Building object, if none is present in your model, and drag and drop the Building Storey objects into it in the tree view:', + 'The following building storey (building parts with their IFC role set as "building storey") objects have been found to not be included in any building. Resolve the situation by creating a building object, if none is present in the model, and drag and drop the building storey objects into it in the tree view:', ) + "\n\n" ) @@ -577,7 +577,7 @@ class BIM_Preflight_TaskPanel: msg += ( translate( "BIM", - 'The following BIM objects have been found to not be included in any Building Storey (BuildingParts with their IFC role set as "Building Storey"). You can resolve the situation by creating a Building Storey object, if none is present in your model, and drag and drop these objects into it in the tree view:', + 'The following BIM objects have been found to not be included in any building storey (building parts with their IFC role set as "building storey"). Resolve the situation by creating a building storey object, if none is present in the model, and drag and drop these objects into it in the tree view:', ) + "\n\n" ) @@ -719,7 +719,7 @@ class BIM_Preflight_TaskPanel: msg += ( translate( "BIM", - "The objects below have Length, Width or Height properties, but these properties won't be explicitly exported to IFC. This is not necessarily an issue, unless you specifically want these quantities to be exported:", + "The objects below have length, width or height properties, but these properties won't be explicitly exported to IFC. This is not necessarily an issue, unless these quantities are desired to be exported:", ) + "\n\n" ) @@ -727,7 +727,7 @@ class BIM_Preflight_TaskPanel: msg += o.Label + "\n" msg += "\n" + translate( "BIM", - "To enable exporting of these quantities, use the IFC quantities manager tool located under menu Manage -> Manage IFC Quantities...", + "To enable exporting of these quantities, use the IFC quantities manager tool located under menu Manage -> Manage IFC Quantities", ) if msg: self.failed(test) @@ -803,7 +803,7 @@ class BIM_Preflight_TaskPanel: msg += o.Label + "\n" msg += "\n" + translate( "BIM", - "To add common property sets to these objects, use the IFC properties manager tool located under menu Manage -> Manage IFC Properties...", + "To add common property sets to these objects, use the IFC properties manager tool located under menu Manage -> Manage IFC Properties", ) if msg: self.failed(test) @@ -895,7 +895,7 @@ class BIM_Preflight_TaskPanel: ) msg += translate( "BIM", - "To fix the property sets of these objects, use the IFC properties manager tool located under menu Manage -> Manage IFC Properties...", + "To fix the property sets of these objects, use the IFC properties manager tool located under menu Manage -> Manage IFC Properties", ) if msg: self.failed(test) @@ -1121,7 +1121,7 @@ class BIM_Preflight_TaskPanel: "\n" + translate( "BIM", - 'An additional object, called "TinyLinesResult" has been added to this model, and selected. It contains all the tiny lines found, so you can inspect them and fix the needed objects. Be sure to delete the TinyLinesResult object when you are done!', + 'An additional object, called "TinyLinesResult" has been added to this model, and selected. It contains all the tiny lines found, for inspection. Be sure to delete the TinyLinesResult object when done!', ) + "\n\n" ) diff --git a/src/Mod/BIM/bimcommands/BimProject.py b/src/Mod/BIM/bimcommands/BimProject.py index a28646476b..f5b935b67e 100644 --- a/src/Mod/BIM/bimcommands/BimProject.py +++ b/src/Mod/BIM/bimcommands/BimProject.py @@ -37,7 +37,7 @@ class BIM_Project: "Pixmap": "BIM_Project", "MenuText": QT_TRANSLATE_NOOP("BIM_Project", "Project"), "ToolTip": QT_TRANSLATE_NOOP("BIM_Project", - "Create an empty NativeIFC project"), + "Creates an empty NativeIFC project"), } def IsActive(self): diff --git a/src/Mod/BIM/bimcommands/BimProjectManager.py b/src/Mod/BIM/bimcommands/BimProjectManager.py index ebde0fd12b..0f12a59e27 100644 --- a/src/Mod/BIM/bimcommands/BimProjectManager.py +++ b/src/Mod/BIM/bimcommands/BimProjectManager.py @@ -40,9 +40,9 @@ class BIM_ProjectManager: return { "Pixmap": "BIM_ProjectManager", - "MenuText": QT_TRANSLATE_NOOP("BIM_ProjectManager", "Setup project..."), + "MenuText": QT_TRANSLATE_NOOP("BIM_ProjectManager", "Setup Project…"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_ProjectManager", "Create or manage a BIM project" + "BIM_ProjectManager", "Creates or manages a BIM project" ), } @@ -482,7 +482,7 @@ class BIM_ProjectManager: def fillPresets(self): self.form.presets.clear() - self.form.presets.addItem(translate("BIM", "User preset...")) + self.form.presets.addItem(translate("BIM", "User preset")) presetdir = os.path.join(FreeCAD.getUserAppDataDir(), "BIM") if os.path.isdir(presetdir): for f in os.listdir(presetdir): @@ -793,7 +793,7 @@ class BIM_ProjectManager: ) FreeCAD.Console.PrintMessage( - translate("BIM", "Template successfully loaded into current document") + translate("BIM", "Template successfully loaded into the current document") + "\n" ) self.reject() diff --git a/src/Mod/BIM/bimcommands/BimRebar.py b/src/Mod/BIM/bimcommands/BimRebar.py index 0c2bbd418a..d59fdc7282 100644 --- a/src/Mod/BIM/bimcommands/BimRebar.py +++ b/src/Mod/BIM/bimcommands/BimRebar.py @@ -42,7 +42,7 @@ class Arch_Rebar: return {'Pixmap' : 'Arch_Rebar', 'MenuText': QT_TRANSLATE_NOOP("Arch_Rebar","Custom Rebar"), 'Accel': "R, B", - 'ToolTip': QT_TRANSLATE_NOOP("Arch_Rebar","Creates a Reinforcement bar from the selected face of solid object and/or a sketch")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_Rebar","Creates a reinforcement bar from the selected face of solid object and/or a sketch")} def IsActive(self): @@ -90,7 +90,7 @@ class Arch_Rebar: FreeCAD.ActiveDocument.recompute() return - FreeCAD.Console.PrintMessage(translate("Arch","Please select a base face on a structural object")+"\n") + FreeCAD.Console.PrintMessage(translate("Arch","Select a base face on a structural object")+"\n") FreeCADGui.Control.closeDialog() FreeCADGui.Control.showDialog(ArchComponent.SelectionTaskPanel()) FreeCAD.ArchObserver = ArchComponent.ArchSelectionObserver(nextCommand="Arch_Rebar") diff --git a/src/Mod/BIM/bimcommands/BimReextrude.py b/src/Mod/BIM/bimcommands/BimReextrude.py index 2258f25422..71d263e213 100644 --- a/src/Mod/BIM/bimcommands/BimReextrude.py +++ b/src/Mod/BIM/bimcommands/BimReextrude.py @@ -35,9 +35,9 @@ class BIM_Reextrude: def GetResources(self): return { "Pixmap": "BIM_Reextrude", - "MenuText": QT_TRANSLATE_NOOP("BIM_Reextrude", "Reextrude"), + "MenuText": QT_TRANSLATE_NOOP("BIM_Reextrude", "Re-Extrude"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_Reextrude", "Recreates an extruded Structure from a selected face" + "BIM_Reextrude", "Recreates an extruded structure from a selected face" ), } @@ -159,7 +159,7 @@ class BIM_Reextrude: else: FreeCAD.Console.PrintError( - translate("BIM", "Error: Please select exactly one base face") + "\n" + translate("BIM", "Error: Select exactly one base face") + "\n" ) diff --git a/src/Mod/BIM/bimcommands/BimReference.py b/src/Mod/BIM/bimcommands/BimReference.py index 1e6cb9d149..5c79c269a0 100644 --- a/src/Mod/BIM/bimcommands/BimReference.py +++ b/src/Mod/BIM/bimcommands/BimReference.py @@ -40,7 +40,7 @@ class Arch_Reference: def GetResources(self): return {'Pixmap' : 'Arch_Reference', - 'MenuText': QT_TRANSLATE_NOOP("Arch_Reference","External reference"), + 'MenuText': QT_TRANSLATE_NOOP("Arch_Reference","External Reference"), 'Accel': "E, X", 'ToolTip': QT_TRANSLATE_NOOP("Arch_Reference","Creates an external reference object")} diff --git a/src/Mod/BIM/bimcommands/BimReorder.py b/src/Mod/BIM/bimcommands/BimReorder.py index 825e2a7c28..6bbe6d1cdd 100644 --- a/src/Mod/BIM/bimcommands/BimReorder.py +++ b/src/Mod/BIM/bimcommands/BimReorder.py @@ -35,10 +35,10 @@ class BIM_Reorder: def GetResources(self): return { "Pixmap": "BIM_Reorder", - "MenuText": QT_TRANSLATE_NOOP("BIM_Reorder", "Reorder children"), + "MenuText": QT_TRANSLATE_NOOP("BIM_Reorder", "Reorder Children"), # 'Accel': "R, D", "ToolTip": QT_TRANSLATE_NOOP( - "BIM_Reorder", "Reorder children of selected object" + "BIM_Reorder", "Reorders children of the selected object" ), } diff --git a/src/Mod/BIM/bimcommands/BimResetCloneColors.py b/src/Mod/BIM/bimcommands/BimResetCloneColors.py index 1a4b558ba1..bd57d55951 100644 --- a/src/Mod/BIM/bimcommands/BimResetCloneColors.py +++ b/src/Mod/BIM/bimcommands/BimResetCloneColors.py @@ -35,7 +35,7 @@ class BIM_ResetCloneColors: def GetResources(self): return { "Pixmap": "BIM_ResetCloneColors", - "MenuText": QT_TRANSLATE_NOOP("BIM_ResetCloneColors", "Reset colors"), + "MenuText": QT_TRANSLATE_NOOP("BIM_ResetCloneColors", "Reset Colors"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_ResetCloneColors", "Resets the colors of this object from its cloned original", diff --git a/src/Mod/BIM/bimcommands/BimSetup.py b/src/Mod/BIM/bimcommands/BimSetup.py index 7f08f42bfd..f7f843eb79 100644 --- a/src/Mod/BIM/bimcommands/BimSetup.py +++ b/src/Mod/BIM/bimcommands/BimSetup.py @@ -39,9 +39,9 @@ class BIM_Setup: def GetResources(self): return { "Pixmap": ":icons/preferences-system.svg", - "MenuText": QT_TRANSLATE_NOOP("BIM_Setup", "BIM Setup..."), + "MenuText": QT_TRANSLATE_NOOP("BIM_Setup", "BIM Setup"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_Setup", "Set some common FreeCAD preferences for BIM workflow" + "BIM_Setup", "Sets common FreeCAD preferences for a BIM workflow" ), } @@ -140,7 +140,7 @@ class BIM_Setup: + ",".join(m) + ". " + translate( - "BIM", "You can install them from menu Tools -> Addon manager." + "BIM", "Install them from menu Tools -> Addon Manager." ) ) self.form.labelMissingWorkbenches.setText(t) @@ -657,7 +657,7 @@ class BIM_Setup: translate("BIM", "IfcOpenShell not found"), translate( "BIM", - "IfcOpenShell is needed to import and export IFC files. It appears to be missing on your system. Would you like to download and install it now? It will be installed in FreeCAD's Macros directory.", + "IfcOpenShell is needed to import and export IFC files. It appears to be missing on the system. Download and install it now? It will be installed in FreeCAD's macros directory.", ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.No, @@ -721,14 +721,14 @@ class BIM_Setup: break else: FreeCAD.Console.PrintWarning( - "Unable to find a build for your version therefore falling back to a pip install" + "Unable to find a build for this version, therefore falling back to a pip install" ) try: import pip except ModuleNotFoundError: FreeCAD.Console.PrintError( - "Please install pip on your system, restart FreeCAD," - " change to BIM Wb and use Utils menu > ifcOpenShell update" + "Pnstall pip on your system, restart FreeCAD," + " change to the BIM workbench and navigate the menu: Utils > ifcOpenShell Update" ) return from nativeifc import ifc_openshell diff --git a/src/Mod/BIM/bimcommands/BimShape2DView.py b/src/Mod/BIM/bimcommands/BimShape2DView.py index 6586f3cad2..02239b92e1 100644 --- a/src/Mod/BIM/bimcommands/BimShape2DView.py +++ b/src/Mod/BIM/bimcommands/BimShape2DView.py @@ -38,7 +38,7 @@ class BIM_Shape2DView(gui_shape2dview.Shape2DView): def GetResources(self): d = super().GetResources() d["Pixmap"] = "Arch_BuildingPart_Tree" - d["MenuText"] = QT_TRANSLATE_NOOP("BIM_Shape2DView", "Section view") + d["MenuText"] = QT_TRANSLATE_NOOP("BIM_Shape2DView", "Section View") d['Accel'] = "V, V" return d @@ -110,7 +110,7 @@ class BIM_Shape2DCut(BIM_Shape2DView): def GetResources(self): d = super().GetResources() d["Pixmap"] = "Arch_View_Cut" - d["MenuText"] = QT_TRANSLATE_NOOP("BIM_Shape2DView", "Section cut") + d["MenuText"] = QT_TRANSLATE_NOOP("BIM_Shape2DView", "Section Cut") d['Accel'] = "V, C" return d diff --git a/src/Mod/BIM/bimcommands/BimSimpleCopy.py b/src/Mod/BIM/bimcommands/BimSimpleCopy.py index 4f5a4d4b17..d9e2d95488 100644 --- a/src/Mod/BIM/bimcommands/BimSimpleCopy.py +++ b/src/Mod/BIM/bimcommands/BimSimpleCopy.py @@ -35,9 +35,9 @@ class BIM_SimpleCopy: def GetResources(self): return { "Pixmap": "Tree_Part", - "MenuText": QT_TRANSLATE_NOOP("BIM_SimpleCopy", "Create simple copy"), + "MenuText": QT_TRANSLATE_NOOP("BIM_SimpleCopy", "Create Simple Copy"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_SimpleCopy", "Create a simple non-parametric copy" + "BIM_SimpleCopy", "Creates a simple non-parametric copy" ), } diff --git a/src/Mod/BIM/bimcommands/BimSite.py b/src/Mod/BIM/bimcommands/BimSite.py index 251f14505c..bea052c76e 100644 --- a/src/Mod/BIM/bimcommands/BimSite.py +++ b/src/Mod/BIM/bimcommands/BimSite.py @@ -45,7 +45,7 @@ class Arch_Site: return {'Pixmap' : 'Arch_Site', 'MenuText': QT_TRANSLATE_NOOP("Arch_Site","Site"), 'Accel': "S, I", - 'ToolTip': QT_TRANSLATE_NOOP("Arch_Site","Creates a site including selected objects.")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_Site","Creates a site including selected objects")} def IsActive(self): diff --git a/src/Mod/BIM/bimcommands/BimTDView.py b/src/Mod/BIM/bimcommands/BimTDView.py index 777e0d9d48..3d898e5884 100644 --- a/src/Mod/BIM/bimcommands/BimTDView.py +++ b/src/Mod/BIM/bimcommands/BimTDView.py @@ -35,12 +35,12 @@ class BIM_TDView: def GetResources(self): return { "Pixmap": "BIM_InsertView", - "MenuText": QT_TRANSLATE_NOOP("BIM_TDView", "Insert view"), + "MenuText": QT_TRANSLATE_NOOP("BIM_TDView", "New View"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_TDView", "Inserts a drawing view on a page.\n" "To choose where to insert the view when multiple pages are available,\n" - "select both the view and the page before you execute the command.", + "select both the view and the page before executing the command.", ), 'Accel': "V, I", } @@ -70,7 +70,7 @@ class BIM_TDView: FreeCAD.Console.PrintError( translate( "BIM", - "No section view or Draft objects selected, or no page selected, or no page found in document", + "No section view, Draft object, or page found or selected in the document", ) + "\n" ) diff --git a/src/Mod/BIM/bimcommands/BimTogglePanels.py b/src/Mod/BIM/bimcommands/BimTogglePanels.py index d5dc898d6e..05c03dad31 100644 --- a/src/Mod/BIM/bimcommands/BimTogglePanels.py +++ b/src/Mod/BIM/bimcommands/BimTogglePanels.py @@ -37,9 +37,9 @@ class BIM_TogglePanels: def GetResources(self): return { "Pixmap": "BIM_TogglePanels", - "MenuText": QT_TRANSLATE_NOOP("BIM_TogglePanels", "Toggle bottom panels"), + "MenuText": QT_TRANSLATE_NOOP("BIM_TogglePanels", "Toggle Bottom Panels"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_TogglePanels", "Toggle bottom dock panels on/off" + "BIM_TogglePanels", "Toggles bottom dock panels on/off" ), "Accel": "Ctrl+0", } diff --git a/src/Mod/BIM/bimcommands/BimTrash.py b/src/Mod/BIM/bimcommands/BimTrash.py index b073155c9c..ddec6525af 100644 --- a/src/Mod/BIM/bimcommands/BimTrash.py +++ b/src/Mod/BIM/bimcommands/BimTrash.py @@ -38,7 +38,7 @@ class BIM_Trash: "Pixmap": "BIM_Trash", "MenuText": QT_TRANSLATE_NOOP("BIM_Trash", "Move to Trash"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_Trash", "Moves the selected objects to the Trash folder" + "BIM_Trash", "Moves the selected objects to the trash folder" ), "Accel": "Shift+Del", } @@ -76,7 +76,7 @@ class BIM_EmptyTrash: def GetResources(self): return { "Pixmap": "BIM_Trash", - "MenuText": QT_TRANSLATE_NOOP("BIM_EmptyTrash", "Clean Trash"), + "MenuText": QT_TRANSLATE_NOOP("BIM_EmptyTrash", "Empty Trash"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_EmptyTrash", "Deletes from the trash bin all objects that are not used by any other", diff --git a/src/Mod/BIM/bimcommands/BimTruss.py b/src/Mod/BIM/bimcommands/BimTruss.py index b2d27e08b2..5a2595e232 100644 --- a/src/Mod/BIM/bimcommands/BimTruss.py +++ b/src/Mod/BIM/bimcommands/BimTruss.py @@ -42,7 +42,7 @@ class Arch_Truss: return {'Pixmap' : 'Arch_Truss', 'MenuText': QT_TRANSLATE_NOOP("Arch_Truss","Truss"), 'Accel': "T, U", - 'ToolTip': QT_TRANSLATE_NOOP("Arch_Truss","Creates a truss object from selected line or from scratch")} + 'ToolTip': QT_TRANSLATE_NOOP("Arch_Truss","Creates a truss object from the selected line or from scratch")} def IsActive(self): @@ -54,7 +54,7 @@ class Arch_Truss: self.doc = FreeCAD.ActiveDocument sel = FreeCADGui.Selection.getSelection() if len(sel) > 1: - FreeCAD.Console.PrintError(translate("Arch","Please select only one base object or none")+"\n") + FreeCAD.Console.PrintError(translate("Arch","Select only one base object or none")+"\n") elif len(sel) == 1: # build on selection basename = "FreeCAD.ActiveDocument."+FreeCADGui.Selection.getSelection()[0].Name diff --git a/src/Mod/BIM/bimcommands/BimTutorial.py b/src/Mod/BIM/bimcommands/BimTutorial.py index 24fefe5ab5..582dc38db5 100644 --- a/src/Mod/BIM/bimcommands/BimTutorial.py +++ b/src/Mod/BIM/bimcommands/BimTutorial.py @@ -133,7 +133,7 @@ class BIM_Tutorial: FreeCAD.Console.PrintError( translate( "BIM", - "Unable to access the tutorial. Verify that you are online (This is needed only once).", + "Unable to access the tutorial. Verify the internet connection (This is needed only once).", ) + "\n" ) @@ -163,7 +163,7 @@ class BIM_Tutorial: # download images (QTextEdit cannot load online images) self.form.textEdit.setHtml( - html.replace("inserthere", translate("BIM", "Downloading images...")) + html.replace("inserthere", translate("BIM", "Downloading images…")) ) nd = [] for descr in self.descriptions: diff --git a/src/Mod/BIM/bimcommands/BimUnclone.py b/src/Mod/BIM/bimcommands/BimUnclone.py index 29cabdc532..37a76d2405 100644 --- a/src/Mod/BIM/bimcommands/BimUnclone.py +++ b/src/Mod/BIM/bimcommands/BimUnclone.py @@ -39,7 +39,7 @@ class BIM_Unclone: "MenuText": QT_TRANSLATE_NOOP("BIM_Unclone", "Unclone"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_Unclone", - "Makes a selected clone object independent from its original", + "Creates a selected clone object independent from its original", ), } @@ -131,7 +131,7 @@ class BIM_Unclone: elif Draft.getType(obj) == "Clone": FreeCAD.Console.PrintError( - translate("BIM", "Draft Clones are not supported yet!") + "\n" + translate("BIM", "Draft clones are not supported yet!") + "\n" ) else: FreeCAD.Console.PrintError( @@ -139,7 +139,7 @@ class BIM_Unclone: ) else: FreeCAD.Console.PrintError( - translate("BIM", "Please select exactly one object") + "\n" + translate("BIM", "Select exactly one object") + "\n" ) diff --git a/src/Mod/BIM/bimcommands/BimUngroup.py b/src/Mod/BIM/bimcommands/BimUngroup.py index 3aad62d18f..78bf4bb8db 100644 --- a/src/Mod/BIM/bimcommands/BimUngroup.py +++ b/src/Mod/BIM/bimcommands/BimUngroup.py @@ -35,7 +35,7 @@ class BIM_Ungroup: def GetResources(self): return { "Pixmap": "Draft_AddToGroup", - "MenuText": QT_TRANSLATE_NOOP("BIM_Convert", "Remove from group"), + "MenuText": QT_TRANSLATE_NOOP("BIM_Convert", "Remove From Group"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_Convert", "Removes this object from its parent group" ), diff --git a/src/Mod/BIM/bimcommands/BimViews.py b/src/Mod/BIM/bimcommands/BimViews.py index 64cae3cc5d..f56e18300e 100644 --- a/src/Mod/BIM/bimcommands/BimViews.py +++ b/src/Mod/BIM/bimcommands/BimViews.py @@ -41,7 +41,7 @@ class BIM_Views: def GetResources(self): return { "Pixmap": "BIM_Views", - "MenuText": QT_TRANSLATE_NOOP("BIM_Views", "Views manager"), + "MenuText": QT_TRANSLATE_NOOP("BIM_Views", "Views Manager"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_Views", "Shows or hides the views manager" ), @@ -119,7 +119,7 @@ class BIM_Views: # set tooltips self.dialog.buttonAddLevel.setToolTip(translate("BIM","Creates a new level")) - self.dialog.buttonAddProxy.setToolTip(translate("BIM","Creates a new Working Plane Proxy")) + self.dialog.buttonAddProxy.setToolTip(translate("BIM","Creates a new working plane proxy")) self.dialog.buttonDelete.setToolTip(translate("BIM","Deletes the selected item")) self.dialog.buttonToggle.setToolTip(translate("BIM","Toggles selected items on/off")) self.dialog.buttonIsolate.setToolTip(translate("BIM","Turns all items off except the selected ones")) diff --git a/src/Mod/BIM/bimcommands/BimWPCommands.py b/src/Mod/BIM/bimcommands/BimWPCommands.py index 79ee68b008..0b1bf710fd 100644 --- a/src/Mod/BIM/bimcommands/BimWPCommands.py +++ b/src/Mod/BIM/bimcommands/BimWPCommands.py @@ -37,7 +37,7 @@ class BIM_SetWPFront: "Pixmap": "view-front.svg", "MenuText": QT_TRANSLATE_NOOP("BIM_SetWPFront", "Working Plane Front"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_SetWPFront", "Set the working plane to Front" + "BIM_SetWPFront", "Sets the working plane to Front" ), "Accel": "W,P,1", } @@ -54,7 +54,7 @@ class BIM_SetWPSide: "Pixmap": "view-right.svg", "MenuText": QT_TRANSLATE_NOOP("BIM_SetWPSide", "Working Plane Side"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_SetWPSide", "Set the working plane to Side" + "BIM_SetWPSide", "Sets the working plane to Side" ), "Accel": "W,P,3", } @@ -71,7 +71,7 @@ class BIM_SetWPTop: "Pixmap": "view-top.svg", "MenuText": QT_TRANSLATE_NOOP("BIM_SetWPTop", "Working Plane Top"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_SetWPTop", "Set the working plane to Top" + "BIM_SetWPTop", "Sets the working plane to Top" ), "Accel": "W,P,2", } diff --git a/src/Mod/BIM/bimcommands/BimWall.py b/src/Mod/BIM/bimcommands/BimWall.py index bfa3293d48..babbe06235 100644 --- a/src/Mod/BIM/bimcommands/BimWall.py +++ b/src/Mod/BIM/bimcommands/BimWall.py @@ -283,7 +283,7 @@ class Arch_Wall: # Wall presets input comboWallPresets = QtGui.QComboBox() - comboWallPresets.addItem(translate("Arch","Wall Presets...")) + comboWallPresets.addItem(translate("Arch","Wall Presets")) comboWallPresets.setToolTip(translate("Arch","This list shows all the MultiMaterials objects of this document. Create some to define wall types.")) self.multimats = [] self.MultiMat = None diff --git a/src/Mod/BIM/bimcommands/BimWelcome.py b/src/Mod/BIM/bimcommands/BimWelcome.py index e95f403863..6055e49582 100644 --- a/src/Mod/BIM/bimcommands/BimWelcome.py +++ b/src/Mod/BIM/bimcommands/BimWelcome.py @@ -36,9 +36,9 @@ class BIM_Welcome: def GetResources(self): return { "Pixmap": "BIM_Welcome.svg", - "MenuText": QT_TRANSLATE_NOOP("BIM_Welcome", "BIM Welcome screen"), + "MenuText": QT_TRANSLATE_NOOP("BIM_Welcome", "BIM Welcome Screen"), "ToolTip": QT_TRANSLATE_NOOP( - "BIM_Welcome", "Show the BIM workbench welcome screen" + "BIM_Welcome", "Shows the BIM workbench welcome screen" ), } diff --git a/src/Mod/BIM/bimcommands/BimWindows.py b/src/Mod/BIM/bimcommands/BimWindows.py index 79f7832364..4fb31b6014 100644 --- a/src/Mod/BIM/bimcommands/BimWindows.py +++ b/src/Mod/BIM/bimcommands/BimWindows.py @@ -35,10 +35,10 @@ class BIM_Windows: def GetResources(self): return { "Pixmap": "BIM_Windows", - "MenuText": QT_TRANSLATE_NOOP("BIM_Windows", "Manage doors and windows..."), + "MenuText": QT_TRANSLATE_NOOP("BIM_Windows", "Manage Doors and Windows"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_Windows", - "Manage the different doors and windows of your BIM project", + "Manages the different doors and windows of the BIM project", ), } diff --git a/src/Mod/BIM/importers/importIFClegacy.py b/src/Mod/BIM/importers/importIFClegacy.py index 97f8e2c30c..8731faaaaf 100644 --- a/src/Mod/BIM/importers/importIFClegacy.py +++ b/src/Mod/BIM/importers/importIFClegacy.py @@ -121,7 +121,7 @@ def getIfcOpenShell(): try: import ifc_wrapper as IfcImport except ImportError: - FreeCAD.Console.PrintMessage(translate("Arch","Couldn't locate IfcOpenShell")+"\n") + FreeCAD.Console.PrintMessage(translate("Arch","Could not locate IfcOpenShell")+"\n") return False else: IFCOPENSHELL5 = True @@ -730,7 +730,7 @@ def getShape(obj,objid): except Exception: if DEBUG: print(" failed to retrieve solid from object ",objid) else: - if DEBUG: print(" object ", objid, " doesn't contain any geometry") + if DEBUG: print(" object ", objid, " does not contain any geometry") if not IFCOPENSHELL5: m = obj.matrix mat = FreeCAD.Matrix(m[0], m[3], m[6], m[9], @@ -947,7 +947,7 @@ def export(exportList,filename): if (not hasattr(ifcw,"IfcFile")) and (not hasattr(ifcw,"file")): FreeCAD.Console.PrintError(translate("Arch","Error: your IfcOpenShell version is too old")+"\n") - print("""importIFC: The version of IfcOpenShell installed on this system doesn't + print("""importIFC: The version of IfcOpenShell installed on this system does not have IFC export capabilities. IFC export currently requires an experimental version of IfcOpenShell available from https://github.com/aothms/IfcOpenShell""") return diff --git a/src/Mod/BIM/importers/importSH3DHelper.py b/src/Mod/BIM/importers/importSH3DHelper.py index b01e6f2c36..757a2ebbe7 100644 --- a/src/Mod/BIM/importers/importSH3DHelper.py +++ b/src/Mod/BIM/importers/importSH3DHelper.py @@ -256,7 +256,7 @@ class SH3DImporter: self._setup_handlers() if self.progress_bar: - self.progress_bar.start(f"Importing SweetHome 3D Home. Please wait ...", -1) + self.progress_bar.start(f"Importing SweetHome 3D Home. Standby…", -1) self._import_home(ET.fromstring(home)) def import_sh3d_from_filename(self, filename:str): @@ -276,7 +276,7 @@ class SH3DImporter: self._setup_handlers() if self.progress_bar: - self.progress_bar.start(f"Importing SweetHome 3D file '{self.filename}'. Please wait ...", -1) + self.progress_bar.start(f"Importing SweetHome 3D file '{self.filename}'. Standby…", -1) with zipfile.ZipFile(self.filename, 'r') as zip: self.zip = zip entries = zip.namelist() @@ -287,7 +287,7 @@ class SH3DImporter: def _import_home(self, home): doc = App.ActiveDocument self.total_object_count = self._get_object_count(home) - _msg(f"Importing home '{home.get('name')}' ...") + _msg(f"Importing home '{home.get('name')}'…") # Create the groups to organize the different resources together self._create_groups() @@ -306,7 +306,7 @@ class SH3DImporter: else: # Has the default floor already been created from a # previous import? - if self.preferences["DEBUG_GEOMETRY"]: _log("No level defined. Using default level ...") + if self.preferences["DEBUG_GEOMETRY"]: _log("No level defined. Using default level…") self.default_floor = self.fc_objects.get('Level') if 'Level' in self.fc_objects else self._create_default_floor() # Importing elements ... @@ -360,7 +360,7 @@ class SH3DImporter: Gui.runCommand('Render_View', 0) self._refresh() - _msg(f"Successfully imported home '{home.get('name')}' ...") + _msg(f"Successfully imported home '{home.get('name')}' …") def _get_object_count(self, home): """Get an approximate count of object to be imported @@ -595,10 +595,10 @@ class SH3DImporter: """ doc = App.ActiveDocument if self.preferences["IMPORT_CAMERAS"] and not doc.getObject("Cameras"): - _log(f"Creating Cameras group ...") + _log(f"Creating Cameras group…") doc.addObject("App::DocumentObjectGroup", "Cameras") if self.preferences["DEBUG_GEOMETRY"] and not doc.getObject("DEBUG_GEOMETRY"): - _log(f"Creating DEBUG_GEOMETRY group ...") + _log(f"Creating DEBUG_GEOMETRY group…") doc.addObject("App::DocumentObjectGroup", "DEBUG_GEOMETRY") def _setup_project(self, elm): @@ -722,12 +722,12 @@ class SH3DImporter: total_elements = len(elements) if self.progress_bar: self.progress_bar.stop() - self.progress_bar.start(f"Step {current_step}/{total_steps}: importing {total_elements} '{tag_name}' elements. Please wait ...", total_elements) - _msg(f"Importing {total_elements} '{tag_name}' elements ...") + self.progress_bar.start(f"Step {current_step}/{total_steps}: importing {total_elements} '{tag_name}' elements. Standby…", total_elements) + _msg(f"Importing {total_elements} '{tag_name}' elements…") handler = self.handlers[xpath] def _process(tuple): (i, elm) = tuple - _msg(f"Importing {tag_name}#{i} ({self.current_object_count + 1}/{self.total_object_count}) ...") + _msg(f"Importing {tag_name}#{i} ({self.current_object_count + 1}/{self.total_object_count})…") try: # with Transaction(f"Importing {tag_name}#{i}"): handler.process(parent, i, elm) @@ -821,13 +821,13 @@ class SH3DImporter: total_elements = len(floors) if self.progress_bar: self.progress_bar.stop() - self.progress_bar.start(f"Step {current_step}/{total_steps}: Creating {total_elements} 'slab' elements. Please wait ...", len(all_walls) + len(all_spaces)) + self.progress_bar.start(f"Step {current_step}/{total_steps}: Creating {total_elements} 'slab' elements. Standby…", len(all_walls) + len(all_spaces)) - _msg(f"Creating {total_elements} 'slab' elements ...") + _msg(f"Creating {total_elements} 'slab' elements…") handler = self.handlers[ET_XPATH_LEVEL] def _create_slab(tuple): (i, floor) = tuple - _msg(f"Creating slab#{i} for floor '{floor.Label}' ...") + _msg(f"Creating slab#{i} for floor '{floor.Label}'…") try: # with Transaction(f"Creating slab#{i} for floor '{floor.Label}'"): handler.create_slabs(floor, self.progress_bar) @@ -846,8 +846,8 @@ class SH3DImporter: if self.progress_bar: self.progress_bar.stop() - self.progress_bar.start(f"Decorating {total_elements} elements. Please wait ...", total_elements) - _msg(f"Decorating {total_elements} elements ...") + self.progress_bar.start(f"Decorating {total_elements} elements. Standby…", total_elements) + _msg(f"Decorating {total_elements} elements…") handler = self.handlers[ET_XPATH_ROOM] for i, space in enumerate(all_spaces): @@ -932,7 +932,7 @@ class BaseHandler: def get_wall_spine(self, wall): if not hasattr(wall, 'BaseObjects'): - _err(f"Wall {wall.Label} has no BaseObjects to get the Spine from...") + _err(f"Wall {wall.Label} has no BaseObjects to get the Spine from…") return wall.BaseObjects[2] def get_faces(self, wall): @@ -1180,7 +1180,7 @@ class LevelHandler(BaseHandler): Part.Feature: the extrusion used to later to fuse. """ if self.importer.preferences["DEBUG_GEOMETRY"]: - _log(f"Extruding {obj_to_extrude.Label} ...") + _log(f"Extruding {obj_to_extrude.Label}…") obj_to_extrude.recompute(True) projection = TechDraw.project(obj_to_extrude.Shape, Z_NORM)[0] face = Part.Face(Part.Wire(projection.Edges)) @@ -1258,7 +1258,7 @@ class RoomHandler(BaseHandler): level_id = elm.get('level', None) floor = self.get_floor(level_id) - assert floor != None, f"Missing floor '{level_id}' for '{elm.get('id')}' ..." + assert floor != None, f"Missing floor '{level_id}' for '{elm.get('id')}'…" space = face = None if self.importer.preferences["MERGE"]: @@ -1453,7 +1453,7 @@ class WallHandler(BaseHandler): """ level_id = elm.get('level', None) floor = self.get_floor(level_id) - assert floor != None, f"Missing floor '{level_id}' for '{elm.get('id')}' ..." + assert floor != None, f"Missing floor '{level_id}' for '{elm.get('id')}'…" wall = base_object = None if self.importer.preferences["MERGE"]: @@ -1576,7 +1576,7 @@ class WallHandler(BaseHandler): # ticket if sweep.Shape.isNull() or not sweep.Shape.isValid(): if is_wall_straight: - _log(f"Sweep's shape is invalid, using ruled surface instead ...") + _log(f"Sweep's shape is invalid, using ruled surface instead…") App.ActiveDocument.removeObject(sweep.Label) compound_solid, base_object = self._make_compound(section_start, section_end, spine) wall = Arch.makeWall(compound_solid) @@ -2197,7 +2197,7 @@ class DoorOrWindowHandler(BaseFurnitureHandler): door_id = f"{elm.get('id', elm.get('name'))}-{i}" level_id = elm.get('level', None) floor = self.get_floor(level_id) - assert floor != None, f"Missing floor '{level_id}' for '{door_id}' ..." + assert floor != None, f"Missing floor '{level_id}' for '{door_id}'…" feature = None @@ -2289,7 +2289,7 @@ class DoorOrWindowHandler(BaseFurnitureHandler): main_wall = extra_walls.pop(0) wall_width = main_wall.Width.Value if len(extra_walls) > 0: - _wrn(f"No main hosting wall for doorOrWindow#{elm.get('id')}. Defaulting to first hosting wall#{main_wall.Label} (w/ width {wall_width}) ...") + _wrn(f"No main hosting wall for doorOrWindow#{elm.get('id')}. Defaulting to first hosting wall#{main_wall.Label} (w/ width {wall_width})…") # Get the left and right face for the main_wall (_, wall_lface, _, wall_rface) = self.get_faces(main_wall) @@ -2304,7 +2304,7 @@ class DoorOrWindowHandler(BaseFurnitureHandler): # Determine the bounding box face bb_face, bb_face_normal = self._get_bb_face(dow_bounding_box, angle, label_prefix) if not bb_face: - _err(f"Weird: None of BoundingBox's faces for doorOrWindow#{elm.get('id')} has the expected angle ({angle}º). Can't create window.") + _err(f"Weird: None of BoundingBox's faces for doorOrWindow#{elm.get('id')} has the expected angle ({angle}º). Cannot create the window.") if debug_geometry: self._debug_shape(dow_bounding_box, f"{label_prefix}-missing-bb-face#{main_wall.Label}", RED) return None elif debug_geometry: @@ -2326,7 +2326,7 @@ class DoorOrWindowHandler(BaseFurnitureHandler): is_on_right = False wall_face = wall_lface if not self._same_dir(bb_face_normal, wall_lface_normal, 1): - _err(f"Weird: the extracted bb_normal {self._pv(bb_face_normal, True)} does not match neither the right face normal ({self._pv(wall_rface_normal, True)}) nor the left face normal ({self._pv(wall_lface_normal, True)}) of the wall {main_wall.Label}... The doorOrWindow might be slightly skewed. Defaulting to left face.") + _err(f"Weird: the extracted bb_normal {self._pv(bb_face_normal, True)} does not match neither the right face normal ({self._pv(wall_rface_normal, True)}) nor the left face normal ({self._pv(wall_lface_normal, True)}) of the wall {main_wall.Label}… The doorOrWindow might be slightly skewed. Defaulting to left face.") # Project the bounding_box face onto the wall projected_face = wall_face.makeParallelProjection(bb_face.OuterWire, bb_face_normal) @@ -2518,7 +2518,7 @@ class FurnitureHandler(BaseFurnitureHandler): furniture_id = self._get_furniture_id(i, elm) level_id = elm.get('level', None) floor = self.get_floor(level_id) - assert floor != None, f"Missing floor '{level_id}' for '{furniture_id}' ..." + assert floor != None, f"Missing floor '{level_id}' for '{furniture_id}'…" furniture = None if self.importer.preferences["MERGE"]: @@ -2719,12 +2719,12 @@ class LightHandler(FurnitureHandler): light_id = super()._get_furniture_id(i, elm) level_id = elm.get('level', None) floor = self.get_floor(level_id) - assert floor != None, f"Missing floor '{level_id}' for '{light_id}' ..." + assert floor != None, f"Missing floor '{level_id}' for '{light_id}'…" if self.importer.preferences["IMPORT_FURNITURES"]: super().process(parent, i, elm) light_apppliance = self.get_fc_object(light_id, 'pieceOfFurniture') - assert light_apppliance != None, f"Missing furniture {light_id} ..." + assert light_apppliance != None, f"Missing furniture {light_id}…" self.setp(light_apppliance, "App::PropertyFloat", "power", "The power of the light. In percent???", float(elm.get('power', 0.5))) if self.importer.preferences["IMPORT_LIGHTS"]: diff --git a/src/Mod/BIM/nativeifc/ifc_commands.py b/src/Mod/BIM/nativeifc/ifc_commands.py index d626e5e281..3fa27aa01f 100644 --- a/src/Mod/BIM/nativeifc/ifc_commands.py +++ b/src/Mod/BIM/nativeifc/ifc_commands.py @@ -53,7 +53,7 @@ class IFC_Diff: ) return { "Pixmap": "IFC", - "MenuText": QT_TRANSLATE_NOOP("IFC_Diff", "IFC Diff..."), + "MenuText": QT_TRANSLATE_NOOP("IFC_Diff", "IFC Diff"), "ToolTip": tt, "Accel": "I, D", } @@ -116,7 +116,7 @@ class IFC_ConvertDocument: ) return { "Pixmap": "IFC", - "MenuText": QT_TRANSLATE_NOOP("IFC_ConvertDocument", "Convert document"), + "MenuText": QT_TRANSLATE_NOOP("IFC_ConvertDocument", "Convert Document"), "ToolTip": tt, # "Accel": "I, C", } @@ -146,7 +146,7 @@ class IFC_MakeProject: ) return { "Pixmap": "IFC", - "MenuText": QT_TRANSLATE_NOOP("IFC_MakeProject", "Make IFC project"), + "MenuText": QT_TRANSLATE_NOOP("IFC_MakeProject", "Create IFC Project"), "ToolTip": tt, "Accel": "I, P", } @@ -186,7 +186,7 @@ class IFC_Save: ) return { "Pixmap": "IFC_document", - "MenuText": QT_TRANSLATE_NOOP("IFC_Save", "Save IFC file"), + "MenuText": QT_TRANSLATE_NOOP("IFC_Save", "Save IFC File"), "ToolTip": tt, "Accel": "Ctrl+S", } @@ -221,7 +221,7 @@ class IFC_SaveAs: ) return { "Pixmap": "IFC_document", - "MenuText": QT_TRANSLATE_NOOP("IFC_SaveAs", "Save IFC file as..."), + "MenuText": QT_TRANSLATE_NOOP("IFC_SaveAs", "Save IFC File As…"), "ToolTip": tt, "Accel": "Ctrl+Shift+S", } diff --git a/src/Mod/BIM/nativeifc/ifc_diff.py b/src/Mod/BIM/nativeifc/ifc_diff.py index 3273e9f8e1..a9cf4bcace 100644 --- a/src/Mod/BIM/nativeifc/ifc_diff.py +++ b/src/Mod/BIM/nativeifc/ifc_diff.py @@ -66,7 +66,7 @@ def htmlize(diff): html = "\n" if diff == 1: - html += translate("BIM", "The IFC file is not saved. Please save once" + html += translate("BIM", "The IFC file is not saved. Save once" " to have an existing IFC file to compare with." " Then, run this command again.") + "
    \n" elif diff: diff --git a/src/Mod/BIM/nativeifc/ifc_openshell.py b/src/Mod/BIM/nativeifc/ifc_openshell.py index c8a7fa95ab..a994c3b3f7 100644 --- a/src/Mod/BIM/nativeifc/ifc_openshell.py +++ b/src/Mod/BIM/nativeifc/ifc_openshell.py @@ -41,7 +41,7 @@ class IFC_UpdateIOS: tt = QT_TRANSLATE_NOOP("IFC_UpdateIOS", "Shows a dialog to update IfcOpenShell") return { "Pixmap": "IFC", - "MenuText": QT_TRANSLATE_NOOP("IFC_UpdateIOS", "IfcOpenShell update"), + "MenuText": QT_TRANSLATE_NOOP("IFC_UpdateIOS", "IfcOpenShell Update"), "ToolTip": tt, } @@ -70,7 +70,7 @@ class IFC_UpdateIOS: from PySide import QtGui title = translate("BIM", "IfcOpenShell update") - note = translate("BIM", "The update is installed in your FreeCAD's user directory and won't affect the rest of your system.") + note = translate("BIM", "The update is installed in your FreeCAD's user directory and will not affect the rest of your system.") if mode == "update": text = translate("BIM", "An update to your installed IfcOpenShell version is available") text += ": " + version + ". " @@ -127,7 +127,7 @@ class IFC_UpdateIOS: except CalledProcessError as pe: FreeCAD.Console.PrintError(pe.stderr) except Exception as e: - text = translate("BIM","Unable to run pip. Please ensure pip is installed on your system.") + text = translate("BIM","Unable to run pip. Ensure pip is installed on your system.") FreeCAD.Console.PrintError(f"{text} {str(e)}\n") return result diff --git a/src/Mod/BIM/utils/buildPsets.py b/src/Mod/BIM/utils/buildPsets.py index ee8d489155..33a3a1c2b7 100644 --- a/src/Mod/BIM/utils/buildPsets.py +++ b/src/Mod/BIM/utils/buildPsets.py @@ -104,14 +104,14 @@ class PropertyDefHandler(xml.sax.ContentHandler): # MAIN -print("Getting psets xml definitions...") +print("Getting psets xml definitions…") with open("psd.zip","wb") as f: u = urlopen(URL) p = u.read() f.write(p) -print("Reading xml definitions...") +print("Reading xml definitions…") psets = [] qtos = [] @@ -127,7 +127,7 @@ with ZipFile("psd.zip", 'r') as z: else: qtos.append(handler.line) -print("Saving files...") +print("Saving files…") with open("../Presets/pset_definitions.csv", "w") as f: for l in psets: diff --git a/src/Mod/CAM/Gui/Command.cpp b/src/Mod/CAM/Gui/Command.cpp index a0b1311a2e..da677ccc58 100644 --- a/src/Mod/CAM/Gui/Command.cpp +++ b/src/Mod/CAM/Gui/Command.cpp @@ -46,7 +46,7 @@ CmdPathArea::CmdPathArea() sAppModule = "Path"; sGroup = QT_TR_NOOP("CAM"); sMenuText = QT_TR_NOOP("Area"); - sToolTipText = QT_TR_NOOP("Creates a feature area from selected objects"); + sToolTipText = QT_TR_NOOP("Creates a feature area from the selected objects"); sWhatsThis = "CAM_Area"; sStatusTip = sToolTipText; sPixmap = "CAM_Area"; @@ -140,8 +140,8 @@ CmdPathAreaWorkplane::CmdPathAreaWorkplane() { sAppModule = "Path"; sGroup = QT_TR_NOOP("CAM"); - sMenuText = QT_TR_NOOP("Area workplane"); - sToolTipText = QT_TR_NOOP("Select a workplane for a FeatureArea"); + sMenuText = QT_TR_NOOP("Area Workplane"); + sToolTipText = QT_TR_NOOP("Selects a workplane for a feature area"); sWhatsThis = "CAM_Area_Workplane"; sStatusTip = sToolTipText; sPixmap = "CAM_Area_Workplane"; @@ -159,14 +159,14 @@ void CmdPathAreaWorkplane::activated(int iMsg) getSelection().getSelectionEx(nullptr, Part::Feature::getClassTypeId())) { const std::vector& subnames = selObj.getSubNames(); if (subnames.size() > 1) { - Base::Console().error("Please select one sub shape object for plane only\n"); + Base::Console().error("Select one sub shape object for plane only\n"); return; } const Part::Feature* pcObj = static_cast(selObj.getObject()); if (subnames.empty()) { if (pcObj->isDerivedFrom()) { if (!areaName.empty()) { - Base::Console().error("Please select one FeatureArea only\n"); + Base::Console().error("Select one feature area only\n"); return; } areaName = pcObj->getNameInDocument(); @@ -179,7 +179,7 @@ void CmdPathAreaWorkplane::activated(int iMsg) } } if (!planeName.empty()) { - Base::Console().error("Please select one shape object for plane only\n"); + Base::Console().error("Select one shape object for plane only\n"); return; } else { @@ -236,7 +236,7 @@ CmdPathCompound::CmdPathCompound() sAppModule = "Path"; sGroup = QT_TR_NOOP("CAM"); sMenuText = QT_TR_NOOP("Compound"); - sToolTipText = QT_TR_NOOP("Creates a compound from selected toolpaths"); + sToolTipText = QT_TR_NOOP("Creates a compound from the selected toolpaths"); sWhatsThis = "CAM_Compound"; sStatusTip = sToolTipText; sPixmap = "CAM_Compound"; @@ -259,7 +259,7 @@ void CmdPathCompound::activated(int iMsg) } else { Base::Console().error( - "Only Path objects must be selected before running this command\n"); + "Only path objects must be selected before running this command\n"); return; } } @@ -277,7 +277,7 @@ void CmdPathCompound::activated(int iMsg) updateActive(); } else { - Base::Console().error("At least one Path object must be selected\n"); + Base::Console().error("At least one path object must be selected\n"); return; } } diff --git a/src/Mod/CAM/Gui/DlgJobChooser.ui b/src/Mod/CAM/Gui/DlgJobChooser.ui index 94cfb25c42..23e5dcfaa1 100644 --- a/src/Mod/CAM/Gui/DlgJobChooser.ui +++ b/src/Mod/CAM/Gui/DlgJobChooser.ui @@ -14,7 +14,7 @@
    - Choose a CAM Job + CAM Job Selection diff --git a/src/Mod/CAM/Gui/DlgProcessorChooser.ui b/src/Mod/CAM/Gui/DlgProcessorChooser.ui index 39543d03a6..9f7e3527f2 100644 --- a/src/Mod/CAM/Gui/DlgProcessorChooser.ui +++ b/src/Mod/CAM/Gui/DlgProcessorChooser.ui @@ -11,7 +11,7 @@
    - Choose a processor + Processor Selection diff --git a/src/Mod/CAM/Gui/DlgSettingsPathColor.ui b/src/Mod/CAM/Gui/DlgSettingsPathColor.ui index 70d5c9aa53..ac8698592d 100644 --- a/src/Mod/CAM/Gui/DlgSettingsPathColor.ui +++ b/src/Mod/CAM/Gui/DlgSettingsPathColor.ui @@ -33,7 +33,7 @@ - Default Path colors + Default Path Colors @@ -323,7 +323,7 @@ - Path Selection Style + Path selection style @@ -351,7 +351,7 @@ - Bounding Box + Bounding box @@ -364,7 +364,7 @@ - Task Panel Layout + Task panel layout @@ -388,12 +388,12 @@ - Multi Panel + Multi-panel - Multi Panel - reversed + Multi-panel - reversed diff --git a/src/Mod/CAM/Gui/Resources/panels/AxisMapEdit.ui b/src/Mod/CAM/Gui/Resources/panels/AxisMapEdit.ui index 043c5a9f56..17ef4e92d6 100644 --- a/src/Mod/CAM/Gui/Resources/panels/AxisMapEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/AxisMapEdit.ui @@ -34,7 +34,7 @@ - Axis Mapping + Axis mapping diff --git a/src/Mod/CAM/Gui/Resources/panels/DlgJobCreate.ui b/src/Mod/CAM/Gui/Resources/panels/DlgJobCreate.ui index 37da174006..07f27ac1ed 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DlgJobCreate.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DlgJobCreate.ui @@ -11,7 +11,7 @@
    - Create Job + New Job @@ -29,7 +29,7 @@ true
    - Select a template to be used for the job. In case there are no templates you can create one through the popup menu of an existing job. Name the file job_*.json and place it in the macro or the path directory (see preferences) in order to be selectable from this list. + Select a template for the job. Templates are creatable from an existing job's context menu. Template files use the `job_*.json` naming convention and are stored in the macro or path directory (path configurable in preferences).
    diff --git a/src/Mod/CAM/Gui/Resources/panels/DlgJobModelSelect.ui b/src/Mod/CAM/Gui/Resources/panels/DlgJobModelSelect.ui index e5a1313a3a..c07a25159b 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DlgJobModelSelect.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DlgJobModelSelect.ui @@ -11,7 +11,7 @@
    - Select Base Models + Base Model Selection diff --git a/src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui b/src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui index fcc464e408..0e37d3d7a2 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui @@ -17,7 +17,7 @@ - If enabled, include all post processing settings in the template. + If enabled, include all post processing settings in the template Post Processing @@ -35,7 +35,7 @@ Qt::NoFocus - Hint about the current post processing configuration. + Hint about the current post processing configuration @@ -45,7 +45,7 @@ - If enabled, tool controller definitions are stored in the template. + If enabled, tool controller definitions are stored in the template Tools @@ -57,7 +57,7 @@ - Check all tool controllers which should be included in the template. + Check all tool controllers which should be included in the template @@ -67,9 +67,7 @@ - Enable to include values of the SetupSheet in the template. - -Any values of the SetupSheet that are changed from their default are preselected. If this field not selected the current SetupSheet was not modified. + Includes SetupSheet values in the template. Any SetupSheet values modified from their default are preselected. Setup Sheet @@ -81,10 +79,10 @@ Any values of the SetupSheet that are changed from their default are preselected - Enable to include the default heights for operations in the template. + Enable to include the default heights for operations in the template - Operation Heights + Operation heights true @@ -94,7 +92,7 @@ Any values of the SetupSheet that are changed from their default are preselected - Operation Depths + Operation depths true @@ -104,10 +102,10 @@ Any values of the SetupSheet that are changed from their default are preselected - Enable to include the default rapid tool speeds in the template. + Enable to include the default rapid tool speeds in the template - Tool Rapid Speeds + Tool rapid speeds true @@ -117,7 +115,7 @@ Any values of the SetupSheet that are changed from their default are preselected - Enable to include the default coolant mode in the template. + Enable to include the default coolant mode in the template Coolant Mode @@ -160,9 +158,9 @@ Note that this option is disabled if a stock object from an existing solid is us If enabled, the current size settings for the stock object are included in the template. -For Box and Cylinder stocks this means the actual size of the stock solid being created. +For box and cylinder stocks this means the actual size of the stock solid being created. -For stock from the Base object's bounding box it means the extra material in all directions. A stock object created from such a template will get its basic size from the new job's Base object and apply the stored extra settings. +For stock from the base object's bounding box it means the extra material in all directions. A stock object created from such a template will get its basic size from the new job's base object and apply the stored extra settings. Extent @@ -181,14 +179,14 @@ For stock from the Base object's bounding box it means the extra material in all Qt::NoFocus - Hint about the current stock extent setting. + Hint about the current stock extent setting - If enabled, the current placement of the stock solid is stored in the template. + If enabled, the current placement of the stock solid is stored in the template Placement @@ -207,7 +205,7 @@ For stock from the Base object's bounding box it means the extra material in all Qt::NoFocus - Hint about the current stock placement. + Hint about the current stock placement diff --git a/src/Mod/CAM/Gui/Resources/panels/DlgSelectPostProcessor.ui b/src/Mod/CAM/Gui/Resources/panels/DlgSelectPostProcessor.ui index 1fd5407d75..d3f4dac439 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DlgSelectPostProcessor.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DlgSelectPostProcessor.ui @@ -39,7 +39,7 @@ - Select one of the post processors. FreeCAD comes with several post processors pre-installed, please make sure at least one of them is enabled in your preferences. + Displays available post processors. FreeCAD includes several pre-installed post processors. At least one post processor must be enabled in preferences. diff --git a/src/Mod/CAM/Gui/Resources/panels/DlgTCChooser.ui b/src/Mod/CAM/Gui/Resources/panels/DlgTCChooser.ui index a9ab7d0ed8..37fc9e33d5 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DlgTCChooser.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DlgTCChooser.ui @@ -20,13 +20,13 @@ - Choose a Tool Controller + Tool Controller Selection - Tool Controller + Tool controller diff --git a/src/Mod/CAM/Gui/Resources/panels/DlgToolControllerEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DlgToolControllerEdit.ui index ad04f72ccc..511aafc20e 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DlgToolControllerEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DlgToolControllerEdit.ui @@ -32,7 +32,7 @@ - Controller Name / Tool Number + Controller Name / Tool Number @@ -64,7 +64,7 @@ - Horiz. Feed + Horizontal feed @@ -93,7 +93,7 @@ - Vert. Feed + Vertical feed @@ -122,7 +122,7 @@ - Horiz Rapid + Horizontal rapid @@ -151,7 +151,7 @@ - Vert Rapid + Vertical rapid diff --git a/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui index 66a9bf8d93..d31fa36c32 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui @@ -118,17 +118,17 @@ - adaptive + Adaptive - custom + Custom - fixed + Fixed diff --git a/src/Mod/CAM/Gui/Resources/panels/DragKnifeEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DragKnifeEdit.ui index 6548f2ad9d..935ef17f6d 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DragKnifeEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DragKnifeEdit.ui @@ -34,7 +34,7 @@ - Offset Distance + Offset distance @@ -60,7 +60,7 @@ - Pivot Height + Pivot height diff --git a/src/Mod/CAM/Gui/Resources/panels/DressUpLeadInOutEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DressUpLeadInOutEdit.ui index 5edf0b83fa..d256ef50c2 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DressUpLeadInOutEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DressUpLeadInOutEdit.ui @@ -25,10 +25,10 @@ - Enable Lead-in move + Enable lead-in move - Enable Lead In + Enable lead-in @@ -58,14 +58,14 @@ - Length / Radius + Length/radius - length or radius of the Lead-in + Length or radius of the lead-in 0.100000000000000 @@ -85,7 +85,7 @@ - extends the leadin distance + Extends the lead-in distance @@ -99,10 +99,10 @@ - Enable Lead-out move + Enable lead-out move - Enable Lead Out + Enable lead out @@ -132,14 +132,14 @@ - Length / Radius + Length/radius - length or radius of the Lead-out + Length or radius of the lead-out 0.100000000000000 @@ -159,7 +159,7 @@ - Extends the leadout distance + Extends the lead-out distance @@ -182,17 +182,17 @@ Plunge at rapid speed - Rapid Plunge + Rapid plunge - Apply Lead In/Out on all layers + Apply lead-in/out on all layers - Include Layers + Include layers @@ -202,7 +202,7 @@ Keep the tool down in the path - Keep Tool Down + Keep tool down diff --git a/src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui b/src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui index 804150a6ed..01c6a04b1c 100644 --- a/src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui +++ b/src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui @@ -42,22 +42,22 @@ - Create Box + Create box - Create Cylinder + Create cylinder - Extend Model's Bounding Box + Extend model's bounding box - Use Existing Solid + Use existing solid @@ -84,7 +84,7 @@ - Select the body to be used to constrain the underlying Path. + Select the body to be used to constrain the underlying path @@ -179,7 +179,7 @@ - Radius of the Cylinder + Radius of the cylinder @@ -193,7 +193,7 @@ - Height of the Cylinder + Height of the cylinder @@ -213,7 +213,7 @@ - Length of the Box + Length of the box @@ -227,7 +227,7 @@ - Width of the Box + Width of the box @@ -241,7 +241,7 @@ - Height of the Box + Height of the box @@ -257,7 +257,7 @@ If checked, the path is constrained by the solid. Otherwise the volume of the solid describes a 'keep out' zone - Constrained to Inside + Constrained to inside true diff --git a/src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui b/src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui index cbceb97244..93c8f1bdac 100644 --- a/src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui @@ -44,7 +44,7 @@ - Width of the resulting holding tag. + Width of the resulting holding tag @@ -58,7 +58,7 @@ - Plunge angle for ascent and descent of holding tag. + Plunge angle for ascent and descent of holding tag 5.000000000000000 @@ -123,14 +123,14 @@ false - Edit... + Edit - Add... + Add diff --git a/src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui index 10c4d94f92..0c8f6fa153 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui @@ -33,7 +33,7 @@ - List of operations with Base Geometry in current Job + List of operations with base geometry in the current job @@ -96,7 +96,7 @@ - All objects will be processed using the same operation properties. + All objects will be processed using the same operation properties Qt::AlignCenter diff --git a/src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui index 190a75f33e..6f8e25fc3f 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui @@ -21,9 +21,9 @@ Table of hole features and the determined radius of the associated hole. -You can add feature for processing by selecting them and then pressing Add. If a feature is accidentally added to the list it can be removed through Remove and will no longer be processed. +Add features for processing by selecting them and then pressing 'Add'. If a feature is accidentally added to the list, it can be removed through 'Remove' and will no longer be processed. -Reset deletes all current items from the list and fills the list with all circular holes eligible for the operation from the model. You can again refine the list afterwards by enabling/disabling, removing and adding features. +Reset deletes all current items from the list and fills the list with all circular holes eligible for the operation from the model. Refine the list afterwards by enabling/disabling, removing and adding features. true diff --git a/src/Mod/CAM/Gui/Resources/panels/PageBaseLocationEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageBaseLocationEdit.ui index 924a12b1f6..58f6b4471a 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageBaseLocationEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageBaseLocationEdit.ui @@ -17,7 +17,7 @@ - List of locations to be processed. + List of locations to be processed @@ -37,7 +37,7 @@ - Opens a dialog to add arbitrary locations. + Opens a dialog to add arbitrary locations Add @@ -57,7 +57,7 @@ - Edit selected location. + Edit selected location Edit @@ -67,7 +67,7 @@ - All locations will be processed using the same operation properties. + All locations will be processed using the same operation properties Qt::AutoText diff --git a/src/Mod/CAM/Gui/Resources/panels/PageDepthsEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageDepthsEdit.ui index 8834a594a6..408363b60a 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageDepthsEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageDepthsEdit.ui @@ -36,14 +36,14 @@ - Start Depth + Start depth - Start Depth of the operation. The highest point in Z-axis the operation needs to process. + Start depth of the operation. The highest point in Z-axis the operation needs to process. -999999999.000000000000000 @@ -56,10 +56,10 @@ - Transfer the Z value of the selected feature as the Start Depth for the operation. + Transfer the Z value of the selected feature as the start depth for the operation - ... + @@ -82,7 +82,7 @@ - Final Depth + Final depth @@ -102,10 +102,10 @@ - Transfer the Z value of the selected feature as the Final Depth for the operation. + Transfer the Z value of the selected feature as the final depth for the operation - ... + @@ -128,14 +128,14 @@ - Step Down + Step down - The depth in Z-axis the operation moves downwards between layers. This value depends on the tool being used, the material to be cut, available cooling and many other factors. Please consult the tool manufacturers data sheets for the proper value. + The depth in Z-axis the operation moves downwards between layers. This value depends on the tool being used, the material to be cut, available cooling and many other factors. Consult the tool manufacturers data sheets for the proper value. -999999999.000000000000000 @@ -160,7 +160,7 @@ - Finish Step Down + Finish step down diff --git a/src/Mod/CAM/Gui/Resources/panels/PageDiametersEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageDiametersEdit.ui index 3b6caf57cd..ec2be04355 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageDiametersEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageDiametersEdit.ui @@ -24,7 +24,7 @@ - Start Depth of the operation. The highest point in Z-axis the operation needs to process. + Start depth of the operation. The highest point in Z-axis the operation needs to process. Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -40,10 +40,10 @@ - Transfer the Z value of the selected feature as the Start Depth for the operation. + Transfer the Z value of the selected feature as the start depth for the operation - ... + @@ -54,7 +54,7 @@ - Max Diameter + Max diameter @@ -77,10 +77,10 @@ - Transfer the Z value of the selected feature as the Final Depth for the operation. + Transfer the Z value of the selected feature as the final depth for the operation. - ... + diff --git a/src/Mod/CAM/Gui/Resources/panels/PageHeightsEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageHeightsEdit.ui index ceab3ede12..7febd2ec12 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageHeightsEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageHeightsEdit.ui @@ -21,7 +21,7 @@ - Safe Height + Safe height @@ -44,7 +44,7 @@ - Clearance Height + Clearance height diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui index 91ae04896c..f586297a34 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui @@ -20,7 +20,7 @@ - Tool Controller + Tool controller @@ -61,7 +61,7 @@ - Accuracy vs Performance + Accuracy vs performance @@ -98,7 +98,7 @@ Larger values (further to the right) will calculate faster; smaller values (furt - Force Clearing Inside-out + Force clearing inside-out @@ -119,7 +119,7 @@ Larger values (further to the right) will calculate faster; smaller values (furt - Finishing Profile + Finishing profile @@ -136,7 +136,7 @@ Larger values (further to the right) will calculate faster; smaller values (furt - XY Stock to Leave + XY stock to leave @@ -162,7 +162,7 @@ Larger values (further to the right) will calculate faster; smaller values (furt - Step Over Percent + Step over percent @@ -179,21 +179,21 @@ Larger values (further to the right) will calculate faster; smaller values (furt - Helix Ramp Angle + Helix ramp angle - Use Outline + Use outline - Operation Type + Operation type @@ -210,7 +210,7 @@ Larger values (further to the right) will calculate faster; smaller values (furt - Keep Tool Down Ratio + Keep tool down ratio @@ -227,7 +227,7 @@ Larger values (further to the right) will calculate faster; smaller values (furt - Helix Cone Angle + Helix cone angle @@ -244,14 +244,14 @@ Larger values (further to the right) will calculate faster; smaller values (furt - Lift Distance + Lift distance - Cut Region + Cut region @@ -268,7 +268,7 @@ Larger values (further to the right) will calculate faster; smaller values (furt - Helix Max Diameter + Helix max diameter @@ -287,7 +287,7 @@ This option changes that behavior to cut each discrete area to its full depth be - Z Stock to Leave + Z stock to leave diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui index 38db977972..e7f084e0fc 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui @@ -32,21 +32,21 @@ - Tool Controller + Tool controller - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation - Coolant Mode + Coolant mode diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpDeburrEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpDeburrEdit.ui index b10d7c6c19..8b0ae3bdb8 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpDeburrEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpDeburrEdit.ui @@ -50,14 +50,14 @@ - Tool Controller + Tool controller - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation @@ -82,14 +82,14 @@ - Coolant Mode + Coolant mode - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation @@ -135,7 +135,7 @@ - The direction in which the profile is performed, clockwise or counterclockwise. + The direction in which the profile is performed, clockwise or counterclockwise CW @@ -192,7 +192,7 @@ - Width of chamfer cut. + Width of chamfer cut mm @@ -219,7 +219,7 @@ - Extra depth of tool immersion. + Extra depth of tool immersion mm diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpDrillingEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpDrillingEdit.ui index 22dec12f54..d8920da0f7 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpDrillingEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpDrillingEdit.ui @@ -39,31 +39,31 @@ - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation - Coolant Mode + Coolant mode - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation - Don't retract after every hole + Do not retract after every hole - Keep Tool Down + Keep tool down @@ -92,7 +92,7 @@ - Extend Depth + Extend depth @@ -112,12 +112,12 @@ - Drill Tip + Drill tip - 2x Drill Tip + 2x drill tip @@ -166,7 +166,7 @@ - Chip Break + Chip break diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpEngraveEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpEngraveEdit.ui index dcfb06a67a..3296627d78 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpEngraveEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpEngraveEdit.ui @@ -26,28 +26,28 @@ - Tool Controller + Tool controller - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation - Coolant Mode + Coolant mode - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation @@ -60,14 +60,14 @@ - Start at Vertex + Start at vertex - Specify the vertex number of the underlying shape string at which engraving should start. + Specify the vertex number of the underlying shape string at which engraving should start 999999 diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpHelixEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpHelixEdit.ui index cf07cebfe7..02d656535a 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpHelixEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpHelixEdit.ui @@ -33,7 +33,7 @@ - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation @@ -47,7 +47,7 @@ - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation @@ -67,7 +67,7 @@ - Specify if the helix operation should start at the inside and work its way outwards, or start at the outside and work its way to the center. + Specify if the helix operation should start at the inside and work its way outwards, or start at the outside and work its way to the center @@ -91,7 +91,7 @@ - The direction for the helix, clockwise or counterclockwise. + The direction for the helix, clockwise or counterclockwise @@ -134,7 +134,7 @@ - Extra Offset + Extra offset diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpPocketExtEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpPocketExtEdit.ui index 74b8d2a40f..ebfdb721b7 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpPocketExtEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpPocketExtEdit.ui @@ -19,7 +19,7 @@ - Enable Extensions + Enable extensions true @@ -65,7 +65,7 @@ Extend the corner between two edges of a pocket. Selected adjacent edges are combined. - Extend Corners + Extend corners true @@ -75,14 +75,14 @@ - Default Length + Default length - Set the extent of the dimension -the default value is half the tool diameter + Set the extent of the dimension. The default value is half the tool diameter. -999999999.000000000000000 diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpPocketFullEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpPocketFullEdit.ui index 8d81b94766..ecff4f3a4c 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpPocketFullEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpPocketFullEdit.ui @@ -26,7 +26,7 @@ - Tool Controller + Tool controller @@ -69,7 +69,7 @@ Specify if the facing should be restricted by the actual shape of the selected face (or the part if no face is selected), or if the bounding box should be faced off. -The latter can be used to face of the entire stock area to ensure uniform heights for the following operations +The latter can be used to face of the entire stock area to ensure uniform heights for the following operations. @@ -175,7 +175,7 @@ The latter can be used to face of the entire stock area to ensure uniform height - Step Over Percent + Step over percent @@ -201,7 +201,7 @@ The latter can be used to face of the entire stock area to ensure uniform height - Material Allowance + Material allowance @@ -224,7 +224,7 @@ The latter can be used to face of the entire stock area to ensure uniform height Specify if this operation uses a starting point - Use Start Point + Use start point @@ -234,21 +234,21 @@ The latter can be used to face of the entire stock area to ensure uniform height If selected the operation uses the outline of the selected base geometry and ignores all holes and islands - Use Outline + Use outline - Clear Edges + Clear edges - Min Travel + Min travel @@ -258,7 +258,7 @@ The latter can be used to face of the entire stock area to ensure uniform height Check to skip machining regions that have already been cleared by previous operations - Use Rest Machining + Use rest machining diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpProbeEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpProbeEdit.ui index d6cf77f997..d3dc72f8e9 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpProbeEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpProbeEdit.ui @@ -32,7 +32,7 @@ - Tool Controller + Tool controller @@ -49,7 +49,7 @@ - Probe Grid Points + Probe grid points @@ -98,7 +98,7 @@ - X Offset + X offset @@ -112,7 +112,7 @@ - Y Offset + Y offset @@ -135,7 +135,7 @@ - File Name + File name @@ -152,7 +152,7 @@ - ... + diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui index 8c539a4a51..6b215e43c1 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui @@ -26,7 +26,7 @@ - Tool Controller + Tool controller @@ -40,7 +40,7 @@ - Coolant Mode + Coolant mode @@ -60,14 +60,14 @@ - Cut Side + Cut side - Specify if the profile should be performed inside or outside the base geometry features. This only matters if Use Compensation is checked (the default) + Specify if the profile should be performed inside or outside the base geometry features. This only matters if 'Use compensation' is checked (the default). @@ -98,7 +98,7 @@ - Extra Offset + Extra offset @@ -118,7 +118,7 @@ - Number of Passes + Number of passes @@ -128,14 +128,14 @@ 1 - The number of passes to do. If more than one, requires a non-zero value for Pass Stepover. + The number of passes to do. If more than one, requires a non-zero value for 'Pass stepover'. - Pass Stepover + Pass stepover @@ -148,7 +148,7 @@ - If doing multiple passes, the extra offset of each additional pass. + If doing multiple passes, the extra offset of each additional pass @@ -174,14 +174,14 @@ Check if this profile operation should also process holes in the base geometry. Found holes are automatically offset on the opposite cut side and performed in the opposite direction as perimeters. Note that this does not include cylindrical holes, the assumption being that they will get drilled - Process Holes + Process holes - If checked, the profile operation is offset by the tool radius. The offset direction is determined by the Cut Side + If checked, the profile operation is offset by the tool radius. The offset direction is determined by 'Cut side'. Use Compensation @@ -191,10 +191,10 @@ - Check if you want this profile operation to also be applied to cylindrical holes, which normally get drilled. This can be useful if no drill of adequate size is available or the number of holes don't warrant a tool change. Note that the cut side and direction is reversed in respect to the specified values + Check if you want this profile operation to also be applied to cylindrical holes, which normally get drilled. This can be useful if no drill of adequate size is available or the number of holes don't warrant a tool change. Note that the cut side and direction is reversed in respect to the specified values. - Process Circles + Process circles diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui index 0631eb9f9b..85f7cd7aa8 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui @@ -32,14 +32,14 @@ - Tool Controller + Tool controller - The tool and its settings to be used for this operation + The tool and its settings to be used for this operation @@ -49,7 +49,7 @@ - Coolant Mode + Coolant mode @@ -68,7 +68,7 @@ - Start Feature Reference + Start feature reference Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -94,32 +94,32 @@ - Center of Mass + Center of mass - Center of Bounding Box + Center of bounding box - Lowest Point + Lowest point - Highest Point + Highest point - Long Edge + Long edge - Short Edge + Short edge @@ -166,22 +166,22 @@ - Center of Mass + Center of mass - Center of Bounding Box + Center of bounding box - Lowest Point + Lowest point - Highest Point + Highest point @@ -219,13 +219,13 @@ - No Base Geometry selected + No base geometry Selected color:blue - No Base Geometry selected. + No base geometry selected Qt::AlignCenter @@ -238,10 +238,10 @@ - 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. + Currently using custom point inputs available in the property view of the data tab Qt::AlignCenter @@ -272,7 +272,7 @@ - Extend Path Start + Extend path start Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -342,7 +342,7 @@ - Layer Mode + Layer mode @@ -371,18 +371,18 @@ - Path Orientation + Path orientation - Choose the path orientation with regard to the feature(s) selected + Choose the path orientation with regard to the features selected - Start to End + Start to end diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpSurfaceEdit.ui index e69f98187e..9aea7bc7b4 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpSurfaceEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpSurfaceEdit.ui @@ -33,21 +33,21 @@ - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation - Coolant Mode + Coolant mode - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation @@ -60,84 +60,84 @@ - Bounding Box + Bounding box - Select the overall boundary for the operation. + Select the overall boundary for the operation - Scan Type + Scan type - Planar: Flat, 3D surface scan. Rotational: 4th-axis rotational scan. + Planar: flat, 3D surface scan. Rotational: 4th-axis rotational scan. - Layer Mode + Layer mode - 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 - Cut Pattern + Cut pattern - Set the geometric clearing pattern to use for the operation. + Set the geometric clearing pattern to use for the operation - Profile Edges + Profile edges - Profile the edges of the selection. + Profile the edges of the selection - Avoid Last X Faces + Avoid last X faces - Avoid cutting the last 'N' faces in the Base Geometry list of selected faces. + Avoid cutting the last 'n' faces in the base geometry list of selected faces @@ -159,7 +159,7 @@ - Additional offset to the selected bounding box along the X axis. + Additional offset to the selected bounding box along the X axis mm @@ -169,7 +169,7 @@ - Additional offset to the selected bounding box along the Y axis. + Additional offset to the selected bounding box along the Y axis mm @@ -181,7 +181,7 @@ - Drop Cutter Direction + Drop cutter direction @@ -202,7 +202,7 @@ - Set the Z-axis depth offset from the target surface. + Set the Z-axis depth offset from the target surface mm @@ -212,7 +212,7 @@ - Step over + Stepover @@ -251,10 +251,10 @@ A step over of 100% results in no overlap between two different cycles. - Make True, if specifying a Start Point + Set to true if specifying a start point - Use Start Point + Use start point @@ -264,17 +264,17 @@ A step over of 100% results in no overlap between two different cycles. Enable optimization of linear paths (co-linear points). Removes unnecessary co-linear points from G-code output. - Optimize Linear Paths + Optimize linear paths - If true, the cutter will remain inside the boundaries of the model or selected face(s) + If true, the cutter will remain inside the boundaries of the model or selected faces - Boundary Enforcement + Boundary enforcement true @@ -287,7 +287,7 @@ A step over of 100% results in no overlap between two different cycles. Enable separate optimization of transitions between, and breaks within, each step over path. - Optimize StepOver Transitions + Optimize stepover transitions diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpTappingEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpTappingEdit.ui index dadc2288d4..242221bf33 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpTappingEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpTappingEdit.ui @@ -42,12 +42,12 @@ - Tap Tip + Tap tip - 2x Tap Tip + 2x tap tip @@ -62,7 +62,7 @@ - Extend Depth + Extend depth @@ -93,7 +93,7 @@ - Coolant Mode + Coolant mode diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpThreadMillingEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpThreadMillingEdit.ui index 82166b695f..71f59ac8c0 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpThreadMillingEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpThreadMillingEdit.ui @@ -82,7 +82,7 @@ - Major Diameter + Major diameter @@ -96,7 +96,7 @@ - Minor Diameter + Minor diameter @@ -174,7 +174,7 @@ - Lead In/Out + Lead in/out diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui index ff9b43d24b..3115241023 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui @@ -94,14 +94,14 @@ - Filter Colinear lines + Filter colinear lines - Sets how aggressively colinear segments are filtered from the Voronoi diagram. Valid values are 0 - 90 degrees (larger numbers filter more). Default = 10 + Sets how aggressively colinear segments are filtered from the voronoi diagram. Valid values are 0 - 90 degrees (larger numbers filter more). Default = 10 90 @@ -150,7 +150,7 @@ - Optimize path to avoid raising endmill when moving to adjacent edges. May result in sub-millimeter inaccuracies. + Optimize path to avoid raising endmill when moving to adjacent edges. May result in sub-millimeter inaccuracies. Optimize movements diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui index 889a0698e2..1e7b8c6cf4 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui @@ -26,14 +26,14 @@ - Tool Controller + Tool controller - The tool and its settings to be used for this operation. + The tool and its settings to be used for this operation @@ -43,7 +43,7 @@ - Coolant Mode + Coolant mode @@ -63,7 +63,7 @@ - Select the algorithm to use: OCL Dropcutter*, or Experimental (Not OCL based). + Select the algorithm to use: 'OCL Dropcutter*', or 'Experimental' (not OCL based). @@ -76,7 +76,7 @@ - Bounding Box + Bounding box @@ -88,14 +88,14 @@ - Select the overall boundary for the operation. + Select the overall boundary for the operation - Layer Mode + Layer mode @@ -107,14 +107,14 @@ - 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 - Cut Pattern + Cut pattern @@ -126,7 +126,7 @@ - Set the geometric clearing pattern to use for the operation. + Set the geometric clearing pattern to use for the operation @@ -139,14 +139,14 @@ - Boundary Adjustment + Boundary adjustment - Set the Z-axis depth offset from the target surface. + Set the Z-axis depth offset from the target surface mm @@ -204,7 +204,7 @@ A step over of 100% results in no overlap between two different cycles. Enable optimization of linear paths (co-linear points). Removes unnecessary co-linear points from G-code output. - Optimize Linear Paths + Optimize linear paths diff --git a/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui index 5409d84059..fbb2d4c7e3 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui @@ -115,7 +115,7 @@ - Template Export + Template export @@ -131,7 +131,7 @@ - Output File + Output file @@ -169,7 +169,7 @@ See the file save policy below on how to deal with name conflicts. - ... + @@ -193,7 +193,7 @@ See the file save policy below on how to deal with name conflicts. - Optional arguments passed to the Post Processor. The arguments are specific for each Post Processor, please see its documentation for details. + Optional arguments passed to the post processor. The arguments are specific for each post processor, please see its documentation for details. @@ -232,7 +232,7 @@ Ordering by operation will do each operation in all coordinate systems before mo - Order By + Order by @@ -394,7 +394,7 @@ FreeCAD has no knowledge of where a particular coordinate system exists within t - If multiple coordinate systems are in use, setting this to TRUE will cause the G-code to be written to multiple output files as controlled by the 'order by' property. For example, if ordering by Fixture, the first output file will be for the first fixture and separate file for the second. + If multiple coordinate systems are in use, setting this to TRUE will cause the G-code to be written to multiple output files as controlled by the 'order by' property. For example, if ordering by fixture, the first output file will be for the first fixture and separate file for the second. <html><head/><body><p>If True, post processing will create multiple output files based on the <span style=" font-style:italic;">order by</span> setting. @@ -475,22 +475,22 @@ If <span style=" font-style:italic;">order by</span> is se - Create Box + Create box - Create Cylinder + Create cylinder - Extend Model's Bounding Box + Extend model's bounding box - Use Existing Solid + Use existing solid @@ -511,7 +511,7 @@ If <span style=" font-style:italic;">order by</span> is se - Assign Stock Material + Assign stock material @@ -754,7 +754,7 @@ If <span style=" font-style:italic;">order by</span> is se - Link Stock and Model + Link stock and model @@ -1038,7 +1038,7 @@ If <span style=" font-style:italic;">order by</span> is se - Default Values + Default values @@ -1050,7 +1050,7 @@ If <span style=" font-style:italic;">order by</span> is se - Start Depth + Start depth @@ -1066,7 +1066,7 @@ Default: OpStartDepth - Final Depth + Final depth @@ -1082,7 +1082,7 @@ Default: OpFinalDepth - Step Down + Step down @@ -1186,7 +1186,7 @@ Default: "5mm" - Coolant Mode + Coolant mode @@ -1267,7 +1267,7 @@ Default: "5mm" Feed - Horizontal Feed + Horizontal feed @@ -1279,7 +1279,7 @@ Default: "5mm" Feed - Vertical Feed + Vertical feed @@ -1367,7 +1367,7 @@ Default: "5mm" - Rapid horizontal speed assigned as HorizRapid to new ToolController. + Rapid horizontal speed assigned as HorizRapid to new ToolController @@ -1387,7 +1387,7 @@ Default: "5mm"
    - Rapid vertical speed assigned to VertRapid of new ToolController. + Rapid vertical speed assigned to VertRapid of new ToolController
    diff --git a/src/Mod/CAM/Gui/Resources/panels/PropertyBag.ui b/src/Mod/CAM/Gui/Resources/panels/PropertyBag.ui index a4cd0d9d0e..530792dd39 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PropertyBag.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PropertyBag.ui @@ -52,14 +52,14 @@ - Modify... + Modify - Add... + Add diff --git a/src/Mod/CAM/Gui/Resources/panels/PropertyCreate.ui b/src/Mod/CAM/Gui/Resources/panels/PropertyCreate.ui index e0570a952e..ebc09d12f7 100644 --- a/src/Mod/CAM/Gui/Resources/panels/PropertyCreate.ui +++ b/src/Mod/CAM/Gui/Resources/panels/PropertyCreate.ui @@ -24,14 +24,14 @@ - Name of property. Can only contain letters, numbers, and underscores. MixedCase names will display with spaces "Mixed Case" + Name of the property. Can only contain letters, numbers, and underscores. MixedCase names will display with spaces "Mixed Case" - The category group the property belongs to. + The category group the property belongs to true @@ -48,7 +48,7 @@ - The type of the property value. + The type of the property value @@ -69,7 +69,7 @@ - ToolTip to be displayed when user hovers mouse over property. + ToolTip to be displayed when user hovers mouse over property true @@ -114,7 +114,7 @@ - Check if you want to create several properties in a batch. + Check to create several properties in a batch Create another diff --git a/src/Mod/CAM/Gui/Resources/panels/SetupGlobal.ui b/src/Mod/CAM/Gui/Resources/panels/SetupGlobal.ui index e9798ce0c3..996bc99020 100644 --- a/src/Mod/CAM/Gui/Resources/panels/SetupGlobal.ui +++ b/src/Mod/CAM/Gui/Resources/panels/SetupGlobal.ui @@ -33,7 +33,7 @@ - Start Depth + Start depth @@ -49,7 +49,7 @@ Default: OpStartDepth - Final Depth + Final depth @@ -65,7 +65,7 @@ Default: OpFinalDepth - Step Down + Step down @@ -202,7 +202,7 @@ Default: "5mm" - Rapid horizontal speed assigned as HorizRapid to new ToolController. + Rapid horizontal speed assigned as HorizRapid to new ToolController @@ -258,7 +258,7 @@ Default: "5mm" - Coolant Mode + Coolant mode diff --git a/src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui b/src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui index 395f051c3f..da9f2dbc17 100644 --- a/src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui +++ b/src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui @@ -11,7 +11,7 @@ - Select a Tool Shape + Tool Shape Selection @@ -31,7 +31,7 @@ - Standard Tools + Standard tools @@ -44,7 +44,7 @@
    - My Tools + My tools
    diff --git a/src/Mod/CAM/Gui/Resources/panels/SurfaceEdit.ui b/src/Mod/CAM/Gui/Resources/panels/SurfaceEdit.ui index eafef0471a..7bb41cbd01 100644 --- a/src/Mod/CAM/Gui/Resources/panels/SurfaceEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/SurfaceEdit.ui @@ -42,13 +42,13 @@ :/icons/CAM_BaseGeometry.svg:/icons/CAM_BaseGeometry.svg
    - Base Geometry + Base geometry - Drag to reorder, then update. + Drag to reorder, then update QAbstractItemView::DragDrop @@ -64,17 +64,17 @@ - Add item selected in window. + Add item selected in window - add + Add - Remove Item selected in list, then update. + Remove item selected in list, then update Remove @@ -84,7 +84,7 @@ - Update the path with the removed and reordered items. + Update the path with the removed and reordered items Update @@ -133,7 +133,7 @@ - Start Depth + Start depth @@ -147,7 +147,7 @@ - Final Depth + Final depth @@ -161,7 +161,7 @@ - Step Down + Step down @@ -175,7 +175,7 @@ - Finish Step Down + Finish step down @@ -211,7 +211,7 @@ - Safe Height + Safe height @@ -225,7 +225,7 @@ - Clearance Height + Clearance height @@ -260,7 +260,7 @@ - Tool Controller + Tool controller @@ -270,7 +270,7 @@ - Coolant Mode + Coolant mode @@ -304,12 +304,12 @@ - OCL Dropcutter + OCL dropcutter - OCL Waterline + OCL waterline diff --git a/src/Mod/CAM/Gui/Resources/panels/TaskCAMSimulator.ui b/src/Mod/CAM/Gui/Resources/panels/TaskCAMSimulator.ui index fff0c1b518..0deaf2a36b 100644 --- a/src/Mod/CAM/Gui/Resources/panels/TaskCAMSimulator.ui +++ b/src/Mod/CAM/Gui/Resources/panels/TaskCAMSimulator.ui @@ -28,7 +28,7 @@ - Accuracy: + Accuracy @@ -83,7 +83,7 @@ - Job: + Job @@ -100,7 +100,7 @@ - Activate / resume simulation + Activate/resume simulation Play diff --git a/src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui b/src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui index 1f481d3de6..075ff5ca7a 100644 --- a/src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui +++ b/src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui @@ -72,7 +72,7 @@ - Make CAMotics File + New CAMotics File diff --git a/src/Mod/CAM/Gui/Resources/panels/TaskPathSimulator.ui b/src/Mod/CAM/Gui/Resources/panels/TaskPathSimulator.ui index 040e814c1d..6a3392b544 100644 --- a/src/Mod/CAM/Gui/Resources/panels/TaskPathSimulator.ui +++ b/src/Mod/CAM/Gui/Resources/panels/TaskPathSimulator.ui @@ -52,7 +52,7 @@ - Activate / resume simulation + Activate/resume simulation Play @@ -112,7 +112,7 @@ - Run simulation till end without animation + Run the simulation until it ends without an animation Fast Forward @@ -177,7 +177,7 @@ - Speed: + Speed @@ -226,7 +226,7 @@ - Accuracy: + Accuracy @@ -275,7 +275,7 @@ - Job: + Job diff --git a/src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui b/src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui index 8153ae64fe..eff7e73369 100644 --- a/src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui +++ b/src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui @@ -104,7 +104,7 @@ - Coating: + Coating @@ -114,7 +114,7 @@ - Hardness: + Hardness @@ -124,7 +124,7 @@ - Materials: + Materials @@ -137,7 +137,7 @@ - Supplier: + Supplier diff --git a/src/Mod/CAM/Gui/Resources/panels/ToolBitLibraryEdit.ui b/src/Mod/CAM/Gui/Resources/panels/ToolBitLibraryEdit.ui index 6b8ecbb8d7..5fe79475eb 100644 --- a/src/Mod/CAM/Gui/Resources/panels/ToolBitLibraryEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/ToolBitLibraryEdit.ui @@ -49,7 +49,7 @@ - Add existing Tool Bit to this library. + Adds the existing tool bit to the library Add Existing @@ -69,7 +69,7 @@ - Delete selected Tool Bit(s) from the library. + Deletes the selected tool bits from the library Remove @@ -96,7 +96,7 @@ - Add New Tool Table + Add new tool table @@ -143,7 +143,7 @@ - Save the current Library + Save the current library @@ -194,7 +194,7 @@ true - Table of Tool Bits of the library. + Table of tool bits of the library QFrame::Box diff --git a/src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui b/src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui index 03ff55b27b..ccce8253d0 100644 --- a/src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui +++ b/src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui @@ -64,7 +64,7 @@ - Length Offset + Length offset @@ -100,28 +100,28 @@ - Flat Radius + Flat radius - Corner Radius + Corner radius - Point/Tip Angle + Point/tip angle - Cutting Edge Height + Cutting edge height diff --git a/src/Mod/CAM/Gui/Resources/panels/ZCorrectEdit.ui b/src/Mod/CAM/Gui/Resources/panels/ZCorrectEdit.ui index ee9b5b874f..b2547b520e 100644 --- a/src/Mod/CAM/Gui/Resources/panels/ZCorrectEdit.ui +++ b/src/Mod/CAM/Gui/Resources/panels/ZCorrectEdit.ui @@ -61,7 +61,7 @@ - ... + diff --git a/src/Mod/CAM/Gui/Resources/preferences/Advanced.ui b/src/Mod/CAM/Gui/Resources/preferences/Advanced.ui index b8cb82864e..d954958d02 100644 --- a/src/Mod/CAM/Gui/Resources/preferences/Advanced.ui +++ b/src/Mod/CAM/Gui/Resources/preferences/Advanced.ui @@ -61,7 +61,7 @@ - Suppress warning whenever a Path selection mode is activated + Suppress warning whenever a path selection mode is activated Suppress feed rate warning @@ -80,7 +80,7 @@ - Suppress warning whenever a Path selection mode is activated + Suppress warning whenever a path selection mode is activated Suppress selection mode warning @@ -114,7 +114,7 @@ - If OpenCAMLib is installed with Python bindings it can be used by some additional 3D operations. NOTE: Enabling OpenCAMLib here requires a restart of FreeCAD to take effect. + If OpenCAMLib is installed with Python bindings, it can be used by some additional 3D operations. NOTE: Enabling OpenCAMLib here requires a restart of FreeCAD to take effect. true diff --git a/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui b/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui index a0d86c24eb..cc55b3f495 100644 --- a/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui +++ b/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui @@ -23,7 +23,7 @@ - Default Width + Default width @@ -39,7 +39,7 @@ If the width is set to 0 the dressup will try to guess a reasonable value based - Default Height + Default height @@ -55,14 +55,14 @@ If the specified height is 0 the dressup will use half the height of the part. S - Default Angle + Default angle - Plunge angle for ascent and descent of holding tag. + Plunge angle for ascent and descent of holding tag ° @@ -84,7 +84,7 @@ If the specified height is 0 the dressup will use half the height of the part. S - Default Radius + Default radius @@ -109,14 +109,14 @@ If the radius is bigger than that which the tag shape itself supports, the resul - Initial # Tags + Initial # tags - Specify the number of tags generated when a new dressup is created. + Specify the number of tags generated when a new dressup is created 2 diff --git a/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui b/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui index 9969a7d9db..30472ceabe 100644 --- a/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui +++ b/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui @@ -57,7 +57,7 @@ If left empty the macro directory is used. - ... + @@ -71,7 +71,7 @@ If left empty the macro directory is used. - The default template to be selected when creating a new Job. + The default template to be selected when creating a new job. This can be helpful when almost all jobs will be processed by the same machine with a similar setup. @@ -82,7 +82,7 @@ If left empty no template will be preselected. - ... + @@ -100,21 +100,21 @@ If left empty no template will be preselected. - Default Geometry Tolerance + Default geometry tolerance - Default value for new Jobs, used for computing Paths. Smaller increases accuracy, but slows down computation + Default value for new jobs, used for computing Paths. Smaller increases accuracy, but slows down computation - Default Curve Accuracy + Default curve accuracy @@ -151,7 +151,7 @@ If left empty no template will be preselected. - Post Processor + Post processor @@ -174,7 +174,7 @@ If left empty no template will be preselected. - Default Path + Default path @@ -216,7 +216,7 @@ See the file save policy below on how to deal with name conflicts. - ... + @@ -227,7 +227,7 @@ See the file save policy below on how to deal with name conflicts. - File Save Policy + File save policy @@ -248,12 +248,12 @@ See the file save policy below on how to deal with name conflicts. - Open File Dialog + Open file dialog - Open File Dialog on conflict + Open file dialog on conflict @@ -285,7 +285,7 @@ See the file save policy below on how to deal with name conflicts. - Post Processors Selection + Post processors selection @@ -302,14 +302,14 @@ See the file save policy below on how to deal with name conflicts. - Default Post Processor + Default post processor - Select one of the post processors as the default. + Select one of the post processors as the default DefaultPostProcessor @@ -322,14 +322,14 @@ See the file save policy below on how to deal with name conflicts. - Default Arguments + Default arguments - Optional arguments passed to the default Post Processor specified above. See the Post Processor's documentation for supported arguments. + Optional arguments passed to the default post processor specified above. See the post processor's documentation for supported arguments. DefaultPostProcessorArgs @@ -392,17 +392,17 @@ See the file save policy below on how to deal with name conflicts. - Create Box + Create box - Create Cylinder + Create cylinder - Extend Model's Bounding Box + Extend model's bounding box @@ -650,7 +650,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. + 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. diff --git a/src/Mod/CAM/Gui/TaskDlgPathCompound.ui b/src/Mod/CAM/Gui/TaskDlgPathCompound.ui index fb738f7374..d2396d1304 100644 --- a/src/Mod/CAM/Gui/TaskDlgPathCompound.ui +++ b/src/Mod/CAM/Gui/TaskDlgPathCompound.ui @@ -11,7 +11,7 @@ - Paths list + Paths List diff --git a/src/Mod/CAM/Path/Base/Gui/PropertyBag.py b/src/Mod/CAM/Path/Base/Gui/PropertyBag.py index 77ac9a033c..f6bd417eae 100644 --- a/src/Mod/CAM/Path/Base/Gui/PropertyBag.py +++ b/src/Mod/CAM/Path/Base/Gui/PropertyBag.py @@ -414,10 +414,10 @@ class PropertyBagCreateCommand(object): def GetResources(self): return { - "MenuText": translate("CAM_PropertyBag", "PropertyBag"), + "MenuText": translate("CAM_PropertyBag", "Property Bag"), "ToolTip": translate( "CAM_PropertyBag", - "Creates an object which can be used to store reference properties.", + "Creates an object which can be used to store reference properties", ), } @@ -443,4 +443,4 @@ class PropertyBagCreateCommand(object): if FreeCAD.GuiUp: FreeCADGui.addCommand("CAM_PropertyBag", PropertyBagCreateCommand()) -FreeCAD.Console.PrintLog("Loading PathPropertyBagGui ... done\n") +FreeCAD.Console.PrintLog("Loading PathPropertyBagGui… done\n") diff --git a/src/Mod/CAM/Path/Dressup/Gui/Array.py b/src/Mod/CAM/Path/Dressup/Gui/Array.py index 98fb4f3b87..8b0220de40 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/Array.py +++ b/src/Mod/CAM/Path/Dressup/Gui/Array.py @@ -72,9 +72,7 @@ class CommandPathDressupArray: # check that the selection contains exactly what we want selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: - Path.Log.error( - translate("CAM_DressupArray", "Please select one toolpath object") + "\n" - ) + Path.Log.error(translate("CAM_DressupArray", "Select one toolpath object") + "\n") return baseObject = selection[0] diff --git a/src/Mod/CAM/Path/Dressup/Gui/AxisMap.py b/src/Mod/CAM/Path/Dressup/Gui/AxisMap.py index 7757d4f0e4..05a747824d 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/AxisMap.py +++ b/src/Mod/CAM/Path/Dressup/Gui/AxisMap.py @@ -252,7 +252,7 @@ class CommandPathDressup: "Pixmap": "CAM_Dressup", "MenuText": QT_TRANSLATE_NOOP("CAM_DressupAxisMap", "Axis Map"), "Accel": "", - "ToolTip": QT_TRANSLATE_NOOP("CAM_DressupAxisMap", "Remap one axis to another."), + "ToolTip": QT_TRANSLATE_NOOP("CAM_DressupAxisMap", "Remaps one axis to another"), } def IsActive(self): @@ -267,9 +267,7 @@ class CommandPathDressup: # check that the selection contains exactly what we want selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: - FreeCAD.Console.PrintError( - translate("CAM_Dressup", "Please select one toolpath object\n") - ) + FreeCAD.Console.PrintError(translate("CAM_Dressup", "Select one toolpath object\n")) return if not selection[0].isDerivedFrom("Path::Feature"): FreeCAD.Console.PrintError( @@ -277,7 +275,7 @@ class CommandPathDressup: ) return if selection[0].isDerivedFrom("Path::FeatureCompoundPython"): - FreeCAD.Console.PrintError(translate("CAM_Dressup", "Please select a toolpath object")) + FreeCAD.Console.PrintError(translate("CAM_Dressup", "Select a toolpath object")) return # everything ok! @@ -306,4 +304,4 @@ if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_DressupAxisMap", CommandPathDressup()) -FreeCAD.Console.PrintLog("Loading PathDressup... done\n") +FreeCAD.Console.PrintLog("Loading PathDressup… done\n") diff --git a/src/Mod/CAM/Path/Dressup/Gui/Boundary.py b/src/Mod/CAM/Path/Dressup/Gui/Boundary.py index dc2eac675d..e878f8fbd7 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/Boundary.py +++ b/src/Mod/CAM/Path/Dressup/Gui/Boundary.py @@ -259,7 +259,7 @@ class CommandPathDressupPathBoundary: "MenuText": QT_TRANSLATE_NOOP("CAM_DressupPathBoundary", "Boundary"), "ToolTip": QT_TRANSLATE_NOOP( "CAM_DressupPathBoundary", - "Creates a Boundary Dress-up from a selected toolpath", + "Creates a boundary dress-up from a selected toolpath", ), } diff --git a/src/Mod/CAM/Path/Dressup/Gui/Dogbone.py b/src/Mod/CAM/Path/Dressup/Gui/Dogbone.py index a6a08ad604..44d056cda0 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/Dogbone.py +++ b/src/Mod/CAM/Path/Dressup/Gui/Dogbone.py @@ -434,7 +434,7 @@ class ObjectDressup(object): "App::PropertyIntegerList", "BoneBlacklist", "Dressup", - QT_TRANSLATE_NOOP("App::Property", "Bones that aren't dressed up"), + QT_TRANSLATE_NOOP("App::Property", "Bones that are not dressed up"), ) obj.BoneBlacklist = [] obj.setEditorMode("BoneBlacklist", 2) # hide this one @@ -1322,7 +1322,7 @@ class CommandDressupDogbone(object): "MenuText": QT_TRANSLATE_NOOP("CAM_DressupDogbone", "Dogbone"), "ToolTip": QT_TRANSLATE_NOOP( "CAM_DressupDogbone", - "Creates a Dogbone Dress-up object from a selected toolpath", + "Creates a dogbone dress-up object from a selected toolpath", ), } @@ -1339,7 +1339,7 @@ class CommandDressupDogbone(object): selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("CAM_DressupDogbone", "Please select one toolpath object") + "\n" + translate("CAM_DressupDogbone", "Select one toolpath object") + "\n" ) return baseObject = selection[0] @@ -1367,4 +1367,4 @@ class CommandDressupDogbone(object): # # FreeCADGui.addCommand("CAM_DressupDogbone", CommandDressupDogbone()) -FreeCAD.Console.PrintLog("Loading DressupDogbone... done\n") +FreeCAD.Console.PrintLog("Loading DressupDogbone… done\n") diff --git a/src/Mod/CAM/Path/Dressup/Gui/DogboneII.py b/src/Mod/CAM/Path/Dressup/Gui/DogboneII.py index 0f89835e68..2402ee1988 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/DogboneII.py +++ b/src/Mod/CAM/Path/Dressup/Gui/DogboneII.py @@ -303,7 +303,7 @@ class ViewProviderDressup(object): def Create(base, name="DressupDogbone"): """ - Create(obj, name='DressupDogbone') ... dresses the given Path.Op.Profile object with dogbones. + Create(obj, name='DressupDogbone')… dresses the given Path.Op.Profile object with dogbones. """ obj = DogboneII.Create(base, name) job = PathUtils.findParentJob(base) @@ -323,7 +323,7 @@ class CommandDressupDogboneII(object): "MenuText": QT_TRANSLATE_NOOP("CAM_DressupDogbone", "Dogbone"), "ToolTip": QT_TRANSLATE_NOOP( "CAM_DressupDogbone", - "Creates a Dogbone Dress-up object from a selected toolpath", + "Creates a dogbone dress-up object from a selected toolpath", ), } @@ -340,7 +340,7 @@ class CommandDressupDogboneII(object): selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("CAM_DressupDogbone", "Please select one toolpath object") + "\n" + translate("CAM_DressupDogbone", "Select one toolpath object") + "\n" ) return baseObject = selection[0] @@ -367,4 +367,4 @@ if FreeCAD.GuiUp: FreeCADGui.addCommand("CAM_DressupDogbone", CommandDressupDogboneII()) -FreeCAD.Console.PrintLog("Loading DressupDogboneII ... done\n") +FreeCAD.Console.PrintLog("Loading DressupDogboneII… done\n") diff --git a/src/Mod/CAM/Path/Dressup/Gui/Dragknife.py b/src/Mod/CAM/Path/Dressup/Gui/Dragknife.py index 69df6b2b85..cada0a52f3 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/Dragknife.py +++ b/src/Mod/CAM/Path/Dressup/Gui/Dragknife.py @@ -576,7 +576,7 @@ class CommandDressupDragknife: def GetResources(self): return { "Pixmap": "CAM_Dressup", - "MenuText": QT_TRANSLATE_NOOP("CAM_DressupDragKnife", "DragKnife"), + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupDragKnife", "Drag Knife"), "ToolTip": QT_TRANSLATE_NOOP( "CAM_DressupDragKnife", "Modifies a toolpath to add dragknife corner actions", @@ -596,7 +596,7 @@ class CommandDressupDragknife: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("CAM_DressupDragKnife", "Please select one toolpath object") + "\n" + translate("CAM_DressupDragKnife", "Select one toolpath object") + "\n" ) return if not selection[0].isDerivedFrom("Path::Feature"): @@ -606,7 +606,7 @@ class CommandDressupDragknife: return if selection[0].isDerivedFrom("Path::FeatureCompoundPython"): FreeCAD.Console.PrintError( - translate("CAM_DressupDragKnife", "Please select a toolpath object") + translate("CAM_DressupDragKnife", "Select a toolpath object") ) return @@ -639,4 +639,4 @@ if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_DressupDragKnife", CommandDressupDragknife()) -FreeCAD.Console.PrintLog("Loading CAM_DressupDragKnife... done\n") +FreeCAD.Console.PrintLog("Loading CAM_DressupDragKnife… done\n") diff --git a/src/Mod/CAM/Path/Dressup/Gui/LeadInOut.py b/src/Mod/CAM/Path/Dressup/Gui/LeadInOut.py index 7137c232a7..34673e1548 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/LeadInOut.py +++ b/src/Mod/CAM/Path/Dressup/Gui/LeadInOut.py @@ -76,45 +76,45 @@ class ObjectDressup: "App::PropertyBool", "KeepToolDown", "Path", - QT_TRANSLATE_NOOP("App::Property", "Keep the Tool Down in toolpath"), + QT_TRANSLATE_NOOP("App::Property", "Keep the tool down in toolpath"), ) obj.addProperty( "App::PropertyDistance", "LengthIn", "Path", - QT_TRANSLATE_NOOP("App::Property", "Length or Radius of the approach"), + QT_TRANSLATE_NOOP("App::Property", "Length or radius of the approach"), ) obj.addProperty( "App::PropertyDistance", "LengthOut", "Path", - QT_TRANSLATE_NOOP("App::Property", "Length or Radius of the exit"), + QT_TRANSLATE_NOOP("App::Property", "Length or radius of the exit"), ) obj.addProperty( "App::PropertyEnumeration", "StyleIn", "Path", - QT_TRANSLATE_NOOP("App::Property", "The Style of motion into the toolpath"), + QT_TRANSLATE_NOOP("App::Property", "The style of motion into the toolpath"), ) obj.StyleIn = lead_styles obj.addProperty( "App::PropertyEnumeration", "StyleOut", "Path", - QT_TRANSLATE_NOOP("App::Property", "The Style of motion out of the toolpath"), + QT_TRANSLATE_NOOP("App::Property", "The style of motion out of the toolpath"), ) obj.StyleOut = lead_styles obj.addProperty( "App::PropertyDistance", "ExtendLeadIn", "Path", - QT_TRANSLATE_NOOP("App::Property", "Extends LeadIn distance"), + QT_TRANSLATE_NOOP("App::Property", "Extends lead in distance"), ) obj.addProperty( "App::PropertyDistance", "ExtendLeadOut", "Path", - QT_TRANSLATE_NOOP("App::Property", "Extends LeadOut distance"), + QT_TRANSLATE_NOOP("App::Property", "Extends lead out distance"), ) obj.addProperty( "App::PropertyBool", @@ -126,7 +126,7 @@ class ObjectDressup: "App::PropertyBool", "IncludeLayers", "Path", - QT_TRANSLATE_NOOP("App::Property", "Apply LeadInOut to layers within an operation"), + QT_TRANSLATE_NOOP("App::Property", "Apply Lead in/out to layers within an operation"), ) obj.Proxy = self @@ -162,13 +162,13 @@ class ObjectDressup: if obj.LengthIn <= 0: Path.Log.error( - translate("CAM_DressupLeadInOut", "Length/Radius positive not Null") + "\n" + translate("CAM_DressupLeadInOut", "Length/radius positive not Null") + "\n" ) obj.LengthIn = 0.1 if obj.LengthOut <= 0: Path.Log.error( - translate("CAM_DressupLeadInOut", "Length/Radius positive not Null") + "\n" + translate("CAM_DressupLeadInOut", "Length/radius positive not Null") + "\n" ) obj.LengthOut = 0.1 @@ -176,7 +176,7 @@ class ObjectDressup: obj.Path = self.generateLeadInOutCurve(obj) def onDocumentRestored(self, obj): - """onDocumentRestored(obj) ... Called automatically when document is restored.""" + """onDocumentRestored(obj)… Called automatically when document is restored.""" lead_styles = [ QT_TRANSLATE_NOOP("CAM_DressupLeadInOut", "Arc"), QT_TRANSLATE_NOOP("CAM_DressupLeadInOut", "Tangent"), @@ -188,7 +188,7 @@ class ObjectDressup: "App::PropertyEnumeration", "StyleIn", "Path", - QT_TRANSLATE_NOOP("App::Property", "The Style of motion into the toolpath"), + QT_TRANSLATE_NOOP("App::Property", "The style of motion into the toolpath"), ) obj.StyleIn = lead_styles obj.StyleIn = obj.StyleOn @@ -199,7 +199,7 @@ class ObjectDressup: "App::PropertyEnumeration", "StyleOut", "Path", - QT_TRANSLATE_NOOP("App::Property", "The Style of motion out of the toolpath"), + QT_TRANSLATE_NOOP("App::Property", "The style of motion out of the toolpath"), ) obj.StyleOut = lead_styles obj.StyleOut = obj.StyleOff @@ -210,7 +210,7 @@ class ObjectDressup: "App::PropertyDistance", "LengthIn", "Path", - QT_TRANSLATE_NOOP("App::Property", "Length or Radius of the approach"), + QT_TRANSLATE_NOOP("App::Property", "Length or radius of the approach"), ) obj.LengthIn = obj.Length obj.removeProperty("Length") @@ -491,10 +491,10 @@ class CommandPathDressupLeadInOut: def GetResources(self): return { "Pixmap": "CAM_Dressup", - "MenuText": QT_TRANSLATE_NOOP("CAM_DressupLeadInOut", "LeadInOut"), + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupLeadInOut", "Lead In/Out"), "ToolTip": QT_TRANSLATE_NOOP( "CAM_DressupLeadInOut", - "Creates a Cutter Radius Compensation G41/G42 Entry Dressup object from a selected path", + "Creates a cutter radius compensation G41/G42 entry dressup object from a selected path", ), } @@ -508,9 +508,7 @@ class CommandPathDressupLeadInOut: # check that the selection contains exactly what we want selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: - Path.Log.error( - translate("CAM_DressupLeadInOut", "Please select one toolpath object") + "\n" - ) + Path.Log.error(translate("CAM_DressupLeadInOut", "Select one toolpath object") + "\n") return baseObject = selection[0] if not baseObject.isDerivedFrom("Path::Feature"): @@ -519,7 +517,7 @@ class CommandPathDressupLeadInOut: ) return if baseObject.isDerivedFrom("Path::FeatureCompoundPython"): - Path.Log.error(translate("CAM_DressupLeadInOut", "Please select a Profile object")) + Path.Log.error(translate("CAM_DressupLeadInOut", "Select a Profile object")) return # everything ok! @@ -547,4 +545,4 @@ if App.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_DressupLeadInOut", CommandPathDressupLeadInOut()) -Path.Log.notice("Loading CAM_DressupLeadInOut... done\n") +Path.Log.notice("Loading CAM_DressupLeadInOut… done\n") diff --git a/src/Mod/CAM/Path/Dressup/Gui/RampEntry.py b/src/Mod/CAM/Path/Dressup/Gui/RampEntry.py index 26ebd52fe5..f96d68658a 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/RampEntry.py +++ b/src/Mod/CAM/Path/Dressup/Gui/RampEntry.py @@ -60,7 +60,7 @@ class ObjectDressup: "App::PropertyAngle", "Angle", "Path", - QT_TRANSLATE_NOOP("App::Property", "Angle of ramp."), + QT_TRANSLATE_NOOP("App::Property", "Angle of ramp"), ) obj.addProperty( "App::PropertyEnumeration", @@ -861,10 +861,10 @@ class CommandPathDressupRampEntry: def GetResources(self): return { "Pixmap": "CAM_Dressup", - "MenuText": QT_TRANSLATE_NOOP("CAM_DressupRampEntry", "RampEntry"), + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupRampEntry", "Ramp Entry"), "ToolTip": QT_TRANSLATE_NOOP( "CAM_DressupRampEntry", - "Creates a Ramp Entry Dress-up object from a selected toolpath", + "Creates a ramp entry dress-up object from a selected toolpath", ), } @@ -879,9 +879,7 @@ class CommandPathDressupRampEntry: # check that the selection contains exactly what we want selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: - Path.Log.error( - translate("CAM_DressupRampEntry", "Please select one toolpath object") + "\n" - ) + Path.Log.error(translate("CAM_DressupRampEntry", "Select one toolpath object") + "\n") return baseObject = selection[0] if not baseObject.isDerivedFrom("Path::Feature"): @@ -890,7 +888,7 @@ class CommandPathDressupRampEntry: ) return if baseObject.isDerivedFrom("Path::FeatureCompoundPython"): - Path.Log.error(translate("CAM_DressupRampEntry", "Please select a Profile object")) + Path.Log.error(translate("CAM_DressupRampEntry", "Select a Profile object")) return # everything ok! @@ -918,4 +916,4 @@ if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_DressupRampEntry", CommandPathDressupRampEntry()) -Path.Log.notice("Loading CAM_DressupRampEntry... done\n") +Path.Log.notice("Loading CAM_DressupRampEntry… done\n") diff --git a/src/Mod/CAM/Path/Dressup/Gui/Tags.py b/src/Mod/CAM/Path/Dressup/Gui/Tags.py index 141c510352..a6a41414f8 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/Tags.py +++ b/src/Mod/CAM/Path/Dressup/Gui/Tags.py @@ -549,7 +549,7 @@ class CommandPathDressupTag: "Pixmap": "CAM_Dressup", "MenuText": QT_TRANSLATE_NOOP("CAM_DressupTag", "Tag"), "ToolTip": QT_TRANSLATE_NOOP( - "CAM_DressupTag", "Creates a Tag Dress-up object from a selected toolpath" + "CAM_DressupTag", "Creates a tag dress-up object from a selected toolpath" ), } diff --git a/src/Mod/CAM/Path/Dressup/Gui/ZCorrect.py b/src/Mod/CAM/Path/Dressup/Gui/ZCorrect.py index 435f699a06..02042472c4 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/ZCorrect.py +++ b/src/Mod/CAM/Path/Dressup/Gui/ZCorrect.py @@ -334,7 +334,9 @@ class CommandPathDressup: "Pixmap": "CAM_Dressup", "MenuText": QT_TRANSLATE_NOOP("CAM_DressupZCorrect", "Z Depth Correction"), "Accel": "", - "ToolTip": QT_TRANSLATE_NOOP("CAM_DressupZCorrect", "Use Probe Map to correct Z depth"), + "ToolTip": QT_TRANSLATE_NOOP( + "CAM_DressupZCorrect", "Corrects Z depth using a probe map" + ), } def IsActive(self): @@ -348,9 +350,7 @@ class CommandPathDressup: # check that the selection contains exactly what we want selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: - FreeCAD.Console.PrintError( - translate("CAM_Dressup", "Please select one toolpath object\n") - ) + FreeCAD.Console.PrintError(translate("CAM_Dressup", "Select one toolpath object\n")) return if not selection[0].isDerivedFrom("Path::Feature"): FreeCAD.Console.PrintError( @@ -358,7 +358,7 @@ class CommandPathDressup: ) return if selection[0].isDerivedFrom("Path::FeatureCompoundPython"): - FreeCAD.Console.PrintError(translate("CAM_Dressup", "Please select a toolpath object")) + FreeCAD.Console.PrintError(translate("CAM_Dressup", "Select a toolpath object")) return # everything ok! @@ -382,4 +382,4 @@ if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_DressupZCorrect", CommandPathDressup()) -FreeCAD.Console.PrintLog("Loading PathDressup... done\n") +FreeCAD.Console.PrintLog("Loading PathDressup… done\n") diff --git a/src/Mod/CAM/Path/Dressup/Tags.py b/src/Mod/CAM/Path/Dressup/Tags.py index 891cca86a6..1fcd8e5db5 100644 --- a/src/Mod/CAM/Path/Dressup/Tags.py +++ b/src/Mod/CAM/Path/Dressup/Tags.py @@ -380,7 +380,7 @@ class MapWireToTag: # if there are no edges connected to entry/exit, it means the plunge in/out is vertical # we need to add in the missing segment and collect the new entry/exit edges. if not self.entryEdges: - Path.Log.debug("fill entryEdges ...") + Path.Log.debug("fill entryEdges…") self.realEntry = sorted(self.edgePoints, key=lambda p: (p - self.entry).Length)[0] self.entryEdges = list( [e for e in edges if Path.Geom.edgeConnectsTo(e, self.realEntry)] @@ -389,7 +389,7 @@ class MapWireToTag: else: self.realEntry = None if not self.exitEdges: - Path.Log.debug("fill exitEdges ...") + Path.Log.debug("fill exitEdges…") self.realExit = sorted(self.edgePoints, key=lambda p: (p - self.exit).Length)[0] self.exitEdges = list([e for e in edges if Path.Geom.edgeConnectsTo(e, self.realExit)]) edges.append(Part.Edge(Part.LineSegment(self.realExit, self.exit))) @@ -1206,7 +1206,7 @@ class ObjectTagDressup: try: self.processTags(obj) except Exception as e: - Path.Log.error("processing tags failed clearing all tags ... '%s'" % (e.args[0])) + Path.Log.error("processing tags failed clearing all tags… '%s'" % (e.args[0])) obj.Path = PathUtils.getPathWithPlacement(obj.Base) # update disabled in case there are some additional ones @@ -1245,7 +1245,7 @@ class ObjectTagDressup: Path.Log.error( translate( "CAM_DressupTag", - "Cannot insert holding tags for this path - please select a Profile path", + "Cannot insert holding tags for this path - select a profile path", ) + "\n" ) @@ -1293,14 +1293,14 @@ class ObjectTagDressup: def Create(baseObject, name="DressupTag"): """ - Create(basePath, name='DressupTag') ... create tag dressup object for the given base path. + Create(basePath, name='DressupTag') … create tag dressup object for the given base path. """ if not baseObject.isDerivedFrom("Path::Feature"): Path.Log.error(translate("CAM_DressupTag", "The selected object is not a path") + "\n") return None if baseObject.isDerivedFrom("Path::FeatureCompoundPython"): - Path.Log.error(translate("CAM_DressupTag", "Please select a Profile object")) + Path.Log.error(translate("CAM_DressupTag", "Select a profile object")) return None obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) @@ -1311,4 +1311,4 @@ def Create(baseObject, name="DressupTag"): return obj -Path.Log.notice("Loading CAM_DressupTag... done\n") +Path.Log.notice("Loading CAM_DressupTag… done\n") diff --git a/src/Mod/CAM/Path/Main/Gui/Camotics.py b/src/Mod/CAM/Path/Main/Gui/Camotics.py index c66fa652f0..2be847ed63 100644 --- a/src/Mod/CAM/Path/Main/Gui/Camotics.py +++ b/src/Mod/CAM/Path/Main/Gui/Camotics.py @@ -309,7 +309,7 @@ class CommandCamoticsSimulate: "Pixmap": "CAM_Camotics", "MenuText": QT_TRANSLATE_NOOP("CAM_Camotics", "CAMotics"), "Accel": "P, C", - "ToolTip": QT_TRANSLATE_NOOP("CAM_Camotics", "Simulate using CAMotics"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Camotics", "Simulates using CAMotics"), "CmdType": "ForEdit", } @@ -331,4 +331,4 @@ if FreeCAD.GuiUp: FreeCADGui.addCommand("CAM_Camotics", CommandCamoticsSimulate()) -FreeCAD.Console.PrintLog("Loading PathCamoticsSimulateGui ... done\n") +FreeCAD.Console.PrintLog("Loading PathCamoticsSimulateGui… done\n") diff --git a/src/Mod/CAM/Path/Main/Gui/Fixture.py b/src/Mod/CAM/Path/Main/Gui/Fixture.py index 51f4644330..a671cf7b10 100644 --- a/src/Mod/CAM/Path/Main/Gui/Fixture.py +++ b/src/Mod/CAM/Path/Main/Gui/Fixture.py @@ -151,7 +151,7 @@ class CommandPathFixture: return { "Pixmap": "CAM_Datums", "MenuText": QT_TRANSLATE_NOOP("CAM_Fixture", "Fixture"), - "ToolTip": QT_TRANSLATE_NOOP("CAM_Fixture", "Creates a Fixture Offset"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Fixture", "Creates a fixture offset"), } def IsActive(self): @@ -187,4 +187,4 @@ if FreeCAD.GuiUp: FreeCADGui.addCommand("CAM_Fixture", CommandPathFixture()) -FreeCAD.Console.PrintLog("Loading PathFixture... done\n") +FreeCAD.Console.PrintLog("Loading PathFixture… done\n") diff --git a/src/Mod/CAM/Path/Main/Gui/Inspect.py b/src/Mod/CAM/Path/Main/Gui/Inspect.py index 097a81e221..e6f28bc6ba 100644 --- a/src/Mod/CAM/Path/Main/Gui/Inspect.py +++ b/src/Mod/CAM/Path/Main/Gui/Inspect.py @@ -127,7 +127,7 @@ class GCodeEditorDialog(QtGui.QDialog): lab.setText( translate( "CAM_Inspect", - "Note: This dialog shows Path Commands in FreeCAD base units (mm/s). \n Values will be converted to the desired unit during post processing.", + "Note: This dialog shows path commands in FreeCAD base units (mm/s). \n Values will be converted to the desired unit during post processing.", ) ) lab.setWordWrap(True) @@ -252,7 +252,7 @@ class CommandPathInspect: def GetResources(self): return { "Pixmap": "CAM_Inspect", - "MenuText": QT_TRANSLATE_NOOP("CAM_Inspect", "Inspect toolPath Commands"), + "MenuText": QT_TRANSLATE_NOOP("CAM_Inspect", "Inspect Toolpath"), "Accel": "P, I", "ToolTip": QT_TRANSLATE_NOOP( "CAM_Inspect", "Inspects the contents of a toolpath object" @@ -271,12 +271,12 @@ class CommandPathInspect: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("CAM_Inspect", "Please select exactly one path object") + "\n" + translate("CAM_Inspect", "Select exactly one path object") + "\n" ) return if not (selection[0].isDerivedFrom("Path::Feature")): FreeCAD.Console.PrintError( - translate("CAM_Inspect", "Please select exactly one path object") + "\n" + translate("CAM_Inspect", "Select exactly one path object") + "\n" ) return diff --git a/src/Mod/CAM/Path/Main/Gui/JobCmd.py b/src/Mod/CAM/Path/Main/Gui/JobCmd.py index 63669dc6d1..0867a9e9c4 100644 --- a/src/Mod/CAM/Path/Main/Gui/JobCmd.py +++ b/src/Mod/CAM/Path/Main/Gui/JobCmd.py @@ -54,9 +54,9 @@ class CommandJobCreate: def GetResources(self): return { "Pixmap": "CAM_Job", - "MenuText": QT_TRANSLATE_NOOP("CAM_Job", "Job"), + "MenuText": QT_TRANSLATE_NOOP("CAM_Job", "New Job"), "Accel": "P, J", - "ToolTip": QT_TRANSLATE_NOOP("CAM_Job", "Creates a CAM Job"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Job", "Creates a CAM job"), } def IsActive(self): @@ -101,7 +101,7 @@ class CommandJobTemplateExport: "MenuText": QT_TRANSLATE_NOOP("CAM_ExportTemplate", "Export Template"), "ToolTip": QT_TRANSLATE_NOOP( "CAM_ExportTemplate", - "Exports CAM Job as a template to be used for other jobs", + "Exports the CAM job as a template to be used for other jobs", ), } @@ -200,4 +200,4 @@ if FreeCAD.GuiUp: FreeCADGui.addCommand("CAM_Job", CommandJobCreate()) FreeCADGui.addCommand("CAM_ExportTemplate", CommandJobTemplateExport()) -FreeCAD.Console.PrintLog("Loading PathJobCmd... done\n") +FreeCAD.Console.PrintLog("Loading PathJobCmd… done\n") diff --git a/src/Mod/CAM/Path/Main/Gui/SanityCmd.py b/src/Mod/CAM/Path/Main/Gui/SanityCmd.py index 32b8f298fe..c15998ca74 100644 --- a/src/Mod/CAM/Path/Main/Gui/SanityCmd.py +++ b/src/Mod/CAM/Path/Main/Gui/SanityCmd.py @@ -50,9 +50,9 @@ class CommandCAMSanity: def GetResources(self): return { "Pixmap": "CAM_Sanity", - "MenuText": QT_TRANSLATE_NOOP("CAM_Sanity", "Check the CAM job for common errors"), + "MenuText": QT_TRANSLATE_NOOP("CAM_Sanity", "Sanity Check"), "Accel": "P, S", - "ToolTip": QT_TRANSLATE_NOOP("CAM_Sanity", "Check the CAM job for common errors"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Sanity", "Checks the CAM job for common errors"), } def IsActive(self): diff --git a/src/Mod/CAM/Path/Main/Gui/Simulator.py b/src/Mod/CAM/Path/Main/Gui/Simulator.py index a05b1b2ddf..443bf9a859 100644 --- a/src/Mod/CAM/Path/Main/Gui/Simulator.py +++ b/src/Mod/CAM/Path/Main/Gui/Simulator.py @@ -610,9 +610,9 @@ class CommandPathSimulate: def GetResources(self): return { "Pixmap": "CAM_Simulator", - "MenuText": QtCore.QT_TRANSLATE_NOOP("CAM_Simulator", "CAM Simulator"), + "MenuText": QtCore.QT_TRANSLATE_NOOP("CAM_Simulator", "Legacy CAM Simulator"), "Accel": "P, M", - "ToolTip": QtCore.QT_TRANSLATE_NOOP("CAM_Simulator", "Simulate G-code on stock"), + "ToolTip": QtCore.QT_TRANSLATE_NOOP("CAM_Simulator", "Simulates G-code on stock"), } def IsActive(self): @@ -630,4 +630,4 @@ class CommandPathSimulate: if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_Simulator", CommandPathSimulate()) - FreeCAD.Console.PrintLog("Loading PathSimulator Gui... done\n") + FreeCAD.Console.PrintLog("Loading PathSimulator Gui… done\n") diff --git a/src/Mod/CAM/Path/Main/Gui/SimulatorGL.py b/src/Mod/CAM/Path/Main/Gui/SimulatorGL.py index 6a1bda33e4..4e83947b00 100644 --- a/src/Mod/CAM/Path/Main/Gui/SimulatorGL.py +++ b/src/Mod/CAM/Path/Main/Gui/SimulatorGL.py @@ -347,9 +347,9 @@ class CommandCAMSimulate: """Command info""" return { "Pixmap": "CAM_SimulatorGL", - "MenuText": QtCore.QT_TRANSLATE_NOOP("CAM_Simulator", "New CAM Simulator"), + "MenuText": QtCore.QT_TRANSLATE_NOOP("CAM_Simulator", "CAM Simulator"), "Accel": "P, N", - "ToolTip": QtCore.QT_TRANSLATE_NOOP("CAM_Simulator", "Simulate G-code on stock"), + "ToolTip": QtCore.QT_TRANSLATE_NOOP("CAM_Simulator", "Simulates G-code on stock"), } def IsActive(self): @@ -369,4 +369,4 @@ class CommandCAMSimulate: if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_SimulatorGL", CommandCAMSimulate()) - FreeCAD.Console.PrintLog("Loading PathSimulator Gui... done\n") + FreeCAD.Console.PrintLog("Loading PathSimulator Gui… done\n") diff --git a/src/Mod/CAM/Path/Op/Gui/Array.py b/src/Mod/CAM/Path/Op/Gui/Array.py index 956bb88042..b2a2441be5 100644 --- a/src/Mod/CAM/Path/Op/Gui/Array.py +++ b/src/Mod/CAM/Path/Op/Gui/Array.py @@ -44,7 +44,7 @@ class ObjectArray: "App::PropertyLinkList", "Base", "Path", - QT_TRANSLATE_NOOP("App::Property", "The toolpath(s) to array"), + QT_TRANSLATE_NOOP("App::Property", "The toolpaths to array"), ) obj.addProperty( "App::PropertyEnumeration", @@ -58,7 +58,7 @@ class ObjectArray: "Path", QT_TRANSLATE_NOOP( "App::Property", - "The spacing between the array copies in Linear pattern", + "The spacing between the array copies in linear pattern", ), ) obj.addProperty( @@ -66,7 +66,7 @@ class ObjectArray: "CopiesX", "Path", QT_TRANSLATE_NOOP( - "App::Property", "The number of copies in X direction in Linear pattern" + "App::Property", "The number of copies in X direction in linear pattern" ), ) obj.addProperty( @@ -74,28 +74,28 @@ class ObjectArray: "CopiesY", "Path", QT_TRANSLATE_NOOP( - "App::Property", "The number of copies in Y direction in Linear pattern" + "App::Property", "The number of copies in Y direction in linear pattern" ), ) obj.addProperty( "App::PropertyAngle", "Angle", "Path", - QT_TRANSLATE_NOOP("App::Property", "Total angle in Polar pattern"), + QT_TRANSLATE_NOOP("App::Property", "Total angle in polar pattern"), ) obj.addProperty( "App::PropertyInteger", "Copies", "Path", QT_TRANSLATE_NOOP( - "App::Property", "The number of copies in Linear 1D and Polar pattern" + "App::Property", "The number of copies in linear 1D and polar pattern" ), ) obj.addProperty( "App::PropertyVector", "Centre", "Path", - QT_TRANSLATE_NOOP("App::Property", "The centre of rotation in Polar pattern"), + QT_TRANSLATE_NOOP("App::Property", "The centre of rotation in polar pattern"), ) obj.addProperty( "App::PropertyBool", @@ -143,7 +143,7 @@ class ObjectArray: "App::PropertyString", "CycleTime", "Path", - QT_TRANSLATE_NOOP("App::Property", "Operations Cycle Time Estimation"), + QT_TRANSLATE_NOOP("App::Property", "Operations cycle time estimation"), ) obj.setEditorMode("CycleTime", 1) # read-only @@ -214,7 +214,7 @@ class ObjectArray: "App::PropertyString", "CycleTime", "Path", - QT_TRANSLATE_NOOP("App::Property", "Operations Cycle Time Estimation"), + QT_TRANSLATE_NOOP("App::Property", "Operations cycle time estimation"), ) obj.CycleTime = self.getCycleTimeEstimate(obj) @@ -480,10 +480,7 @@ class CommandPathArray: return { "Pixmap": "CAM_Array", "MenuText": QT_TRANSLATE_NOOP("CAM_Array", "Array"), - "ToolTip": QT_TRANSLATE_NOOP( - "CAM_Array", - "Creates an array from selected toolpath(s)\nwith identical tool controllers and without coolant", - ), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Array", "Creates an array from selected toolpaths"), } def IsActive(self): diff --git a/src/Mod/CAM/Path/Op/Gui/Base.py b/src/Mod/CAM/Path/Op/Gui/Base.py index 470bf3b521..141b79bc75 100644 --- a/src/Mod/CAM/Path/Op/Gui/Base.py +++ b/src/Mod/CAM/Path/Op/Gui/Base.py @@ -1292,8 +1292,8 @@ class CommandSetStartPoint: def GetResources(self): return { "Pixmap": "CAM_StartPoint", - "MenuText": QT_TRANSLATE_NOOP("PathOp", "Pick Start Point"), - "ToolTip": QT_TRANSLATE_NOOP("PathOp", "Pick Start Point"), + "MenuText": QT_TRANSLATE_NOOP("PathOp", "Start Point Selection"), + "ToolTip": QT_TRANSLATE_NOOP("PathOp", "Selects the start point"), } def IsActive(self): @@ -1416,4 +1416,4 @@ def SetupOperation(name, objFactory, opPageClass, pixmap, menuText, toolTip, set FreeCADGui.addCommand("CAM_SetStartPoint", CommandSetStartPoint()) -FreeCAD.Console.PrintLog("Loading PathOpGui... done\n") +FreeCAD.Console.PrintLog("Loading PathOpGui… done\n") diff --git a/src/Mod/CAM/Path/Op/Gui/Comment.py b/src/Mod/CAM/Path/Op/Gui/Comment.py index 796589b7d6..07347c188d 100644 --- a/src/Mod/CAM/Path/Op/Gui/Comment.py +++ b/src/Mod/CAM/Path/Op/Gui/Comment.py @@ -101,7 +101,7 @@ class CommandPathComment: return { "Pixmap": "CAM_Comment", "MenuText": QT_TRANSLATE_NOOP("CAM_Comment", "Comment"), - "ToolTip": QT_TRANSLATE_NOOP("CAM_Comment", "Add a Comment to your CNC program"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Comment", "Adds a Comment to the CNC program"), } def IsActive(self): @@ -112,7 +112,7 @@ class CommandPathComment: return False def Activated(self): - FreeCAD.ActiveDocument.openTransaction("Create a Comment in your CNC program") + FreeCAD.ActiveDocument.openTransaction("Create a Comment in the CNC program") FreeCADGui.addModule("Path.Op.Gui.Comment") snippet = """ import Path @@ -134,4 +134,4 @@ if FreeCAD.GuiUp: FreeCADGui.addCommand("CAM_Comment", CommandPathComment()) -FreeCAD.Console.PrintLog("Loading PathComment... done\n") +FreeCAD.Console.PrintLog("Loading PathComment… done\n") diff --git a/src/Mod/CAM/Path/Op/Gui/Copy.py b/src/Mod/CAM/Path/Op/Gui/Copy.py index bdde0dcd20..69e21d566c 100644 --- a/src/Mod/CAM/Path/Op/Gui/Copy.py +++ b/src/Mod/CAM/Path/Op/Gui/Copy.py @@ -147,4 +147,4 @@ if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_Copy", CommandPathCopy()) -FreeCAD.Console.PrintLog("Loading PathCopy... done\n") +FreeCAD.Console.PrintLog("Loading PathCopy… done\n") diff --git a/src/Mod/CAM/Path/Op/Gui/PathShapeTC.py b/src/Mod/CAM/Path/Op/Gui/PathShapeTC.py index b7c5eeeec7..531fa5f904 100644 --- a/src/Mod/CAM/Path/Op/Gui/PathShapeTC.py +++ b/src/Mod/CAM/Path/Op/Gui/PathShapeTC.py @@ -62,21 +62,21 @@ def _addBaseProperties(obj): "App::PropertyString", "Comment", "Path", - QT_TRANSLATE_NOOP("App::Property", "An optional comment for this Operation"), + QT_TRANSLATE_NOOP("App::Property", "An optional comment for this operation"), locked=True, ) obj.addProperty( "App::PropertyString", "UserLabel", "Path", - QT_TRANSLATE_NOOP("App::Property", "User Assigned Label"), + QT_TRANSLATE_NOOP("App::Property", "User assigned label"), locked=True, ) obj.addProperty( "App::PropertyString", "CycleTime", "Path", - QT_TRANSLATE_NOOP("App::Property", "Operations Cycle Time Estimation"), + QT_TRANSLATE_NOOP("App::Property", "Operations cycle time estimation"), locked=True, ) obj.setEditorMode("CycleTime", 1) # Set property read-only @@ -180,9 +180,10 @@ class CommandPathShapeTC: def GetResources(self): return { "Pixmap": "CAM_ShapeTC", - "MenuText": QT_TRANSLATE_NOOP("CAM_PathShapeTC", "Path from Shape TC"), + "MenuText": QT_TRANSLATE_NOOP("CAM_PathShapeTC", "Path From Shape TC"), "ToolTip": QT_TRANSLATE_NOOP( - "CAM_PathShapeTC", "Creates path from selected shapes with tool controller" + "CAM_PathShapeTC", + "Creates a path from the selected shapes with the tool controller", ), } diff --git a/src/Mod/CAM/Path/Op/Gui/SimpleCopy.py b/src/Mod/CAM/Path/Op/Gui/SimpleCopy.py index 9f6fb9a4a8..ed7db44ec8 100644 --- a/src/Mod/CAM/Path/Op/Gui/SimpleCopy.py +++ b/src/Mod/CAM/Path/Op/Gui/SimpleCopy.py @@ -55,12 +55,12 @@ class CommandPathSimpleCopy: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("CAM_SimpleCopy", "Please select exactly one toolpath object") + "\n" + translate("CAM_SimpleCopy", "Select exactly one toolpath object") + "\n" ) return if not (selection[0].isDerivedFrom("Path::Feature")): FreeCAD.Console.PrintError( - translate("CAM_SimpleCopy", "Please select exactly one toolpath object") + "\n" + translate("CAM_SimpleCopy", "Select exactly one toolpath object") + "\n" ) return diff --git a/src/Mod/CAM/Path/Op/Gui/Stop.py b/src/Mod/CAM/Path/Op/Gui/Stop.py index fa887eff4a..e633970906 100644 --- a/src/Mod/CAM/Path/Op/Gui/Stop.py +++ b/src/Mod/CAM/Path/Op/Gui/Stop.py @@ -37,7 +37,7 @@ class Stop: "App::PropertyEnumeration", "Stop", "Path", - QT_TRANSLATE_NOOP("App::Property", "Add Optional or Mandatory Stop to the program"), + QT_TRANSLATE_NOOP("App::Property", "Add an optional or mandatory stop to the program"), ) obj.Stop = ["Optional", "Mandatory"] obj.Proxy = self @@ -107,7 +107,7 @@ class CommandPathStop: "Pixmap": "CAM_Stop", "MenuText": QT_TRANSLATE_NOOP("CAM_Stop", "Stop"), "ToolTip": QT_TRANSLATE_NOOP( - "CAM_Stop", "Add Optional or Mandatory Stop to the program" + "CAM_Stop", "Adds an optional or mandatory stop to the program" ), } @@ -142,4 +142,4 @@ if FreeCAD.GuiUp: FreeCADGui.addCommand("CAM_Stop", CommandPathStop()) -FreeCAD.Console.PrintLog("Loading PathStop... done\n") +FreeCAD.Console.PrintLog("Loading PathStop… done\n") diff --git a/src/Mod/CAM/Path/Post/Command.py b/src/Mod/CAM/Path/Post/Command.py index fc9dfd66da..6f6f52149f 100644 --- a/src/Mod/CAM/Path/Post/Command.py +++ b/src/Mod/CAM/Path/Post/Command.py @@ -108,7 +108,7 @@ class CommandPathPost: "Pixmap": "CAM_Post", "MenuText": QT_TRANSLATE_NOOP("CAM_Post", "Post Process"), "Accel": "P, P", - "ToolTip": QT_TRANSLATE_NOOP("CAM_Post", "Post Process the selected Job"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Post", "Post Processes the selected job"), } def IsActive(self): @@ -262,4 +262,4 @@ if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_Post", CommandPathPost()) -FreeCAD.Console.PrintLog("Loading PathPost... done\n") +FreeCAD.Console.PrintLog("Loading PathPost… done\n") diff --git a/src/Mod/CAM/Path/Tool/Gui/Controller.py b/src/Mod/CAM/Path/Tool/Gui/Controller.py index 0a5374b5af..bc40b82154 100644 --- a/src/Mod/CAM/Path/Tool/Gui/Controller.py +++ b/src/Mod/CAM/Path/Tool/Gui/Controller.py @@ -140,8 +140,10 @@ class CommandPathToolController(object): def GetResources(self): return { "Pixmap": "CAM_LengthOffset", - "MenuText": QT_TRANSLATE_NOOP("CAM_ToolController", "Add Tool Controller to the Job"), - "ToolTip": QT_TRANSLATE_NOOP("CAM_ToolController", "Add Tool Controller"), + "MenuText": QT_TRANSLATE_NOOP("CAM_ToolController", "Tool Controller"), + "ToolTip": QT_TRANSLATE_NOOP( + "CAM_ToolController", "Adds a new tool controller to the active job" + ), } def selectedJob(self): @@ -364,4 +366,4 @@ if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand("CAM_ToolController", CommandPathToolController()) -FreeCAD.Console.PrintLog("Loading PathToolControllerGui... done\n") +FreeCAD.Console.PrintLog("Loading PathToolControllerGui… done\n") diff --git a/src/Mod/CAM/Path/Tool/library/ui/cmd.py b/src/Mod/CAM/Path/Tool/library/ui/cmd.py index 3118935b39..a1f9f94f99 100644 --- a/src/Mod/CAM/Path/Tool/library/ui/cmd.py +++ b/src/Mod/CAM/Path/Tool/library/ui/cmd.py @@ -48,8 +48,8 @@ class CommandToolBitLibraryDockOpen: def GetResources(self): return { "Pixmap": "CAM_ToolTable", - "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitDock", "ToolBit Dock"), - "ToolTip": QT_TRANSLATE_NOOP("CAM_ToolBitDock", "Toggle the Toolbit Dock"), + "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitDock", "Toolbit Dock"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_ToolBitDock", "Toggles the toolbit dock"), "Accel": "P, T", "CmdType": "ForEdit", } @@ -73,9 +73,9 @@ class CommandLibraryEditorOpen: def GetResources(self): return { "Pixmap": "CAM_ToolTable", - "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitLibraryOpen", "ToolBit Library editor"), + "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitLibraryOpen", "Toolbit Library Editor"), "ToolTip": QT_TRANSLATE_NOOP( - "CAM_ToolBitLibraryOpen", "Open an editor to manage ToolBit libraries" + "CAM_ToolBitLibraryOpen", "Opens an editor to manage toolbit libraries" ), "CmdType": "ForEdit", } @@ -95,4 +95,4 @@ if FreeCAD.GuiUp: BarList = ["CAM_ToolBitDock"] MenuList = ["CAM_ToolBitLibraryOpen", "CAM_ToolBitDock"] -FreeCAD.Console.PrintLog("Loading PathToolBitLibraryCmd... done\n") +FreeCAD.Console.PrintLog("Loading PathToolBitLibraryCmd… done\n") diff --git a/src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py b/src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py index d1b3254043..e417120e0a 100644 --- a/src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py +++ b/src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py @@ -49,8 +49,8 @@ class CommandToolBitCreate: def GetResources(self): return { "Pixmap": "CAM_ToolBit", - "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitCreate", "Create Tool"), - "ToolTip": QT_TRANSLATE_NOOP("CAM_ToolBitCreate", "Creates a new ToolBit object"), + "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitCreate", "New Tool"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_ToolBitCreate", "Creates a new toolbit object"), } def IsActive(self): @@ -73,14 +73,14 @@ class CommandToolBitSave: def GetResources(self): if self.saveAs: - menuTxt = QT_TRANSLATE_NOOP("CAM_ToolBitSaveAs", "Save Tool as...") + menuTxt = QT_TRANSLATE_NOOP("CAM_ToolBitSaveAs", "Save Tool As…") else: menuTxt = QT_TRANSLATE_NOOP("CAM_ToolBitSave", "Save Tool") return { "Pixmap": "CAM_ToolBit", "MenuText": menuTxt, "ToolTip": QT_TRANSLATE_NOOP( - "CAM_ToolBitSave", "Save an existing ToolBit object to a file" + "CAM_ToolBitSave", "Saves an existing toolbit object to a file" ), } @@ -123,7 +123,7 @@ class CommandToolBitLoad: "Pixmap": "CAM_ToolBit", "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitLoad", "Load Tool"), "ToolTip": QT_TRANSLATE_NOOP( - "CAM_ToolBitLoad", "Load an existing ToolBit object from a file" + "CAM_ToolBitLoad", "Loads an existing toolbit object from a file" ), } diff --git a/src/Mod/CAM/PathCommands.py b/src/Mod/CAM/PathCommands.py index 9658b7f8e3..b14a3c9431 100644 --- a/src/Mod/CAM/PathCommands.py +++ b/src/Mod/CAM/PathCommands.py @@ -59,7 +59,7 @@ class _CommandSelectLoop: "MenuText": QT_TRANSLATE_NOOP("CAM_SelectLoop", "Finish Selecting Loop"), "Accel": "P, L", "ToolTip": QT_TRANSLATE_NOOP( - "CAM_SelectLoop", "Complete the selection of edges that form a loop" + "CAM_SelectLoop", "Completes the selection of edges that form a loop" ), "CmdType": "ForEdit", } @@ -142,12 +142,10 @@ class _ToggleOperation: def GetResources(self): return { "Pixmap": "CAM_OpActive", - "MenuText": QT_TRANSLATE_NOOP( - "CAM_OpActiveToggle", "Toggle the Active State of the Operation" - ), + "MenuText": QT_TRANSLATE_NOOP("CAM_OpActiveToggle", "Toggle Operation"), "Accel": "P, X", "ToolTip": QT_TRANSLATE_NOOP( - "CAM_OpActiveToggle", "Toggle the Active State of the Operation" + "CAM_OpActiveToggle", "Toggles the active state of the operation" ), "CmdType": "ForEdit", } @@ -185,8 +183,8 @@ class _CopyOperation: def GetResources(self): return { "Pixmap": "CAM_OpCopy", - "MenuText": QT_TRANSLATE_NOOP("CAM_OperationCopy", "Copy the operation in the job"), - "ToolTip": QT_TRANSLATE_NOOP("CAM_OperationCopy", "Copy the operation in the job"), + "MenuText": QT_TRANSLATE_NOOP("CAM_OperationCopy", "Copy Operation"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_OperationCopy", "Copies the operation in the job"), "CmdType": "ForEdit", } diff --git a/src/Mod/Help/dlgPreferencesHelp.ui b/src/Mod/Help/dlgPreferencesHelp.ui index e32f3c9c6d..a99b52c719 100644 --- a/src/Mod/Help/dlgPreferencesHelp.ui +++ b/src/Mod/Help/dlgPreferencesHelp.ui @@ -26,8 +26,8 @@ false - This will fetch the documentation from pages rendered on GitHub. -This is currently not available... + Fetches the documentation from pages rendered on GitHub. +This is currently not available. GitHub (online) @@ -84,10 +84,10 @@ to get French translation of the documentation. Set this to a custom URL or the folder where the help files are located. -You can easily download the documentation for offline use by using the Addon -Manager and installing the "offline-documentation" addon. If this -field is left blank, FreeCAD will automatically search for the help files at -the default location ($USERAPPDATADIR/Mod/offline-documentation). +Documentation can be downloaded for offline use via the Addon Manager and installing the +"offline-documentation" addon. If this field is left blank, FreeCAD will +automatically search for the help files at the default location +($USERAPPDATADIR/Mod/offline-documentation). Gui::FileChooser::Directory @@ -109,7 +109,7 @@ the default location ($USERAPPDATADIR/Mod/offline-documentation). Qt::LeftToRight - Translation suffix: + Translation suffix @@ -167,7 +167,7 @@ custom stylesheet below and can look nicer than the wiki option. The 'Markdown' - Note: if PySide Web components are not found on your system, help pages will open in your default web browser regardless of the options below + Note: if PySide Web components are not found on the system, help pages will open in the default web browser regardless of the options below. true @@ -177,10 +177,10 @@ custom stylesheet below and can look nicer than the wiki option. The 'Markdown' - The documentation will open in your default web browser. + The documentation will open in the default web browser - In your default web browser + In the default web browser true @@ -196,7 +196,7 @@ custom stylesheet below and can look nicer than the wiki option. The 'Markdown' - The documentation will open in a new tab inside the FreeCAD interface. This requires the PySide QtWebengineWidgets component + The documentation will open in a new tab inside the FreeCAD interface. This requires the PySide QtWebengineWidgets component. In a FreeCAD tab @@ -218,8 +218,8 @@ custom stylesheet below and can look nicer than the wiki option. The 'Markdown' true - The documentation will open in a dockable dialog inside the FreeCAD window, -which allows you to keep it open while working in the 3D view. This requires the PySide QtWebengineWidgets component + Documentation opens in a dockable dialog within FreeCAD, allowing simultaneous work in the 3D view. +Requires the PySide QtWebengineWidgets component. In a separate, embeddable dialog @@ -246,16 +246,15 @@ which allows you to keep it open while working in the 3D view. This requires the - Custom stylesheet: + Custom stylesheet - You can here indicate the path to an alternative CSS file to be used -to style the Markdown pages. This will only work if you have selected the -Markdown version above. + Specify the path to an alternative CSS file for styling Markdown pages. +This only applies if Markdown is selected above. StyleSheet diff --git a/src/Mod/Material/App/AppMaterial.cpp b/src/Mod/Material/App/AppMaterial.cpp index 50975b3330..a6bc448cf1 100644 --- a/src/Mod/Material/App/AppMaterial.cpp +++ b/src/Mod/Material/App/AppMaterial.cpp @@ -85,7 +85,7 @@ PyMOD_INIT_FUNC(Materials) #endif PyObject* module = Materials::initModule(); - Base::Console().log("Loading Material module... done\n"); + Base::Console().log("Loading Material module… done\n"); Base::Interpreter().addType(&Materials::Array2DPy::Type, module, "Array2D"); Base::Interpreter().addType(&Materials::Array3DPy::Type, module, "Array3D"); diff --git a/src/Mod/Material/App/ExternalManager.cpp b/src/Mod/Material/App/ExternalManager.cpp index d9af3c53dc..ad4b358fcc 100644 --- a/src/Mod/Material/App/ExternalManager.cpp +++ b/src/Mod/Material/App/ExternalManager.cpp @@ -100,7 +100,7 @@ void ExternalManager::getConfiguration() void ExternalManager::instantiate() { _instantiated = false; - Base::Console().log("Loading external manager...\n"); + Base::Console().log("Loading external manager…\n"); if (_moduleName.empty() || _className.empty()) { Base::Console().log("External module not defined\n"); diff --git a/src/Mod/Material/Gui/AppMatGui.cpp b/src/Mod/Material/Gui/AppMatGui.cpp index f406363590..e3500fca45 100644 --- a/src/Mod/Material/Gui/AppMatGui.cpp +++ b/src/Mod/Material/Gui/AppMatGui.cpp @@ -94,7 +94,7 @@ PyMOD_INIT_FUNC(MatGui) PyObject* matGuiModule = MatGui::initModule(); - Base::Console().log("Loading GUI of Material module... done\n"); + Base::Console().log("Loading GUI of Material module… done\n"); MatGui::Workbench ::init(); auto manip = std::make_shared(); @@ -107,7 +107,7 @@ PyMOD_INIT_FUNC(MatGui) // widget Gui::Dialog::DlgPreferencesImp::setGroupData("Material", "Material", - QObject::tr("Material workbench")); + QObject::tr("Material Workbench")); new Gui::PrefPageProducer( QT_TRANSLATE_NOOP("QObject", "Material")); new Gui::PrefPageProducer( diff --git a/src/Mod/Material/Gui/Array2D.cpp b/src/Mod/Material/Gui/Array2D.cpp index 558562f614..85cdcb71e6 100644 --- a/src/Mod/Material/Gui/Array2D.cpp +++ b/src/Mod/Material/Gui/Array2D.cpp @@ -76,7 +76,7 @@ Array2D::Array2D(const QString& propertyName, ui->tableView->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->tableView, &QWidget::customContextMenuRequested, this, &Array2D::onContextMenu); - _deleteAction.setText(tr("Delete row")); + _deleteAction.setText(tr("Delete Row")); _deleteAction.setShortcut(Gui::QtTools::deleteKeySequence()); connect(&_deleteAction, &QAction::triggered, this, &Array2D::onDelete); @@ -135,7 +135,7 @@ void Array2D::onDataChanged(const QModelIndex& topLeft, void Array2D::onContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); contextMenu.addAction(&_deleteAction); @@ -169,7 +169,7 @@ int Array2D::confirmDelete() box.setIcon(QMessageBox::Question); box.setWindowTitle(QObject::tr("Confirm Delete")); - QString prompt = QObject::tr("Are you sure you want to delete the row?"); + QString prompt = QObject::tr("Delete the row?"); box.setText(prompt); box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); diff --git a/src/Mod/Material/Gui/Array3D.cpp b/src/Mod/Material/Gui/Array3D.cpp index fe32438761..fc4397b3dd 100644 --- a/src/Mod/Material/Gui/Array3D.cpp +++ b/src/Mod/Material/Gui/Array3D.cpp @@ -74,11 +74,11 @@ Array3D::Array3D(const QString& propertyName, ui->table2D->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->table2D, &QWidget::customContextMenuRequested, this, &Array3D::on2DContextMenu); - _deleteDepthAction.setText(tr("Delete row")); + _deleteDepthAction.setText(tr("Delete Row")); connect(&_deleteDepthAction, &QAction::triggered, this, &Array3D::onDepthDelete); ui->table3D->addAction(&_deleteDepthAction); - _delete2DAction.setText(tr("Delete row")); + _delete2DAction.setText(tr("Delete Row")); connect(&_delete2DAction, &QAction::triggered, this, &Array3D::on2DDelete); ui->table2D->addAction(&_delete2DAction); @@ -228,7 +228,7 @@ void Array3D::update2DArray() void Array3D::onDepthContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); contextMenu.addAction(&_deleteDepthAction); @@ -262,7 +262,7 @@ int Array3D::confirmDepthDelete() box.setIcon(QMessageBox::Question); box.setWindowTitle(tr("Confirm Delete")); - QString prompt = tr("Are you sure you want to delete the row?"); + QString prompt = tr("Delete the row?"); box.setText(prompt); box.setInformativeText(tr("Removing this will also remove all 2D contents.")); @@ -299,7 +299,7 @@ void Array3D::deleteDepthSelected() void Array3D::on2DContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); contextMenu.addAction(&_delete2DAction); @@ -334,7 +334,7 @@ int Array3D::confirm2dDelete() box.setIcon(QMessageBox::Question); box.setWindowTitle(tr("Confirm Delete")); - QString prompt = tr("Are you sure you want to delete the row?"); + QString prompt = tr("Delete the row?"); box.setText(prompt); box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); diff --git a/src/Mod/Material/Gui/Command.cpp b/src/Mod/Material/Gui/Command.cpp index ae1ddcda95..3390541ff9 100644 --- a/src/Mod/Material/Gui/Command.cpp +++ b/src/Mod/Material/Gui/Command.cpp @@ -51,8 +51,8 @@ CmdMaterialEdit::CmdMaterialEdit() { sAppModule = "Material"; sGroup = QT_TR_NOOP("Material"); - sMenuText = QT_TR_NOOP("Edit..."); - sToolTipText = QT_TR_NOOP("Edit material properties"); + sMenuText = QT_TR_NOOP("Edit"); + sToolTipText = QT_TR_NOOP("Edits material properties"); sWhatsThis = "Material_Edit"; sStatusTip = sToolTipText; sPixmap = "Material_Edit"; @@ -85,7 +85,7 @@ StdCmdSetAppearance::StdCmdSetAppearance() : Command("Std_SetAppearance") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Appearance..."); + sMenuText = QT_TR_NOOP("&Appearance"); sToolTipText = QT_TR_NOOP("Sets the display properties of the selected object"); sWhatsThis = "Std_SetAppearance"; sStatusTip = QT_TR_NOOP("Sets the display properties of the selected object"); @@ -114,7 +114,7 @@ StdCmdSetMaterial::StdCmdSetMaterial() : Command("Std_SetMaterial") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Material..."); + sMenuText = QT_TR_NOOP("&Material"); sToolTipText = QT_TR_NOOP("Sets the material of the selected object"); sWhatsThis = "Std_SetMaterial"; sStatusTip = QT_TR_NOOP("Sets the material of the selected object"); @@ -143,8 +143,8 @@ CmdInspectAppearance::CmdInspectAppearance() : Command("Materials_InspectAppearance") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Inspect Appearance..."); - sToolTipText = QT_TR_NOOP("Inspect the appearance properties of the selected object"); + sMenuText = QT_TR_NOOP("Inspect Appearance"); + sToolTipText = QT_TR_NOOP("Inspects the appearance properties of the selected object"); sWhatsThis = "Materials_InspectAppearance"; sStatusTip = QT_TR_NOOP("Inspect the appearance properties of the selected object"); // sPixmap = "Material_Edit"; @@ -170,8 +170,8 @@ CmdInspectMaterial::CmdInspectMaterial() : Command("Materials_InspectMaterial") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Inspect Material..."); - sToolTipText = QT_TR_NOOP("Inspect the material properties of the selected object"); + sMenuText = QT_TR_NOOP("Inspect Material"); + sToolTipText = QT_TR_NOOP("Inspects the material properties of the selected object"); sWhatsThis = "Materials_InspectMaterial"; sStatusTip = QT_TR_NOOP("Inspect the material properties of the selected object"); // sPixmap = "Material_Edit"; @@ -199,8 +199,8 @@ CmdMigrateToExternal::CmdMigrateToExternal() : Command("Materials_MigrateToExternal") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Migrate..."); - sToolTipText = QT_TR_NOOP("Migrate the materials to the external materials manager"); + sMenuText = QT_TR_NOOP("Migrate"); + sToolTipText = QT_TR_NOOP("Migrates the materials to the external materials manager"); sWhatsThis = "Materials_MigrateToDatabase"; sStatusTip = QT_TR_NOOP("Migrate existing materials to the external materials manager"); // sPixmap = "Materials_Edit"; diff --git a/src/Mod/Material/Gui/DlgDisplayProperties.ui b/src/Mod/Material/Gui/DlgDisplayProperties.ui index f90f5551ce..ad13aa5bd4 100644 --- a/src/Mod/Material/Gui/DlgDisplayProperties.ui +++ b/src/Mod/Material/Gui/DlgDisplayProperties.ui @@ -11,13 +11,13 @@ - Display properties + Display Properties - Viewing mode + Viewing Mode @@ -52,7 +52,7 @@ - Document window: + Document window @@ -84,7 +84,7 @@ false - Plot mode: + Plot mode @@ -141,7 +141,7 @@ - Point size: + Point size @@ -196,7 +196,7 @@ - Line width: + Line width @@ -234,7 +234,7 @@ - Transparency: + Transparency @@ -286,7 +286,7 @@ - Line transparency: + Line transparency @@ -362,14 +362,14 @@ - Color plot: + Color plot - Custom appearance: + Custom appearance @@ -379,21 +379,21 @@ - Point color: + Point color - Line color: + Line color - ... + Color Plot @@ -403,7 +403,7 @@ - ... + Appearance diff --git a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp index aa2aaa0095..0c83cf8a0d 100644 --- a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp +++ b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp @@ -178,17 +178,17 @@ void DlgDisplayPropertiesImp::setupFilters() auto filterList = std::make_shared>>(); auto filter = std::make_shared(); - filter->setName(tr("Basic Appearance")); + filter->setName(tr("Basic appearance")); filter->addRequiredComplete(Materials::ModelUUIDs::ModelUUID_Rendering_Basic); filterList->push_back(filter); filter = std::make_shared(); - filter->setName(tr("Texture Appearance")); + filter->setName(tr("Texture appearance")); filter->addRequiredComplete(Materials::ModelUUIDs::ModelUUID_Rendering_Texture); filterList->push_back(filter); filter = std::make_shared(); - filter->setName(tr("All Materials")); + filter->setName(tr("All materials")); filterList->push_back(filter); d->ui.widgetMaterial->setIncludeEmptyFolders(false); diff --git a/src/Mod/Material/Gui/DlgInspectAppearance.cpp b/src/Mod/Material/Gui/DlgInspectAppearance.cpp index 2d67cfe676..0316b5ae62 100644 --- a/src/Mod/Material/Gui/DlgInspectAppearance.cpp +++ b/src/Mod/Material/Gui/DlgInspectAppearance.cpp @@ -199,7 +199,7 @@ QWidget* DlgInspectAppearance::makeAppearanceTab(const App::Material& material) int row = 0; auto* labelDiffuse = new QLabel(); - labelDiffuse->setText(tr("Diffuse Color")); + labelDiffuse->setText(tr("Diffuse color")); auto* colorDiffuse = new ColorWidget(material.diffuseColor); colorDiffuse->setMaximumHeight(23); @@ -208,7 +208,7 @@ QWidget* DlgInspectAppearance::makeAppearanceTab(const App::Material& material) row += 1; auto* labelAmbient = new QLabel(); - labelAmbient->setText(tr("Ambient Color")); + labelAmbient->setText(tr("Ambient color")); auto* colorAmbient = new ColorWidget(material.ambientColor); colorAmbient->setMaximumHeight(23); @@ -217,7 +217,7 @@ QWidget* DlgInspectAppearance::makeAppearanceTab(const App::Material& material) row += 1; auto* labelEmissive = new QLabel(); - labelEmissive->setText(tr("Emissive Color")); + labelEmissive->setText(tr("Emissive color")); auto* colorEmissive = new ColorWidget(material.emissiveColor); colorEmissive->setMaximumHeight(23); @@ -226,7 +226,7 @@ QWidget* DlgInspectAppearance::makeAppearanceTab(const App::Material& material) row += 1; auto* labelSpecular = new QLabel(); - labelSpecular->setText(tr("Specular Color")); + labelSpecular->setText(tr("Specular color")); auto* colorSpecular = new ColorWidget(material.specularColor); colorSpecular->setMaximumHeight(23); diff --git a/src/Mod/Material/Gui/DlgInspectAppearance.ui b/src/Mod/Material/Gui/DlgInspectAppearance.ui index 0136f599e1..cf16e9de78 100644 --- a/src/Mod/Material/Gui/DlgInspectAppearance.ui +++ b/src/Mod/Material/Gui/DlgInspectAppearance.ui @@ -47,7 +47,7 @@ - Document Name + Document name @@ -61,7 +61,7 @@ - Label / Internal Name + Label / internal name diff --git a/src/Mod/Material/Gui/DlgInspectMaterial.cpp b/src/Mod/Material/Gui/DlgInspectMaterial.cpp index e5512ba0a3..f1eb8c7537 100644 --- a/src/Mod/Material/Gui/DlgInspectMaterial.cpp +++ b/src/Mod/Material/Gui/DlgInspectMaterial.cpp @@ -169,7 +169,7 @@ void DlgInspectMaterial::update(std::vector& views) ui->editObjectLabel->setText(QStringLiteral("")); } ui->editObjectName->setText(QLatin1String(obj->getNameInDocument())); - appendClip(tr("Internal Name: ") + QString::fromUtf8(obj->getNameInDocument())); + appendClip(tr("Internal name: ") + QString::fromUtf8(obj->getNameInDocument())); auto subElement = Gui::Selection().getSelectionEx(); if (subElement.size() > 0) { @@ -270,10 +270,10 @@ void DlgInspectMaterial::addModelDetails(QTreeView* tree, addExpanded(tree, parent, library); auto libraryPath = - clipItem(tr("Library Directory: ") + model->getLibrary()->getDirectoryPath()); + clipItem(tr("Library directory: ") + model->getLibrary()->getDirectoryPath()); addExpanded(tree, parent, libraryPath); - auto directory = clipItem(tr("Sub Directory: ") + model->getDirectory()); + auto directory = clipItem(tr("Subdirectory: ") + model->getDirectory()); addExpanded(tree, parent, directory); auto inherits = clipItem(tr("Inherits:")); @@ -343,9 +343,9 @@ void DlgInspectMaterial::addMaterialDetails(QTreeView* tree, auto library = clipItem(tr("Library: ") + material.getLibrary()->getName()); addExpanded(tree, parent, library); - auto libraryPath = clipItem(tr("Library Directory: ") + material.getLibrary()->getDirectoryPath()); + auto libraryPath = clipItem(tr("Library directory: ") + material.getLibrary()->getDirectoryPath()); addExpanded(tree, parent, libraryPath); - auto directory = clipItem(tr("Sub Directory: ") + material.getDirectory()); + auto directory = clipItem(tr("Sub directory: ") + material.getDirectory()); addExpanded(tree, parent, directory); auto inherits = clipItem(tr("Inherits:")); addExpanded(tree, parent, inherits); @@ -362,25 +362,25 @@ void DlgInspectMaterial::addMaterialDetails(QTreeView* tree, } unindent(); - auto appearance = clipItem(tr("Appearance Models:")); + auto appearance = clipItem(tr("Appearance models:")); addExpanded(tree, parent, appearance); indent(); addModels(tree, appearance, material.getAppearanceModels()); unindent(); - auto physical = clipItem(tr("Physical Models:")); + auto physical = clipItem(tr("Physical models:")); addExpanded(tree, parent, physical); indent(); addModels(tree, physical, material.getPhysicalModels()); unindent(); - auto appearanceProperties = clipItem(tr("Appearance Properties:")); + auto appearanceProperties = clipItem(tr("Appearance properties:")); addExpanded(tree, parent, appearanceProperties); indent(); addProperties(tree, appearanceProperties, material.getAppearanceProperties()); unindent(); - auto physicalProperties = clipItem(tr("Physical Properties:")); + auto physicalProperties = clipItem(tr("Physical properties:")); addExpanded(tree, parent, physicalProperties); indent(); addProperties(tree, physicalProperties, material.getPhysicalProperties()); diff --git a/src/Mod/Material/Gui/DlgInspectMaterial.ui b/src/Mod/Material/Gui/DlgInspectMaterial.ui index dec62fce7c..e939dfc958 100644 --- a/src/Mod/Material/Gui/DlgInspectMaterial.ui +++ b/src/Mod/Material/Gui/DlgInspectMaterial.ui @@ -47,7 +47,7 @@ - Document Name + Document name @@ -61,7 +61,7 @@ - Label / Internal Name + Label / internal name @@ -125,7 +125,7 @@ - Copy to clipboard + Copy to Clipboard diff --git a/src/Mod/Material/Gui/DlgMaterialImp.cpp b/src/Mod/Material/Gui/DlgMaterialImp.cpp index d72450a14d..6addf027f6 100644 --- a/src/Mod/Material/Gui/DlgMaterialImp.cpp +++ b/src/Mod/Material/Gui/DlgMaterialImp.cpp @@ -96,7 +96,7 @@ DlgMaterialImp::DlgMaterialImp(bool floating, QWidget* parent, Qt::WindowFlags f if (floating) { Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance(); QDockWidget* dw = - pDockMgr->addDockWindow("Display properties", this, Qt::AllDockWidgetAreas); + pDockMgr->addDockWindow("Display Properties", this, Qt::AllDockWidgetAreas); dw->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable); dw->setFloating(true); dw->show(); diff --git a/src/Mod/Material/Gui/DlgSettingsExternal.ui b/src/Mod/Material/Gui/DlgSettingsExternal.ui index e714904929..e88bafa134 100644 --- a/src/Mod/Material/Gui/DlgSettingsExternal.ui +++ b/src/Mod/Material/Gui/DlgSettingsExternal.ui @@ -26,7 +26,7 @@ - External Interface + External interface @@ -88,14 +88,14 @@ - Model Cache Size + Model cache size - Hit Rate + Hit rate Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -121,7 +121,7 @@ - Hit Rate + Hit rate Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -131,7 +131,7 @@ - Material Cache Size + Material cache size diff --git a/src/Mod/Material/Gui/DlgSettingsMaterial.ui b/src/Mod/Material/Gui/DlgSettingsMaterial.ui index f3f63bdc2f..5bd8cc4ad4 100644 --- a/src/Mod/Material/Gui/DlgSettingsMaterial.ui +++ b/src/Mod/Material/Gui/DlgSettingsMaterial.ui @@ -20,7 +20,7 @@ - Card resources + Card Resources @@ -28,7 +28,7 @@ - The cards built-in to FreeCAD will be listed as available. + The cards built-in to FreeCAD will be listed as available Use built-in materials @@ -47,7 +47,7 @@ - Use materials added by external workbenches. + Use materials added by external workbenches Use materials from external workbenches @@ -66,10 +66,10 @@ - Also cards from FreeCAD's preferences directory will be listed as available. + Cards from FreeCAD’s preferences directory are also listed as available - Use materials from Materials directory in user's FreeCAD preference directory + Use materials from the Materials preference directory true @@ -85,11 +85,10 @@ - Also material cards also from the specified directory -will be listed as available. + Material cards from the specified directory will also be listed as available - Use materials from user defined directory + Use materials from user-defined directory true @@ -152,13 +151,13 @@ will be listed as available. - Card sorting and duplicates + Card Sorting and Duplicates - Duplicate cards will be deleted from the displayed material card list. + Duplicate cards will be deleted from the displayed material card list Delete card duplicates diff --git a/src/Mod/Material/Gui/ImageEdit.ui b/src/Mod/Material/Gui/ImageEdit.ui index 2c1fc90d4d..9f47ab731a 100644 --- a/src/Mod/Material/Gui/ImageEdit.ui +++ b/src/Mod/Material/Gui/ImageEdit.ui @@ -92,7 +92,7 @@ - File... + File diff --git a/src/Mod/Material/Gui/ListEdit.cpp b/src/Mod/Material/Gui/ListEdit.cpp index 4a74054cec..162cbc0710 100644 --- a/src/Mod/Material/Gui/ListEdit.cpp +++ b/src/Mod/Material/Gui/ListEdit.cpp @@ -141,7 +141,7 @@ int ListEdit::confirmDelete() box.setIcon(QMessageBox::Question); box.setWindowTitle(QObject::tr("Confirm Delete")); - QString prompt = QObject::tr("Are you sure you want to delete the row?"); + QString prompt = QObject::tr("Delete the row?"); box.setText(prompt); box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); diff --git a/src/Mod/Material/Gui/MaterialDelegate.cpp b/src/Mod/Material/Gui/MaterialDelegate.cpp index e547c111f5..397e247548 100644 --- a/src/Mod/Material/Gui/MaterialDelegate.cpp +++ b/src/Mod/Material/Gui/MaterialDelegate.cpp @@ -158,7 +158,7 @@ void MaterialDelegate::setValue(QAbstractItemModel* model, property->getUnits().toStdString().c_str()); QMessageBox msgBox; - msgBox.setWindowTitle(QStringLiteral("Property units mismatch")); + msgBox.setWindowTitle(QStringLiteral("Property Units Mismatch")); msgBox.setText(QStringLiteral("Units mismatch '%1' = '%2', " "setting to default property units '%3'\n") .arg(propertyName) diff --git a/src/Mod/Material/Gui/MaterialSave.cpp b/src/Mod/Material/Gui/MaterialSave.cpp index 2acac7579f..6c360dbb37 100644 --- a/src/Mod/Material/Gui/MaterialSave.cpp +++ b/src/Mod/Material/Gui/MaterialSave.cpp @@ -190,7 +190,7 @@ int MaterialSave::confirmOverwrite(const QString& filename) box.setWindowTitle(QObject::tr("Confirm Overwrite")); QFileInfo info(_selectedFull); - QString prompt = tr("Are you sure you want to save over '%1'?").arg(filename); + QString prompt = tr("Save over '%1'?").arg(filename); box.setText(prompt); box.setInformativeText(tr("Saving over the original file may cause other documents to break. " @@ -215,13 +215,13 @@ int MaterialSave::confirmNewMaterial() { QMessageBox box(this); box.setIcon(QMessageBox::Question); - box.setWindowTitle(tr("Confirm Save As New Material")); + box.setWindowTitle(tr("Confirm Save as New Material")); QString prompt = tr("Save as new material"); box.setText(prompt); box.setInformativeText(tr( - "This material already exists in this library. Would you like to save as a new material?")); + "This material already exists in this library. Save as a new material?")); box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); box.setDefaultButton(QMessageBox::Cancel); @@ -242,13 +242,13 @@ int MaterialSave::confirmCopy() { QMessageBox box(this); box.setIcon(QMessageBox::Question); - box.setWindowTitle(tr("Confirm Save As Copy")); + box.setWindowTitle(tr("Confirm Save as Copy")); - QString prompt = tr("Save as Copy"); + QString prompt = tr("Save as copy"); box.setText(prompt); box.setInformativeText(tr("Saving a copy is not recommended as it can break other documents. " - "We recommend you save as a new material.")); + "It is recommended to save as a new material.")); QPushButton* duplicateButton = box.addButton(tr("Save Copy"), QMessageBox::AcceptRole); QPushButton* newButton = box.addButton(tr("Save As New"), QMessageBox::ActionRole); @@ -483,7 +483,7 @@ void MaterialSave::onNewFolder(bool checked) if (item->hasChildren()) { for (auto i = 0; i < item->rowCount(); i++) { auto child = item->child(i); - if (child->text().startsWith(tr("New Folder"))) { + if (child->text().startsWith(tr("New folder"))) { newCount++; } } @@ -493,7 +493,7 @@ void MaterialSave::onNewFolder(bool checked) if (item->data(Qt::UserRole).isNull()) { QIcon folderIcon(QStringLiteral(":/icons/folder.svg")); - QString folderName = tr("New Folder"); + QString folderName = tr("New folder"); if (newCount > 0) { folderName += QString::number(newCount); } @@ -533,7 +533,7 @@ QString MaterialSave::pathFromIndex(const QModelIndex& index) const void MaterialSave::onContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); contextMenu.addAction(&_deleteAction); @@ -565,7 +565,7 @@ int MaterialSave::confirmDelete(QWidget* parent) box.setWindowTitle(QObject::tr("Confirm Delete")); QFileInfo info(_selectedFull); - QString prompt = QObject::tr("Are you sure you want to delete '%1'?").arg(info.fileName()); + QString prompt = QObject::tr("Delete '%1'?").arg(info.fileName()); box.setText(prompt); if (selectedHasChildren()) { diff --git a/src/Mod/Material/Gui/MaterialSave.ui b/src/Mod/Material/Gui/MaterialSave.ui index 7298e6a23a..eb8a231678 100644 --- a/src/Mod/Material/Gui/MaterialSave.ui +++ b/src/Mod/Material/Gui/MaterialSave.ui @@ -19,7 +19,7 @@ - Library: + Library @@ -67,7 +67,7 @@ - Filename: + Filename @@ -101,7 +101,7 @@ - Save as Inherited + Save as inherited diff --git a/src/Mod/Material/Gui/MaterialTreeWidget.cpp b/src/Mod/Material/Gui/MaterialTreeWidget.cpp index 12599e3295..200ab22a8f 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidget.cpp +++ b/src/Mod/Material/Gui/MaterialTreeWidget.cpp @@ -137,7 +137,7 @@ void MaterialTreeWidget::createLayout() m_expand->setIcon(style()->standardIcon(QStyle::SP_TitleBarUnshadeButton)); m_materialTree = new QTreeView(this); m_filterCombo = new QComboBox(this); - m_editor = new QPushButton(tr("Launch editor"), this); + m_editor = new QPushButton(tr("Launch Editor"), this); m_materialTree->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_materialTree->setMinimumSize(m_treeSizeHint); diff --git a/src/Mod/Material/Gui/MaterialsEditor.cpp b/src/Mod/Material/Gui/MaterialsEditor.cpp index 44d33e5d06..e4f63a4809 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.cpp +++ b/src/Mod/Material/Gui/MaterialsEditor.cpp @@ -589,7 +589,7 @@ void MaterialsEditor::saveMaterial() void MaterialsEditor::accept() { if (_material->isOldFormat()) { - Base::Console().log("*** Old Format File ***\n"); + Base::Console().log("*** Old format file ***\n"); oldFormatError(); return; @@ -606,7 +606,7 @@ void MaterialsEditor::oldFormatError() box.setWindowTitle(tr("Old Format Material")); box.setText(tr("This file is in the old material card format.")); - box.setInformativeText(QObject::tr("You must save the material before using it.")); + box.setInformativeText(QObject::tr("Save the material before using it.")); box.adjustSize(); // Silence warnings from Qt on Windows box.exec(); } @@ -1317,13 +1317,13 @@ void MaterialsEditor::onDoubleClick(const QModelIndex& index) void MaterialsEditor::onContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); - QAction action1(tr("Inherit from"), this); + QAction action1(tr("Inherit From"), this); connect(&action1, &QAction::triggered, this, &MaterialsEditor::onInherit); contextMenu.addAction(&action1); - QAction action2(tr("Inherit new material"), this); + QAction action2(tr("Inherit New Material"), this); connect(&action2, &QAction::triggered, this, &MaterialsEditor::onInheritNew); contextMenu.addAction(&action2); @@ -1345,9 +1345,8 @@ int MaterialsEditor::confirmSave(QWidget* parent) QMessageBox box(parent ? parent : this); box.setIcon(QMessageBox::Question); box.setWindowTitle(QObject::tr("Unsaved Material")); - box.setText(QObject::tr("Do you want to save your changes to the material before closing?")); - - box.setInformativeText(QObject::tr("If you don't save, your changes will be lost.")); + box.setText(QObject::tr("Save changes to the material before closing?")); + box.setInformativeText(QObject::tr("Otherwise, all changes will be lost.")); box.setStandardButtons(QMessageBox::Discard | QMessageBox::Cancel | QMessageBox::Save); box.setDefaultButton(QMessageBox::Save); box.setEscapeButton(QMessageBox::Cancel); diff --git a/src/Mod/Material/Gui/MaterialsEditor.ui b/src/Mod/Material/Gui/MaterialsEditor.ui index c676cf2451..01a3286e01 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.ui +++ b/src/Mod/Material/Gui/MaterialsEditor.ui @@ -148,7 +148,7 @@ - Source Reference + Source reference @@ -199,10 +199,10 @@ - Add to favorites + Adds or removes to/from favorites - * + Toggle Favorite diff --git a/src/Mod/Material/Gui/ModelSelect.ui b/src/Mod/Material/Gui/ModelSelect.ui index 085993f36c..68085f868d 100644 --- a/src/Mod/Material/Gui/ModelSelect.ui +++ b/src/Mod/Material/Gui/ModelSelect.ui @@ -156,10 +156,10 @@ - Add to favorites + Adds or removes to/from favorites - * + Toggle Favorites diff --git a/src/Mod/Material/Gui/Resources/ui/materials-editor.ui b/src/Mod/Material/Gui/Resources/ui/materials-editor.ui index ba901ad1fe..2b8c667192 100644 --- a/src/Mod/Material/Gui/Resources/ui/materials-editor.ui +++ b/src/Mod/Material/Gui/Resources/ui/materials-editor.ui @@ -19,7 +19,7 @@ - Material card + Material Card @@ -67,7 +67,7 @@ Opens an existing material card - Open... + Open… @@ -77,7 +77,7 @@ Saves this material as a card - Save as... + Save As… @@ -93,7 +93,7 @@ - Material parameter + Material Parameter @@ -112,7 +112,7 @@ - Add / remove parameter + Add/Remove Parameter @@ -123,14 +123,14 @@ - Add property + Add Property - Delete property + Delete Property diff --git a/src/Mod/Material/Gui/TaskMigrateExternal.cpp b/src/Mod/Material/Gui/TaskMigrateExternal.cpp index 63319e4fe3..11295e4ae1 100644 --- a/src/Mod/Material/Gui/TaskMigrateExternal.cpp +++ b/src/Mod/Material/Gui/TaskMigrateExternal.cpp @@ -74,7 +74,7 @@ void DlgMigrateExternal::showLibraries() void DlgMigrateExternal::migrate() { try { - statusUpdate(tr("Migrating Models...")); + statusUpdate(tr("Migrating models…")); for (int row = 0; row < ui->listModelLibraries->count(); row++) { auto item = ui->listModelLibraries->item(row); if (item->checkState() == Qt::Checked) { @@ -86,7 +86,7 @@ void DlgMigrateExternal::migrate() } statusUpdate(tr("done")); - statusUpdate(tr("Validating Models...")); + statusUpdate(tr("Validating models…")); for (int row = 0; row < ui->listModelLibraries->count(); row++) { auto item = ui->listModelLibraries->item(row); if (item->checkState() == Qt::Checked) { @@ -98,7 +98,7 @@ void DlgMigrateExternal::migrate() } statusUpdate(tr("done")); - statusUpdate(tr("Migrating Materials...")); + statusUpdate(tr("Migrating materials…")); for (int row = 0; row < ui->listMaterialLibraries->count(); row++) { auto item = ui->listMaterialLibraries->item(row); if (item->checkState() == Qt::Checked) { @@ -110,7 +110,7 @@ void DlgMigrateExternal::migrate() } statusUpdate(tr("done")); - statusUpdate(tr("Validating Materials...")); + statusUpdate(tr("Validating materials…")); for (int row = 0; row < ui->listMaterialLibraries->count(); row++) { auto item = ui->listMaterialLibraries->item(row); if (item->checkState() == Qt::Checked) { @@ -144,10 +144,10 @@ void DlgMigrateExternal::migrate() } catch (const Base::Exception& e) { statusUpdate(QString::fromStdString(e.what())); - statusUpdate(tr("Unknown exception - Aborted")); + statusUpdate(tr("Unknown exception - aborted")); } catch (...) { - statusUpdate(tr("Unknown exception - Aborted")); + statusUpdate(tr("Unknown exception - aborted")); } } diff --git a/src/Mod/Material/Gui/TaskMigrateExternal.ui b/src/Mod/Material/Gui/TaskMigrateExternal.ui index 65c82761b3..cd4ef35ba8 100644 --- a/src/Mod/Material/Gui/TaskMigrateExternal.ui +++ b/src/Mod/Material/Gui/TaskMigrateExternal.ui @@ -17,7 +17,7 @@ - Select Material Libraries + Select material libraries @@ -31,7 +31,7 @@ - Select Model Libraries + Select model libraries diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py index 1c2e3e3882..d340e969a4 100644 --- a/src/Mod/Material/MaterialEditor.py +++ b/src/Mod/Material/MaterialEditor.py @@ -262,7 +262,7 @@ class MaterialEditor: if self.edited: reply = QtGui.QMessageBox.question(self.widget, #FreeCADGui.getMainWindow(), translate("Material","The document has been modified."), - translate("Material","Do you want to save your changes?"), + translate("Material","Save changes?"), QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Save) @@ -330,7 +330,7 @@ class MaterialEditor: if self.edited: reply = QtGui.QMessageBox.question(self.widget, #FreeCADGui.getMainWindow(), translate("Material","The document has been modified."), - translate("Material","Do you want to save your changes?"), + translate("Material","Save changes?"), QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Save) @@ -586,7 +586,7 @@ class MaterialEditor: self.card_path = directory filetuple = QtGui.QFileDialog.getOpenFileName( QtGui.QApplication.activeWindow(), - "Open FreeCAD Material file", + "Open FreeCAD material file", self.card_path, "*.FCMat" ) @@ -664,7 +664,7 @@ class MaterialEditor: name = "Material" filetuple = QtGui.QFileDialog.getSaveFileName( QtGui.QApplication.activeWindow(), - "Save FreeCAD Material file", + "Save FreeCAD material file", self.save_directory + "/" + name + ".FCMat", "*.FCMat" ) diff --git a/src/Mod/Measure/App/AppMeasure.cpp b/src/Mod/Measure/App/AppMeasure.cpp index 881922f6c0..3e71e5c6f6 100644 --- a/src/Mod/Measure/App/AppMeasure.cpp +++ b/src/Mod/Measure/App/AppMeasure.cpp @@ -183,7 +183,7 @@ PyMOD_INIT_FUNC(Measure) } - Base::Console().log("Loading Measure module... done\n"); + Base::Console().log("Loading Measure module… done\n"); PyMOD_Return(mod); } diff --git a/src/Mod/Measure/Gui/AppMeasureGui.cpp b/src/Mod/Measure/Gui/AppMeasureGui.cpp index 4da57110ef..7283fc9bcb 100644 --- a/src/Mod/Measure/Gui/AppMeasureGui.cpp +++ b/src/Mod/Measure/Gui/AppMeasureGui.cpp @@ -84,7 +84,7 @@ PyMOD_INIT_FUNC(MeasureGui) } PyObject* mod = MeasureGui::initModule(); - Base::Console().log("Loading GUI of Measure module... done\n"); + Base::Console().log("Loading GUI of Measure module… done\n"); // instantiating the commands CreateMeasureCommands(); diff --git a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.ui b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.ui index 545c0cf8d5..497c87db8d 100644 --- a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.ui +++ b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.ui @@ -48,7 +48,7 @@ - Default property values + Default Property Values diff --git a/src/Mod/Measure/Gui/TaskMeasure.cpp b/src/Mod/Measure/Gui/TaskMeasure.cpp index f57914caa5..d36454690f 100644 --- a/src/Mod/Measure/Gui/TaskMeasure.cpp +++ b/src/Mod/Measure/Gui/TaskMeasure.cpp @@ -93,8 +93,9 @@ TaskMeasure::TaskMeasure() autoSaveAction = new QAction(tr("Auto Save")); autoSaveAction->setCheckable(true); autoSaveAction->setChecked(mAutoSave); - autoSaveAction->setToolTip(tr("Auto saving of the last measurement when starting a new " - "measurement. Use SHIFT to temporarily invert the behaviour.")); + autoSaveAction->setToolTip( + tr("Auto saving of the last measurement when starting a new " + "measurement. Use the Shift key to temporarily invert the behaviour.")); connect(autoSaveAction, &QAction::triggered, this, &TaskMeasure::autoSaveChanged); newMeasurementBehaviourAction = new QAction(tr("Additive Selection")); @@ -102,7 +103,8 @@ TaskMeasure::TaskMeasure() newMeasurementBehaviourAction->setChecked(Gui::Selection().getSelectionStyle() == SelectionStyle::GreedySelection); newMeasurementBehaviourAction->setToolTip( - tr("If checked, new selection will be added to the measurement. If unchecked, CTRL must be " + tr("If checked, new selection will be added to the measurement. If unchecked, the Ctrl key " + "must be " "pressed to add a " "selection to the current measurement otherwise a new measurement will be started")); connect(newMeasurementBehaviourAction, @@ -184,14 +186,14 @@ void TaskMeasure::modifyStandardButtons(QDialogButtonBox* box) QPushButton* btn = box->button(QDialogButtonBox::Apply); btn->setText(tr("Save")); - btn->setToolTip(tr("Save the measurement in the active document.")); + btn->setToolTip(tr("Saves the measurement in the active document")); connect(btn, &QPushButton::released, this, qOverload<>(&TaskMeasure::apply)); // Disable button by default btn->setEnabled(false); btn = box->button(QDialogButtonBox::Abort); btn->setText(tr("Close")); - btn->setToolTip(tr("Close the measurement task.")); + btn->setToolTip(tr("Closes the measurement task")); // Connect reset button btn = box->button(QDialogButtonBox::Reset); diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp index 29d0e66b84..aa2aeb01fb 100644 --- a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp +++ b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp @@ -129,7 +129,7 @@ SbMatrix ViewProviderMeasureAngle::getMatrix() GeomAPI_ProjectPointOnCurve projection(tempPoint, heapLine2); if (projection.NbPoints() < 1) { - throw Base::RuntimeError("parallel vectors: couldn't project onto line"); + throw Base::RuntimeError("parallel vectors: could not project onto line"); } gp_Vec newPoint2; newPoint2.SetXYZ(projection.Point(1).XYZ()); @@ -195,7 +195,7 @@ SbMatrix ViewProviderMeasureAngle::getMatrix() GeomAPI_ExtremaCurveCurve extrema(heapLine1, heapLine2); if (extrema.NbExtrema() < 1) { - throw Base::RuntimeError("couldn't get extrema"); + throw Base::RuntimeError("Could not get extrema"); } gp_Pnt extremaPoint1, extremaPoint2, dimensionOriginPoint; diff --git a/src/Mod/Measure/InitGui.py b/src/Mod/Measure/InitGui.py index 15c421a4b5..758aa0aaf2 100644 --- a/src/Mod/Measure/InitGui.py +++ b/src/Mod/Measure/InitGui.py @@ -39,6 +39,6 @@ import FreeCAD FreeCAD.MeasureManager.addMeasureType( "CENTEROFMASS", - "Center of Mass", + "Center of mass", MeasureCOM, ) diff --git a/src/Mod/MeshPart/App/AppMeshPart.cpp b/src/Mod/MeshPart/App/AppMeshPart.cpp index 4c1ea6598e..147d7d6257 100644 --- a/src/Mod/MeshPart/App/AppMeshPart.cpp +++ b/src/Mod/MeshPart/App/AppMeshPart.cpp @@ -44,6 +44,6 @@ PyMOD_INIT_FUNC(MeshPart) PyMOD_Return(nullptr); } PyObject* mod = MeshPart::initModule(); - Base::Console().log("Loading MeshPart module... done\n"); + Base::Console().log("Loading MeshPart module… done\n"); PyMOD_Return(mod); } diff --git a/src/Mod/MeshPart/App/MeshFlattening.cpp b/src/Mod/MeshPart/App/MeshFlattening.cpp index 2834ad5df9..14f0888a01 100644 --- a/src/Mod/MeshPart/App/MeshFlattening.cpp +++ b/src/Mod/MeshPart/App/MeshFlattening.cpp @@ -132,7 +132,7 @@ FaceUnwrapper::FaceUnwrapper(const TopoDS_Face& face) const Handle(Poly_Triangulation) & triangulation = BRep_Tool::Triangulation(face, location); if (triangulation.IsNull()) { - throw std::runtime_error("null triangulation in face construction"); + throw std::runtime_error("Null triangulation in face construction"); } Standard_Integer numNodes = triangulation->NbNodes(); @@ -185,7 +185,7 @@ ColMat FaceUnwrapper::interpolateFlatFace(const TopoDS_Face& face) { if (this->uv_nodes.size() == 0) { throw(std::runtime_error("no uv-coordinates found, interpolating with nurbs is only " - "possible if the Flattener was constructed with a nurbs.")); + "possible if the flattener was constructed with a nurbs.")); } // extract xyz poles, knots, weights, degree @@ -244,7 +244,7 @@ FaceUnwrapper::FaceUnwrapper(ColMat xyz_nodes, ColMat> FaceUnwrapper::getFlatBoundaryNodes() { if (this->ze_nodes.size() == 0) { - throw(std::runtime_error("flat vertices not xet computed")); + throw(std::runtime_error("Flat vertices not yet computed")); } ColMat flat_vertices; diff --git a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp index 827ed1cec1..6426a56e50 100644 --- a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp +++ b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp @@ -74,7 +74,7 @@ PyMOD_INIT_FUNC(MeshPartGui) } PyObject* mod = MeshPartGui::initModule(); - Base::Console().log("Loading GUI of MeshPart module... done\n"); + Base::Console().log("Loading GUI of MeshPart module… done\n"); // clang-format off // instantiating the commands diff --git a/src/Mod/MeshPart/Gui/Command.cpp b/src/Mod/MeshPart/Gui/Command.cpp index a261d71a95..4f3497106c 100644 --- a/src/Mod/MeshPart/Gui/Command.cpp +++ b/src/Mod/MeshPart/Gui/Command.cpp @@ -56,7 +56,8 @@ CmdMeshPartMesher::CmdMeshPartMesher() { sAppModule = "MeshPart"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Create mesh from shape..."); + sMenuText = QT_TR_NOOP("Mesh From Shape"); + sToolTipText = QT_TR_NOOP("Tessellate shape"); sWhatsThis = "MeshPart_Mesher"; sStatusTip = sToolTipText; @@ -81,9 +82,9 @@ CmdMeshPartTrimByPlane::CmdMeshPartTrimByPlane() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Trim mesh with a plane"); + sMenuText = QT_TR_NOOP("Trim Mesh"); sToolTipText = QT_TR_NOOP("Trims a mesh with a plane"); - sStatusTip = QT_TR_NOOP("Trims a mesh with a plane"); + sStatusTip = sToolTipText; } void CmdMeshPartTrimByPlane::activated(int) @@ -91,17 +92,17 @@ void CmdMeshPartTrimByPlane::activated(int) Base::Type partType = Base::Type::fromName("Part::Plane"); std::vector plane = getSelection().getObjectsOfType(partType); if (plane.empty()) { - QMessageBox::warning(Gui::getMainWindow(), - qApp->translate("MeshPart_TrimByPlane", "Select plane"), - qApp->translate("MeshPart_TrimByPlane", - "Please select a plane at which you trim the mesh.")); + QMessageBox::warning( + Gui::getMainWindow(), + qApp->translate("MeshPart_TrimByPlane", "Select plane"), + qApp->translate("MeshPart_TrimByPlane", "Select a plane to trim the mesh with.")); return; } QMessageBox msgBox(Gui::getMainWindow()); msgBox.setIcon(QMessageBox::Question); msgBox.setWindowTitle(qApp->translate("MeshPart_TrimByPlane", "Trim by plane")); - msgBox.setText(qApp->translate("MeshPart_TrimByPlane", "Select the side you want to keep.")); + msgBox.setText(qApp->translate("MeshPart_TrimByPlane", "Select the side to keep.")); QPushButton* inner = msgBox.addButton(qApp->translate("MeshPart_TrimByPlane", "Below"), QMessageBox::ActionRole); QPushButton* outer = @@ -186,8 +187,8 @@ CmdMeshPartSection::CmdMeshPartSection() { sAppModule = "MeshPart"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Create section from mesh and plane"); - sToolTipText = QT_TR_NOOP("Section"); + sMenuText = QT_TR_NOOP("Section"); + sToolTipText = QT_TR_NOOP("Creates a section from a mesh and plane"); sWhatsThis = "MeshPart_Section"; sStatusTip = sToolTipText; } @@ -200,8 +201,7 @@ void CmdMeshPartSection::activated(int) QMessageBox::warning( Gui::getMainWindow(), qApp->translate("MeshPart_Section", "Select plane"), - qApp->translate("MeshPart_Section", - "Please select a plane at which you section the mesh.")); + qApp->translate("MeshPart_Section", "Select a plane to section the mesh with.")); return; } @@ -271,8 +271,8 @@ CmdMeshPartCrossSections::CmdMeshPartCrossSections() { sAppModule = "MeshPart"; sGroup = QT_TR_NOOP("MeshPart"); - sMenuText = QT_TR_NOOP("Cross-sections..."); - sToolTipText = QT_TR_NOOP("Cross-sections"); + sMenuText = QT_TR_NOOP("Cross-Sections"); + sToolTipText = QT_TR_NOOP("Applies cross-sections to the mesh"); sWhatsThis = "MeshPart_CrossSections"; sStatusTip = sToolTipText; // sPixmap = "MeshPart_CrossSections"; @@ -307,9 +307,8 @@ CmdMeshPartCurveOnMesh::CmdMeshPartCurveOnMesh() { sAppModule = "MeshPart"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Curve on mesh..."); - sToolTipText = QT_TR_NOOP("Creates an approximated curve on top of a mesh.\n" - "This command only works with a 'mesh' object."); + sMenuText = QT_TR_NOOP("Curve on Mesh"); + sToolTipText = QT_TR_NOOP("Creates an approximated curve on top of a mesh object"); sWhatsThis = "MeshPart_CurveOnMesh"; sStatusTip = sToolTipText; sPixmap = "MeshPart_CurveOnMesh"; diff --git a/src/Mod/MeshPart/Gui/CrossSections.ui b/src/Mod/MeshPart/Gui/CrossSections.ui index b26ac273a6..607d1dbd9d 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.ui +++ b/src/Mod/MeshPart/Gui/CrossSections.ui @@ -11,13 +11,13 @@ - Cross sections + Cross Sections - Guiding plane + Guiding Plane @@ -49,7 +49,7 @@ - Position: + Position @@ -106,7 +106,7 @@ - Distance: + Distance diff --git a/src/Mod/MeshPart/Gui/CurveOnMesh.cpp b/src/Mod/MeshPart/Gui/CurveOnMesh.cpp index 445b21a37a..6e902d8fc5 100644 --- a/src/Mod/MeshPart/Gui/CurveOnMesh.cpp +++ b/src/Mod/MeshPart/Gui/CurveOnMesh.cpp @@ -620,7 +620,7 @@ void CurveOnMeshHandler::Private::vertexCallback(void* ud, SoEventCallback* cb) } else if (self->d_ptr->mesh != mesh) { Gui::getMainWindow()->statusBar()->showMessage( - tr("Wrong mesh picked")); + tr("Wrong mesh selected")); return; } @@ -659,7 +659,7 @@ void CurveOnMeshHandler::Private::vertexCallback(void* ud, SoEventCallback* cb) } } else { - Gui::getMainWindow()->statusBar()->showMessage(tr("No point was picked")); + Gui::getMainWindow()->statusBar()->showMessage(tr("No point was selected")); } } else if (mbe->getButton() == SoMouseButtonEvent::BUTTON2 diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.ui b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.ui index ddcf02075c..0d98840c2c 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.ui +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.ui @@ -11,7 +11,7 @@ - Curve on mesh + Curve on Mesh @@ -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/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp index 96ec027d2e..c5683905ab 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.cpp +++ b/src/Mod/MeshPart/Gui/Tessellation.cpp @@ -276,14 +276,14 @@ bool Tessellation::accept() QMessageBox::critical( this, windowTitle(), - tr("You have selected a body without tip.\n" - "Either set the tip of the body or select a different shape, please.")); + tr("Error: body without a tip selected.\n" + "Either set the tip of the body or select a different shapee.")); } else if (partWithNoFace) { QMessageBox::critical(this, windowTitle(), - tr("You have selected a shape without faces.\n" - "Select a different shape, please.")); + tr("Error: shape without faces selected.\n" + "Select a different shape.")); } else { QMessageBox::critical(this, windowTitle(), tr("Select a shape for meshing, first.")); diff --git a/src/Mod/MeshPart/Gui/Tessellation.ui b/src/Mod/MeshPart/Gui/Tessellation.ui index 84a781bc0b..a3f74999cd 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.ui +++ b/src/Mod/MeshPart/Gui/Tessellation.ui @@ -17,7 +17,7 @@ - Meshing options + Meshing Options @@ -38,7 +38,7 @@ - Surface deviation: + Surface deviation @@ -64,7 +64,7 @@ - Angular deviation: + Angular deviation @@ -96,7 +96,7 @@ The maximal linear deviation of a mesh segment will be the specified -Surface deviation multiplied by the length of the current mesh segment (edge) +surface deviation multiplied by the length of the current mesh segment (edge) Relative surface deviation @@ -153,7 +153,7 @@ this feature (e.g. the format OBJ). - Maximum edge length: + Maximum edge length true @@ -266,7 +266,7 @@ The smallest value is 0. - Mesh size grading: + Mesh size grading @@ -299,7 +299,7 @@ A value in the range of 0.1-1. - Elements per edge: + Elements per edge @@ -332,7 +332,7 @@ A value in the range of 0.2-10. - Elements per curvature radius: + Elements per curvature radius diff --git a/src/Mod/Part/App/TopoShapeFace.pyi b/src/Mod/Part/App/TopoShapeFace.pyi index a97c75a531..06e9672412 100644 --- a/src/Mod/Part/App/TopoShapeFace.pyi +++ b/src/Mod/Part/App/TopoShapeFace.pyi @@ -31,7 +31,7 @@ class TopoShapeFace(TopoShape): Wire: Final[object] = ... """ The outer wire of this face - deprecated -- please use OuterWire + deprecated -- use OuterWire """ OuterWire: Final[object] = ... diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp index b4192dc940..66e88d1635 100644 --- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp @@ -973,7 +973,7 @@ Py::Object TopoShapeFacePy::getWire() const Py::Object sys_out(PySys_GetObject("stdout")); Py::Callable write(sys_out.getAttr("write")); Py::Tuple arg(1); - arg.setItem(0, Py::String("Warning: Wire is deprecated, please use OuterWire\n")); + arg.setItem(0, Py::String("Warning: Wire is deprecated, use OuterWire\n")); write.apply(arg); } catch (const Py::Exception&) { diff --git a/src/Mod/Part/AttachmentEditor/Commands.py b/src/Mod/Part/AttachmentEditor/Commands.py index 83a1ab9017..e9f4a99e9a 100644 --- a/src/Mod/Part/AttachmentEditor/Commands.py +++ b/src/Mod/Part/AttachmentEditor/Commands.py @@ -76,9 +76,9 @@ class CommandEditAttachment: 'Command to edit attachment' def GetResources(self): return {'Pixmap': 'Part_Attachment', - 'MenuText': QT_TRANSLATE_NOOP("Part_EditAttachment","Attachment..."), + 'MenuText': QT_TRANSLATE_NOOP("Part_EditAttachment","Attachment"), 'Accel': "", - 'ToolTip': QT_TRANSLATE_NOOP("Part_EditAttachment","Edit attachment of selected object.")} + 'ToolTip': QT_TRANSLATE_NOOP("Part_EditAttachment","Opens the attachment editor to change the attachment of the selected object")} def Activated(self): try: diff --git a/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py b/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py index 2ee48895dd..df0e2d98f6 100644 --- a/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py +++ b/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py @@ -209,7 +209,7 @@ class AttachmentEditorTaskPanel(FrozenClass): mb = QtGui.QMessageBox() mb.setIcon(mb.Icon.Warning) mb.setText(translate('AttachmentEditor', - "{} is not attachable. You can still use attachment editor dialog to align the object, but the attachment won't be parametric." + "{} is not attachable. The attachment editor can still be used to align the object, but the attachment will not be parametric." ,None) .format(obj_to_attach.Label)) mb.setWindowTitle(translate('AttachmentEditor',"Attachment",None)) @@ -554,7 +554,7 @@ class AttachmentEditorTaskPanel(FrozenClass): typestr = self.last_sugr['references_Types'] if i < len(typestr): typ = self.attacher.getRefTypeInfo(typestr[i])['UserFriendlyName'] - btn.setText(translate('AttachmentEditor',"Selecting...",None) if self.i_active_ref == i else typ) + btn.setText(translate('AttachmentEditor',"Selecting…",None) if self.i_active_ref == i else typ) finally: self.block = old_selfblock diff --git a/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui b/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui index 6aebec1f1e..194bc70acf 100644 --- a/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui +++ b/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui @@ -98,7 +98,7 @@ - Attachment mode: + Attachment mode @@ -121,7 +121,7 @@ - Attachment Offset (in local coordinates): + Attachment Offset in its Local Coordinate System @@ -133,7 +133,7 @@ - In x-direction: + In x-direction labelOffset @@ -168,7 +168,7 @@ - In y-direction: + In y-direction @@ -200,7 +200,7 @@ - In z-direction: + In z-direction @@ -232,7 +232,7 @@ - Around x-axis: + Around x-axis @@ -277,7 +277,7 @@ Note: The placement is expressed in local space of object being attached. - Around y-axis: + Around y-axis @@ -322,7 +322,7 @@ Note: The placement is expressed in local space of object being attached. - Around z-axis: + Around z-axis diff --git a/src/Mod/Part/BOPTools/JoinFeatures.py b/src/Mod/Part/BOPTools/JoinFeatures.py index fc3e590faf..b3867cf806 100644 --- a/src/Mod/Part/BOPTools/JoinFeatures.py +++ b/src/Mod/Part/BOPTools/JoinFeatures.py @@ -77,7 +77,7 @@ def cmdCreateJoinFeature(name, mode): error_text1 = translate("Part_JoinFeatures", "Computing the result failed with an error:") error_text2 = translate("Part_JoinFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.") mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2) - mb.setWindowTitle(translate("Part_JoinFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_JoinFeatures","Bad Selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(translate("Part_JoinFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) @@ -183,10 +183,10 @@ class CommandConnect: def GetResources(self): return {'Pixmap': getIconPath("Part_JoinConnect.svg"), - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinConnect","Connect objects"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinConnect","Connect Shapes"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_JoinConnect", - "Fuses objects, taking care to preserve voids.")} + "Fuses shapes, taking care to preserve voids")} def Activated(self): if len(FreeCADGui.Selection.getSelectionEx()) >= 1: @@ -196,7 +196,7 @@ class CommandConnect: mb.setIcon(mb.Icon.Warning) mb.setText(translate("Part_JoinFeatures", "Select at least two objects, or one or more compounds", None)) - mb.setWindowTitle(translate("Part_JoinFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_JoinFeatures","Bad Selection", None)) mb.exec_() def IsActive(self): @@ -279,10 +279,10 @@ class CommandEmbed: def GetResources(self): return {'Pixmap': getIconPath("Part_JoinEmbed.svg"), - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinEmbed","Embed object"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinEmbed","Embed Shapes"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_JoinEmbed", - "Fuses one object into another, taking care to preserve voids.")} + "Fuses one shape into another, taking care to preserve voids")} def Activated(self): if len(FreeCADGui.Selection.getSelectionEx()) == 2: @@ -292,7 +292,7 @@ class CommandEmbed: mb.setIcon(mb.Icon.Warning) mb.setText(translate("Part_JoinFeatures", "Select base object, then the object to embed, and then invoke this tool.", None)) - mb.setWindowTitle(translate("Part_JoinFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_JoinFeatures","Bad Selection", None)) mb.exec_() def IsActive(self): @@ -373,10 +373,10 @@ class CommandCutout: def GetResources(self): return {'Pixmap': getIconPath("Part_JoinCutout.svg"), - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinCutout","Cutout for object"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_JoinCutout","Cutout Shape"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_JoinCutout", - "Makes a cutout in one object to fit another object.")} + "Creates a cutout in the selected shape to fit another shape")} def Activated(self): if len(FreeCADGui.Selection.getSelectionEx()) == 2: @@ -386,7 +386,7 @@ class CommandCutout: mb.setIcon(mb.Icon.Warning) mb.setText(translate("Part_JoinFeatures", "Select the object to make a cutout in, then the object that should fit into the cutout, and then invoke this tool.", None)) - mb.setWindowTitle(translate("Part_JoinFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_JoinFeatures","Bad Selection", None)) mb.exec_() def IsActive(self): diff --git a/src/Mod/Part/BOPTools/SplitFeatures.py b/src/Mod/Part/BOPTools/SplitFeatures.py index 42cac7a4b4..0a54ca924a 100644 --- a/src/Mod/Part/BOPTools/SplitFeatures.py +++ b/src/Mod/Part/BOPTools/SplitFeatures.py @@ -154,7 +154,7 @@ def cmdCreateBooleanFragmentsFeature(name, mode): error_text1 = translate("Part_SplitFeatures", "Computing the result failed with an error:") error_text2 = translate("Part_SplitFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.") mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2) - mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) @@ -177,14 +177,10 @@ class CommandBooleanFragments: def GetResources(self): return {'Pixmap': getIconPath("Part_BooleanFragments.svg"), - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_BooleanFragments","Boolean fragments"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_BooleanFragments","Boolean Fragments"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_BooleanFragments", - "Create a 'Boolean Fragments' object from two or more selected objects,\n" - "or from the shapes inside a compound.\n" - "This is a boolean union which is then sliced at the intersections\n" - "of the original shapes.\n" - "A 'Compound Filter' can be used to extract the individual slices.")} + "Creates a boolean union which is sliced at the intersections of the selected shapes")} def Activated(self): if len(FreeCADGui.Selection.getSelectionEx()) >= 1: @@ -196,7 +192,7 @@ class CommandBooleanFragments: "Select at least two objects, or one or more compounds. " "If only one compound is selected, the compounded shapes will be intersected between each other " "(otherwise, compounds with self-intersections are invalid).", None)) - mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None)) mb.exec_() def IsActive(self): @@ -297,7 +293,7 @@ def cmdCreateSliceFeature(name, mode, transaction=True): error_text1 = translate("Part_SplitFeatures", "Computing the result failed with an error:") error_text2 = translate("Part_SplitFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.") mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2) - mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) @@ -334,12 +330,10 @@ class CommandSlice: def GetResources(self): return {'Pixmap': getIconPath("Part_Slice.svg"), - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_Slice","Slice to compound"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_Slice","Slice to Compound"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_Slice", - "Slice a selected object by using other objects as cutting tools.\n" - "The resulting pieces will be stored in a compound.\n" - "A 'Compound Filter' can be used to extract the individual slices.")} + "Slices the selected object by using other objects as cutting tools and storing the results in one compound")} def Activated(self): if len(FreeCADGui.Selection.getSelectionEx()) > 1: @@ -351,7 +345,7 @@ class CommandSlice: "Select at least two objects. " "The first one is the object to be sliced; " "the rest are objects to slice with.", None)) - mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None)) mb.exec_() def IsActive(self): @@ -366,11 +360,10 @@ class CommandSliceApart: def GetResources(self): return {'Pixmap': getIconPath("Part_SliceApart.svg"), - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_SliceApart","Slice apart"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_SliceApart","Slice Apart"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_SliceApart", - "Slice a selected object by other objects, and split it apart.\n" - "It will create a 'Compound Filter' for each slice.")} + "Slices the selected object by other objects, and splits it apart, creating a compound filter for each slide")} def Activated(self): if len(FreeCADGui.Selection.getSelectionEx()) > 1: @@ -382,7 +375,7 @@ class CommandSliceApart: "Select at least two objects. " "The first one is the object to be sliced; " "the rest are objects to slice with.", None)) - mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None)) mb.exec_() def IsActive(self): @@ -491,7 +484,7 @@ def cmdCreateXORFeature(name): error_text1 = translate("Part_SplitFeatures", "Computing the result failed with an error:") error_text2 = translate("Part_SplitFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.") mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2) - mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) @@ -517,10 +510,9 @@ class CommandXOR: 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_XOR","Boolean XOR"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_XOR", - "Perform an 'exclusive OR' boolean operation with two or more selected objects,\n" + "Performs an 'exclusive OR' boolean operation with two or more selected objects,\n" "or with the shapes inside a compound.\n" - "This means the overlapping volumes of the shapes will be removed.\n" - "A 'Compound Filter' can be used to extract the remaining pieces.")} + "Overlapping volumes of the shapes will be removed.")} def Activated(self): if len(FreeCADGui.Selection.getSelectionEx()) >= 1: @@ -532,7 +524,7 @@ class CommandXOR: "Select at least two objects, or one or more compounds. " "If only one compound is selected, the compounded shapes will be intersected between each other " "(otherwise, compounds with self-intersections are invalid).", None)) - mb.setWindowTitle(translate("Part_SplitFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_SplitFeatures","Bad Selection", None)) mb.exec_() def IsActive(self): diff --git a/src/Mod/Part/BOPTools/ToleranceFeatures.py b/src/Mod/Part/BOPTools/ToleranceFeatures.py index f8eaf28d88..1ef8e9466e 100644 --- a/src/Mod/Part/BOPTools/ToleranceFeatures.py +++ b/src/Mod/Part/BOPTools/ToleranceFeatures.py @@ -69,7 +69,7 @@ def cmdCreateToleranceSetFeature(name, minTolerance=1e-7, maxTolerance=0): error_text1 = translate("Part_ToleranceFeatures", "Computing the result failed with an error:") error_text2 = translate("Part_ToleranceFeatures", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.") mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2) - mb.setWindowTitle(translate("Part_ToleranceFeatures","Bad selection", None)) + mb.setWindowTitle(translate("Part_ToleranceFeatures","Bad Selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(translate("Part_ToleranceFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) @@ -192,7 +192,7 @@ class CommandToleranceSet: 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_ToleranceSet","Set Tolerance"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_ToleranceSet", - "Set Tolerance for selected objects.")} + "Creates a parametric copy of the selected object with all contained tolerances set to at least a certain minimum value")} def Activated(self): if len(FreeCADGui.Selection.getSelectionEx()) >= 1: @@ -202,7 +202,7 @@ class CommandToleranceSet: mb.setIcon(mb.Icon.Warning) mb.setText(translate("Part_ToleranceSet", "Select at least one object or compounds", None)) - mb.setWindowTitle(translate("Part_ToleranceSet","Bad selection", None)) + mb.setWindowTitle(translate("Part_ToleranceSet","Bad Selection", None)) mb.exec_() def IsActive(self): diff --git a/src/Mod/Part/BasicShapes/TaskTube.ui b/src/Mod/Part/BasicShapes/TaskTube.ui index 67e0672c10..14ae2598fd 100644 --- a/src/Mod/Part/BasicShapes/TaskTube.ui +++ b/src/Mod/Part/BasicShapes/TaskTube.ui @@ -89,7 +89,7 @@ - Height: + Height diff --git a/src/Mod/Part/CompoundTools/_CommandCompoundFilter.py b/src/Mod/Part/CompoundTools/_CommandCompoundFilter.py index 23308f55f4..71ca51d118 100644 --- a/src/Mod/Part/CompoundTools/_CommandCompoundFilter.py +++ b/src/Mod/Part/CompoundTools/_CommandCompoundFilter.py @@ -51,7 +51,7 @@ class _CommandCompoundFilter: 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_CompoundFilter", "Compound Filter"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_CompoundFilter", - "Filter out objects from a selected compound " + "Filters out objects from the selected compound " "by characteristics like volume,\n" "area, or length, or by choosing specific items.\n" "If a second object is selected, it will be used " @@ -68,7 +68,7 @@ class _CommandCompoundFilter: "First select a shape that is a compound. " "If a second object is selected (optional) " "it will be treated as a stencil.", None)) - mb.setWindowTitle(translate("Part_CompoundFilter", "Bad selection", None)) + mb.setWindowTitle(translate("Part_CompoundFilter", "Bad Selection", None)) mb.exec_() def IsActive(self): @@ -109,7 +109,7 @@ def cmdCreateCompoundFilter(name): error_text1 = translate("Part_CompoundFilter", "Computing the result failed with an error:") error_text2 = translate("Part_CompoundFilter", "Click 'Continue' to create the feature anyway, or 'Abort' to cancel.") mb.setText(error_text1 + "\n\n" + str(err) + "\n\n" + error_text2) - mb.setWindowTitle(translate("Part_CompoundFilter","Bad selection", None)) + mb.setWindowTitle(translate("Part_CompoundFilter","Bad Selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(translate("Part_SplitFeatures", "Continue", None), QtGui.QMessageBox.ButtonRole.ActionRole) mb.setDefaultButton(btnOK) diff --git a/src/Mod/Part/CompoundTools/_CommandExplodeCompound.py b/src/Mod/Part/CompoundTools/_CommandExplodeCompound.py index 69c34be5e4..e6e75b4ad6 100644 --- a/src/Mod/Part/CompoundTools/_CommandExplodeCompound.py +++ b/src/Mod/Part/CompoundTools/_CommandExplodeCompound.py @@ -47,11 +47,10 @@ class _CommandExplodeCompound: "Command to explode a compound" def GetResources(self): return {'Pixmap': "Part_ExplodeCompound", - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_ExplodeCompound", "Explode compound"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_ExplodeCompound", "Explode Compound"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_ExplodeCompound", - "Split up a compound of shapes into separate objects.\n" - "It will create a 'Compound Filter' for each shape.")} + "Splits up a compound of shapes into separate objects, creating a compound filter for each shape")} def Activated(self): if len(FreeCADGui.Selection.getSelection()) == 1: @@ -60,7 +59,7 @@ class _CommandExplodeCompound: mb = QtGui.QMessageBox() mb.setIcon(mb.Icon.Warning) mb.setText(translate("Part_ExplodeCompound", "First select a shape that is a compound.", None)) - mb.setWindowTitle(translate("Part_ExplodeCompound", "Bad selection", None)) + mb.setWindowTitle(translate("Part_ExplodeCompound", "Bad Selection", None)) mb.exec_() def IsActive(self): diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index 297b8e4c43..264ea28025 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -133,7 +133,7 @@ PyMOD_INIT_FUNC(PartGui) PyObject* partGuiModule = PartGui::initModule(); - Base::Console().log("Loading GUI of Part module... done\n"); + Base::Console().log("Loading GUI of Part module… done\n"); Gui::BitmapFactory().addPath(QStringLiteral(":/icons/booleans")); Gui::BitmapFactory().addPath(QStringLiteral(":/icons/create")); diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index bed30dac11..41e81c527d 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -84,8 +84,8 @@ CmdPartPickCurveNet::CmdPartPickCurveNet() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Pick curve network"); - sToolTipText = QT_TR_NOOP("Pick a curve network"); + sMenuText = QT_TR_NOOP("Pick Curve Network"); + sToolTipText = QT_TR_NOOP("Picks a curve network"); sWhatsThis = "Part_PickCurveNet"; sStatusTip = sToolTipText; sPixmap = "Test1"; @@ -106,8 +106,8 @@ CmdPartNewDoc::CmdPartNewDoc() { sAppModule = "Part"; sGroup = "Part"; - sMenuText = "New document"; - sToolTipText = "Create an empty part document"; + sMenuText = "New Document"; + sToolTipText = "Creates an Empty Part Document"; sWhatsThis = "Part_NewDoc"; sStatusTip = sToolTipText; sPixmap = "New"; @@ -130,8 +130,8 @@ CmdPartBox2::CmdPartBox2() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Box fix 1"); - sToolTipText = QT_TR_NOOP("Create a box solid without dialog"); + sMenuText = QT_TR_NOOP("Box Fix 1"); + sToolTipText = QT_TR_NOOP("Creates a solid box"); sWhatsThis = "Part_Box2"; sStatusTip = sToolTipText; sPixmap = "Part_Box_Parametric"; @@ -171,8 +171,8 @@ CmdPartBox3::CmdPartBox3() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Box fix 2"); - sToolTipText = QT_TR_NOOP("Create a box solid without dialog"); + sMenuText = QT_TR_NOOP("Box Fix 2"); + sToolTipText = QT_TR_NOOP("Creates a solid box"); sWhatsThis = "Part_Box3"; sStatusTip = sToolTipText; sPixmap = "Part_Box_Parametric"; @@ -212,8 +212,9 @@ CmdPartPrimitives::CmdPartPrimitives() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create primitives..."); - sToolTipText = QT_TR_NOOP("Creation of parametrized geometric primitives"); + sMenuText = QT_TR_NOOP("Primitive"); + + sToolTipText = QT_TR_NOOP("Creates solid geometric primitives parametrically"); sWhatsThis = "Part_Primitives"; sStatusTip = sToolTipText; sPixmap = "Part_Primitives"; @@ -299,7 +300,7 @@ CmdPartCut::CmdPartCut() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Cut"); - sToolTipText = QT_TR_NOOP("Make a cut of two shapes"); + sToolTipText = QT_TR_NOOP("Cuts 2 selected shapes"); sWhatsThis = "Part_Cut"; sStatusTip = sToolTipText; sPixmap = "Part_Cut"; @@ -312,7 +313,7 @@ void CmdPartCut::activated(int iMsg) getSelection().getSelectionEx(nullptr, App::DocumentObject::getClassTypeId(), Gui::ResolveMode::FollowLink); if (Sel.size() != 2) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select two shapes please.")); + QObject::tr("Select 2 shapes")); return; } @@ -324,7 +325,7 @@ void CmdPartCut::activated(int iMsg) if (!PartGui::checkForSolids(shape) && !askUser) { int ret = QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Non-solids selected"), QObject::tr("The use of non-solids for boolean operations may lead to unexpected results.\n" - "Do you want to continue?"), QMessageBox::Yes, QMessageBox::No); + "Continue?"), QMessageBox::Yes, QMessageBox::No); if (ret == QMessageBox::No) return; askUser = true; @@ -357,7 +358,7 @@ CmdPartCommon::CmdPartCommon() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Intersection"); - sToolTipText = QT_TR_NOOP("Make an intersection of two shapes"); + sToolTipText = QT_TR_NOOP("Intersects the selected shapes"); sWhatsThis = "Part_Common"; sStatusTip = sToolTipText; sPixmap = "Part_Common"; @@ -371,7 +372,7 @@ void CmdPartCommon::activated(int iMsg) if (Sel.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Please select two shapes or more. Or, select one compound containing two or more shapes to compute the intersection between.")); + QObject::tr("Select at least 2 shapes. Alternatively, select 1 compound containing 2 or more shapes to compute the intersection between.")); return; } @@ -383,7 +384,7 @@ void CmdPartCommon::activated(int iMsg) if (!PartGui::checkForSolids(shape) && !askUser) { int ret = QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Non-solids selected"), QObject::tr("The use of non-solids for boolean operations may lead to unexpected results.\n" - "Do you want to continue?"), QMessageBox::Yes, QMessageBox::No); + "Continue?"), QMessageBox::Yes, QMessageBox::No); if (ret == QMessageBox::No) return; askUser = true; @@ -416,7 +417,7 @@ CmdPartFuse::CmdPartFuse() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Union"); - sToolTipText = QT_TR_NOOP("Make a union of several shapes"); + sToolTipText = QT_TR_NOOP("Unites the selected shapes"); sWhatsThis = "Part_Fuse"; sStatusTip = sToolTipText; sPixmap = "Part_Fuse"; @@ -449,7 +450,7 @@ void CmdPartFuse::activated(int iMsg) } if (numShapes < 2) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Please select two shapes or more. Or, select one compound containing two or more shapes to be fused.")); + QObject::tr("Select at least 2 shapes. Alternatively, select 1 compound containing 2 or more shapes to be fused.")); return; } @@ -461,7 +462,7 @@ void CmdPartFuse::activated(int iMsg) if (!PartGui::checkForSolids(shape) && !askUser) { int ret = QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Non-solids selected"), QObject::tr("The use of non-solids for boolean operations may lead to unexpected results.\n" - "Do you want to continue?"), QMessageBox::Yes, QMessageBox::No); + "Continue?"), QMessageBox::Yes, QMessageBox::No); if (ret == QMessageBox::No) return; askUser = true; @@ -494,8 +495,9 @@ CmdPartCompJoinFeatures::CmdPartCompJoinFeatures() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Join objects..."); - sToolTipText = QT_TR_NOOP("Join walled objects"); + sMenuText = QT_TR_NOOP("Join Shapes"); + + sToolTipText = QT_TR_NOOP("Joins the selected walled shapes"); sWhatsThis = "Part_CompJoinFeatures"; sStatusTip = sToolTipText; } @@ -600,8 +602,9 @@ CmdPartCompSplitFeatures::CmdPartCompSplitFeatures() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Split objects..."); - sToolTipText = QT_TR_NOOP("Shape splitting and Compsolid creation tools."); + sMenuText = QT_TR_NOOP("Split Shapes"); + + sToolTipText = QT_TR_NOOP("Shape splitting and compsolid creation tools"); sWhatsThis = "Part_CompSplitFeatures"; sStatusTip = sToolTipText; } @@ -718,8 +721,8 @@ CmdPartCompCompoundTools::CmdPartCompCompoundTools() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Compound tools"); - sToolTipText = QT_TR_NOOP("Compound tools: working with lists of shapes."); + sMenuText = QT_TR_NOOP("Compound Tools"); + sToolTipText = QT_TR_NOOP("Compound tools for working with multiple shapes"); sWhatsThis = "Part_CompCompoundTools"; sStatusTip = sToolTipText; } @@ -825,8 +828,8 @@ CmdPartCompound::CmdPartCompound() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Make compound"); - sToolTipText = QT_TR_NOOP("Make a compound of several shapes"); + sMenuText = QT_TR_NOOP("Compound"); + sToolTipText = QT_TR_NOOP("Compounds the selected shapes"); sWhatsThis = "Part_Compound"; sStatusTip = sToolTipText; sPixmap = "Part_Compound"; @@ -838,7 +841,7 @@ void CmdPartCompound::activated(int iMsg) unsigned int n = getSelection().countObjectsOfType(nullptr, Gui::ResolveMode::FollowLink); if (n < 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select one shape or more, please.")); + QObject::tr("Select at least one shape")); return; } @@ -881,7 +884,7 @@ CmdPartSection::CmdPartSection() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Section"); - sToolTipText = QT_TR_NOOP("Make a section of two shapes"); + sToolTipText = QT_TR_NOOP("Sections 2 selected shapes"); sWhatsThis = "Part_Section"; sStatusTip = sToolTipText; sPixmap = "Part_Section"; @@ -894,7 +897,7 @@ void CmdPartSection::activated(int iMsg) getSelection().getSelectionEx(nullptr, App::DocumentObject::getClassTypeId(), Gui::ResolveMode::FollowLink); if (Sel.size() != 2) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select two shapes please.")); + QObject::tr("Select 2 shapes")); return; } @@ -928,7 +931,8 @@ CmdPartImport::CmdPartImport() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Import CAD file..."); + sMenuText = QT_TR_NOOP("Import CAD File"); + sToolTipText = QT_TR_NOOP("Imports a CAD file"); sWhatsThis = "Part_Import"; sStatusTip = sToolTipText; @@ -991,7 +995,8 @@ CmdPartExport::CmdPartExport() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Export CAD file..."); + sMenuText = QT_TR_NOOP("Export CAD File"); + sToolTipText = QT_TR_NOOP("Exports to a CAD file"); sWhatsThis = "Part_Export"; sStatusTip = sToolTipText; @@ -1039,8 +1044,9 @@ CmdPartImportCurveNet::CmdPartImportCurveNet() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Import curve network..."); - sToolTipText= QT_TR_NOOP("Import a curve network"); + sMenuText = QT_TR_NOOP("Import Curve Network"); + + sToolTipText= QT_TR_NOOP("Imports a curve network"); sWhatsThis = "Part_ImportCurveNet"; sStatusTip = sToolTipText; sPixmap = "Part_Box_Parametric"; @@ -1087,8 +1093,8 @@ CmdPartMakeSolid::CmdPartMakeSolid() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Convert to solid"); - sToolTipText = QT_TR_NOOP("Create solid from a shell or compound"); + sMenuText = QT_TR_NOOP("Convert to Solid"); + sToolTipText = QT_TR_NOOP("Converts the selected shell or compound to a solid"); sWhatsThis = "Part_MakeSolid"; sStatusTip = sToolTipText; sPixmap = "Part_MakeSolid"; @@ -1165,8 +1171,8 @@ CmdPartReverseShape::CmdPartReverseShape() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Reverse shapes"); - sToolTipText = QT_TR_NOOP("Reverse orientation of shapes"); + sMenuText = QT_TR_NOOP("Reverse Shapes"); + sToolTipText = QT_TR_NOOP("Reverses the orientation of the selected shapes"); sWhatsThis = "Part_ReverseShape"; sStatusTip = sToolTipText; sPixmap = "Part_Reverse_Shape"; @@ -1227,8 +1233,8 @@ CmdPartBoolean::CmdPartBoolean() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Boolean..."); - sToolTipText = QT_TR_NOOP("Run a boolean operation with two shapes selected"); + sMenuText = QT_TR_NOOP("Boolean Operation"); + sToolTipText = QT_TR_NOOP("Applies a boolean operations with the selected shapes"); sWhatsThis = "Part_Boolean"; sStatusTip = sToolTipText; sPixmap = "Part_Booleans"; @@ -1258,8 +1264,8 @@ CmdPartExtrude::CmdPartExtrude() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Extrude..."); - sToolTipText = QT_TR_NOOP("Extrude a selected sketch"); + sMenuText = QT_TR_NOOP("Extrude"); + sToolTipText = QT_TR_NOOP("Extrudes the selected sketch or profile"); sWhatsThis = "Part_Extrude"; sStatusTip = sToolTipText; sPixmap = "Part_Extrude"; @@ -1286,8 +1292,8 @@ CmdPartScale::CmdPartScale() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Scale..."); - sToolTipText = QT_TR_NOOP("Scale a selected shape"); + sMenuText = QT_TR_NOOP("Scale"); + sToolTipText = QT_TR_NOOP("Scales the selected shape"); sWhatsThis = "Part_Scale"; sStatusTip = sToolTipText; sPixmap = "Part_Scale"; @@ -1315,8 +1321,8 @@ CmdPartMakeFace::CmdPartMakeFace() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Make face from wires"); - sToolTipText = QT_TR_NOOP("Make face from set of wires (e.g. from a sketch)"); + sMenuText = QT_TR_NOOP("Face From Wires"); + sToolTipText = QT_TR_NOOP("Creates a face from the selected wires (e.g. from a sketch)"); sWhatsThis = "Part_MakeFace"; sStatusTip = sToolTipText; sPixmap = "Part_MakeFace"; @@ -1367,8 +1373,8 @@ CmdPartRevolve::CmdPartRevolve() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Revolve..."); - sToolTipText = QT_TR_NOOP("Revolve a selected shape"); + sMenuText = QT_TR_NOOP("Revolve"); + sToolTipText = QT_TR_NOOP("Revolves the selected shape"); sWhatsThis = "Part_Revolve"; sStatusTip = sToolTipText; sPixmap = "Part_Revolve"; @@ -1395,8 +1401,8 @@ CmdPartFillet::CmdPartFillet() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Fillet..."); - sToolTipText = QT_TR_NOOP("Fillet the selected edges of a shape"); + sMenuText = QT_TR_NOOP("Fillet"); + sToolTipText = QT_TR_NOOP("Fillets the selected edges of a shape"); sWhatsThis = "Part_Fillet"; sStatusTip = sToolTipText; sPixmap = "Part_Fillet"; @@ -1423,8 +1429,8 @@ CmdPartChamfer::CmdPartChamfer() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Chamfer..."); - sToolTipText = QT_TR_NOOP("Chamfer the selected edges of a shape"); + sMenuText = QT_TR_NOOP("Chamfer"); + sToolTipText = QT_TR_NOOP("Chamfers the selected edges of a shape"); sWhatsThis = "Part_Chamfer"; sStatusTip = sToolTipText; sPixmap = "Part_Chamfer"; @@ -1451,8 +1457,8 @@ CmdPartMirror::CmdPartMirror() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Mirroring..."); - sToolTipText = QT_TR_NOOP("Mirroring a selected shape"); + sMenuText = QT_TR_NOOP("Mirror"); + sToolTipText = QT_TR_NOOP("Mirrors the selected shape"); sWhatsThis = "Part_Mirror"; sStatusTip = sToolTipText; sPixmap = "Part_Mirror"; @@ -1479,8 +1485,8 @@ CmdPartCrossSections::CmdPartCrossSections() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Cross-sections..."); - sToolTipText = QT_TR_NOOP("Cross-sections"); + sMenuText = QT_TR_NOOP("Cross-Sections"); + sToolTipText = QT_TR_NOOP("Creates cross-sections"); sWhatsThis = "Part_CrossSections"; sStatusTip = sToolTipText; sPixmap = "Part_CrossSections"; @@ -1518,7 +1524,8 @@ CmdPartBuilder::CmdPartBuilder() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Shape builder..."); + sMenuText = QT_TR_NOOP("Shape Builder"); + sToolTipText = QT_TR_NOOP("Advanced utility to create shapes"); sWhatsThis = "Part_Builder"; sStatusTip = sToolTipText; @@ -1547,8 +1554,8 @@ CmdPartLoft::CmdPartLoft() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Loft..."); - sToolTipText = QT_TR_NOOP("Utility to loft"); + sMenuText = QT_TR_NOOP("Loft"); + sToolTipText = QT_TR_NOOP("Lofts the selected profiles"); sWhatsThis = "Part_Loft"; sStatusTip = sToolTipText; sPixmap = "Part_Loft"; @@ -1576,8 +1583,8 @@ CmdPartSweep::CmdPartSweep() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Sweep..."); - sToolTipText = QT_TR_NOOP("Utility to sweep"); + sMenuText = QT_TR_NOOP("Sweep"); + sToolTipText = QT_TR_NOOP("Sweeps profiles along a wire"); sWhatsThis = "Part_Sweep"; sStatusTip = sToolTipText; sPixmap = "Part_Sweep"; @@ -1605,8 +1612,8 @@ CmdPartOffset::CmdPartOffset() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("3D Offset..."); - sToolTipText = QT_TR_NOOP("Utility to offset in 3D"); + sMenuText = QT_TR_NOOP("3D Offset"); + sToolTipText = QT_TR_NOOP("Offsets shapes in 3D"); sWhatsThis = "Part_Offset"; sStatusTip = sToolTipText; sPixmap = "Part_Offset"; @@ -1660,8 +1667,8 @@ CmdPartOffset2D::CmdPartOffset2D() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("2D Offset..."); - sToolTipText = QT_TR_NOOP("Utility to offset planar shapes"); + sMenuText = QT_TR_NOOP("2D Offset"); + sToolTipText = QT_TR_NOOP("Offsets planar shapes in 2D"); sWhatsThis = "Part_Offset2D"; sStatusTip = sToolTipText; sPixmap = "Part_Offset2D"; @@ -1714,7 +1721,7 @@ CmdPartCompOffset::CmdPartCompOffset() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Offset:"); + sMenuText = QT_TR_NOOP("Offset"); sToolTipText = QT_TR_NOOP("Tools to offset shapes (construct parallel shapes)"); sWhatsThis = "Part_CompOffset"; sStatusTip = sToolTipText; @@ -1806,8 +1813,8 @@ CmdPartThickness::CmdPartThickness() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Thickness..."); - sToolTipText = QT_TR_NOOP("Utility to apply a thickness"); + sMenuText = QT_TR_NOOP("Thickness"); + sToolTipText = QT_TR_NOOP("Removes the selected faces and offsets the remaining shape outward to add thickness"); sWhatsThis = "Part_Thickness"; sStatusTip = sToolTipText; sPixmap = "Part_Thickness"; @@ -1896,8 +1903,9 @@ CmdShapeInfo::CmdShapeInfo() { sAppModule = "Part"; sGroup = "Part"; - sMenuText = "Shape info..."; - sToolTipText = "Info about shape"; + sMenuText = "Shape Info"; + + sToolTipText = "Displays information about the selected shape"; sWhatsThis = "Part_ShapeInfo"; sStatusTip = sToolTipText; sPixmap = "Part_ShapeInfo"; @@ -1934,8 +1942,8 @@ CmdPartRuledSurface::CmdPartRuledSurface() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create ruled surface"); - sToolTipText = QT_TR_NOOP("Create a ruled surface from either two Edges or two wires"); + sMenuText = QT_TR_NOOP("Ruled Surface"); + sToolTipText = QT_TR_NOOP("Creates a ruled surface between 2 selected wires"); sWhatsThis = "Part_RuledSurface"; sStatusTip = sToolTipText; sPixmap = "Part_RuledSurface"; @@ -2023,7 +2031,7 @@ void CmdPartRuledSurface::activated(int iMsg) if (!ok) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("You have to select either two edges or two wires.")); + QObject::tr("Select either 2 edges or 2 wires.")); return; } @@ -2054,7 +2062,7 @@ CmdCheckGeometry::CmdCheckGeometry() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Check Geometry"); - sToolTipText = QT_TR_NOOP("Analyzes Geometry For Errors"); + sToolTipText = QT_TR_NOOP("Analyzes the selected shapes for errors"); sWhatsThis = "Part_CheckGeometry"; sStatusTip = sToolTipText; sPixmap = "Part_CheckGeometry"; @@ -2086,9 +2094,8 @@ CmdColorPerFace::CmdColorPerFace() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Appearance per &face"); - sToolTipText = QT_TR_NOOP("Set the appearance of each individual face " - "of the selected object."); + sMenuText = QT_TR_NOOP("Appearance per &Face"); + sToolTipText = QT_TR_NOOP("Sets the appearance of individual faces of the selected object"); sStatusTip = sToolTipText; sWhatsThis = "Part_ColorPerFace"; sPixmap = "Part_ColorFace"; @@ -2124,8 +2131,8 @@ CmdBoxSelection::CmdBoxSelection() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Box selection"); - sToolTipText = QT_TR_NOOP("Box selection"); + sMenuText = QT_TR_NOOP("Box Selection"); + sToolTipText = QT_TR_NOOP("Selects elements in the 3D view using a box selection"); sWhatsThis = "Part_BoxSelection"; sStatusTip = QT_TR_NOOP("Box selection"); sPixmap = "Part_BoxSelection"; @@ -2154,11 +2161,11 @@ CmdPartProjectionOnSurface::CmdPartProjectionOnSurface() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create projection on surface..."); - sToolTipText = QT_TR_NOOP("Project edges, wires, or faces of one object\n" - "onto a face of another object.\n" + sMenuText = QT_TR_NOOP("Project on Surface"); + sToolTipText = QT_TR_NOOP("Projects edges, wires, or faces of one shape\n" + "onto a face of another shape.\n" "The camera view determines the direction\n" - "of projection."); + "of the projection."); sWhatsThis = "Part_ProjectionOnSurface"; sStatusTip = sToolTipText; sPixmap = "Part_ProjectionOnSurface"; @@ -2187,8 +2194,9 @@ CmdPartSectionCut::CmdPartSectionCut() { sAppModule = "Part"; sGroup = "View"; - sMenuText = QT_TR_NOOP("Persiste&nt section cut"); - sToolTipText = QT_TR_NOOP("Creates a persistent section cut of visible part objects"); + sMenuText = QT_TR_NOOP("Persiste&nt Section Cut"); + sToolTipText = QT_TR_NOOP("Creates a new object as a boolean intersection of all visible " + "shapes and the selected axis planes"); sWhatsThis = "Part_SectionCut"; sStatusTip = sToolTipText; sPixmap = "Part_SectionCut"; @@ -2244,8 +2252,8 @@ CmdPartCoordinateSystem::CmdPartCoordinateSystem() : Command("Part_CoordinateSystem") { sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create coordinate system"); - sToolTipText = QT_TR_NOOP("Create a coordinate system object that can be attached to other objects."); + sMenuText = QT_TR_NOOP("Coordinate System"); + sToolTipText = QT_TR_NOOP("Creates a coordinate system that can be attached to other objects"); sWhatsThis = "Part_CoordinateSystem"; sStatusTip = sToolTipText; sPixmap = "Std_CoordinateSystem"; @@ -2255,7 +2263,7 @@ void CmdPartCoordinateSystem::activated(int iMsg) { Q_UNUSED(iMsg); - openCommand(QT_TRANSLATE_NOOP("Command", "Add a coordinate system")); + openCommand(QT_TRANSLATE_NOOP("Command", "Add coordinate system")); std::string name = getUniqueObjectName("LCS"); doCommand(Doc, "obj = App.activeDocument().addObject('Part::LocalCoordinateSystem','%s')", name.c_str()); @@ -2278,8 +2286,8 @@ CmdPartDatumPlane::CmdPartDatumPlane() : Command("Part_DatumPlane") { sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create datum plane"); - sToolTipText = QT_TR_NOOP("Create a datum plane object that can be attached to other objects."); + sMenuText = QT_TR_NOOP("Datum Plane"); + sToolTipText = QT_TR_NOOP("Creates a datum plane that can be attached to other objects"); sWhatsThis = "Part_DatumPlane"; sStatusTip = sToolTipText; sPixmap = "Std_Plane"; @@ -2289,7 +2297,7 @@ void CmdPartDatumPlane::activated(int iMsg) { Q_UNUSED(iMsg); - openCommand(QT_TRANSLATE_NOOP("Command", "Add a datum plane")); + openCommand(QT_TRANSLATE_NOOP("Command", "Add datum plane")); std::string name = getUniqueObjectName("DatumPlane"); doCommand(Doc, "obj = App.activeDocument().addObject('Part::DatumPlane','%s')", name.c_str()); @@ -2311,8 +2319,8 @@ CmdPartDatumLine::CmdPartDatumLine() : Command("Part_DatumLine") { sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create datum line"); - sToolTipText = QT_TR_NOOP("Create a datum line object that can be attached to other objects."); + sMenuText = QT_TR_NOOP("Datum Line"); + sToolTipText = QT_TR_NOOP("Creates a datum line that can be attached to other objects"); sWhatsThis = "Part_DatumLine"; sStatusTip = sToolTipText; sPixmap = "Std_Axis"; @@ -2322,7 +2330,7 @@ void CmdPartDatumLine::activated(int iMsg) { Q_UNUSED(iMsg); - openCommand(QT_TRANSLATE_NOOP("Command", "Add a datum line")); + openCommand(QT_TRANSLATE_NOOP("Command", "Add datum line")); std::string name = getUniqueObjectName("DatumLine"); doCommand(Doc, "obj = App.activeDocument().addObject('Part::DatumLine','%s')", name.c_str()); @@ -2344,8 +2352,8 @@ CmdPartDatumPoint::CmdPartDatumPoint() : Command("Part_DatumPoint") { sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create datum point"); - sToolTipText = QT_TR_NOOP("Create a datum point object that can be attached to other objects."); + sMenuText = QT_TR_NOOP("Datum Point"); + sToolTipText = QT_TR_NOOP("Creates a datum point that can be attached to other objects"); sWhatsThis = "Part_DatumPoint"; sStatusTip = sToolTipText; sPixmap = "Std_Point"; @@ -2355,7 +2363,7 @@ void CmdPartDatumPoint::activated(int iMsg) { Q_UNUSED(iMsg); - openCommand(QT_TRANSLATE_NOOP("Command", "Add a datum point")); + openCommand(QT_TRANSLATE_NOOP("Command", "Add datum point")); std::string name = getUniqueObjectName("DatumPoint"); doCommand(Doc, "obj = App.activeDocument().addObject('Part::DatumPoint','%s')", name.c_str()); @@ -2379,8 +2387,8 @@ public: : GroupCommand("Part_Datums") { sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create datum"); - sToolTipText = QT_TR_NOOP("Create a datum object (coordinate system, plane, line, point) that can be attached to other objects."); + sMenuText = QT_TR_NOOP("Datums"); + sToolTipText = QT_TR_NOOP("Creates a datum object (coordinate system, plane, line, or point) that can be attached to other objects"); sWhatsThis = "Part_Datums"; sStatusTip = sToolTipText; diff --git a/src/Mod/Part/Gui/CommandFilter.cpp b/src/Mod/Part/Gui/CommandFilter.cpp index db86926623..23a61d7489 100644 --- a/src/Mod/Part/Gui/CommandFilter.cpp +++ b/src/Mod/Part/Gui/CommandFilter.cpp @@ -43,9 +43,9 @@ PartCmdSelectFilter::PartCmdSelectFilter() : Command("Part_SelectFilter") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Selection filter"); - sToolTipText = QT_TR_NOOP("Change the selection filter"); - sStatusTip = QT_TR_NOOP("Change the selection filter"); + sMenuText = QT_TR_NOOP("Selection Filter"); + sToolTipText = QT_TR_NOOP("Changes the selection filter"); + sStatusTip = sToolTipText; sWhatsThis = "Part_SelectFilter"; sPixmap = "clear-selection"; eType = Alter3DView; @@ -170,10 +170,10 @@ PartCmdVertexSelection::PartCmdVertexSelection() : Command("Part_VertexSelection") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Vertex selection"); - sToolTipText = QT_TR_NOOP("Only allow the selection of vertices"); + sMenuText = QT_TR_NOOP("Vertex Selection"); + sToolTipText = QT_TR_NOOP("Only allows the selection of vertices"); sWhatsThis = "Part_VertexSelection"; - sStatusTip = QT_TR_NOOP("Only allow the selection of vertices"); + sStatusTip = sToolTipText; sPixmap = "vertex-selection"; sAccel = "X, S"; eType = Alter3DView; @@ -195,10 +195,10 @@ PartCmdEdgeSelection::PartCmdEdgeSelection() : Command("Part_EdgeSelection") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Edge selection"); - sToolTipText = QT_TR_NOOP("Only allow the selection of edges"); + sMenuText = QT_TR_NOOP("Edge Selection"); + sToolTipText = QT_TR_NOOP("Only allows the selection of edges"); sWhatsThis = "Part_EdgeSelection"; - sStatusTip = QT_TR_NOOP("Only allow the selection of edges"); + sStatusTip = sToolTipText; sPixmap = "edge-selection"; sAccel = "E, S"; eType = Alter3DView; @@ -220,10 +220,10 @@ PartCmdFaceSelection::PartCmdFaceSelection() : Command("Part_FaceSelection") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Face selection"); - sToolTipText = QT_TR_NOOP("Only allow the selection of faces"); + sMenuText = QT_TR_NOOP("Face Selection"); + sToolTipText = QT_TR_NOOP("Only allows the selection of faces"); sWhatsThis = "Part_FaceSelection"; - sStatusTip = QT_TR_NOOP("Only allow the selection of faces"); + sStatusTip = sToolTipText; sPixmap = "face-selection"; sAccel = "F, S"; eType = Alter3DView; @@ -245,10 +245,10 @@ PartCmdRemoveSelectionGate::PartCmdRemoveSelectionGate() : Command("Part_RemoveSelectionGate") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("All selection filters cleared"); - sToolTipText = QT_TR_NOOP("All selection filters cleared"); + sMenuText = QT_TR_NOOP("No Selection Filters"); + sToolTipText = QT_TR_NOOP("Clears all selection filters"); sWhatsThis = "Part_RemoveSelectionGate"; - sStatusTip = QT_TR_NOOP("All selection filters cleared"); + sStatusTip = sToolTipText; sPixmap = "clear-selection"; sAccel = "C, S"; eType = Alter3DView; diff --git a/src/Mod/Part/Gui/CommandParametric.cpp b/src/Mod/Part/Gui/CommandParametric.cpp index 3fd5e4aa68..4eab77b164 100644 --- a/src/Mod/Part/Gui/CommandParametric.cpp +++ b/src/Mod/Part/Gui/CommandParametric.cpp @@ -63,7 +63,7 @@ CmdPartCylinder::CmdPartCylinder() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Cylinder"); - sToolTipText = QT_TR_NOOP("Create a Cylinder"); + sToolTipText = QT_TR_NOOP("Creates a solid cylinder"); sWhatsThis = "Part_Cylinder"; sStatusTip = sToolTipText; sPixmap = "Part_Cylinder_Parametric"; @@ -105,7 +105,7 @@ CmdPartBox::CmdPartBox() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Cube"); - sToolTipText = QT_TR_NOOP("Create a cube solid"); + sToolTipText = QT_TR_NOOP("Creates a solid cube"); sWhatsThis = "Part_Box"; sStatusTip = sToolTipText; sPixmap = "Part_Box_Parametric"; @@ -147,7 +147,7 @@ CmdPartSphere::CmdPartSphere() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Sphere"); - sToolTipText = QT_TR_NOOP("Create a sphere solid"); + sToolTipText = QT_TR_NOOP("Creates a solid sphere"); sWhatsThis = "Part_Sphere"; sStatusTip = sToolTipText; sPixmap = "Part_Sphere_Parametric"; @@ -189,7 +189,7 @@ CmdPartCone::CmdPartCone() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Cone"); - sToolTipText = QT_TR_NOOP("Create a cone solid"); + sToolTipText = QT_TR_NOOP("Creates a solid cone"); sWhatsThis = "Part_Cone"; sStatusTip = sToolTipText; sPixmap = "Part_Cone_Parametric"; @@ -231,7 +231,7 @@ CmdPartTorus::CmdPartTorus() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Torus"); - sToolTipText = QT_TR_NOOP("Create a torus solid"); + sToolTipText = QT_TR_NOOP("Creates a solid torus"); sWhatsThis = "Part_Torus"; sStatusTip = sToolTipText; sPixmap = "Part_Torus_Parametric"; diff --git a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp index 4e3fb0b11d..8ecc6df4ff 100644 --- a/src/Mod/Part/Gui/CommandSimple.cpp +++ b/src/Mod/Part/Gui/CommandSimple.cpp @@ -53,8 +53,8 @@ CmdPartSimpleCylinder::CmdPartSimpleCylinder() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create Cylinder..."); - sToolTipText = QT_TR_NOOP("Create a Cylinder"); + sMenuText = QT_TR_NOOP("Cylinder"); + sToolTipText = QT_TR_NOOP("Creates a solid cylinder"); sWhatsThis = "Part_SimpleCylinder"; sStatusTip = sToolTipText; sPixmap = "Part_Cylinder_Parametric"; @@ -103,8 +103,8 @@ CmdPartShapeFromMesh::CmdPartShapeFromMesh() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create shape from mesh..."); - sToolTipText = QT_TR_NOOP("Create shape from selected mesh object"); + sMenuText = QT_TR_NOOP("Shape From Mesh"); + sToolTipText = QT_TR_NOOP("Creates a shape from the selected mesh"); sWhatsThis = "Part_ShapeFromMesh"; sStatusTip = sToolTipText; sPixmap = "Part_Shape_from_Mesh"; @@ -131,8 +131,8 @@ CmdPartPointsFromMesh::CmdPartPointsFromMesh() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create points object from geometry"); - sToolTipText = QT_TR_NOOP("Create selectable points object from selected geometric object"); + sMenuText = QT_TR_NOOP("Points From Shape"); + sToolTipText = QT_TR_NOOP("Creates distributed points from the selected shape"); sWhatsThis = "Part_PointsFromMesh"; sStatusTip = sToolTipText; sPixmap = "Part_PointsFromMesh"; @@ -217,8 +217,8 @@ CmdPartSimpleCopy::CmdPartSimpleCopy() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create simple copy"); - sToolTipText = QT_TR_NOOP("Create a simple non-parametric copy"); + sMenuText = QT_TR_NOOP("Simple Copy"); + sToolTipText = QT_TR_NOOP("Creates a simple non-parametric copy of the selected shapes"); sWhatsThis = "Part_SimpleCopy"; sStatusTip = sToolTipText; sPixmap = "Part_3D_object"; @@ -292,8 +292,8 @@ CmdPartTransformedCopy::CmdPartTransformedCopy() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create transformed copy"); - sToolTipText = QT_TR_NOOP("Create a non-parametric copy with transformed placement"); + sMenuText = QT_TR_NOOP("Transformed Copy"); + sToolTipText = QT_TR_NOOP("Creates a non-parametric copy with transformed placement of the selected shapes"); sWhatsThis = "Part_TransformCopy"; sStatusTip = sToolTipText; sPixmap = "Part_Transformed_Copy.svg"; @@ -320,8 +320,8 @@ CmdPartElementCopy::CmdPartElementCopy() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Create shape element copy"); - sToolTipText = QT_TR_NOOP("Create a non-parametric copy of the selected shape element"); + sMenuText = QT_TR_NOOP("Shape Element Copy"); + sToolTipText = QT_TR_NOOP("Creates a non-parametric copy of the selected shape element"); sWhatsThis = "Part_ElementCopy"; sStatusTip = sToolTipText; sPixmap = "Part_Element_Copy.svg"; @@ -348,8 +348,8 @@ CmdPartRefineShape::CmdPartRefineShape() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Refine shape"); - sToolTipText = QT_TR_NOOP("Refine the copy of a shape"); + sMenuText = QT_TR_NOOP("Refine Shape"); + sToolTipText = QT_TR_NOOP("Creates a refined copy of the selected shapes"); sWhatsThis = "Part_RefineShape"; sStatusTip = sToolTipText; sPixmap = "Part_Refine_Shape"; @@ -409,7 +409,7 @@ CmdPartDefeaturing::CmdPartDefeaturing() sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); sMenuText = QT_TR_NOOP("Defeaturing"); - sToolTipText = QT_TR_NOOP("Remove feature from a shape"); + sToolTipText = QT_TR_NOOP("Removes the selected features from a shape"); sWhatsThis = "Part_Defeaturing"; sStatusTip = sToolTipText; sPixmap = "Part_Defeaturing"; diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp index 6907f7553e..718cb55e6c 100644 --- a/src/Mod/Part/Gui/CrossSections.cpp +++ b/src/Mod/Part/Gui/CrossSections.cpp @@ -266,7 +266,7 @@ void CrossSections::apply() section->purgeTouched(); } #else - Base::SequencerLauncher seq("Cross-sections...", obj.size() * (d.size() +1)); + Base::SequencerLauncher seq("Cross-sections…", obj.size() * (d.size() + 1)); Gui::Command::runCommand(Gui::Command::App, "import Part\n"); Gui::Command::runCommand(Gui::Command::App, "from FreeCAD import Base\n"); for (auto it : obj) { diff --git a/src/Mod/Part/Gui/CrossSections.ui b/src/Mod/Part/Gui/CrossSections.ui index fc81253cca..7dbf89c098 100644 --- a/src/Mod/Part/Gui/CrossSections.ui +++ b/src/Mod/Part/Gui/CrossSections.ui @@ -11,13 +11,13 @@ - Cross sections + Cross Sections - Guiding plane + Guiding Plane @@ -49,7 +49,7 @@ - Position: + Position @@ -106,7 +106,7 @@ - Distance: + Distance diff --git a/src/Mod/Part/Gui/DlgBlock.ui b/src/Mod/Part/Gui/DlgBlock.ui index 6ba084bc86..fbb93ff4cd 100644 --- a/src/Mod/Part/Gui/DlgBlock.ui +++ b/src/Mod/Part/Gui/DlgBlock.ui @@ -11,13 +11,13 @@ - Block definition + Block Definition - First limit + First Limit @@ -37,7 +37,7 @@ - Type: + Type @@ -73,7 +73,7 @@ - Length: + Length @@ -90,7 +90,7 @@ - Limit: + Limit @@ -132,7 +132,7 @@ - Selection: + Selection @@ -178,7 +178,7 @@ false - Second limit + Second Limit @@ -198,7 +198,7 @@ - Type: + Type @@ -234,7 +234,7 @@ - Length: + Length @@ -251,7 +251,7 @@ - Limit: + Limit diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.cpp b/src/Mod/Part/Gui/DlgBooleanOperation.cpp index 95b9b7f000..fa04a31f70 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.cpp +++ b/src/Mod/Part/Gui/DlgBooleanOperation.cpp @@ -383,12 +383,12 @@ void DlgBooleanOperation::accept() if (!litem || !indexOfCurrentItem(litem,ltop,lchild)) { QMessageBox::critical(this, windowTitle(), - tr("Select a shape on the left side, first")); + tr("First, select a shape on the left side")); return; } if (!ritem || !indexOfCurrentItem(ritem,rtop,rchild)) { QMessageBox::critical(this, windowTitle(), - tr("Select a shape on the right side, first")); + tr("First, select a shape on the right side")); return; } if (ltop == rtop && lchild == rchild) { @@ -413,7 +413,7 @@ void DlgBooleanOperation::accept() if (!obj1 || !obj2) { // objects don't exists (anymore) QMessageBox::critical(this, windowTitle(), - tr("One of the selected objects doesn't exist anymore")); + tr("One of the selected objects does not exist anymore")); return; } diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.ui b/src/Mod/Part/Gui/DlgBooleanOperation.ui index 71b2bbcb86..fe190ce9ba 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.ui +++ b/src/Mod/Part/Gui/DlgBooleanOperation.ui @@ -17,7 +17,7 @@ - Boolean operation + Boolean Operation @@ -152,7 +152,7 @@ - Swap selection + Swap Selection diff --git a/src/Mod/Part/Gui/DlgExportHeaderStep.ui b/src/Mod/Part/Gui/DlgExportHeaderStep.ui index f9311dccca..a978b090e2 100644 --- a/src/Mod/Part/Gui/DlgExportHeaderStep.ui +++ b/src/Mod/Part/Gui/DlgExportHeaderStep.ui @@ -20,7 +20,7 @@ - If not empty, field contents will be used in the STEP file header. + If not empty, field contents will be used in the STEP file header Header diff --git a/src/Mod/Part/Gui/DlgExportStep.cpp b/src/Mod/Part/Gui/DlgExportStep.cpp index 8c9a47365b..8f17b379ed 100644 --- a/src/Mod/Part/Gui/DlgExportStep.cpp +++ b/src/Mod/Part/Gui/DlgExportStep.cpp @@ -205,7 +205,7 @@ TaskExportStep::TaskExportStep(QWidget* parent) setLayout(layout); showThis = new QCheckBox(this); - showThis->setText(tr("Don't show this dialog again")); + showThis->setText(tr("Do not show this dialog again")); layout->addWidget(showThis); QDialogButtonBox* buttonBox = new QDialogButtonBox(this); diff --git a/src/Mod/Part/Gui/DlgExportStep.ui b/src/Mod/Part/Gui/DlgExportStep.ui index 269ebece0c..d03b4e7cb4 100644 --- a/src/Mod/Part/Gui/DlgExportStep.ui +++ b/src/Mod/Part/Gui/DlgExportStep.ui @@ -101,10 +101,10 @@ - Check this option to keep the placement information when exporting -a single object. Please note that when importing back the STEP file, the + Keeps the placement information when exporting +a single object. When importing back the STEP file, the placement will be encoded into the shape geometry, instead of keeping -it inside the Placement property. +it inside the placement property. Export single object placement diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp index 8324c8b97e..6adcaa4ae3 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.cpp +++ b/src/Mod/Part/Gui/DlgExtrusion.cpp @@ -211,7 +211,7 @@ void DlgExtrusion::onSelectEdgeClicked() if (!filter) { filter = new EdgeSelection(); Gui::Selection().addSelectionGate(filter); - ui->btnSelectEdge->setText(tr("Selecting...")); + ui->btnSelectEdge->setText(tr("Selecting…")); //visibility automation try{ @@ -474,7 +474,8 @@ void DlgExtrusion::apply() if (Part::Feature::getTopoShape(sourceObj, Part::ShapeOption::ResolveLink | Part::ShapeOption::Transform).isNull()){ FC_ERR("Object " << sourceObj->getFullName() - << " is not Part object (has no OCC shape). Can't extrude it."); + << " is not a Part object because it has no OCC shape. Extrusion is not possible."); + continue; } @@ -507,7 +508,7 @@ void DlgExtrusion::apply() catch (Base::Exception &err){ QMessageBox::critical(this, windowTitle(), - tr("Creating Extrusion failed.\n%1") + tr("Creating extrusion failed.\n%1") .arg(QCoreApplication::translate("Exception", err.what()))); return; } @@ -642,7 +643,7 @@ bool DlgExtrusion::validate() //check source shapes if (ui->treeWidget->selectedItems().isEmpty()) { QMessageBox::critical(this, windowTitle(), - tr("No shapes selected for extrusion. Select some, first.")); + tr("No shapes selected for extrusion.")); return false; } @@ -688,7 +689,7 @@ bool DlgExtrusion::validate() errmsg = QStringLiteral("Unknown error"); } if (errmsg.length() > 0){ - QMessageBox::critical(this, windowTitle(), tr("Can't determine normal vector of shape to be extruded. Please use other mode. \n\n(%1)").arg(errmsg)); + QMessageBox::critical(this, windowTitle(), tr("Cannot determine normal vector of shape to be extruded. Use other mode. \n\n(%1)").arg(errmsg)); ui->rbDirModeNormal->setFocus(); return false; } diff --git a/src/Mod/Part/Gui/DlgExtrusion.ui b/src/Mod/Part/Gui/DlgExtrusion.ui index bc3a1e4838..2cbc2a3f0d 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.ui +++ b/src/Mod/Part/Gui/DlgExtrusion.ui @@ -29,7 +29,7 @@ - Extrude perpendicularly to plane of input shape. + Extrudes perpendicularly to the plane of the input shape Along normal @@ -45,14 +45,14 @@ Set direction to match a direction of straight edge. Hint: to account for length of the edge too, set both lengths to zero. - Along edge: + Along edge - If checked, direction of extrusion is reversed. + Reverses the direction of the extrusion Reversed @@ -65,7 +65,7 @@ - Click to start selecting an edge in 3D view. + Starts the selection of edges in the 3D view Select @@ -75,10 +75,10 @@ - Specify direction manually using X,Y,Z values. + Specify direction manually using X, Y, Z values - Custom direction: + Custom direction @@ -96,7 +96,7 @@ - X: + X @@ -119,7 +119,7 @@ - Y: + Y @@ -142,7 +142,7 @@ - Z: + Z @@ -182,7 +182,7 @@ - Along: + Along @@ -221,7 +221,7 @@ If both lengths are zero, magnitude of direction is used. - Against: + Against @@ -240,7 +240,7 @@ If both lengths are zero, magnitude of direction is used. - Length to extrude against the direction (can be negative). + Length to extrude against the direction (can be negative) mm @@ -259,7 +259,7 @@ If both lengths are zero, magnitude of direction is used. - Distribute extrusion length equally to both sides. + Distributes the extrusion length equally to both sides Symmetric @@ -334,7 +334,7 @@ If both lengths are zero, magnitude of direction is used. - If checked, extruding closed wires will give solids, not shells. + Results in solids if wires are closed, otherwise in shells Create solid diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 4034b77597..66d80858bf 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -267,7 +267,7 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge d->filletType = type; if (d->filletType == DlgFilletEdges::CHAMFER) { - ui->parameterName->setTitle(tr("Chamfer Parameters")); + ui->parameterName->setTitle(tr("Chamfer parameters")); ui->labelfillet->setText(tr("Chamfer type")); ui->labelRadius->setText(tr("Length:")); ui->filletType->setItemText(0, tr("Equal distance")); @@ -278,7 +278,7 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge model->setHeaderData(2, Qt::Horizontal, tr("Size2"), Qt::DisplayRole); } else { - ui->parameterName->setTitle(tr("Fillet Parameter")); + ui->parameterName->setTitle(tr("Fillet parameter")); ui->labelfillet->setText(tr("Fillet type")); model->setHeaderData(0, Qt::Horizontal, tr("Edges to fillet"), Qt::DisplayRole); model->setHeaderData(1, Qt::Horizontal, tr("Start radius"), Qt::DisplayRole); @@ -961,7 +961,7 @@ bool DlgFilletEdges::accept() if (!d->object) { QMessageBox::warning(this, tr("No shape selected"), tr("No valid shape is selected.\n" - "Please select a valid shape in the drop-down box first.")); + "Select a valid shape in the drop-down box first.")); return false; } App::Document* activeDoc = App::GetApplication().getActiveDocument(); @@ -1013,7 +1013,7 @@ bool DlgFilletEdges::accept() if (!todo) { QMessageBox::warning(this, tr("No edge selected"), tr("No edge entity is checked to fillet.\n" - "Please check one or more edge entities first.")); + "Check one or more edge entities first.")); return false; } diff --git a/src/Mod/Part/Gui/DlgFilletEdges.ui b/src/Mod/Part/Gui/DlgFilletEdges.ui index 4cacfe6720..1e197ae252 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.ui +++ b/src/Mod/Part/Gui/DlgFilletEdges.ui @@ -29,7 +29,7 @@ - Selected shape: + Selected shape @@ -107,7 +107,7 @@ - Type: + Type @@ -139,7 +139,7 @@ - Radius: + Radius diff --git a/src/Mod/Part/Gui/DlgImportExportIges.ui b/src/Mod/Part/Gui/DlgImportExportIges.ui index 4911c732bd..89c48138a1 100644 --- a/src/Mod/Part/Gui/DlgImportExportIges.ui +++ b/src/Mod/Part/Gui/DlgImportExportIges.ui @@ -62,7 +62,7 @@ - Export solids and shells as + Export Solids and Shells As @@ -81,10 +81,10 @@ - Solids will be exported as manifold solid B-Rep object, shells as shell + Solids will be exported as manifold solid B-rep object, shells as shell - Solids (type 186) and Shells (type 514) / B-REP mode + Solids (type 186) and shells (type 514) / B-rep mode diff --git a/src/Mod/Part/Gui/DlgImportStep.cpp b/src/Mod/Part/Gui/DlgImportStep.cpp index 4942179beb..a7edc5ee41 100644 --- a/src/Mod/Part/Gui/DlgImportStep.cpp +++ b/src/Mod/Part/Gui/DlgImportStep.cpp @@ -146,7 +146,7 @@ TaskImportStep::TaskImportStep(QWidget* parent) setLayout(layout); showThis = new QCheckBox(this); - showThis->setText(tr("Don't show this dialog again")); + showThis->setText(tr("Do not show this dialog again")); layout->addWidget(showThis); QDialogButtonBox* buttonBox = new QDialogButtonBox(this); diff --git a/src/Mod/Part/Gui/DlgImportStep.ui b/src/Mod/Part/Gui/DlgImportStep.ui index 3b54a070a1..0a01036a20 100644 --- a/src/Mod/Part/Gui/DlgImportStep.ui +++ b/src/Mod/Part/Gui/DlgImportStep.ui @@ -26,11 +26,10 @@ - If checked, Compound merge will be done -during file reading (slower but higher details). + Merges compounds during file reading (slower but higher details) - Enable STEP Compound merge + Enable STEP compound merge ReadShapeCompoundMode @@ -43,7 +42,7 @@ during file reading (slower but higher details). - Select this to use App::LinkGroup as group container, or else use App::Part. + Select this to use App::LinkGroup as group container, or else use App::Part Use LinkGroup @@ -59,7 +58,7 @@ during file reading (slower but higher details). - Select this to import invisible objects. + Select this to import invisible objects Import invisible objects diff --git a/src/Mod/Part/Gui/DlgPartBox.ui b/src/Mod/Part/Gui/DlgPartBox.ui index 6eff5eefeb..5a550d771f 100644 --- a/src/Mod/Part/Gui/DlgPartBox.ui +++ b/src/Mod/Part/Gui/DlgPartBox.ui @@ -11,13 +11,13 @@ - Box definition + Box Definition - Position: + Position @@ -29,7 +29,7 @@ - X: + X @@ -49,7 +49,7 @@ - Y: + Y @@ -69,7 +69,7 @@ - Z: + Z @@ -89,7 +89,7 @@ - Direction: + Direction @@ -106,7 +106,7 @@ - Size: + Size @@ -118,7 +118,7 @@ - Length: + Length @@ -138,7 +138,7 @@ - Width: + Width @@ -158,7 +158,7 @@ - Height: + Height diff --git a/src/Mod/Part/Gui/DlgPartCylinder.ui b/src/Mod/Part/Gui/DlgPartCylinder.ui index dc5f3079b6..a91e6cb0d1 100644 --- a/src/Mod/Part/Gui/DlgPartCylinder.ui +++ b/src/Mod/Part/Gui/DlgPartCylinder.ui @@ -11,13 +11,13 @@ - Cylinder definition + Cylinder Definition - Position: + Position @@ -29,7 +29,7 @@ - X: + X @@ -49,7 +49,7 @@ - Y: + Y @@ -69,7 +69,7 @@ - Z: + Z @@ -89,7 +89,7 @@ - Direction: + Direction @@ -118,7 +118,7 @@ - Radius: + Radius @@ -138,7 +138,7 @@ - Height: + Height diff --git a/src/Mod/Part/Gui/DlgPartImportIges.ui b/src/Mod/Part/Gui/DlgPartImportIges.ui index 21a5762e66..a372de2bfc 100644 --- a/src/Mod/Part/Gui/DlgPartImportIges.ui +++ b/src/Mod/Part/Gui/DlgPartImportIges.ui @@ -11,7 +11,7 @@ - IGES input file + IGES Input File @@ -51,7 +51,7 @@ - ... + Search File diff --git a/src/Mod/Part/Gui/DlgPartImportStep.ui b/src/Mod/Part/Gui/DlgPartImportStep.ui index 3266e7d62c..b04905b9c6 100644 --- a/src/Mod/Part/Gui/DlgPartImportStep.ui +++ b/src/Mod/Part/Gui/DlgPartImportStep.ui @@ -11,7 +11,7 @@ - STEP input file + STEP Input File @@ -51,7 +51,7 @@ - ... + Search File diff --git a/src/Mod/Part/Gui/DlgPrimitives.ui b/src/Mod/Part/Gui/DlgPrimitives.ui index ece575ac86..be51a6f773 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.ui +++ b/src/Mod/Part/Gui/DlgPrimitives.ui @@ -237,7 +237,7 @@ - Length: + Length @@ -257,7 +257,7 @@ - Width: + Width @@ -328,7 +328,7 @@ - Length: + Length @@ -348,7 +348,7 @@ - Width: + Width @@ -368,7 +368,7 @@ - Height: + Height @@ -442,7 +442,7 @@ - Radius: + Radius @@ -462,7 +462,7 @@ - Height: + Height @@ -482,7 +482,7 @@ - Angle in first direction: + Angle in first direction @@ -508,7 +508,7 @@ - Angle in second direction: + Angle in second direction @@ -566,7 +566,7 @@ - Rotation angle: + Rotation angle @@ -640,7 +640,7 @@ - Radius 1: + Radius 1 @@ -660,7 +660,7 @@ - Radius 2: + Radius 2 @@ -680,7 +680,7 @@ - Height: + Height @@ -726,7 +726,7 @@ - Angle: + Angle @@ -800,7 +800,7 @@ - Radius: + Radius @@ -849,7 +849,7 @@ - U parameter: + U parameter @@ -869,7 +869,7 @@ - V parameters: + V parameters @@ -972,7 +972,7 @@ - Radius 1: + Radius 1 @@ -992,7 +992,7 @@ - Radius 2: + Radius 2 @@ -1012,7 +1012,7 @@ - Radius 3: + Radius 3 @@ -1061,7 +1061,7 @@ - U parameter: + U parameter @@ -1081,7 +1081,7 @@ - V parameter: + V parameter @@ -1181,7 +1181,7 @@ - Radius 1: + Radius 1 @@ -1201,7 +1201,7 @@ - Radius 2: + Radius 2 @@ -1250,7 +1250,7 @@ - U Parameter: + U parameter @@ -1270,7 +1270,7 @@ - V parameter: + V parameter @@ -1373,7 +1373,7 @@ - Polygon: + Polygon @@ -1396,7 +1396,7 @@ - Circumradius: + Circumradius @@ -1416,7 +1416,7 @@ - Height: + Height @@ -1436,7 +1436,7 @@ - Angle in first direction: + Angle in first direction @@ -1462,7 +1462,7 @@ - Angle in second direction: + Angle in second direction @@ -1515,7 +1515,7 @@ - X min/max: + X min/max @@ -1545,7 +1545,7 @@ - Y min/max: + Y min/max @@ -1575,7 +1575,7 @@ - Z min/max: + Z min/max @@ -1605,7 +1605,7 @@ - X2 min/max: + X2 min/max @@ -1638,7 +1638,7 @@ - Z2 min/max: + Z2 min/max @@ -1722,7 +1722,7 @@ - Pitch: + Pitch @@ -1742,7 +1742,7 @@ - Height: + Height @@ -1762,7 +1762,7 @@ - Radius: + Radius @@ -1782,7 +1782,7 @@ - Angle: + Angle @@ -1799,7 +1799,7 @@ - Coordinate system: + Coordinate system @@ -1871,7 +1871,7 @@ - Growth: + Growth @@ -1891,7 +1891,7 @@ - Number of rotations: + Number of rotations @@ -1911,7 +1911,7 @@ - Radius: + Radius @@ -1967,7 +1967,7 @@ - Radius: + Radius @@ -1987,7 +1987,7 @@ - Angle 1: + Angle 1 @@ -2004,7 +2004,7 @@ - Angle 2: + Angle 2 @@ -2041,7 +2041,7 @@ - From three points + From 3 Points @@ -2069,7 +2069,7 @@ - Major radius: + Major radius @@ -2089,7 +2089,7 @@ - Minor radius: + Minor radius @@ -2109,7 +2109,7 @@ - Angle 1: + Angle 1 @@ -2126,7 +2126,7 @@ - Angle 2: + Angle 2 @@ -2167,7 +2167,7 @@ - X: + X Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2187,7 +2187,7 @@ - Y: + Y Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2207,7 +2207,7 @@ - Z: + Z Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2265,7 +2265,7 @@ - X: + X Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2298,7 +2298,7 @@ - Y: + Y Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2331,7 +2331,7 @@ - Z: + Z Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2415,7 +2415,7 @@ - Polygon: + Polygon @@ -2438,7 +2438,7 @@ - Circumradius: + Circumradius diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp index cc32cb46bd..646a360ec5 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp @@ -133,7 +133,7 @@ public: DlgProjectionOnSurface::DlgProjectionOnSurface(QWidget* parent) : QWidget(parent) , ui(new Ui::DlgProjectionOnSurface) - , m_projectionObjectName(tr("Projection Object")) + , m_projectionObjectName(tr("Projection object")) , filterEdge(nullptr) , filterFace(nullptr) { @@ -162,13 +162,13 @@ DlgProjectionOnSurface::DlgProjectionOnSurface(QWidget* parent) m_partDocument = App::GetApplication().getActiveDocument(); if (!m_partDocument) { - throw Base::ValueError(tr("Have no active document!!!").toStdString()); + throw Base::ValueError(tr("No active document").toStdString()); } this->attachDocument(m_partDocument); m_partDocument->openTransaction("Project on surface"); m_projectionObject = m_partDocument->addObject("Projection Object"); if (!m_projectionObject) { - throw Base::ValueError(tr("Can not create a projection object!!!").toStdString()); + throw Base::ValueError(tr("Cannot create a projection object").toStdString()); } m_projectionObject->Label.setValue(std::string(m_projectionObjectName.toUtf8()).c_str()); onRadioButtonShowAllClicked(); diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.ui b/src/Mod/Part/Gui/DlgProjectionOnSurface.ui index 4d9647530a..e44ef6db52 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.ui +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.ui @@ -11,13 +11,13 @@ - Projection on surface + Project on Surface - Select projection surface + Select Projection Surface @@ -28,21 +28,21 @@ - Add face + Add Face - Add wire + Add Wire - Add edge + Add Edge @@ -73,7 +73,7 @@ - Show Edges + Show edges false @@ -144,7 +144,7 @@ - Get current camera direction + Get Current Camera Direction @@ -153,7 +153,7 @@ - X: + X @@ -183,7 +183,7 @@ - Y: + Y @@ -210,7 +210,7 @@ - Z: + Z diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp index d1ddc0c236..b9fb3701e3 100644 --- a/src/Mod/Part/Gui/DlgRevolution.cpp +++ b/src/Mod/Part/Gui/DlgRevolution.cpp @@ -266,7 +266,7 @@ bool DlgRevolution::validate() //check source shapes if (ui->treeWidget->selectedItems().isEmpty()) { QMessageBox::critical(this, windowTitle(), - tr("Select a shape for revolution, first.")); + tr("Select a shape for revolution.")); return false; } @@ -461,7 +461,7 @@ void DlgRevolution::onSelectLineClicked() if (!filter) { filter = new EdgeSelection(); Gui::Selection().addSelectionGate(filter); - ui->selectLine->setText(tr("Selecting... (line or arc)")); + ui->selectLine->setText(tr("Selecting… (line or arc)")); } else { Gui::Selection().rmvSelectionGate(); filter = nullptr; diff --git a/src/Mod/Part/Gui/DlgRevolution.ui b/src/Mod/Part/Gui/DlgRevolution.ui index b2e903c463..d521ac0e15 100644 --- a/src/Mod/Part/Gui/DlgRevolution.ui +++ b/src/Mod/Part/Gui/DlgRevolution.ui @@ -53,7 +53,7 @@ - Revolution axis + Revolution Axis @@ -61,7 +61,7 @@ - Center X: + Center X @@ -81,7 +81,7 @@ - Center Y: + Center Y @@ -101,7 +101,7 @@ - Center Z: + Center Z @@ -143,10 +143,10 @@ - Click to set this as axis + Sets this as axis - Dir. X: + X Direction @@ -184,10 +184,10 @@ - Click to set this as axis + Sets this as axis - Dir. Y: + Y Direction @@ -225,7 +225,7 @@ - Dir. Z: + Z Direction @@ -247,7 +247,7 @@ - Select reference + Select Reference @@ -278,7 +278,7 @@ - Angle: + Angle Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -312,7 +312,7 @@ - If checked, revolution will extend forwards and backwards by half the angle. + Extends the revolution forwards and backwards by half the angle Symmetric angle @@ -322,10 +322,10 @@ - If checked, revolving wires will produce solids. If not, revolving a wire yields a shell. + Creates a solid. Otherwise it results in a shell. - Create Solid + Create solid diff --git a/src/Mod/Part/Gui/DlgScale.cpp b/src/Mod/Part/Gui/DlgScale.cpp index 6a4d54b054..f114f42bfb 100644 --- a/src/Mod/Part/Gui/DlgScale.cpp +++ b/src/Mod/Part/Gui/DlgScale.cpp @@ -218,7 +218,7 @@ void DlgScale::apply() if (Part::Feature::getTopoShape(sourceObj, Part::ShapeOption::ResolveLink | Part::ShapeOption::Transform).isNull()){ FC_ERR("Object " << sourceObj->getFullName() - << " is not Part object (has no OCC shape). Can't scale it."); + << " is not a shape object. Scaling is not possible."); continue; } @@ -251,13 +251,13 @@ void DlgScale::apply() catch (Base::Exception &err){ QMessageBox::critical(this, windowTitle(), - tr("Creating Scale failed.\n%1") + tr("Creating scale failed.\n%1") .arg(QCoreApplication::translate("Exception", err.what()))); return; } catch(...) { QMessageBox::critical(this, windowTitle(), - tr("Creating Scale failed.\n%1").arg(QStringLiteral("Unknown error"))); + tr("Creating scale failed.\n%1").arg(QStringLiteral("Unknown error"))); return; } } diff --git a/src/Mod/Part/Gui/DlgScale.ui b/src/Mod/Part/Gui/DlgScale.ui index b32e9d0988..5aa3237ce5 100644 --- a/src/Mod/Part/Gui/DlgScale.ui +++ b/src/Mod/Part/Gui/DlgScale.ui @@ -19,7 +19,7 @@ - X Factor + X factor @@ -61,7 +61,7 @@ - Z Factor + Z factor @@ -109,17 +109,17 @@ - Y Factor + Y factor - Specify a different scale factor for each cardinal direction. + Specify a different scale factor for each cardinal direction - Non-Uniform Scaling + Non-uniform scaling @@ -192,7 +192,7 @@ - Select shape(s) that should be scaled + Select shapes to be scaled diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPart.ui b/src/Mod/Part/Gui/DlgSettings3DViewPart.ui index 5c54359904..7dc06574ec 100644 --- a/src/Mod/Part/Gui/DlgSettings3DViewPart.ui +++ b/src/Mod/Part/Gui/DlgSettings3DViewPart.ui @@ -11,7 +11,7 @@ - Shape view + Shape View diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp index 554051d968..6055e3e3d6 100644 --- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp +++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp @@ -101,7 +101,7 @@ void DlgSettings3DViewPart::onMaxAngularDeflectionValueChanged(double vMaxAngle) checkValue = true; QMessageBox::warning( this, - tr("Angle Deflection"), + tr("Angle deflection"), tr("Setting a too small angle deviation causes the tessellation to take longer" " and thus freezes or slows down the GUI.")); } diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.ui b/src/Mod/Part/Gui/DlgSettingsGeneral.ui index ee3a26255c..7cb42a47e3 100644 --- a/src/Mod/Part/Gui/DlgSettingsGeneral.ui +++ b/src/Mod/Part/Gui/DlgSettingsGeneral.ui @@ -17,7 +17,7 @@ - Model settings + Model Settings @@ -55,7 +55,7 @@ - Automatically refine model after sketch-based operation + Automatically refine model after applying operations true @@ -80,7 +80,7 @@ false - Object naming + Object Naming @@ -108,7 +108,7 @@ - Features settings + Features Settings @@ -187,7 +187,7 @@ - These settings are experimental and may result in decreased stability, more problems and undefined behaviors. + These settings are experimental and may result in decreased stability, problems and undefined behaviors true @@ -197,7 +197,7 @@ - Allow multiple solids in Part Design Body by default (experimental) + Allow multiple solids in Part Design bodies by default AllowCompoundDefault diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui index 57ad807335..51c465c2e6 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui @@ -11,13 +11,13 @@ - Shape appearance + Shape Appearance - Default Shape view properties + Default Shape Appearance Properties @@ -502,7 +502,7 @@ will be used or black. - Default Annotation color + Default Annotation Color diff --git a/src/Mod/Part/Gui/Location.ui b/src/Mod/Part/Gui/Location.ui index 6059cba7c0..ddd7260982 100644 --- a/src/Mod/Part/Gui/Location.ui +++ b/src/Mod/Part/Gui/Location.ui @@ -87,7 +87,7 @@ - 3D view + 3D View @@ -107,7 +107,7 @@ the sketch plane's normal vector will be used - Rotation axis + Rotation Axis @@ -115,14 +115,14 @@ the sketch plane's normal vector will be used - x + X - x-component of direction vector + X-component of direction vector false @@ -144,14 +144,14 @@ the sketch plane's normal vector will be used - y + Y - y-component of direction vector + Y-component of direction vector false @@ -173,14 +173,14 @@ the sketch plane's normal vector will be used - z + Z - z-component of direction vector + Z-component of direction vector false diff --git a/src/Mod/Part/Gui/Mirroring.cpp b/src/Mod/Part/Gui/Mirroring.cpp index 911d125336..c3d72df087 100644 --- a/src/Mod/Part/Gui/Mirroring.cpp +++ b/src/Mod/Part/Gui/Mirroring.cpp @@ -282,7 +282,7 @@ bool Mirroring::accept() { if (ui->shapes->selectedItems().isEmpty()) { QMessageBox::critical(this, windowTitle(), - tr("Select a shape for mirroring, first.")); + tr("Select a shape for mirroring.")); return false; } diff --git a/src/Mod/Part/Gui/Mirroring.ui b/src/Mod/Part/Gui/Mirroring.ui index e773146e95..b8c7677ee2 100644 --- a/src/Mod/Part/Gui/Mirroring.ui +++ b/src/Mod/Part/Gui/Mirroring.ui @@ -11,19 +11,19 @@ - Mirroring + Mirror - Base point + Base Point - x + X Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -46,7 +46,7 @@ - y + Y Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -69,7 +69,7 @@ - z + Z Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -95,7 +95,7 @@ - Mirror plane: + Mirror plane @@ -103,17 +103,17 @@ - XY plane + XY-plane - XZ plane + XZ-plane - YZ plane + YZ-plane diff --git a/src/Mod/Part/Gui/SectionCutting.cpp b/src/Mod/Part/Gui/SectionCutting.cpp index b6e517a9ac..8425f8bf04 100644 --- a/src/Mod/Part/Gui/SectionCutting.cpp +++ b/src/Mod/Part/Gui/SectionCutting.cpp @@ -97,16 +97,16 @@ SectionCut::SectionCut(QWidget* parent) // get all objects in the document auto docGui = Gui::Application::Instance->activeDocument(); if (!docGui) { - throw Base::RuntimeError("SectionCut error: there is no document"); + throw Base::RuntimeError("Section cut error: there is no document"); } doc = docGui->getDocument(); if (!doc) { - throw Base::RuntimeError("SectionCut error: there is no document"); + throw Base::RuntimeError("Section cut error: there is no document"); } std::vector ObjectsList = doc->getObjects(); if (ObjectsList.empty()) { - throw Base::RuntimeError("SectionCut error: there are no objects in the document"); + throw Base::RuntimeError("Section cut error: there are no objects in the document"); } // now store those that are currently visible @@ -550,7 +550,7 @@ void SectionCut::deleteCompound() pcCompoundDelBF = Gui::Application::Instance->getViewProvider(compoundObject); if (!pcCompoundDelBF) { Base::Console().error( - "SectionCut error: compound is incorrectly named, cannot proceed\n"); + "Section cut error: compound is incorrectly named, cannot proceed\n"); return; } compoundChilds = pcCompoundDelBF->claimChildren(); @@ -606,7 +606,7 @@ Part::Box* SectionCut::createBox(const char* name, const Base::Vector3f& size) // create a box auto pcBox = doc->addObject(name); if (!pcBox) { - throw Base::RuntimeError(std::string("SectionCut error: ") + throw Base::RuntimeError(std::string("Section cut error: ") + std::string(name) + std::string(" could not be added\n")); } @@ -785,7 +785,7 @@ Part::Cut* SectionCut::createCut(const char* name) { auto pcCut = doc->addObject(name); if (!pcCut) { - throw Base::RuntimeError(std::string("SectionCut error: ") + throw Base::RuntimeError(std::string("Section cut error: ") + std::string(name) + std::string(" could not be added\n")); } @@ -1126,7 +1126,7 @@ std::tuple SectionCut::adjustRanges() // we get its size by its bounding box SbBox3f CompoundBoundingBox = getViewBoundingBox(); if (CompoundBoundingBox.isEmpty()) { // NOLINT - throw Base::RuntimeError("SectionCut error: the CompoundBoundingBox is empty"); + throw Base::RuntimeError("Section cut error: the CompoundBoundingBox is empty"); } // refresh all cut limits according to the new bounding box @@ -1392,7 +1392,7 @@ SectionCut* SectionCut::makeDockWidget(QWidget* parent) Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance(); // the dialog is designed that you can see the tree, thus put it to the right side QDockWidget *dw = - pDockMgr->addDockWindow("Section Cutting", sectionCut, Qt::RightDockWidgetArea); + pDockMgr->addDockWindow("Section cutting", sectionCut, Qt::RightDockWidgetArea); dw->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable); //dw->setFloating(true); dw->show(); @@ -1567,7 +1567,7 @@ void SectionCut::onCutXvalueChanged(double val) } auto pcBox = dynamic_cast(CutBox); if (!pcBox) { - Base::Console().error((std::string("SectionCut error: ") + std::string(BoxXName) + Base::Console().error((std::string("Section cut error: ") + std::string(BoxXName) + std::string(" is no Part::Box object. Cannot proceed.\n")).c_str()); return; } @@ -1644,7 +1644,7 @@ void SectionCut::onCutXvalueChanged(double val) // recompute the cut auto pcCut = dynamic_cast(CutObject); if (!pcCut) { - Base::Console().error((std::string("SectionCut error: ") + std::string(CutZName) + Base::Console().error((std::string("Section cut error: ") + std::string(CutZName) + std::string(" is no Part::Cut object. Cannot proceed.\n")).c_str()); return; } @@ -1688,7 +1688,7 @@ void SectionCut::onCutYvalueChanged(double val) } auto pcBox = dynamic_cast(CutBox); if (!pcBox) { - Base::Console().error((std::string("SectionCut error: ") + std::string(BoxYName) + Base::Console().error((std::string("Section cut error: ") + std::string(BoxYName) + std::string(" is no Part::Box object. Cannot proceed.\n")).c_str()); return; } @@ -1710,7 +1710,7 @@ void SectionCut::onCutYvalueChanged(double val) if (hasBoxZ) { auto CutFeatureZ = findObject(CutZName); if (!CutFeatureZ) { - Base::Console().error((std::string("SectionCut error: there is no ") + Base::Console().error((std::string("Section cut error: there is no ") + std::string(CutZName) + std::string("\n")).c_str()); return; } @@ -1746,7 +1746,7 @@ void SectionCut::onCutYvalueChanged(double val) // recompute the cut auto pcCut = dynamic_cast(CutObject); if (!pcCut) { - Base::Console().error((std::string("SectionCut error: ") + std::string(CutZName) + Base::Console().error((std::string("Section cut error: ") + std::string(CutZName) + std::string(" is no Part::Cut object. Cannot proceed.\n")).c_str()); return; } @@ -1810,7 +1810,7 @@ void SectionCut::onCutZvalueChanged(double val) } auto pcBox = dynamic_cast(CutBox); if (!pcBox) { - Base::Console().error((std::string("SectionCut error: ") + std::string(BoxZName) + Base::Console().error((std::string("Section cut error: ") + std::string(BoxZName) + std::string(" is no Part::Box object. Cannot proceed.\n")).c_str()); return; } @@ -1827,7 +1827,7 @@ void SectionCut::onCutZvalueChanged(double val) } auto pcCut = dynamic_cast(CutObject); if (!pcCut) { - Base::Console().error((std::string("SectionCut error: ") + std::string(CutZName) + Base::Console().error((std::string("Section cut error: ") + std::string(CutZName) + std::string(" is no Part::Cut object. Cannot proceed.\n")).c_str()); return; } @@ -1916,7 +1916,7 @@ void SectionCut::FlipClickedHelper(const char* BoxName) } auto pcBox = dynamic_cast(CutBox); if (!pcBox) { - Base::Console().error((std::string("SectionCut error: ") + std::string(BoxName) + Base::Console().error((std::string("Section cut error: ") + std::string(BoxName) + std::string(" is no Part::Box object. Cannot proceed.\n")).c_str()); return; } @@ -2007,7 +2007,7 @@ Part::Box* SectionCut::findCutBox(const char* name) const if (auto obj = doc->getObject(name)) { auto pcBox = dynamic_cast(obj); if (!pcBox) { - throw Base::RuntimeError("SectionCut error: cut box is incorrectly named, cannot proceed"); + throw Base::RuntimeError("Section cut error: cut box is incorrectly named, cannot proceed"); } return pcBox; @@ -2025,7 +2025,7 @@ App::DocumentObject* SectionCut::findOrCreateObject(const char* objName) { auto object = findObject(objName); if (!object) { - Base::Console().warning((std::string("SectionCut warning: there is no ") + Base::Console().warning((std::string("Section cut warning: there is no ") + std::string(objName) + std::string(", trying to recreate it\n")).c_str()); startCutting(); return nullptr; @@ -2144,7 +2144,7 @@ void SectionCut::setBooleanFragmentsColor() compoundObject = doc->getObject(CompoundName); } else { - Base::Console().error("SectionCut error: compound is incorrectly named, cannot proceed\n"); + Base::Console().error("Section cut error: compound is incorrectly named, cannot proceed\n"); return; } // assure it is not a Part::Compound @@ -2153,7 +2153,7 @@ void SectionCut::setBooleanFragmentsColor() // check for valid BooleanFragments by accessing its ViewProvider auto CompoundBFVP = Gui::Application::Instance->getViewProvider(compoundObject); if (!CompoundBFVP) { - Base::Console().error("SectionCut error: cannot access ViewProvider of cut compound\n"); + Base::Console().error("Section cut error: cannot access ViewProvider of cut compound\n"); return; } auto CutCompoundBFGeom = dynamic_cast(CompoundBFVP); @@ -2175,7 +2175,7 @@ void SectionCut::onBFragTransparencyHSMoved(int val) Gui::ViewProvider* CutVP = Gui::Application::Instance->getViewProvider(cutObject); if (!CutVP) { Base::Console().error( - "SectionCut error: cannot access ViewProvider of cut object\n"); + "Section cut error: cannot access ViewProvider of cut object\n"); return; } auto CutVPGeom = dynamic_cast(CutVP); @@ -2227,14 +2227,14 @@ void SectionCut::onRefreshCutPBclicked() // get document auto docGui = Gui::Application::Instance->activeDocument(); if (!docGui) { - Base::Console().error("SectionCut error: there is no document\n"); + Base::Console().error("Section cut error: there is no document\n"); return; } doc = docGui->getDocument(); // get all objects in the document std::vector ObjectsList = doc->getObjects(); if (ObjectsList.empty()) { - Base::Console().error("SectionCut error: there are no objects in the document\n"); + Base::Console().error("Section cut error: there are no objects in the document\n"); return; } // empty the ObjectsListVisible @@ -2281,12 +2281,12 @@ SbBox3f SectionCut::getViewBoundingBox() SbBox3f Box; auto docGui = Gui::Application::Instance->activeDocument(); if (!docGui) { - Base::Console().error("SectionCut error: there is no active document\n"); + Base::Console().error("Section cut error: there is no active document\n"); return Box; // return an empty box } auto view = dynamic_cast(docGui->getActiveView()); if (!view) { - Base::Console().error("SectionCut error: could not get the active view\n"); + Base::Console().error("Section cut error: could not get the active view\n"); return Box; // return an empty box } Gui::View3DInventorViewer* viewer = view->getViewer(); @@ -2376,7 +2376,7 @@ App::DocumentObject* SectionCut::CreateBooleanFragments(App::Document* doc) // check for success App::DocumentObject* object = doc->getObject(CompoundName); if (!object) { - Base::Console().error((std::string("SectionCut error: ") + std::string(CompoundName) + Base::Console().error((std::string("Section cut error: ") + std::string(CompoundName) + std::string(" could not be added\n")).c_str()); return nullptr; } @@ -2394,7 +2394,7 @@ App::DocumentObject* SectionCut::createBooleanFragments( auto CutLinkList = dynamic_cast( CutCompoundBF ? CutCompoundBF->getPropertyByName("Objects") : nullptr); if (!CutLinkList) { - throw Base::RuntimeError((std::string("SectionCut error: ") + std::string(CompoundName) + throw Base::RuntimeError((std::string("Section cut error: ") + std::string(CompoundName) + std::string(" could not be added\n")).c_str()); } CutLinkList->setValue(links); @@ -2418,7 +2418,7 @@ Part::Compound* SectionCut::createCompound(const std::vectoraddObject(CompoundName); if (!CutCompoundPart) { - throw Base::RuntimeError((std::string("SectionCut error: ") + std::string(CompoundName) + throw Base::RuntimeError((std::string("Section cut error: ") + std::string(CompoundName) + std::string(" could not be added\n")).c_str()); } diff --git a/src/Mod/Part/Gui/SectionCutting.ui b/src/Mod/Part/Gui/SectionCutting.ui index 6636948b96..dfa6b90f69 100644 --- a/src/Mod/Part/Gui/SectionCutting.ui +++ b/src/Mod/Part/Gui/SectionCutting.ui @@ -17,7 +17,7 @@ - Persistent Section Cutting + Persistent Section Cut @@ -239,7 +239,7 @@ - Cut face + Cut Face @@ -251,7 +251,7 @@ - Color of cut face + Color of the cut face Color @@ -299,8 +299,8 @@ - If checked, the color and transparency -will be taken from the cut objects. + Takes the color and transparency +from the cut objects. Works only properly if all objects have the same values. @@ -327,7 +327,7 @@ have the same values. - Transparency of cut face + Transparency of the cut face Transparency @@ -373,7 +373,7 @@ for the price that all cut objects will get the same color - Cut intersecting objects + Cut Intersecting Objects true @@ -391,7 +391,7 @@ will get the same color - Color of cut face + Color of the cut face Color @@ -442,8 +442,8 @@ will get the same color - If checked, the color and transparency -will be taken from the cut objects. + Takes the color and transparency +from the cut objects. Works only properly if all objects have the same values. @@ -470,7 +470,7 @@ have the same values. - Transparency of cut face + Transparency of the cut face Transparency @@ -511,7 +511,7 @@ have the same values. Refreshes the list of visible objects - Refresh view + Refresh View diff --git a/src/Mod/Part/Gui/ShapeFromMesh.ui b/src/Mod/Part/Gui/ShapeFromMesh.ui index db7e02674d..84b8c58cfe 100644 --- a/src/Mod/Part/Gui/ShapeFromMesh.ui +++ b/src/Mod/Part/Gui/ShapeFromMesh.ui @@ -11,13 +11,13 @@ - Shape from mesh + Shape From Mesh - Sew shape + Sew Shape true @@ -29,7 +29,7 @@ - Enter tolerance for sewing shape: + Tolerance for sewing the shape diff --git a/src/Mod/Part/Gui/TaskAttacher.cpp b/src/Mod/Part/Gui/TaskAttacher.cpp index aa4ba226d0..7697216063 100644 --- a/src/Mod/Part/Gui/TaskAttacher.cpp +++ b/src/Mod/Part/Gui/TaskAttacher.cpp @@ -341,7 +341,7 @@ bool TaskAttacher::updatePreview() ui->message->setStyleSheet(QStringLiteral("QLabel{color: green;}")); } } - QString splmLabelText = attached ? tr("Attachment Offset (in local coordinates):") : tr("Attachment Offset (inactive - not attached):"); + QString splmLabelText = attached ? tr("Attachment offset (in its local coordinate system):") : tr("Attachment offset (inactive - not attached):"); ui->groupBox_AttachmentOffset->setTitle(splmLabelText); ui->groupBox_AttachmentOffset->setEnabled(attached); @@ -876,7 +876,7 @@ void TaskAttacher::updateRefButton(int idx) b->setChecked(iActiveRef == idx); if (iActiveRef == idx) { - b->setText(tr("Selecting...")); + b->setText(tr("Selecting…")); } else if (idx < static_cast(this->lastSuggestResult.references_Types.size())) { b->setText(AttacherGui::getShapeTypeText(this->lastSuggestResult.references_Types[idx])); @@ -1293,7 +1293,7 @@ bool TaskDlgAttacher::accept() Gui::Command::commitCommand(); } catch (const Base::Exception& e) { - QMessageBox::warning(parameter, tr("Datum dialog: Input error"), QCoreApplication::translate("Exception", e.what())); + QMessageBox::warning(parameter, tr("Datum dialog: input error"), QCoreApplication::translate("Exception", e.what())); return false; } diff --git a/src/Mod/Part/Gui/TaskAttacher.ui b/src/Mod/Part/Gui/TaskAttacher.ui index db16431302..06f56f9eed 100644 --- a/src/Mod/Part/Gui/TaskAttacher.ui +++ b/src/Mod/Part/Gui/TaskAttacher.ui @@ -98,7 +98,7 @@ - Attachment mode: + Attachment mode @@ -121,7 +121,7 @@ - Attachment Offset (in local coordinates): + Attachment Offset in its Local Coordinate System @@ -133,7 +133,7 @@ - In x-direction: + In x-direction @@ -152,8 +152,8 @@ - Note: The placement is expressed in local coordinate system -of object being attached. + The offset is expressed in the local coordinate system +of the object being attached false @@ -169,7 +169,7 @@ of object being attached. - In y-direction: + In y-direction @@ -188,8 +188,8 @@ of object being attached. - Note: The placement is expressed in local coordinate system -of object being attached. + The offset is expressed in the local coordinate system +of the object being attached false @@ -205,7 +205,7 @@ of object being attached. - In z-direction: + In z-direction @@ -224,8 +224,8 @@ of object being attached. - Note: The placement is expressed in local coordinate system -of object being attached. + The offset is expressed in the local coordinate system +of the object being attached false @@ -241,7 +241,7 @@ of object being attached. - Around x-axis: + Around x-axis @@ -254,9 +254,8 @@ of object being attached. - Rotation around the x-axis -Note: The placement is expressed in local coordinate system -of object being attached. + Rotation around the local x-axis. The offset is expressed in the local coordinate system +of the object being attached. false @@ -281,7 +280,7 @@ of object being attached. - Around y-axis: + Around y-axis @@ -294,9 +293,8 @@ of object being attached. - Rotation around the y-axis -Note: The placement is expressed in local coordinate system -of object being attached. + Rotation around the local y-axis. The offset is expressed in the local coordinate system +of the object being attached. false @@ -321,7 +319,7 @@ of object being attached. - Around z-axis: + Around z-axis @@ -334,9 +332,8 @@ of object being attached. - Rotation around the z-axis -Note: The placement is expressed in local coordinate system -of object being attached. + Rotation around the local z-axis. The offset is expressed in the local coordinate system +of the object being attached. false diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp index 43c94f8de9..f53ffe43ba 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp +++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp @@ -76,7 +76,7 @@ QVector buildShapeEnumVector() { QVectornames; names.push_back(QObject::tr("Compound")); //TopAbs_COMPOUND - names.push_back(QObject::tr("Compound Solid")); //TopAbs_COMPSOLID + names.push_back(QObject::tr("Compound solid")); //TopAbs_COMPSOLID names.push_back(QObject::tr("Solid")); //TopAbs_SOLID names.push_back(QObject::tr("Shell")); //TopAbs_SHELL names.push_back(QObject::tr("Face")); //TopAbs_FACE @@ -98,40 +98,40 @@ QString shapeEnumToString(const int &index) QVector buildCheckStatusStringVector() { QVectornames; - names.push_back(QObject::tr("No Error")); // BRepCheck_NoError - names.push_back(QObject::tr("Invalid Point On Curve")); // BRepCheck_InvalidPointOnCurve - names.push_back(QObject::tr("Invalid Point On Curve On Surface")); // BRepCheck_InvalidPointOnCurveOnSurface - names.push_back(QObject::tr("Invalid Point On Surface")); // BRepCheck_InvalidPointOnSurface - names.push_back(QObject::tr("No 3D Curve")); // BRepCheck_No3DCurve - names.push_back(QObject::tr("Multiple 3D Curve")); // BRepCheck_Multiple3DCurve - names.push_back(QObject::tr("Invalid 3D Curve")); // BRepCheck_Invalid3DCurve - names.push_back(QObject::tr("No Curve On Surface")); // BRepCheck_NoCurveOnSurface - names.push_back(QObject::tr("Invalid Curve On Surface")); // BRepCheck_InvalidCurveOnSurface - names.push_back(QObject::tr("Invalid Curve On Closed Surface")); // BRepCheck_InvalidCurveOnClosedSurface - names.push_back(QObject::tr("Invalid Same Range Flag")); // BRepCheck_InvalidSameRangeFlag - names.push_back(QObject::tr("Invalid Same Parameter Flag")); // BRepCheck_InvalidSameParameterFlag - names.push_back(QObject::tr("Invalid Degenerated Flag")); // BRepCheck_InvalidDegeneratedFlag - names.push_back(QObject::tr("Free Edge")); // BRepCheck_FreeEdge - names.push_back(QObject::tr("Invalid MultiConnexity")); // BRepCheck_InvalidMultiConnexity - names.push_back(QObject::tr("Invalid Range")); // BRepCheck_InvalidRange - names.push_back(QObject::tr("Empty Wire")); // BRepCheck_EmptyWire - names.push_back(QObject::tr("Redundant Edge")); // BRepCheck_RedundantEdge - names.push_back(QObject::tr("Self Intersecting Wire")); // BRepCheck_SelfIntersectingWire - names.push_back(QObject::tr("No Surface")); // BRepCheck_NoSurface - names.push_back(QObject::tr("Invalid Wire")); // BRepCheck_InvalidWire - names.push_back(QObject::tr("Redundant Wire")); // BRepCheck_RedundantWire - names.push_back(QObject::tr("Intersecting Wires")); // BRepCheck_IntersectingWires - names.push_back(QObject::tr("Invalid Imbrication Of Wires")); // BRepCheck_InvalidImbricationOfWires - names.push_back(QObject::tr("Empty Shell")); // BRepCheck_EmptyShell - names.push_back(QObject::tr("Redundant Face")); // BRepCheck_RedundantFace - names.push_back(QObject::tr("Unorientable Shape")); // BRepCheck_UnorientableShape - names.push_back(QObject::tr("Not Closed")); // BRepCheck_NotClosed - names.push_back(QObject::tr("Not Connected")); // BRepCheck_NotConnected - names.push_back(QObject::tr("Sub Shape Not In Shape")); // BRepCheck_SubshapeNotInShape - names.push_back(QObject::tr("Bad Orientation")); // BRepCheck_BadOrientation - names.push_back(QObject::tr("Bad Orientation Of Sub Shape")); // BRepCheck_BadOrientationOfSubshape - names.push_back(QObject::tr("Invalid Tolerance Value")); // BRepCheck_InvalidToleranceValue - names.push_back(QObject::tr("Check Failed")); // BRepCheck_CheckFail + names.push_back(QObject::tr("No error")); // BRepCheck_NoError + names.push_back(QObject::tr("Invalid point on curve")); // BRepCheck_InvalidPointOnCurve + names.push_back(QObject::tr("Invalid point on curve on surface")); // BRepCheck_InvalidPointOnCurveOnSurface + names.push_back(QObject::tr("Invalid point on surface")); // BRepCheck_InvalidPointOnSurface + names.push_back(QObject::tr("No 3D curve")); // BRepCheck_No3DCurve + names.push_back(QObject::tr("Multiple 3D curves")); // BRepCheck_Multiple3DCurve + names.push_back(QObject::tr("Invalid 3D curve")); // BRepCheck_Invalid3DCurve + names.push_back(QObject::tr("No curve on surface")); // BRepCheck_NoCurveOnSurface + names.push_back(QObject::tr("Invalid curve on surface")); // BRepCheck_InvalidCurveOnSurface + names.push_back(QObject::tr("Invalid curve on closed surface")); // BRepCheck_InvalidCurveOnClosedSurface + names.push_back(QObject::tr("Invalid same range flag")); // BRepCheck_InvalidSameRangeFlag + names.push_back(QObject::tr("Invalid same parameter flag")); // BRepCheck_InvalidSameParameterFlag + names.push_back(QObject::tr("Invalid degenerated flag")); // BRepCheck_InvalidDegeneratedFlag + names.push_back(QObject::tr("Free edge")); // BRepCheck_FreeEdge + names.push_back(QObject::tr("Invalid multi-connexity")); // BRepCheck_InvalidMultiConnexity + names.push_back(QObject::tr("Invalid range")); // BRepCheck_InvalidRange + names.push_back(QObject::tr("Empty wire")); // BRepCheck_EmptyWire + names.push_back(QObject::tr("Redundant edge")); // BRepCheck_RedundantEdge + names.push_back(QObject::tr("Self-intersecting wire")); // BRepCheck_SelfIntersectingWire + names.push_back(QObject::tr("No surface")); // BRepCheck_NoSurface + names.push_back(QObject::tr("Invalid wire")); // BRepCheck_InvalidWire + names.push_back(QObject::tr("Redundant wire")); // BRepCheck_RedundantWire + names.push_back(QObject::tr("Intersecting wires")); // BRepCheck_IntersectingWires + names.push_back(QObject::tr("Invalid imbrication of wires")); // BRepCheck_InvalidImbricationOfWires + names.push_back(QObject::tr("Empty shell")); // BRepCheck_EmptyShell + names.push_back(QObject::tr("Redundant face")); // BRepCheck_RedundantFace + names.push_back(QObject::tr("Unorientable shape")); // BRepCheck_UnorientableShape + names.push_back(QObject::tr("Not closed")); // BRepCheck_NotClosed + names.push_back(QObject::tr("Not connected")); // BRepCheck_NotConnected + names.push_back(QObject::tr("Sub-shape not in shape")); // BRepCheck_SubshapeNotInShape + names.push_back(QObject::tr("Bad orientation")); // BRepCheck_BadOrientation + names.push_back(QObject::tr("Bad orientation of sub-shape")); // BRepCheck_BadOrientationOfSubshape + names.push_back(QObject::tr("Invalid tolerance value")); // BRepCheck_InvalidToleranceValue + names.push_back(QObject::tr("Check failed")); // BRepCheck_CheckFail return names; } @@ -141,11 +141,11 @@ QString checkStatusToString(const int &index) static QVector names = buildCheckStatusStringVector(); if (index == -1) { - return QString(QObject::tr("No Result")); + return QString(QObject::tr("No result")); } if (index > 33 || index < 0) { - QString message(QObject::tr("Out Of Enum Range:") + QStringLiteral(" ")); + QString message(QObject::tr("Out of enum range:") + QStringLiteral(" ")); QString number; number.setNum(index); message += number; @@ -157,18 +157,18 @@ QString checkStatusToString(const int &index) QVector buildBOPCheckResultVector() { QVector results; - results.push_back(QObject::tr("Boolean operation: Unknown check")); //BOPAlgo_CheckUnknown - results.push_back(QObject::tr("Boolean operation: Bad type")); //BOPAlgo_BadType - results.push_back(QObject::tr("Boolean operation: Self-intersection found")); //BOPAlgo_SelfIntersect - results.push_back(QObject::tr("Boolean operation: Edge too small")); //BOPAlgo_TooSmallEdge - results.push_back(QObject::tr("Boolean operation: Non-recoverable face")); //BOPAlgo_NonRecoverableFace - results.push_back(QObject::tr("Boolean operation: Incompatibility of vertex")); //BOPAlgo_IncompatibilityOfVertex - results.push_back(QObject::tr("Boolean operation: Incompatibility of edge")); //BOPAlgo_IncompatibilityOfEdge - results.push_back(QObject::tr("Boolean operation: Incompatibility of face")); //BOPAlgo_IncompatibilityOfFace - results.push_back(QObject::tr("Boolean operation: Aborted")); //BOPAlgo_OperationAborted + results.push_back(QObject::tr("Boolean operation: unknown check")); //BOPAlgo_CheckUnknown + results.push_back(QObject::tr("Boolean operation: bad type")); //BOPAlgo_BadType + results.push_back(QObject::tr("Boolean operation: self-intersection found")); //BOPAlgo_SelfIntersect + results.push_back(QObject::tr("Boolean operation: edge too small")); //BOPAlgo_TooSmallEdge + results.push_back(QObject::tr("Boolean operation: non-recoverable face")); //BOPAlgo_NonRecoverableFace + results.push_back(QObject::tr("Boolean operation: incompatibility of vertex")); //BOPAlgo_IncompatibilityOfVertex + results.push_back(QObject::tr("Boolean operation: incompatibility of edge")); //BOPAlgo_IncompatibilityOfEdge + results.push_back(QObject::tr("Boolean operation: incompatibility of face")); //BOPAlgo_IncompatibilityOfFace + results.push_back(QObject::tr("Boolean operation: aborted")); //BOPAlgo_OperationAborted results.push_back(QObject::tr("Boolean operation: GeomAbs_C0")); //BOPAlgo_GeomAbs_C0 - results.push_back(QObject::tr("Boolean operation: Invalid curve on surface")); //BOPAlgo_InvalidCurveOnSurface - results.push_back(QObject::tr("Boolean operation: Not valid")); //BOPAlgo_NotValid + results.push_back(QObject::tr("Boolean operation: invalid curve on surface")); //BOPAlgo_InvalidCurveOnSurface + results.push_back(QObject::tr("Boolean operation: not valid")); //BOPAlgo_NotValid return results; } @@ -396,7 +396,7 @@ void TaskCheckGeometryResults::setupInterface() message->setTextInteractionFlags(Qt::TextBrowserInteraction); message->setOpenExternalLinks(false); connect(message, &QLabel::linkActivated, this, &TaskCheckGeometryResults::generateReport); - message->setText(tr("Check is running...")); + message->setText(tr("Check is running…")); model = new ResultModel(this); treeView = new QTreeView(this); treeView->setModel(model); @@ -421,7 +421,7 @@ void TaskCheckGeometryResults::goCheck() reportViewStrings.clear(); reportViewStrings << QLatin1String("\n"); - std::string scopeName {tr("Boolean operation check...").toStdString()}; + std::string scopeName {tr("Boolean operation check…").toStdString()}; Handle(Message_ProgressIndicator) theProgress = new BOPProgressIndicator(tr("Check geometry"), Gui::getMainWindow()); @@ -515,7 +515,7 @@ void TaskCheckGeometryResults::goCheck() if (runSignal) { std::string label = tr("Checking").toStdString() + " "; label += sel.pObject->Label.getStrValue(); - label += "..."; + label += "…"; Message_ProgressScope theInnerScope(theScope.Next(), TCollection_AsciiString(label.c_str()), 1); theInnerScope.Show(); @@ -545,7 +545,7 @@ void TaskCheckGeometryResults::goCheck() treeView->header()->resizeSections(QHeaderView::ResizeToContents); QString aMessage {tr("%1 processed out of %2 selected").arg(checkedCount).arg(selectedCount)}; aMessage += QLatin1String("
    ") + tr("%n invalid shapes.", "", invalidShapes); - aMessage += QLatin1String(" ") + tr("To Report view.") + QLatin1String(""); + aMessage += QLatin1String(" ") + tr("to report view.") + QLatin1String(""); message->setText(aMessage); } @@ -666,17 +666,17 @@ void TaskCheckGeometryResults::buildShapeContent(App::DocumentObject *pObject, c { args.setItem(0, Py::Long(-1)); Py::Float result(Py::asObject(Part::TopoShape(shape).getPyObject()).callMemberFunction("globalTolerance",args)); - stream << " " << tr("Global Minimum").toStdString() << ": " << result << std::endl; + stream << " " << tr("Global minimum").toStdString() << ": " << result << std::endl; } { args.setItem(0, Py::Long(0)); Py::Float result(Py::asObject(Part::TopoShape(shape).getPyObject()).callMemberFunction("globalTolerance",args)); - stream << " " << tr("Global Average").toStdString() << ": " << result << std::endl; + stream << " " << tr("Global average").toStdString() << ": " << result << std::endl; } { args.setItem(0, Py::Long(1)); Py::Float result(Py::asObject(Part::TopoShape(shape).getPyObject()).callMemberFunction("globalTolerance",args)); - stream << " " << tr("Global Maximum").toStdString() << ": " << result; + stream << " " << tr("Global maximum").toStdString() << ": " << result; } } @@ -1091,7 +1091,7 @@ TaskCheckGeometryDialog::TaskCheckGeometryDialog() autoRunCheckBox = new QCheckBox(); autoRunCheckBox->setText(tr("Skip this settings page")); autoRunCheckBox->setToolTip( - tr("Skip this settings page and run the geometry check automatically.") + tr("Skip this settings page and run the geometry check automatically") + QStringLiteral("\n") + tr("Default: false")); autoRunCheckBox->setChecked(group->GetBool("AutoRun", false)); diff --git a/src/Mod/Part/Gui/TaskFaceAppearances.ui b/src/Mod/Part/Gui/TaskFaceAppearances.ui index 69781f818b..8ae33aa39f 100644 --- a/src/Mod/Part/Gui/TaskFaceAppearances.ui +++ b/src/Mod/Part/Gui/TaskFaceAppearances.ui @@ -11,13 +11,13 @@
    - Set appearance per face + Appearance per Face - Click on the faces in the 3D view to select them + Select the faces in the 3D view @@ -38,7 +38,7 @@
    - Faces: + Faces
    @@ -63,14 +63,15 @@ - ... + Appearance + - Custom appearance: + Custom appearance @@ -87,18 +88,17 @@ Resets color for all faces of the part
    - Set to default + Set to Default
    - When checked, you can select multiple faces -by dragging a selection rectangle in the 3D view + Allows the selection of multiple faces by dragging a rectangle in the 3D view - Box selection + Box Selection true diff --git a/src/Mod/Part/Gui/TaskLoft.cpp b/src/Mod/Part/Gui/TaskLoft.cpp index b1334829d4..ed9346c751 100644 --- a/src/Mod/Part/Gui/TaskLoft.cpp +++ b/src/Mod/Part/Gui/TaskLoft.cpp @@ -177,7 +177,7 @@ bool LoftWidget::accept() int count = d->ui.selector->selectedTreeWidget()->topLevelItemCount(); if (count < 2) { - QMessageBox::critical(this, tr("Too few elements"), tr("At least two vertices, edges, wires or faces are required.")); + QMessageBox::critical(this, tr("Too few elements"), tr("At least 2 vertices, edges, wires, or faces are required.")); return false; } for (int i=0; i - RectoVerso + Recto verso diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp index 7b87f880e1..756065af66 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp +++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp @@ -271,7 +271,7 @@ void ShapeBuilderWidget::createWireFromEdge() Gui::SelectionFilter edgeFilter ("SELECT Part::Feature SUBELEMENT Edge COUNT 1.."); bool matchEdge = edgeFilter.match(); if (!matchEdge) { - QMessageBox::critical(this, tr("Wrong selection"), tr("Select one or more edges")); + QMessageBox::critical(this, tr("Wrong selection"), tr("Select at least 1 edge")); return; } @@ -364,7 +364,7 @@ void ShapeBuilderWidget::createFaceFromEdge() Gui::SelectionFilter edgeFilter ("SELECT Part::Feature SUBELEMENT Edge COUNT 1.."); bool matchEdge = edgeFilter.match(); if (!matchEdge) { - QMessageBox::critical(this, tr("Wrong selection"), tr("Select one or more edges")); + QMessageBox::critical(this, tr("Wrong selection"), tr("Select at least 1 edge")); return; } @@ -416,7 +416,7 @@ void ShapeBuilderWidget::createShellFromFace() Gui::SelectionFilter faceFilter ("SELECT Part::Feature SUBELEMENT Face COUNT 2.."); bool matchFace = faceFilter.match(); if (!matchFace) { - QMessageBox::critical(this, tr("Wrong selection"), tr("Select two or more faces")); + QMessageBox::critical(this, tr("Wrong selection"), tr("Select at least 2 faces")); return; } @@ -477,7 +477,7 @@ void ShapeBuilderWidget::createSolidFromShell() Gui::SelectionFilter partFilter ("SELECT Part::Feature COUNT 1"); bool matchPart = partFilter.match(); if (!matchPart) { - QMessageBox::critical(this, tr("Wrong selection"), tr("Select only one part object")); + QMessageBox::critical(this, tr("Wrong selection"), tr("Select only 1 shape object")); return; } @@ -543,14 +543,14 @@ void ShapeBuilderWidget::switchMode(int mode) } else if (mode == 2) { d->gate->setMode(ShapeSelection::VERTEX); - d->ui.label->setText(tr("Select a list of vertices")); + d->ui.label->setText(tr("Select vertices")); d->ui.checkPlanar->setEnabled(true); d->ui.checkFaces->setEnabled(false); d->ui.checkRefine->setEnabled(false); } else if (mode == 3) { d->gate->setMode(ShapeSelection::EDGE); - d->ui.label->setText(tr("Select a closed set of edges")); + d->ui.label->setText(tr("Select a closed loop of edges")); d->ui.checkPlanar->setEnabled(true); d->ui.checkFaces->setEnabled(false); d->ui.checkRefine->setEnabled(false); diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.ui b/src/Mod/Part/Gui/TaskShapeBuilder.ui index d756d2b8c4..fcdf7d6827 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.ui +++ b/src/Mod/Part/Gui/TaskShapeBuilder.ui @@ -11,13 +11,13 @@
    - Create shape + Create Shape - Create shape + Create Shape @@ -98,7 +98,8 @@ - Box selection... + Box Selection + diff --git a/src/Mod/Part/Gui/TaskSweep.cpp b/src/Mod/Part/Gui/TaskSweep.cpp index c1a485656e..1da8e1d3a4 100644 --- a/src/Mod/Part/Gui/TaskSweep.cpp +++ b/src/Mod/Part/Gui/TaskSweep.cpp @@ -337,7 +337,7 @@ bool SweepWidget::accept() return false; } if (!ok) { - QMessageBox::critical(this, tr("Invalid selection"), tr("Select one or more edges from a single object.")); + QMessageBox::critical(this, tr("Invalid selection"), tr("Select at least 1 edge from a single object.")); return false; } for (int i=0; iref(); @@ -172,7 +172,7 @@ SoSeparator* ViewProvider2DObjectGrid::createGrid() int lines = vlines + hlines; if (lines > maxNumberOfLines.getValue()) { - Base::Console().warning("Grid Disabled: Requested number of lines %d is larger than the maximum configured of %d\n." + Base::Console().warning("Grid disabled: requested number of lines %d is larger than the maximum configured of %d\n." "Either increase the 'GridSize' property to a more reasonable value (recommended) or increase the 'maxNumberOfLines' property.\n", lines, maxNumberOfLines.getValue()); parent->addChild(vts); parent->addChild(grid); @@ -328,9 +328,9 @@ ViewProvider2DObject::ViewProvider2DObject() { ADD_PROPERTY_TYPE(ShowPlane, (false), - "Display Options", + "Display options", (App::PropertyType)(App::Prop_None), - "If true, plane related with object is additionally rendered."); + "If true, plane related with object is additionally rendered"); } ViewProvider2DObject::~ViewProvider2DObject() = default; diff --git a/src/Mod/Part/Gui/ViewProviderAttachExtension.cpp b/src/Mod/Part/Gui/ViewProviderAttachExtension.cpp index 0a99471950..f2584eff64 100644 --- a/src/Mod/Part/Gui/ViewProviderAttachExtension.cpp +++ b/src/Mod/Part/Gui/ViewProviderAttachExtension.cpp @@ -98,7 +98,7 @@ void ViewProviderAttachExtension::extensionSetupContextMenu(QMenu* menu, QObject if (attach) { // toggle command to display components Gui::ActionFunction* func = new Gui::ActionFunction(menu); - QAction* act = menu->addAction(QObject::tr("Attachment editor")); + QAction* act = menu->addAction(QObject::tr("Attachment Editor")); if (Gui::Control().activeDialog()) act->setDisabled(true); func->trigger(act, [this](){ diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp index 30feec08bc..70c286cafb 100644 --- a/src/Mod/Part/Gui/ViewProviderExt.cpp +++ b/src/Mod/Part/Gui/ViewProviderExt.cpp @@ -886,7 +886,7 @@ void ViewProviderPartExt::setupContextMenu(QMenu* menu, QObject* receiver, const { QIcon iconObject = mergeGreyableOverlayIcons(Gui::BitmapFactory().pixmap("Part_ColorFace.svg")); Gui::ViewProviderGeometryObject::setupContextMenu(menu, receiver, member); - QAction* act = menu->addAction(iconObject, QObject::tr("Set appearance per face..."), receiver, member); + QAction* act = menu->addAction(iconObject, QObject::tr("Appearance per Face"), receiver, member); act->setData(QVariant((int)ViewProvider::Color)); } diff --git a/src/Mod/Part/Gui/ViewProviderGridExtension.cpp b/src/Mod/Part/Gui/ViewProviderGridExtension.cpp index 878267ac66..0880d2fb9d 100644 --- a/src/Mod/Part/Gui/ViewProviderGridExtension.cpp +++ b/src/Mod/Part/Gui/ViewProviderGridExtension.cpp @@ -424,7 +424,7 @@ void GridExtensionP::drawGrid(bool cameraUpdate) { ViewProviderGridExtension::ViewProviderGridExtension() { - EXTENSION_ADD_PROPERTY_TYPE(ShowGrid, (false), "Grid", (App::PropertyType)(App::Prop_None), "Switch the grid on/off"); + EXTENSION_ADD_PROPERTY_TYPE(ShowGrid, (false), "Grid", (App::PropertyType)(App::Prop_None), "Toggle grid visibility"); EXTENSION_ADD_PROPERTY_TYPE(GridSize, (10.0), "Grid", (App::PropertyType)(App::Prop_None), "Gap size of the grid"); EXTENSION_ADD_PROPERTY_TYPE(GridAuto, (true), "Grid", (App::PropertyType)(App::Prop_None), "Change size of grid based on view area."); diff --git a/src/Mod/Part/Gui/ViewProviderMirror.cpp b/src/Mod/Part/Gui/ViewProviderMirror.cpp index 7fdb99d058..9ef1481f3a 100644 --- a/src/Mod/Part/Gui/ViewProviderMirror.cpp +++ b/src/Mod/Part/Gui/ViewProviderMirror.cpp @@ -81,7 +81,7 @@ void ViewProviderMirror::setupContextMenu(QMenu* menu, QObject* receiver, const enabled = false; } QAction* act; - act = menu->addAction(QObject::tr("Edit mirror plane"), receiver, member); + act = menu->addAction(QObject::tr("Edit Mirror Plane"), receiver, member); act->setEnabled(enabled); act->setData(QVariant((int)ViewProvider::Default)); @@ -207,7 +207,7 @@ bool ViewProviderMirror::onDelete(const std::vector &) void ViewProviderMirror::dragStartCallback(void *, SoDragger *) { // This is called when a manipulator is about to manipulating - Gui::Application::Instance->activeDocument()->openCommand(QT_TRANSLATE_NOOP("Command", "Edit Mirror")); + Gui::Application::Instance->activeDocument()->openCommand(QT_TRANSLATE_NOOP("Command", "Edit mirror")); } void ViewProviderMirror::dragFinishCallback(void *, SoDragger *) @@ -291,7 +291,7 @@ void ViewProviderFillet::updateData(const App::Property* prop) void ViewProviderFillet::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { QAction* act; - act = menu->addAction(QObject::tr("Edit fillet edges"), receiver, member); + act = menu->addAction(QObject::tr("Edit Fillet"), receiver, member); act->setData(QVariant((int)ViewProvider::Default)); PartGui::ViewProviderPart::setupContextMenu(menu, receiver, member); } @@ -401,7 +401,7 @@ void ViewProviderChamfer::updateData(const App::Property* prop) void ViewProviderChamfer::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { QAction* act; - act = menu->addAction(QObject::tr("Edit chamfer edges"), receiver, member); + act = menu->addAction(QObject::tr("Edit Chamfer"), receiver, member); act->setData(QVariant((int)ViewProvider::Default)); PartGui::ViewProviderPart::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/Part/Gui/ViewProviderProjectOnSurface.cpp b/src/Mod/Part/Gui/ViewProviderProjectOnSurface.cpp index cb232c36b7..686da3628c 100644 --- a/src/Mod/Part/Gui/ViewProviderProjectOnSurface.cpp +++ b/src/Mod/Part/Gui/ViewProviderProjectOnSurface.cpp @@ -51,7 +51,7 @@ ViewProviderProjectOnSurface::~ViewProviderProjectOnSurface() = default; void ViewProviderProjectOnSurface::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - QAction* act = menu->addAction(QObject::tr("Edit projection"), receiver, member); + QAction* act = menu->addAction(QObject::tr("Edit Projection"), receiver, member); act->setData(QVariant((int)ViewProvider::Default)); ViewProviderPart::setupContextMenu(menu, receiver, member); diff --git a/src/Mod/Part/Gui/ViewProviderSpline.cpp b/src/Mod/Part/Gui/ViewProviderSpline.cpp index d35229ec1b..8271dec65f 100644 --- a/src/Mod/Part/Gui/ViewProviderSpline.cpp +++ b/src/Mod/Part/Gui/ViewProviderSpline.cpp @@ -91,7 +91,7 @@ void ViewProviderSplineExtension::extensionSetupContextMenu(QMenu* menu, QObject { // toggle command to display components Gui::ActionFunction* func = new Gui::ActionFunction(menu); - QAction* act = menu->addAction(QObject::tr("Show control points")); + QAction* act = menu->addAction(QObject::tr("Show Control Points")); act->setCheckable(true); act->setChecked(ControlPoints.getValue()); func->toggle(act, [this](bool on) { diff --git a/src/Mod/Part/Gui/Workbench.cpp b/src/Mod/Part/Gui/Workbench.cpp index 4931369add..48571a4218 100644 --- a/src/Mod/Part/Gui/Workbench.cpp +++ b/src/Mod/Part/Gui/Workbench.cpp @@ -85,7 +85,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Part_Tube"; Gui::MenuItem* copy = new Gui::MenuItem; - copy->setCommand("Create a copy"); + copy->setCommand("Copy"); *copy << "Part_SimpleCopy" << "Part_TransformedCopy" << "Part_ElementCopy" @@ -132,17 +132,13 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Part_MakeSolid" << "Part_ReverseShape" << copy - << "Part_CheckGeometry" - << "Part_Defeaturing" - << "Materials_InspectAppearance" - << "Materials_InspectMaterial" << "Separator" << bop << join << split << compound << "Separator"; if (hasSketcher) { *part << "Sketcher_NewSketch"; } - *part << "Part_Extrude" + *part << "Part_Extrude" << "Part_Revolve" << "Part_Mirror" << "Part_Scale" @@ -158,8 +154,14 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Part_Offset2D" << "Part_Thickness" << "Part_ProjectionOnSurface" + << "Part_SectionCut" << "Separator" - << "Part_EditAttachment"; + << "Part_EditAttachment" + << "Separator" + << "Part_CheckGeometry" + << "Part_Defeaturing" + << "Materials_InspectAppearance" + << "Materials_InspectMaterial"; Gui::MenuItem* view = root->findItem("&View"); if (view) { diff --git a/src/Mod/Part/Gui/WorkbenchManipulator.cpp b/src/Mod/Part/Gui/WorkbenchManipulator.cpp index eee8c4aece..743b6cd1a2 100644 --- a/src/Mod/Part/Gui/WorkbenchManipulator.cpp +++ b/src/Mod/Part/Gui/WorkbenchManipulator.cpp @@ -31,7 +31,6 @@ using namespace PartGui; void WorkbenchManipulator::modifyMenuBar([[maybe_unused]] Gui::MenuItem* menuBar) { - addSectionCut(menuBar); } void WorkbenchManipulator::modifyToolBars(Gui::ToolBarItem* toolBar) @@ -44,20 +43,6 @@ void WorkbenchManipulator::modifyDockWindows([[maybe_unused]] Gui::DockWindowIte { } -void WorkbenchManipulator::addSectionCut(Gui::MenuItem* menuBar) -{ - const char* toggleClipPlane = "Std_ToggleClipPlane"; - auto par = menuBar->findParentOf(toggleClipPlane); - if (par) { - auto item = par->findItem(toggleClipPlane); - item = par->afterItem(item); - - auto add = new Gui::MenuItem(); // NOLINT - add->setCommand("Part_SectionCut"); - par->insertItem(item, add); - } -} - void WorkbenchManipulator::addSelectionFilter(Gui::ToolBarItem* toolBar) { if (auto view = toolBar->findItem("View")) { diff --git a/src/Mod/Part/Gui/WorkbenchManipulator.h b/src/Mod/Part/Gui/WorkbenchManipulator.h index 623f2cc502..1f5dfbd5a0 100644 --- a/src/Mod/Part/Gui/WorkbenchManipulator.h +++ b/src/Mod/Part/Gui/WorkbenchManipulator.h @@ -35,7 +35,7 @@ protected: /*! * \brief modifyMenuBar * Method to manipulate the menu structure of a workbench. - * The default implementation doesn't change anything.SectionCut + * The default implementation doesn't change anything. */ void modifyMenuBar(Gui::MenuItem* menuBar) override; /*! @@ -52,7 +52,6 @@ protected: void modifyDockWindows([[maybe_unused]] Gui::DockWindowItems* dockWindow) override; private: - static void addSectionCut(Gui::MenuItem* menuBar); static void addSelectionFilter(Gui::ToolBarItem* toolBar); static void addDatums(Gui::ToolBarItem* toolBar); }; diff --git a/src/Mod/Part/TestPartGui.py b/src/Mod/Part/TestPartGui.py index 3efaedfd54..79768bf181 100644 --- a/src/Mod/Part/TestPartGui.py +++ b/src/Mod/Part/TestPartGui.py @@ -99,7 +99,7 @@ class SectionCutTestCases(unittest.TestCase): button = box.button(QtWidgets.QDialogButtonBox.Close) button.click() else: - print ("No Section Cutting panel found") + print ("No section cutting panel found") def tearDown(self): FreeCAD.closeDocument("SectionCut") diff --git a/src/Mod/PartDesign/App/AppPartDesign.cpp b/src/Mod/PartDesign/App/AppPartDesign.cpp index 56df444367..fcb4eb2cc9 100644 --- a/src/Mod/PartDesign/App/AppPartDesign.cpp +++ b/src/Mod/PartDesign/App/AppPartDesign.cpp @@ -78,7 +78,7 @@ PyMOD_INIT_FUNC(_PartDesign) } PyObject* mod = PartDesign::initModule(); - Base::Console().log("Loading PartDesign module... done\n"); + Base::Console().log("Loading Part Design module… done\n"); // NOTE: To finish the initialization of our own type objects we must diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index 058082c6f2..41365ee29e 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -2147,10 +2147,10 @@ App::DocumentObjectExecReturn* Hole::execute() retry = false; } catch (Standard_Failure & e) { FC_WARN(getFullName() << ": boolean operation with compound failed (" - << e.GetMessageString() << "), retry..."); + << e.GetMessageString() << "), retry…"); } catch (Base::Exception & e) { - FC_WARN(getFullName() << ": boolean operation with compound failed (" - << e.what() << "), retry..."); + FC_WARN(getFullName() << ": boolean operation with compound failed (" << e.what() + << "), retry…"); } if (retry) { diff --git a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp index e9e8a33985..994697683f 100644 --- a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp +++ b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp @@ -116,7 +116,7 @@ PyMOD_INIT_FUNC(PartDesignGui) } PyObject* mod = PartDesignGui::initModule(); - Base::Console().log("Loading GUI of PartDesign module... done\n"); + Base::Console().log("Loading GUI of Part Design module… done\n"); // instantiating the commands CreatePartDesignCommands(); diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index aa8ebd3ad9..eb0798af77 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -143,7 +143,7 @@ void UnifiedDatumCommand(Gui::Command &cmd, Base::Type type, std::string name) cmd.doCommand(Gui::Command::Doc,"App.activeDocument().recompute()"); // recompute the feature based on its references PartDesignGui::setEdit(Feat,pcActiveBody); } else { - QMessageBox::warning(Gui::getMainWindow(),QObject::tr("Error"), QObject::tr("There is no active body. Please make a body active before inserting a datum entity.")); + QMessageBox::warning(Gui::getMainWindow(),QObject::tr("Error"), QObject::tr("There is no active body. Please activate a body before inserting a datum entity.")); } } catch (Base::Exception &e) { QMessageBox::warning(Gui::getMainWindow(),QObject::tr("Error"),QApplication::translate("Exception", e.what())); @@ -161,8 +161,8 @@ CmdPartDesignPlane::CmdPartDesignPlane() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a datum plane"); - sToolTipText = QT_TR_NOOP("Create a new datum plane"); + sMenuText = QT_TR_NOOP("Datum Plane"); + sToolTipText = QT_TR_NOOP("Creates a new datum plane"); sWhatsThis = "PartDesign_Plane"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Plane"; @@ -189,8 +189,8 @@ CmdPartDesignLine::CmdPartDesignLine() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a datum line"); - sToolTipText = QT_TR_NOOP("Create a new datum line"); + sMenuText = QT_TR_NOOP("Datum Line"); + sToolTipText = QT_TR_NOOP("Creates a new datum line"); sWhatsThis = "PartDesign_Line"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Line"; @@ -217,8 +217,8 @@ CmdPartDesignPoint::CmdPartDesignPoint() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a datum point"); - sToolTipText = QT_TR_NOOP("Create a new datum point"); + sMenuText = QT_TR_NOOP("Datum Point"); + sToolTipText = QT_TR_NOOP("Creates a new datum point"); sWhatsThis = "PartDesign_Point"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Point"; @@ -245,8 +245,8 @@ CmdPartDesignCS::CmdPartDesignCS() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a local coordinate system"); - sToolTipText = QT_TR_NOOP("Create a new local coordinate system"); + sMenuText = QT_TR_NOOP("Local Coordinate System"); + sToolTipText = QT_TR_NOOP("Creates a new local coordinate system"); sWhatsThis = "PartDesign_CoordinateSystem"; sStatusTip = sToolTipText; sPixmap = "PartDesign_CoordinateSystem"; @@ -277,8 +277,8 @@ CmdPartDesignShapeBinder::CmdPartDesignShapeBinder() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a shape binder"); - sToolTipText = QT_TR_NOOP("Create a new shape binder"); + sMenuText = QT_TR_NOOP("Shape Binder"); + sToolTipText = QT_TR_NOOP("Creates a new shape binder"); sWhatsThis = "PartDesign_ShapeBinder"; sStatusTip = sToolTipText; sPixmap = "PartDesign_ShapeBinder"; @@ -297,7 +297,7 @@ void CmdPartDesignShapeBinder::activated(int iMsg) } if (bEditSelected) { - openCommand(QT_TRANSLATE_NOOP("Command", "Edit ShapeBinder")); + openCommand(QT_TRANSLATE_NOOP("Command", "Edit Shape Binder")); PartDesignGui::setEdit(support.getValue()); } else { PartDesign::Body *pcActiveBody = PartDesignGui::getBody(/*messageIfNot = */true); @@ -306,7 +306,7 @@ void CmdPartDesignShapeBinder::activated(int iMsg) std::string FeatName = getUniqueObjectName("ShapeBinder",pcActiveBody); - openCommand(QT_TRANSLATE_NOOP("Command", "Create ShapeBinder")); + openCommand(QT_TRANSLATE_NOOP("Command", "Create Shape Binder")); FCMD_OBJ_CMD(pcActiveBody,"newObject('PartDesign::ShapeBinder','" << FeatName << "')"); // remove the body from links in case it's selected as @@ -343,8 +343,8 @@ CmdPartDesignSubShapeBinder::CmdPartDesignSubShapeBinder() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a sub-object(s) shape binder"); - sToolTipText = QT_TR_NOOP("Create a reference to geometry from one or more objects, allowing it to be used inside or outside a PartDesign Body. It tracks relative placements, supports multiple geometry types (solids, faces, edges, vertices), and can work with objects in the same or external documents."); + sMenuText = QT_TR_NOOP("Sub-Shape Binder"); + sToolTipText = QT_TR_NOOP("Creates a reference to geometry from one or more objects, allowing it to be used inside or outside a body. It tracks relative placements, supports multiple geometry types (solids, faces, edges, vertices), and can work with objects in the same or external documents."); sWhatsThis = "PartDesign_SubShapeBinder"; sStatusTip = sToolTipText; sPixmap = "PartDesign_SubShapeBinder"; @@ -389,7 +389,7 @@ void CmdPartDesignSubShapeBinder::activated(int iMsg) PartDesign::SubShapeBinder *binder = nullptr; try { - openCommand(QT_TRANSLATE_NOOP("Command", "Create SubShapeBinder")); + openCommand(QT_TRANSLATE_NOOP("Command", "Create Sub-Shape Binder")); if (pcActiveBody) { FCMD_OBJ_CMD(pcActiveBody,"newObject('PartDesign::SubShapeBinder','" << FeatName << "')"); binder = dynamic_cast(pcActiveBody->getObject(FeatName.c_str())); @@ -407,7 +407,7 @@ void CmdPartDesignSubShapeBinder::activated(int iMsg) } catch (Base::Exception &e) { e.reportException(); QMessageBox::critical(Gui::getMainWindow(), - QObject::tr("Sub-Shape Binder"), QApplication::translate("Exception", e.what())); + QObject::tr("Sub-shape binder"), QApplication::translate("Exception", e.what())); abortCommand(); } } @@ -427,8 +427,8 @@ CmdPartDesignClone::CmdPartDesignClone() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a clone"); - sToolTipText = QT_TR_NOOP("Create a parametric copy of a solid object as the base feature of a new body"); + sMenuText = QT_TR_NOOP("Clone"); + sToolTipText = QT_TR_NOOP("Copies a solid object parametrically as the base feature of a new body"); sWhatsThis = "PartDesign_Clone"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Clone"; @@ -501,8 +501,8 @@ CmdPartDesignNewSketch::CmdPartDesignNewSketch() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create sketch"); - sToolTipText = QT_TR_NOOP("Create a new sketch"); + sMenuText = QT_TR_NOOP("New Sketch"); + sToolTipText = QT_TR_NOOP("Creates a new sketch"); sWhatsThis = "PartDesign_NewSketch"; sStatusTip = sToolTipText; sPixmap = "Sketcher_NewSketch"; @@ -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 ShapeBinder or a BaseFeature to reference external geometry in a body.")); + msgBox.setInformativeText(QObject::tr("Consider using a sape binder or a base feature to reference external geometry in a body")); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok); msgBox.exec(); @@ -990,7 +990,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons return; if (!dlg.radioXRef->isChecked()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Make copy")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Make Copy")); auto copy = PartDesignGui::TaskFeaturePick::makeCopy(sketches[0], "", dlg.radioIndependent->isChecked()); auto oBody = PartDesignGui::getBodyFor(sketches[0], false); if (oBody) @@ -1012,7 +1012,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons if (dlg && !pickDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); @@ -1091,7 +1091,7 @@ CmdPartDesignPad::CmdPartDesignPad() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Pad"); - sToolTipText = QT_TR_NOOP("Pad a selected sketch"); + sToolTipText = QT_TR_NOOP("Extrudes the selected sketch or profile and adds it to the body"); sWhatsThis = "PartDesign_Pad"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Pad"; @@ -1120,7 +1120,7 @@ CmdPartDesignPocket::CmdPartDesignPocket() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Pocket"); - sToolTipText = QT_TR_NOOP("Create a pocket with the selected sketch"); + sToolTipText = QT_TR_NOOP("Extrudes the selected sketch or profile and removes it from the body"); sWhatsThis = "PartDesign_Pocket"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Pocket"; @@ -1149,7 +1149,7 @@ CmdPartDesignHole::CmdPartDesignHole() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Hole"); - sToolTipText = QT_TR_NOOP("Create a hole with the selected sketch"); + sToolTipText = QT_TR_NOOP("Creates holes in the active body at the center points of circles or arcs of the selected sketch or profile"); sWhatsThis = "PartDesign_Hole"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Hole"; @@ -1191,8 +1191,8 @@ CmdPartDesignRevolution::CmdPartDesignRevolution() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Revolution"); - sToolTipText = QT_TR_NOOP("Revolve a selected sketch"); + sMenuText = QT_TR_NOOP("Revolve"); + sToolTipText = QT_TR_NOOP("Revolves the selected sketch or profile around a line or axis and adds it to the body"); sWhatsThis = "PartDesign_Revolution"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Revolution"; @@ -1247,7 +1247,7 @@ CmdPartDesignGroove::CmdPartDesignGroove() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Groove"); - sToolTipText = QT_TR_NOOP("Groove a selected sketch"); + sToolTipText = QT_TR_NOOP("Revolves the sketch or profile around a line or axis and removes it from the body"); sWhatsThis = "PartDesign_Groove"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Groove"; @@ -1309,8 +1309,8 @@ CmdPartDesignAdditivePipe::CmdPartDesignAdditivePipe() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Additive pipe"); - sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a path or to other profiles"); + sMenuText = QT_TR_NOOP("Additive Pipe"); + sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a path and adds it to the body"); sWhatsThis = "PartDesign_AdditivePipe"; sStatusTip = sToolTipText; sPixmap = "PartDesign_AdditivePipe"; @@ -1356,8 +1356,8 @@ CmdPartDesignSubtractivePipe::CmdPartDesignSubtractivePipe() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Subtractive pipe"); - sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a path or to other profiles and remove it from the body"); + sMenuText = QT_TR_NOOP("Subtractive Pipe"); + sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a path and removes it from the body"); sWhatsThis = "PartDesign_SubtractivePipe"; sStatusTip = sToolTipText; sPixmap = "PartDesign_SubtractivePipe"; @@ -1403,8 +1403,8 @@ CmdPartDesignAdditiveLoft::CmdPartDesignAdditiveLoft() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Additive loft"); - sToolTipText = QT_TR_NOOP("Loft a selected profile through other profile sections"); + sMenuText = QT_TR_NOOP("Additive Loft"); + sToolTipText = QT_TR_NOOP("Lofts the selected sketch or profile along a path and adds it to the body"); sWhatsThis = "PartDesign_AdditiveLoft"; sStatusTip = sToolTipText; sPixmap = "PartDesign_AdditiveLoft"; @@ -1450,8 +1450,8 @@ CmdPartDesignSubtractiveLoft::CmdPartDesignSubtractiveLoft() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Subtractive loft"); - sToolTipText = QT_TR_NOOP("Loft a selected profile through other profile sections and remove it from the body"); + sMenuText = QT_TR_NOOP("Subtractive Loft"); + sToolTipText = QT_TR_NOOP("Lofts the selected sketch or profile along a path and removes it from the body"); sWhatsThis = "PartDesign_SubtractiveLoft"; sStatusTip = sToolTipText; sPixmap = "PartDesign_SubtractiveLoft"; @@ -1496,8 +1496,8 @@ CmdPartDesignAdditiveHelix::CmdPartDesignAdditiveHelix() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Additive helix"); - sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a helix"); + sMenuText = QT_TR_NOOP("Additive Helix"); + sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a helix and adds it to the body"); sWhatsThis = "PartDesign_AdditiveHelix"; sStatusTip = sToolTipText; sPixmap = "PartDesign_AdditiveHelix"; @@ -1568,8 +1568,8 @@ CmdPartDesignSubtractiveHelix::CmdPartDesignSubtractiveHelix() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Subtractive helix"); - sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a helix and remove it from the body"); + sMenuText = QT_TR_NOOP("Subtractive Helix"); + sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a helix and removes it from the body"); sWhatsThis = "PartDesign_SubtractiveHelix"; sStatusTip = sToolTipText; sPixmap = "PartDesign_SubtractiveHelix"; @@ -1635,7 +1635,7 @@ bool dressupGetSelected(Gui::Command* cmd, const std::string& which, return false; } else if (pcActiveBody != PartDesignGui::getBodyFor(selection[0].getObject(), false)) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in Active Body"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in the active body"), QObject::tr("Select an edge, face, or body from an active body.")); return false; } @@ -1657,7 +1657,7 @@ bool dressupGetSelected(Gui::Command* cmd, const std::string& which, if (TopShape.getShape().IsNull()){ QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Shape of the selected Part is empty")); + QObject::tr("Shape of the selected part is empty")); return false; } @@ -1749,7 +1749,7 @@ CmdPartDesignFillet::CmdPartDesignFillet() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Fillet"); - sToolTipText = QT_TR_NOOP("Make a fillet on an edge, face or body"); + sToolTipText = QT_TR_NOOP("Applies a fillet to the selected edges or faces"); sWhatsThis = "PartDesign_Fillet"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Fillet"; @@ -1777,7 +1777,7 @@ CmdPartDesignChamfer::CmdPartDesignChamfer() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Chamfer"); - sToolTipText = QT_TR_NOOP("Chamfer the selected edges of a shape"); + sToolTipText = QT_TR_NOOP("Applies a chamfer to the selected edges or faces"); sWhatsThis = "PartDesign_Chamfer"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Chamfer"; @@ -1806,7 +1806,7 @@ CmdPartDesignDraft::CmdPartDesignDraft() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Draft"); - sToolTipText = QT_TR_NOOP("Make a draft on a face"); + sToolTipText = QT_TR_NOOP("Applies a draft to the selected faces"); sWhatsThis = "PartDesign_Draft"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Draft"; @@ -1874,7 +1874,7 @@ CmdPartDesignThickness::CmdPartDesignThickness() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Thickness"); - sToolTipText = QT_TR_NOOP("Make a thick solid"); + sToolTipText = QT_TR_NOOP("Applies thickness and removes the selected faces"); sWhatsThis = "PartDesign_Thickness"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Thickness"; @@ -1967,7 +1967,7 @@ void prepareTransformed(PartDesign::Body *pcActiveBody, Gui::Command* cmd, const PartDesign::Body* activeBody = PartDesignGui::getBody(true); for (auto feature : features) { if (activeBody != PartDesignGui::getBodyFor(feature, false)) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in Active Body"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in the active body"), QObject::tr("Please select only one feature in an active body.")); return; } @@ -1990,8 +1990,8 @@ CmdPartDesignMirrored::CmdPartDesignMirrored() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Mirrored"); - sToolTipText = QT_TR_NOOP("Create a mirrored feature"); + sMenuText = QT_TR_NOOP("Mirror"); + sToolTipText = QT_TR_NOOP("Mirrors the selected features or active body"); sWhatsThis = "PartDesign_Mirrored"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Mirrored"; @@ -2023,7 +2023,7 @@ void CmdPartDesignMirrored::activated(int iMsg) finishTransformed(cmd, Feat); }; - prepareTransformed(pcActiveBody, this, "Mirrored", worker); + prepareTransformed(pcActiveBody, this, "Mirror", worker); } bool CmdPartDesignMirrored::isActive() @@ -2041,8 +2041,8 @@ CmdPartDesignLinearPattern::CmdPartDesignLinearPattern() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("LinearPattern"); - sToolTipText = QT_TR_NOOP("Create a linear pattern feature"); + sMenuText = QT_TR_NOOP("Linear Pattern"); + sToolTipText = QT_TR_NOOP("Duplicates the selected features or the active body in a linear pattern"); sWhatsThis = "PartDesign_LinearPattern"; sStatusTip = sToolTipText; sPixmap = "PartDesign_LinearPattern"; @@ -2094,8 +2094,8 @@ CmdPartDesignPolarPattern::CmdPartDesignPolarPattern() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("PolarPattern"); - sToolTipText = QT_TR_NOOP("Create a polar pattern feature"); + sMenuText = QT_TR_NOOP("Polar Pattern"); + sToolTipText = QT_TR_NOOP("Duplicates the selected features or the active body in a circular pattern"); sWhatsThis = "PartDesign_PolarPattern"; sStatusTip = sToolTipText; sPixmap = "PartDesign_PolarPattern"; @@ -2149,8 +2149,8 @@ CmdPartDesignScaled::CmdPartDesignScaled() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Scaled"); - sToolTipText = QT_TR_NOOP("Create a scaled feature"); + sMenuText = QT_TR_NOOP("Scale"); + sToolTipText = QT_TR_NOOP("Scales the selected features or the active body"); sWhatsThis = "PartDesign_Scaled"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Scaled"; @@ -2173,7 +2173,7 @@ void CmdPartDesignScaled::activated(int iMsg) finishTransformed(cmd, Feat); }; - prepareTransformed(pcActiveBody, this, "Scaled", worker); + prepareTransformed(pcActiveBody, this, "Scale", worker); } bool CmdPartDesignScaled::isActive() @@ -2191,8 +2191,8 @@ CmdPartDesignMultiTransform::CmdPartDesignMultiTransform() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create MultiTransform"); - sToolTipText = QT_TR_NOOP("Create a multitransform feature"); + sMenuText = QT_TR_NOOP("Multi-Transform"); + sToolTipText = QT_TR_NOOP("Applies multiple transformations to the selected features or active body"); sWhatsThis = "PartDesign_MultiTransform"; sStatusTip = sToolTipText; sPixmap = "PartDesign_MultiTransform"; @@ -2235,7 +2235,7 @@ void CmdPartDesignMultiTransform::activated(int iMsg) if (prevFeature) Gui::Selection().addSelection(prevFeature->getDocument()->getName(), prevFeature->getNameInDocument()); - openCommand(QT_TRANSLATE_NOOP("Command", "Convert to MultiTransform feature")); + openCommand(QT_TRANSLATE_NOOP("Command", "Convert to Multi-Transform feature")); Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.runCommandByName("PartDesign_MoveTip"); @@ -2306,8 +2306,8 @@ CmdPartDesignBoolean::CmdPartDesignBoolean() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Boolean operation"); - sToolTipText = QT_TR_NOOP("Boolean operation with two or more bodies"); + sMenuText = QT_TR_NOOP("Boolean Operation"); + sToolTipText = QT_TR_NOOP("Applies boolean operations with the selected objects and the active body"); sWhatsThis = "PartDesign_Boolean"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Boolean"; @@ -2368,8 +2368,8 @@ public: { sAppModule = "PartDesign"; sGroup = "PartDesign"; - sMenuText = QT_TR_NOOP("Create datum"); - sToolTipText = QT_TR_NOOP("Create a datum object or local coordinate system"); + sMenuText = QT_TR_NOOP("Create Datum"); + sToolTipText = QT_TR_NOOP("Creates a datum object or local coordinate system"); sWhatsThis = "PartDesign_CompDatums"; sStatusTip = sToolTipText; eType = ForEdit; @@ -2403,8 +2403,8 @@ public: { sAppModule = "PartDesign"; sGroup = "PartDesign"; - sMenuText = QT_TR_NOOP("Create datum"); - sToolTipText = QT_TR_NOOP("Create a datum object or local coordinate system"); + sMenuText = QT_TR_NOOP("Create Datum"); + sToolTipText = QT_TR_NOOP("Creates a datum object or local coordinate system"); sWhatsThis = "PartDesign_CompDatums"; sStatusTip = sToolTipText; eType = ForEdit; diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index db38c7915c..4973734f7c 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -85,8 +85,8 @@ CmdPartDesignBody::CmdPartDesignBody() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create body"); - sToolTipText = QT_TR_NOOP("Create a new body and make it active"); + sMenuText = QT_TR_NOOP("New Body"); + sToolTipText = QT_TR_NOOP("Creates a new body and activtes it"); sWhatsThis = "PartDesign_Body"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Body"; @@ -112,12 +112,12 @@ void CmdPartDesignBody::activated(int iMsg) PartDesign::Body::findBodyOf ( baseFeature ) ) { // Prevent creating bodies based on features already belonging to other bodies QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Bad base feature"), - QObject::tr("Body can't be based on a PartDesign feature.")); + QObject::tr("A body cannot be based on a Part Design feature.")); baseFeature = nullptr; } else if (PartDesign::Body::findBodyOf ( baseFeature )){ QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Bad base feature"), - QObject::tr("%1 already belongs to a body, can't use it as base feature for another body.") + QObject::tr("%1 already belongs to a body and cannot be used as a base feature for another body.") .arg(QString::fromUtf8(baseFeature->Label.getValue()))); baseFeature = nullptr; } @@ -313,7 +313,7 @@ CmdPartDesignMigrate::CmdPartDesignMigrate() sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); sMenuText = QT_TR_NOOP("Migrate"); - sToolTipText = QT_TR_NOOP("Migrate document to the modern PartDesign workflow"); + sToolTipText = QT_TR_NOOP("Migrates the document to the modern Part Design workflow"); sWhatsThis = "PartDesign_Migrate"; sStatusTip = sToolTipText; sPixmap = "PartDesign_Migrate"; @@ -343,7 +343,7 @@ void CmdPartDesignMigrate::activated(int iMsg) } else { // Huh? nothing to migrate? QMessageBox::warning ( nullptr, QObject::tr ( "Nothing to migrate" ), - QObject::tr ( "No PartDesign features found that don't belong to a body." + QObject::tr ( "No Part Design features found that do not belong to a body." " Nothing to migrate." ) ); } return; @@ -429,7 +429,7 @@ void CmdPartDesignMigrate::activated(int iMsg) } // do the actual migration - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy Part Design features to Bodies")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy Part Design features to bodies")); for ( auto chainIt = featureChains.begin(); !featureChains.empty(); featureChains.erase (chainIt), chainIt = featureChains.begin () ) { @@ -527,8 +527,8 @@ CmdPartDesignMoveTip::CmdPartDesignMoveTip() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Set tip"); - sToolTipText = QT_TR_NOOP("Move the tip of the body"); + sMenuText = QT_TR_NOOP("Set Tip"); + sToolTipText = QT_TR_NOOP("Moves the tip of the body to the selected feature"); sWhatsThis = "PartDesign_MoveTip"; sStatusTip = sToolTipText; sPixmap = "PartDesign_MoveTip"; @@ -555,11 +555,11 @@ void CmdPartDesignMoveTip::activated(int iMsg) if (!selFeature) { QMessageBox::warning (nullptr, QObject::tr( "Selection error" ), - QObject::tr( "Select exactly one PartDesign feature or a body." ) ); + QObject::tr( "Select exactly one Part Design feature or a body." ) ); return; } else if (!body) { QMessageBox::warning (nullptr, QObject::tr( "Selection error" ), - QObject::tr( "Couldn't determine a body for the selected feature '%s'.", selFeature->Label.getValue() ) ); + QObject::tr( "Could not determine a body for the selected feature '%s'.", selFeature->Label.getValue() ) ); return; } else if ( !selFeature->isDerivedFrom(PartDesign::Feature::getClassTypeId () ) && selFeature != body && body->BaseFeature.getValue() != selFeature ) { @@ -606,7 +606,7 @@ CmdPartDesignDuplicateSelection::CmdPartDesignDuplicateSelection() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Duplicate selected &object"); + sMenuText = QT_TR_NOOP("Duplicate &Object"); sToolTipText = QT_TR_NOOP("Duplicates the selected object and adds it to the active body"); sWhatsThis = "PartDesign_DuplicateSelection"; sStatusTip = sToolTipText; @@ -619,7 +619,7 @@ void CmdPartDesignDuplicateSelection::activated(int iMsg) std::vector beforeFeatures = getDocument()->getObjects(); - openCommand(QT_TRANSLATE_NOOP("Command", "Duplicate a PartDesign object")); + openCommand(QT_TRANSLATE_NOOP("Command", "Duplicate a Part Design object")); doCommand(Doc,"FreeCADGui.runCommand('Std_DuplicateSelection')"); if (pcActiveBody) { @@ -666,7 +666,7 @@ CmdPartDesignMoveFeature::CmdPartDesignMoveFeature() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Move object to other body"); + sMenuText = QT_TR_NOOP("Move Object To…"); sToolTipText = QT_TR_NOOP("Moves the selected object to another body"); sWhatsThis = "PartDesign_MoveFeature"; sStatusTip = sToolTipText; @@ -709,7 +709,7 @@ void CmdPartDesignMoveFeature::activated(int iMsg) if (source_bodies.size() != 1) { //show messagebox and cancel QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Features cannot be moved"), - QObject::tr("Only features of a single source Body can be moved")); + QObject::tr("Only features of a single source body can be moved")); return; } @@ -833,8 +833,8 @@ CmdPartDesignMoveFeatureInTree::CmdPartDesignMoveFeatureInTree() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Move object after other object"); - sToolTipText = QT_TR_NOOP("Moves the selected object and insert it after another object"); + sMenuText = QT_TR_NOOP("Move Feature After…"); + sToolTipText = QT_TR_NOOP("Moves the selected feature after another feature in the same body"); sWhatsThis = "PartDesign_MoveFeatureInTree"; sStatusTip = sToolTipText; sPixmap = "PartDesign_MoveFeatureInTree"; @@ -887,17 +887,22 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) items.push_back( QString::fromUtf8 ( feat->Label.getValue() ) ); } - QString text = QInputDialog::getItem(Gui::getMainWindow(), - qApp->translate("PartDesign_MoveFeatureInTree", "Select feature"), + QString text = QInputDialog::getItem( + Gui::getMainWindow(), + qApp->translate("PartDesign_MoveFeatureInTree", "Move Feature After…"), qApp->translate("PartDesign_MoveFeatureInTree", "Select a feature from the list"), - items, 0, false, &ok, Qt::MSWindowsFixedSizeDialogHint); + items, + 0, + false, + &ok, + Qt::MSWindowsFixedSizeDialogHint); if (!ok) return; int index = items.indexOf(text); // first object is the beginning of the body App::DocumentObject* target = index != 0 ? model[index-1] : nullptr; - openCommand(QT_TRANSLATE_NOOP("Command", "Move an object inside tree")); + openCommand(QT_TRANSLATE_NOOP("Command", "Move a feature inside body")); App::DocumentObject* lastObject = target; for ( auto feat: features ) { @@ -959,9 +964,9 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) && lastObject->isDerivedFrom() ) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setIcon(QMessageBox::Question); - msgBox.setWindowTitle(qApp->translate("PartDesign_MoveFeatureInTree", "Move tip")); + msgBox.setWindowTitle(qApp->translate("PartDesign_MoveFeatureInTree", "Move Tip")); msgBox.setText(qApp->translate("PartDesign_MoveFeatureInTree", "The moved feature appears after the currently set tip.")); - msgBox.setInformativeText(qApp->translate("PartDesign_MoveFeatureInTree", "Do you want the last feature to be the new tip?")); + msgBox.setInformativeText(qApp->translate("PartDesign_MoveFeatureInTree", "Set tip to last feature?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp index ba8e65ff50..422b7bbd50 100644 --- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp @@ -66,8 +66,8 @@ CmdPrimtiveCompAdditive::CmdPrimtiveCompAdditive() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create an additive primitive"); - sToolTipText = QT_TR_NOOP("Create an additive primitive"); + sMenuText = QT_TR_NOOP("Additive Primitive"); + sToolTipText = QT_TR_NOOP("Creates an additive primitive"); sWhatsThis = "PartDesign_CompPrimitiveAdditive"; sStatusTip = sToolTipText; eType = ForEdit; @@ -195,35 +195,35 @@ void CmdPrimtiveCompAdditive::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Box")); - arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive box by its width, height, and length")); + arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive box by its width, height, and length")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Cylinder")); - arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive cylinder by its radius, height, and angle")); + arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive cylinder by its radius, height, and angle")); arc2->setStatusTip(arc2->toolTip()); QAction* arc3 = a[2]; arc3->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Sphere")); - arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive sphere by its radius and various angles")); + arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive sphere by its radius and various angles")); arc3->setStatusTip(arc3->toolTip()); QAction* arc4 = a[3]; arc4->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Cone")); - arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive cone")); + arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive cone")); arc4->setStatusTip(arc4->toolTip()); QAction* arc5 = a[4]; arc5->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Ellipsoid")); - arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive ellipsoid")); + arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive ellipsoid")); arc5->setStatusTip(arc5->toolTip()); QAction* arc6 = a[5]; arc6->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Torus")); - arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive torus")); + arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive torus")); arc6->setStatusTip(arc6->toolTip()); QAction* arc7 = a[6]; arc7->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Prism")); - arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive prism")); + arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive prism")); arc7->setStatusTip(arc7->toolTip()); QAction* arc8 = a[7]; arc8->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Wedge")); - arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive wedge")); + arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive wedge")); arc8->setStatusTip(arc8->toolTip()); } @@ -239,8 +239,8 @@ CmdPrimtiveCompSubtractive::CmdPrimtiveCompSubtractive() { sAppModule = "PartDesign"; sGroup = QT_TR_NOOP("PartDesign"); - sMenuText = QT_TR_NOOP("Create a subtractive primitive"); - sToolTipText = QT_TR_NOOP("Create a subtractive primitive"); + sMenuText = QT_TR_NOOP("Subtractive Primitive"); + sToolTipText = QT_TR_NOOP("Creates a subtractive primitive"); sWhatsThis = "PartDesign_CompPrimitiveSubtractive"; sStatusTip = sToolTipText; eType = ForEdit; @@ -347,35 +347,35 @@ void CmdPrimtiveCompSubtractive::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Box")); - arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive box by its width, height and length")); + arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive box by its width, height and length")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Cylinder")); - arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive cylinder by its radius, height and angle")); + arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive cylinder by its radius, height and angle")); arc2->setStatusTip(arc2->toolTip()); QAction* arc3 = a[2]; arc3->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Sphere")); - arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive sphere by its radius and various angles")); + arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive sphere by its radius and various angles")); arc3->setStatusTip(arc3->toolTip()); QAction* arc4 = a[3]; arc4->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Cone")); - arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive cone")); + arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive cone")); arc4->setStatusTip(arc4->toolTip()); QAction* arc5 = a[4]; arc5->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Ellipsoid")); - arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive ellipsoid")); + arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive ellipsoid")); arc5->setStatusTip(arc5->toolTip()); QAction* arc6 = a[5]; arc6->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Torus")); - arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive torus")); + arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive torus")); arc6->setStatusTip(arc6->toolTip()); QAction* arc7 = a[6]; arc7->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Prism")); - arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive prism")); + arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive prism")); arc7->setStatusTip(arc7->toolTip()); QAction* arc8 = a[7]; arc8->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Wedge")); - arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive wedge")); + arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive wedge")); arc8->setStatusTip(arc8->toolTip()); } diff --git a/src/Mod/PartDesign/Gui/DlgActiveBody.ui b/src/Mod/PartDesign/Gui/DlgActiveBody.ui index 84c6506a85..d279a6fba6 100644 --- a/src/Mod/PartDesign/Gui/DlgActiveBody.ui +++ b/src/Mod/PartDesign/Gui/DlgActiveBody.ui @@ -17,9 +17,8 @@ - To create a new PartDesign object, there must be an active Body object in the document. - -Please select a body from below, or create a new body. + To create a new Part Design object, there must be an active body object in the document. +Select a body from below, or create a new body. true @@ -33,7 +32,7 @@ Please select a body from below, or create a new body. - Create new body + Create New Body diff --git a/src/Mod/PartDesign/Gui/FeaturePickDialog.cpp b/src/Mod/PartDesign/Gui/FeaturePickDialog.cpp index a8fdc8da8c..68857f74d4 100644 --- a/src/Mod/PartDesign/Gui/FeaturePickDialog.cpp +++ b/src/Mod/PartDesign/Gui/FeaturePickDialog.cpp @@ -43,9 +43,9 @@ const QString FeaturePickDialog::getFeatureStatusString(const featureStatus st) case invalidShape: return tr("Invalid shape"); case noWire: return tr("No wire in sketch"); case isUsed: return tr("Sketch already used by other feature"); - case otherBody: return tr("Sketch belongs to another Body feature"); + case otherBody: return tr("Sketch belongs to another body feature"); case basePlane: return tr("Base plane"); - case afterTip: return tr("Feature is located after the Tip feature"); + case afterTip: return tr("Feature is located after the tip of the body"); } return tr(""); diff --git a/src/Mod/PartDesign/Gui/SketchWorkflow.cpp b/src/Mod/PartDesign/Gui/SketchWorkflow.cpp index acc06864be..19ef91df16 100644 --- a/src/Mod/PartDesign/Gui/SketchWorkflow.cpp +++ b/src/Mod/PartDesign/Gui/SketchWorkflow.cpp @@ -246,7 +246,7 @@ public: App::Document* appdocument = guidocument->getDocument(); std::string FeatName = appdocument->getUniqueObjectName("Sketch"); - guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "Create a Sketch on Face")); + guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "Sketch on Face")); FCMD_OBJ_CMD(activeBody, "newObject('Sketcher::SketchObject','" << FeatName << "')"); auto Feat = activeBody->getDocument()->getObject(FeatName.c_str()); FCMD_OBJ_CMD(Feat, "AttachmentSupport = " << supportString); @@ -492,7 +492,7 @@ public: { try { // Start command early, so undo will undo any Body creation - guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "Create a new Sketch")); + guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "New Sketch")); tryFindSupport(); } catch (const RejectException&) { @@ -659,7 +659,7 @@ private: if (dlg && !pickDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); @@ -698,7 +698,7 @@ private: App::Document* doc = partDesignBody->getDocument(); if (!doc->hasPendingTransaction()) { - doc->openTransaction(QT_TRANSLATE_NOOP("Command", "Create a new Sketch")); + doc->openTransaction(QT_TRANSLATE_NOOP("Command", "New Sketch")); } FCMD_OBJ_CMD(partDesignBody,"newObject('Sketcher::SketchObject','" << FeatName << "')"); @@ -732,19 +732,19 @@ void SketchWorkflow::createSketch() } catch (const WrongSelectionException&) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Several sub-elements selected"), - QObject::tr("You have to select a single face as support for a sketch!")); + QObject::tr("Select a single face as support for a sketch!")); } catch (const WrongSupportException&) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No support face selected"), - QObject::tr("You have to select a face as support for a sketch!")); + QObject::tr("Select a face as support for a sketch!")); } catch (const SupportNotPlanarException&) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No planar support"), - QObject::tr("You need a planar face as support for a sketch!")); + QObject::tr("Need a planar face as support for a sketch!")); } catch (const MissingPlanesException&) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No valid planes in this document"), - QObject::tr("Please create a plane first or select a face to sketch on")); + QObject::tr("Create a plane first or select a face to sketch on")); } } diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp index bfc43ff794..6af54e3ef7 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp @@ -51,7 +51,7 @@ using namespace Gui; TaskBooleanParameters::TaskBooleanParameters(ViewProviderBoolean* BooleanView, QWidget* parent) : TaskBox(Gui::BitmapFactory().pixmap("PartDesign_Boolean"), - tr("Boolean parameters"), + tr("Boolean Parameters"), true, parent) , ui(new Ui_TaskBooleanParameters) diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui b/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui index 0176226986..c74220cbba 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui @@ -19,7 +19,7 @@ - Add body + Add Body true @@ -29,7 +29,7 @@ - Remove body + Remove Body true diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.ui b/src/Mod/PartDesign/Gui/TaskChamferParameters.ui index a45878b4b2..d6759648aa 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.ui @@ -17,8 +17,7 @@ - Click button to enter selection mode, -click again to end selection + Toggles between selection and preview mode Select @@ -77,7 +76,7 @@ click again to end selection false - Flip direction + Flips the direction @@ -117,7 +116,7 @@ click again to end selection - Use All Edges + Use all edges diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp index 47839dc795..01fce8491e 100644 --- a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp @@ -98,7 +98,7 @@ bool TaskDlgDatumParameters::accept() { //see if we are able to assign a mode if (parameter->getActiveMapMode() == mmDeactivated) { QMessageBox msg(Gui::getMainWindow()); - msg.setWindowTitle(tr("Incompatible reference set")); + msg.setWindowTitle(tr("Incompatible Reference Set")); msg.setText(tr("There is no attachment mode that fits the current set" " of references. If you choose to continue, the feature will remain where" " it is now, and will not be moved as the references change." diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.ui b/src/Mod/PartDesign/Gui/TaskDraftParameters.ui index 288aceeb7f..3d2d38b1fe 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.ui @@ -17,8 +17,7 @@ - Click button to enter selection mode, -click again to end selection + Toggles between selection and preview mode Select @@ -77,7 +76,7 @@ click again to end selection - Neutral plane + Neutral Plane true @@ -94,7 +93,7 @@ click again to end selection - Pull direction + Pull Direction true diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp index 12bb0c3790..11247c81ef 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp @@ -291,12 +291,12 @@ void TaskDressUpParameters::createAddAllEdgesAction(QListWidget* parentList) { // creates a context menu, a shortcut for it and connects it to a slot function - addAllEdgesAction = new QAction(tr("Add all edges"), this); + addAllEdgesAction = new QAction(tr("Add All Edges"), this); addAllEdgesAction->setShortcut(QKeySequence(QStringLiteral("Ctrl+Shift+A"))); // display shortcut behind the context menu entry addAllEdgesAction->setShortcutVisibleInContextMenu(true); parentList->addAction(addAllEdgesAction); - addAllEdgesAction->setStatusTip(tr("Adds all edges to the list box (active only when in add selection mode).")); + addAllEdgesAction->setStatusTip(tr("Adds all edges to the list box (only when in add selection mode)")); parentList->setContextMenuPolicy(Qt::ActionsContextMenu); } diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp index 6257ab9392..cb9b734649 100644 --- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp @@ -264,7 +264,7 @@ void TaskExtrudeParameters::onSelectShapeFacesToggle(bool checked) } else { setSelectionMode(None); - ui->buttonShapeFace->setText(tr("Select faces")); + ui->buttonShapeFace->setText(tr("Select Faces")); } } @@ -602,7 +602,7 @@ void TaskExtrudeParameters::fillDirectionCombo() } // add the other entries - addAxisToCombo(nullptr, std::string(), tr("Select reference...")); + addAxisToCombo(nullptr, std::string(), tr("Select reference…")); // we start with the sketch normal as proposal for the custom direction if (pcSketch) { diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp index ad00474162..fdd75d8536 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp @@ -80,7 +80,7 @@ const QString TaskFeaturePick::getFeatureStatusString(const featureStatus st) case basePlane: return tr("Base plane"); case afterTip: - return tr("Feature is located after the tip feature"); + return tr("Feature is located after the tip of the body"); } return QString(); diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.ui b/src/Mod/PartDesign/Gui/TaskFeaturePick.ui index e53a139796..6d4a9f36b7 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.ui +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.ui @@ -27,7 +27,7 @@ - Allow external features + Allow External Features false diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.ui b/src/Mod/PartDesign/Gui/TaskFilletParameters.ui index 7843b56434..39a13b6c35 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.ui @@ -17,8 +17,7 @@ - Click button to enter selection mode, -click again to end selection + Toggles between selection and preview mode Select @@ -44,7 +43,7 @@ click again to end selection - Radius: + Radius @@ -60,7 +59,7 @@ click again to end selection - Use All Edges + Use all edges diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp index 980ec2ffaf..9e9d4ee584 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp @@ -53,7 +53,7 @@ TaskHelixParameters::TaskHelixParameters(PartDesignGui::ViewProviderHelix* Helix : TaskSketchBasedParameters(HelixView, parent, "PartDesign_AdditiveHelix", - tr("Helix parameters")) + tr("Helix Parameters")) , ui(new Ui_TaskHelixParameters) { // we need a separate container widget to add all controls to @@ -201,7 +201,7 @@ void TaskHelixParameters::fillAxisCombo(bool forceRefill) addPartAxes(); // add "Select reference" - addAxisToCombo(nullptr, std::string(), tr("Select reference...")); + addAxisToCombo(nullptr, std::string(), tr("Select reference…")); } // add current link, if not in list and highlight it @@ -234,9 +234,9 @@ void TaskHelixParameters::addPartAxes() if (PartDesign::Body* body = PartDesign::Body::findBodyOf(profile)) { try { App::Origin* orig = body->getOrigin(); - addAxisToCombo(orig->getX(), "", tr("Base X axis")); - addAxisToCombo(orig->getY(), "", tr("Base Y axis")); - addAxisToCombo(orig->getZ(), "", tr("Base Z axis")); + addAxisToCombo(orig->getX(), "", tr("Base x-axis")); + addAxisToCombo(orig->getY(), "", tr("Base y-axis")); + addAxisToCombo(orig->getZ(), "", tr("Base z-axis")); } catch (const Base::Exception& ex) { ex.reportException(); @@ -625,7 +625,7 @@ void TaskHelixParameters::getReferenceAxis(App::DocumentObject*& obj, const App::PropertyLinkSub& lnk = *(axesInList.at(num)); if (!lnk.getValue()) { throw Base::RuntimeError( - "Still in reference selection mode; reference wasn't selected yet"); + "Still in reference selection mode; reference was not selected yet"); } else { auto revolution = getObject(); diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.ui b/src/Mod/PartDesign/Gui/TaskHelixParameters.ui index 798d2e222a..e9a7c6c267 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.ui @@ -19,7 +19,7 @@ - Status: + Status @@ -37,7 +37,7 @@ - Axis: + Axis @@ -45,17 +45,17 @@ - Base X axis + Base x-axis - Base Y axis + Base y-axis - Base Z axis + Base z-axis @@ -75,7 +75,7 @@ - Select reference... + Select reference… @@ -87,7 +87,7 @@ - Mode: + Mode @@ -122,7 +122,7 @@ - Pitch: + Pitch @@ -149,7 +149,7 @@ - Height: + Height @@ -176,7 +176,7 @@ - Turns: + Turns @@ -200,7 +200,7 @@ - Cone angle: + Cone angle @@ -230,7 +230,7 @@ - Radial growth: + Radial growth diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp index eeb92b75e4..f17ae611f1 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp @@ -50,7 +50,7 @@ namespace sp = std::placeholders; #endif TaskHoleParameters::TaskHoleParameters(ViewProviderHole* HoleView, QWidget* parent) - : TaskSketchBasedParameters(HoleView, parent, "PartDesign_Hole", tr("Hole parameters")) + : TaskSketchBasedParameters(HoleView, parent, "PartDesign_Hole", tr("Hole Parameters")) , observer(new Observer(this, getObject())) , isApplying(false) , ui(new Ui_TaskHoleParameters) diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui index 0c2d83c201..a8b90b77b9 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui @@ -17,7 +17,7 @@ - Task Hole Parameters + Hole Parameters @@ -75,7 +75,7 @@ Qt::LayoutDirection::RightToLeft - Head Type + Head type @@ -114,7 +114,7 @@ Qt::LayoutDirection::LeftToRight - Depth Type + Depth type @@ -196,7 +196,7 @@ - Head Diameter + Head diameter @@ -244,7 +244,7 @@ - Head Depth + Head depth @@ -670,12 +670,12 @@ over 90: larger hole radius at the bottom - Tap Drill (To Be Threaded) + Tap drill (to be threaded) - Modeled Thread + Modeled thread @@ -683,7 +683,7 @@ over 90: larger hole radius at the bottom - Hole Type + Hole type diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui index 1c89aa967e..9390eb9fdc 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui @@ -60,7 +60,7 @@ - Overall Length + Overall length diff --git a/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp b/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp index 97810cf47d..bdcb1fbfb0 100644 --- a/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp @@ -48,7 +48,7 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskLoftParameters */ TaskLoftParameters::TaskLoftParameters(ViewProviderLoft* LoftView, bool /*newObj*/, QWidget* parent) - : TaskSketchBasedParameters(LoftView, parent, "PartDesign_AdditiveLoft", tr("Loft parameters")) + : TaskSketchBasedParameters(LoftView, parent, "PartDesign_AdditiveLoft", tr("Loft Parameters")) , ui(new Ui_TaskLoftParameters) { // we need a separate container widget to add all controls to diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index 6e79357ed2..240e307f1e 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -80,34 +80,34 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget) this, &TaskMultiTransformParameters::onTransformDelete); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Add mirrored transformation"), ui->listTransformFeatures); + action = new QAction(tr("Add Mirror Transformation"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformAddMirrored); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Add linear pattern"), ui->listTransformFeatures); + action = new QAction(tr("Add Linear Pattern"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformAddLinearPattern); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Add polar pattern"), ui->listTransformFeatures); + action = new QAction(tr("Add Polar Pattern"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformAddPolarPattern); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Add scaled transformation"), ui->listTransformFeatures); + action = new QAction(tr("Add Scale Transformation"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformAddScaled); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Move up"), ui->listTransformFeatures); + action = new QAction(tr("Move Up"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onMoveUp); ui->listTransformFeatures->addAction(action); - action = new QAction(tr("Move down"), ui->listTransformFeatures); + action = new QAction(tr("Move Down"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onMoveDown); ui->listTransformFeatures->addAction(action); ui->listTransformFeatures->setContextMenuPolicy(Qt::ActionsContextMenu); @@ -141,7 +141,7 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget) editHint = false; } else { - ui->listTransformFeatures->addItem(tr("Right-click to add")); + ui->listTransformFeatures->addItem(tr("Right-click to add a transformation")); editHint = true; } } @@ -257,14 +257,14 @@ void TaskMultiTransformParameters::onTransformActivated(const QModelIndex& index void TaskMultiTransformParameters::onTransformAddMirrored() { closeSubTask(); - std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Mirrored"); + std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Mirror"); auto pcBody = dynamic_cast(Part::BodyBase::findBodyOf(getTopTransformedObject())); if (!pcBody) { return; } if (isEnabledTransaction()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Mirrored")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Mirror")); } FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Mirrored','"<getObject()->getDocument()->getUniqueObjectName("LinearPattern"); + std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Linear Pattern"); auto pcBody = dynamic_cast(Part::BodyBase::findBodyOf(getTopTransformedObject())); if (!pcBody) { return; } if (isEnabledTransaction()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Make LinearPattern")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Linear Pattern")); } FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::LinearPattern','"<getObject()->getDocument()->getUniqueObjectName("PolarPattern"); + std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Polar Pattern"); auto pcBody = dynamic_cast(Part::BodyBase::findBodyOf(getTopTransformedObject())); if (!pcBody) { return; } if (isEnabledTransaction()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "PolarPattern")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Polar Pattern")); } FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::PolarPattern','"<getObject()->getDocument()->getUniqueObjectName("Scaled"); + std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Scale"); auto pcBody = dynamic_cast(Part::BodyBase::findBodyOf(getTopTransformedObject())); if (!pcBody) { return; } if (isEnabledTransaction()) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Scaled")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Scale")); } FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Scaled','"<offsetEdit->setToolTip(tr("Offset from face at which pad will end")); + ui->offsetEdit->setToolTip(tr("Offsets the pad from the face at which the pad will end")); ui->checkBoxReversed->setToolTip(tr("Reverses pad direction")); // set the history path diff --git a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui index 9249302006..22d3dd492a 100644 --- a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui @@ -167,8 +167,7 @@ - Click button to enter selection mode, - click again to end selection + Toggles between selection and preview mode Select @@ -249,7 +248,7 @@ - Direction/edge: + Direction/edge @@ -266,7 +265,7 @@ from the model as reference - Select reference... + Select reference… @@ -304,14 +303,14 @@ the sketch plane's normal vector will be used - x + X - x-component of direction vector + X-component of direction vector false @@ -333,14 +332,14 @@ the sketch plane's normal vector will be used - y + Y - y-component of direction vector + Y-component of direction vector false @@ -362,14 +361,14 @@ the sketch plane's normal vector will be used - z + Z - z-component of direction vector + Z-component of direction vector false diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp index 9486bf6aec..e3e8ec9dd1 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp @@ -66,7 +66,7 @@ using namespace Gui; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskPipeParameters::TaskPipeParameters(ViewProviderPipe* PipeView, bool /*newObj*/, QWidget* parent) - : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", tr("Pipe parameters")) + : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", tr("Pipe Parameters")) , ui(new Ui_TaskPipeParameters) , stateHandler(nullptr) { @@ -577,7 +577,7 @@ TaskPipeOrientation::TaskPipeOrientation(ViewProviderPipe* PipeView, : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", - tr("Section orientation")) + tr("Section Orientation")) , ui(new Ui_TaskPipeOrientation) , stateHandler(nullptr) { @@ -876,7 +876,7 @@ TaskPipeScaling::TaskPipeScaling(ViewProviderPipe* PipeView, bool /*newObj*/, QW : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", - tr("Section transformation")) + tr("Section Transformation")) , ui(new Ui_TaskPipeScaling) , stateHandler(nullptr) { diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.ui b/src/Mod/PartDesign/Gui/TaskPipeParameters.ui index 9daa193d20..ecf9b05d67 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.ui @@ -48,7 +48,7 @@ - Corner Transition + Corner transition @@ -67,12 +67,12 @@ - Right Corner + Right corner - Round Corner + Round corner @@ -82,7 +82,7 @@ - Path to sweep along + Path to Sweep Along @@ -116,7 +116,7 @@ - Add Edge + Add edge true @@ -135,7 +135,7 @@ - Remove Edge + Remove edge true diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp index d005cfecfb..dee310c9f5 100644 --- a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp @@ -37,7 +37,7 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskPocketParameters */ TaskPocketParameters::TaskPocketParameters(ViewProviderPocket *PocketView,QWidget *parent, bool newObj) - : TaskExtrudeParameters(PocketView, parent, "PartDesign_Pocket", tr("Pocket parameters")) + : TaskExtrudeParameters(PocketView, parent, "PartDesign_Pocket", tr("Pocket Parameters")) , oldLength(0) { ui->offsetEdit->setToolTip(tr("Offset from face at which pocket will end")); diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui index aecc727b4f..ea1ba5896d 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui @@ -60,12 +60,12 @@ - Overall Angle + Overall angle - Offset Angle + Offset angle diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp index ebb5d0d8f6..73ffdfc834 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp @@ -48,7 +48,7 @@ using namespace PartDesignGui; // clang-format off TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent) - : TaskBox(QPixmap(),tr("Primitive parameters"), true, parent) + : TaskBox(QPixmap(),tr("Primitive Parameters"), true, parent) , ui(new Ui_DlgPrimitives) , vp(vp) { diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui index 5090ebb3dc..451e8af680 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui @@ -59,7 +59,7 @@ - Length: + Length @@ -79,7 +79,7 @@ - Width: + Width @@ -150,7 +150,7 @@ - Length: + Length @@ -170,7 +170,7 @@ - Width: + Width @@ -190,7 +190,7 @@ - Height: + Height @@ -264,7 +264,7 @@ - Radius: + Radius @@ -284,7 +284,7 @@ - Height: + Height @@ -304,7 +304,7 @@ - Angle in first direction: + Angle in first direction @@ -330,7 +330,7 @@ - Angle in second direction: + Angle in second direction @@ -388,7 +388,7 @@ - Rotation angle: + Rotation angle @@ -462,7 +462,7 @@ - Radius 1: + Radius 1 @@ -482,7 +482,7 @@ - Radius 2: + Radius 2 @@ -502,7 +502,7 @@ - Height: + Height @@ -548,7 +548,7 @@ - Angle: + Angle @@ -622,7 +622,7 @@ - Radius: + Radius @@ -671,7 +671,7 @@ - U parameter: + U parameter @@ -691,7 +691,7 @@ - V parameters: + V parameters @@ -794,7 +794,7 @@ - Radius 1: + Radius 1 @@ -817,7 +817,7 @@ - Radius 2: + Radius 2 @@ -840,7 +840,7 @@ - Radius 3: + Radius 3 @@ -893,7 +893,7 @@ If zero, it is equal to Radius2 - U parameter: + U parameter @@ -913,7 +913,7 @@ If zero, it is equal to Radius2 - V parameter: + V parameter @@ -1013,7 +1013,7 @@ If zero, it is equal to Radius2 - Radius 1: + Radius 1 @@ -1036,7 +1036,7 @@ If zero, it is equal to Radius2 - Radius 2: + Radius 2 @@ -1088,7 +1088,7 @@ If zero, it is equal to Radius2 - U Parameter: + U parameter @@ -1108,7 +1108,7 @@ If zero, it is equal to Radius2 - V parameter: + V parameter @@ -1211,7 +1211,7 @@ If zero, it is equal to Radius2 - Polygon: + Polygon @@ -1231,7 +1231,7 @@ If zero, it is equal to Radius2 - Circumradius: + Circumradius @@ -1251,7 +1251,7 @@ If zero, it is equal to Radius2 - Height: + Height @@ -1271,7 +1271,7 @@ If zero, it is equal to Radius2 - Angle in first direction: + Angle in first direction @@ -1297,7 +1297,7 @@ If zero, it is equal to Radius2 - Angle in second direction: + Angle in second direction @@ -1350,7 +1350,7 @@ If zero, it is equal to Radius2 - X min/max: + X min/max @@ -1380,7 +1380,7 @@ If zero, it is equal to Radius2 - Y min/max: + Y min/max @@ -1410,7 +1410,7 @@ If zero, it is equal to Radius2 - Z min/max: + Z min/max @@ -1440,7 +1440,7 @@ If zero, it is equal to Radius2 - X2 min/max: + X2 min/max @@ -1473,7 +1473,7 @@ If zero, it is equal to Radius2 - Z2 min/max: + Z2 min/max @@ -1557,7 +1557,7 @@ If zero, it is equal to Radius2 - Pitch: + Pitch @@ -1577,7 +1577,7 @@ If zero, it is equal to Radius2 - Height: + Height @@ -1597,7 +1597,7 @@ If zero, it is equal to Radius2 - Radius: + Radius @@ -1617,7 +1617,7 @@ If zero, it is equal to Radius2 - Angle: + Angle @@ -1634,7 +1634,7 @@ If zero, it is equal to Radius2 - Coordinate system: + Coordinate system @@ -1706,7 +1706,7 @@ If zero, it is equal to Radius2 - Growth: + Growth @@ -1726,7 +1726,7 @@ If zero, it is equal to Radius2 - Number of rotations: + Number of rotations @@ -1746,7 +1746,7 @@ If zero, it is equal to Radius2 - Radius: + Radius @@ -1802,7 +1802,7 @@ If zero, it is equal to Radius2 - Radius: + Radius @@ -1822,7 +1822,7 @@ If zero, it is equal to Radius2 - Angle 1: + Angle 1 @@ -1839,7 +1839,7 @@ If zero, it is equal to Radius2 - Angle 2: + Angle 2 @@ -1876,7 +1876,7 @@ If zero, it is equal to Radius2 - From three points + From 3 Points @@ -1904,7 +1904,7 @@ If zero, it is equal to Radius2 - Major radius: + Major radius @@ -1924,7 +1924,7 @@ If zero, it is equal to Radius2 - Minor radius: + Minor radius @@ -1944,7 +1944,7 @@ If zero, it is equal to Radius2 - Angle 1: + Angle 1 @@ -1961,7 +1961,7 @@ If zero, it is equal to Radius2 - Angle 2: + Angle 2 @@ -2002,7 +2002,7 @@ If zero, it is equal to Radius2 - X: + X Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2022,7 +2022,7 @@ If zero, it is equal to Radius2 - Y: + Y Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2042,7 +2042,7 @@ If zero, it is equal to Radius2 - Z: + Z Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2090,7 +2090,7 @@ If zero, it is equal to Radius2 - X: + X Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2110,7 +2110,7 @@ If zero, it is equal to Radius2 - Y: + Y Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2130,7 +2130,7 @@ If zero, it is equal to Radius2 - Z: + Z Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2167,7 +2167,7 @@ If zero, it is equal to Radius2 - X: + X Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2190,7 +2190,7 @@ If zero, it is equal to Radius2 - Y: + Y Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2213,7 +2213,7 @@ If zero, it is equal to Radius2 - Z: + Z Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2287,7 +2287,7 @@ If zero, it is equal to Radius2 - Polygon: + Polygon @@ -2310,7 +2310,7 @@ If zero, it is equal to Radius2 - Circumradius: + Circumradius diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp index 734c6fffc6..c3c8d711f7 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp @@ -86,7 +86,7 @@ TaskRevolutionParameters::TaskRevolutionParameters(PartDesignGui::ViewProvider* ui->revolveAngle2->bind(rev->Angle2); } else { - throw Base::TypeError("The object is neither a Groove nor a Revolution."); + throw Base::TypeError("The object is neither a groove nor a revolution."); } setupDialog(); @@ -213,7 +213,7 @@ void TaskRevolutionParameters::fillAxisCombo(bool forceRefill) auto *pcFeat = getObject(); if (!pcFeat) { - throw Base::TypeError("The object is not ProfileBased."); + throw Base::TypeError("The object is not profile-based."); } //add sketch axes @@ -232,16 +232,16 @@ void TaskRevolutionParameters::fillAxisCombo(bool forceRefill) if (PartDesign::Body * body = PartDesign::Body::findBodyOf(pcFeat)) { try { App::Origin* orig = body->getOrigin(); - addAxisToCombo(orig->getX(), std::string(), tr("Base X axis")); - addAxisToCombo(orig->getY(), std::string(), tr("Base Y axis")); - addAxisToCombo(orig->getZ(), std::string(), tr("Base Z axis")); + addAxisToCombo(orig->getX(), std::string(), tr("Base x-axis")); + addAxisToCombo(orig->getY(), std::string(), tr("Base y-axis")); + addAxisToCombo(orig->getZ(), std::string(), tr("Base z-axis")); } catch (const Base::Exception &ex) { ex.reportException(); } } //add "Select reference" - addAxisToCombo(nullptr, std::string(), tr("Select reference...")); + addAxisToCombo(nullptr, std::string(), tr("Select reference…")); }//endif forceRefill //add current link, if not in list @@ -712,14 +712,14 @@ TaskDlgRevolutionParameters::TaskDlgRevolutionParameters(ViewProviderRevolution : TaskDlgSketchBasedParameters(RevolutionView) { assert(RevolutionView); - Content.push_back(new TaskRevolutionParameters(RevolutionView, "PartDesign_Revolution", tr("Revolution parameters"))); + Content.push_back(new TaskRevolutionParameters(RevolutionView, "PartDesign_Revolution", tr("Revolution Parameters"))); } TaskDlgGrooveParameters::TaskDlgGrooveParameters(ViewProviderGroove *GrooveView) : TaskDlgSketchBasedParameters(GrooveView) { assert(GrooveView); - Content.push_back(new TaskRevolutionParameters(GrooveView, "PartDesign_Groove", tr("Groove parameters"))); + Content.push_back(new TaskRevolutionParameters(GrooveView, "PartDesign_Groove", tr("Groove Parameters"))); } diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui index 9d71865136..82cbbb0c57 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui @@ -39,7 +39,7 @@ - Axis: + Axis @@ -47,17 +47,17 @@ - Base X axis + Base x-axis - Base Y axis + Base y-axis - Base Z axis + Base z-xis @@ -72,7 +72,7 @@ - Select reference... + Select reference… @@ -84,7 +84,7 @@ - Angle: + Angle diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp index 50dd8664c1..b968e81ba2 100644 --- a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp @@ -58,7 +58,7 @@ using namespace Gui; TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder* view, bool newObj, QWidget* parent) : Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("PartDesign_ShapeBinder"), - tr("Datum shape parameters"), true, parent) + tr("Datum Shape Parameters"), true, parent) , SelectionObserver(view) , ui(new Ui_TaskShapeBinder) , vp(view) diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp index 732d541c07..b44add0142 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp @@ -257,7 +257,7 @@ void TaskThicknessParameters::apply() { // Alert user if he created an empty feature if (ui->listWidgetReferences->count() == 0) { - Base::Console().warning(tr("Empty thickness created !\n").toStdString().c_str()); + Base::Console().warning(tr("Empty thickness created!\n").toStdString().c_str()); } } diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui b/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui index 0568e31a4b..c64a4f992d 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui @@ -17,8 +17,7 @@ - Click button to enter selection mode, -click again to end selection + Toggles between selection and preview mode Select @@ -91,7 +90,7 @@ click again to end selection - Recto Verso + Recto verso @@ -99,7 +98,7 @@ click again to end selection - Join Type + Join type diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp index 7922507570..fe8a91283f 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp @@ -34,7 +34,7 @@ using namespace Gui::TaskView; namespace sp = std::placeholders; TaskTransformedMessages::TaskTransformedMessages(ViewProviderTransformed *transformedView_) - : TaskBox(Gui::BitmapFactory().pixmap("Part_Transformed_Copy"), tr("Transformed feature messages"), true, nullptr) + : TaskBox(Gui::BitmapFactory().pixmap("Part_Transformed_Copy"), tr("Transformed Feature Messages"), true, nullptr) , transformedView(transformedView_) , ui(new Ui_TaskTransformedMessages) { diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index 2ed2e16f28..0640e4b135 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -417,9 +417,9 @@ void TaskTransformedParameters::fillAxisCombo(ComboLinks& combolinks, Part::Part if (body) { try { App::Origin* orig = body->getOrigin(); - combolinks.addLink(orig->getX(), "", tr("Base X axis")); - combolinks.addLink(orig->getY(), "", tr("Base Y axis")); - combolinks.addLink(orig->getZ(), "", tr("Base Z axis")); + combolinks.addLink(orig->getX(), "", tr("Base x-axis")); + combolinks.addLink(orig->getY(), "", tr("Base y-axis")); + combolinks.addLink(orig->getZ(), "", tr("Base z-axis")); } catch (const Base::Exception& ex) { Base::Console().error("%s\n", ex.what()); @@ -427,7 +427,7 @@ void TaskTransformedParameters::fillAxisCombo(ComboLinks& combolinks, Part::Part } // add "Select reference" - combolinks.addLink(nullptr, std::string(), tr("Select reference...")); + combolinks.addLink(nullptr, std::string(), tr("Select reference…")); } void TaskTransformedParameters::fillPlanesCombo(ComboLinks& combolinks, Part::Part2DObject* sketch) @@ -463,7 +463,7 @@ void TaskTransformedParameters::fillPlanesCombo(ComboLinks& combolinks, Part::Pa } // add "Select reference" - combolinks.addLink(nullptr, std::string(), tr("Select reference...")); + combolinks.addLink(nullptr, std::string(), tr("Select reference…")); } void TaskTransformedParameters::recomputeFeature() diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui b/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui index 0535e4cc3f..a449d6cdc1 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui @@ -75,7 +75,7 @@ - Add feature + Add Feature true @@ -85,7 +85,7 @@ - Remove feature + Remove Feature true diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index e56b4d468f..6f05ff8619 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -137,11 +137,10 @@ PartDesign::Body *getBody(bool messageIfNot, bool autoActivate, bool assertModer DlgActiveBody dia( Gui::getMainWindow(), doc, - QObject::tr("In order to use PartDesign you need an active Body object in the document. " - "Please make one active (double click) or create one." - "\n\nIf you have a legacy document with PartDesign objects without Body, " - "use the migrate function in PartDesign to put them into a Body." - )); + QObject::tr("To use Part Design, an active body object is required in the document. " + "Activate a body (double-click) or create a new one." + "\n\nFor legacy documents with Part Design objects lacking a body, " + "use the migrate function in Part Design to place them into a body.")); if (dia.exec() == QDialog::DialogCode::Accepted) activeBody = dia.getActiveBody(); } @@ -186,9 +185,8 @@ void needActiveBodyError() { QMessageBox::warning( Gui::getMainWindow(), QObject::tr("Active Body Required"), - QObject::tr("To create a new PartDesign object, there must be " - "an active Body object in the document. Please make " - "one active (double click) or create a new Body.") ); + QObject::tr("To create a new Part Design object, an active body is required in the document. " + "Activate an existing body (double-click) or create a new one.")); } PartDesign::Body * makeBody(App::Document *doc) @@ -283,7 +281,7 @@ void fixSketchSupport (Sketcher::SketchObject* sketch) const App::Document* doc = sketch->getDocument(); PartDesign::Body *body = getBodyFor(sketch, /*messageIfNot*/ false); if (!body) { - throw Base::RuntimeError ("Couldn't find body for the sketch"); + throw Base::RuntimeError ("Could not find a body for the sketch"); } // Get the Origin for the body @@ -393,7 +391,7 @@ void relinkToBody (PartDesign::Feature *feature) { PartDesign::Body *body = PartDesign::Body::findBodyOf ( feature ); if (!body) { - throw Base::RuntimeError ("Couldn't find body for the feature"); + throw Base::RuntimeError ("Could not find a body for the feature"); } for ( const auto & obj: doc->getObjects () ) { diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp index 58ac6fce77..7b8d88fb3b 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.cpp +++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp @@ -74,7 +74,8 @@ bool ViewProvider::doubleClicked() void ViewProvider::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { QIcon iconObject = mergeGreyableOverlayIcons(Gui::BitmapFactory().pixmap("Part_ColorFace.svg")); - QAction* act = menu->addAction(iconObject, QObject::tr("Set colors..."), receiver, member); + QAction* act = menu->addAction(iconObject, QObject::tr("Set Face Colors"), receiver, member); + act->setData(QVariant((int)ViewProvider::Color)); // Call the extensions Gui::ViewProvider::setupContextMenu(menu, receiver, member); @@ -104,7 +105,7 @@ bool ViewProvider::setEdit(int ModNum) if (dlg && !featureDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp index 08a2d2a429..cbd9359127 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp @@ -118,7 +118,7 @@ void ViewProviderBody::setupContextMenu(QMenu* menu, QObject* receiver, const ch Q_UNUSED(member); Gui::ActionFunction* func = new Gui::ActionFunction(menu); - QAction* act = menu->addAction(tr("Active body")); + QAction* act = menu->addAction(tr("Active Body")); act->setCheckable(true); act->setChecked(isActiveBody()); func->trigger(act, [this]() { diff --git a/src/Mod/PartDesign/Gui/ViewProviderBoolean.cpp b/src/Mod/PartDesign/Gui/ViewProviderBoolean.cpp index 0bafeccfec..b5bd5a0938 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBoolean.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBoolean.cpp @@ -60,7 +60,7 @@ ViewProviderBoolean::~ViewProviderBoolean() = default; void ViewProviderBoolean::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit boolean")); + addDefaultAction(menu, QObject::tr("Edit Boolean")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } @@ -77,7 +77,7 @@ bool ViewProviderBoolean::setEdit(int ModNum) if (dlg && !booleanDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp b/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp index 72c9beb997..58487b2c27 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp @@ -38,7 +38,7 @@ const std::string & ViewProviderChamfer::featureName() const { void ViewProviderChamfer::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit chamfer")); + addDefaultAction(menu, QObject::tr("Edit Chamfer")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h index 490c12f3e4..4b2ee5d7f1 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h +++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h @@ -38,7 +38,7 @@ public: /// constructor ViewProviderChamfer() { sPixmap = "PartDesign_Chamfer.svg"; - menuName = tr("Chamfer parameters");} + menuName = tr("Chamfer Parameters");} /// return "Chamfer" const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp index 474dc3b9d0..d6e3262a77 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp @@ -112,22 +112,22 @@ void ViewProviderDatum::attach(App::DocumentObject *obj) if (o->is()) { datumType = QStringLiteral("Plane"); datumText = QObject::tr("Plane"); - datumMenuText = tr("Datum Plane parameters"); + datumMenuText = tr("Datum Plane Parameters"); } else if (o->is()) { datumType = QStringLiteral("Line"); datumText = QObject::tr("Line"); - datumMenuText = tr("Datum Line parameters"); + datumMenuText = tr("Datum Line Parameters"); } else if (o->is()) { datumType = QStringLiteral("Point"); datumText = QObject::tr("Point"); - datumMenuText = tr("Datum Point parameters"); + datumMenuText = tr("Datum Point Parameters"); } else if (o->is()) { datumType = QStringLiteral("CoordinateSystem"); datumText = QObject::tr("Coordinate System"); - datumMenuText = tr("Local Coordinate System parameters"); + datumMenuText = tr("Local Coordinate System Parameters"); } SoShapeHints* hints = new SoShapeHints(); @@ -226,7 +226,7 @@ bool ViewProviderDatum::isSelectable() const void ViewProviderDatum::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { QAction* act; - act = menu->addAction(QObject::tr("Edit datum"), receiver, member); + act = menu->addAction(QObject::tr("Edit Datum"), receiver, member); act->setData(QVariant((int)ViewProvider::Default)); // Call the extensions Gui::ViewProvider::setupContextMenu(menu, receiver, member); @@ -248,7 +248,7 @@ bool ViewProviderDatum::setEdit(int ModNum) if (dlg && !datumDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp b/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp index 2a9df97c34..a9dac19d63 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp @@ -39,7 +39,7 @@ const std::string & ViewProviderDraft::featureName() const { void ViewProviderDraft::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit draft")); + addDefaultAction(menu, QObject::tr("Edit Draft")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.h b/src/Mod/PartDesign/Gui/ViewProviderDraft.h index c1ae569e67..90aeae4c92 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDraft.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.h @@ -39,7 +39,7 @@ public: /// constructor ViewProviderDraft() { sPixmap = "PartDesign_Draft.svg"; - menuName = tr("Draft parameters"); } + menuName = tr("Draft Parameters"); } /// return "Draft" const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp index 7046c0a418..0e9f5c53b2 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp @@ -73,7 +73,7 @@ bool ViewProviderDressUp::setEdit(int ModNum) { } else { QMessageBox::warning ( nullptr, QObject::tr("Feature error"), QObject::tr("%1 misses a base feature.\n" - "This feature is broken and can't be edited.") + "This feature is broken and cannot be edited.") .arg( QString::fromLatin1(dressUp->getNameInDocument()) ) ); return false; diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp b/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp index 98eb04ae46..348dbcbc10 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp @@ -38,7 +38,7 @@ const std::string & ViewProviderFillet::featureName() const { void ViewProviderFillet::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit fillet")); + addDefaultAction(menu, QObject::tr("Edit Fillet")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.h b/src/Mod/PartDesign/Gui/ViewProviderFillet.h index c8fabd8ace..2ff681e3ad 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderFillet.h +++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.h @@ -38,7 +38,7 @@ public: /// constructor ViewProviderFillet() { sPixmap = "PartDesign_Fillet.svg"; - menuName = tr("Fillet parameters"); } + menuName = tr("Fillet Parameters"); } /// return "Fillet" const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp b/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp index f61857fa28..d6d498406e 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp @@ -43,7 +43,7 @@ ViewProviderGroove::~ViewProviderGroove() = default; void ViewProviderGroove::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit groove")); + addDefaultAction(menu, QObject::tr("Edit Groove")); PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp b/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp index 3bc6bf1f38..9d62d3b51c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp @@ -48,7 +48,7 @@ ViewProviderHelix::~ViewProviderHelix() = default; void ViewProviderHelix::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit helix")); + addDefaultAction(menu, QObject::tr("Edit Helix")); PartDesignGui::ViewProviderAddSub::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderHole.cpp b/src/Mod/PartDesign/Gui/ViewProviderHole.cpp index 9a1d48418e..2e5a011481 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHole.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderHole.cpp @@ -59,7 +59,7 @@ std::vector ViewProviderHole::claimChildren()const void ViewProviderHole::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit hole")); + addDefaultAction(menu, QObject::tr("Edit Hole")); PartGui::ViewProviderPart::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method } @@ -76,7 +76,7 @@ bool ViewProviderHole::setEdit(int ModNum) if (dlg && !holeDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp index 541eeda74c..49e311795f 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp @@ -36,7 +36,7 @@ TaskDlgFeatureParameters *ViewProviderLinearPattern::getEditDialog() { void ViewProviderLinearPattern::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit linear pattern")); + addDefaultAction(menu, QObject::tr("Edit Linear Pattern")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h index 96ad862036..eedbfb5e37 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderLinearPattern : public ViewProviderTransfo PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderLinearPattern); public: ViewProviderLinearPattern() - { menuName = tr("LinearPattern parameters"); + { menuName = tr("Linear Pattern Parameters"); sPixmap = "PartDesign_LinearPattern.svg"; } const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp index 6e11dbd4f3..792492eccb 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp @@ -63,7 +63,7 @@ std::vector ViewProviderLoft::claimChildren()const void ViewProviderLoft::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit loft")); + addDefaultAction(menu, QObject::tr("Edit Loft")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp index 26b2858bb8..804a005923 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp @@ -36,7 +36,7 @@ TaskDlgFeatureParameters *ViewProviderMirrored::getEditDialog() { void ViewProviderMirrored::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit mirrored")); + addDefaultAction(menu, QObject::tr("Edit Mirror")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h index cb6dd6a075..f0abf0e0a4 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderMirrored : public ViewProviderTransformed PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderMirrored); public: ViewProviderMirrored() { - menuName = tr("Mirrored parameters"); + menuName = tr("Mirror Parameters"); sPixmap = "PartDesign_Mirrored.svg"; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp index 19cc315638..2f9b6b3a11 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp @@ -45,7 +45,7 @@ const std::string & ViewProviderMultiTransform::featureName() const void ViewProviderMultiTransform::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit multi-transform")); + addDefaultAction(menu, QObject::tr("Edit Multi-Transform")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method } diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h index 1d6a532eea..1c1ce5c6a0 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderMultiTransform : public ViewProviderTransf PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderMultiTransform); public: ViewProviderMultiTransform() { - menuName = tr("MultiTransform parameters"); + menuName = tr("Multi-Transform Parameters"); sPixmap = "PartDesign_MultiTransform.svg"; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp index 8eb1955ebb..a3398d75a4 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp @@ -43,7 +43,7 @@ ViewProviderPad::~ViewProviderPad() = default; void ViewProviderPad::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit pad")); + addDefaultAction(menu, QObject::tr("Edit Pad")); PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp index 02bf485cd6..f8ffd26274 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp @@ -71,7 +71,7 @@ std::vector ViewProviderPipe::claimChildren()const void ViewProviderPipe::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit pipe")); + addDefaultAction(menu, QObject::tr("Edit Pipe")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp b/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp index 5114457c69..fa949627f1 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp @@ -45,7 +45,7 @@ ViewProviderPocket::~ViewProviderPocket() = default; void ViewProviderPocket::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit pocket")); + addDefaultAction(menu, QObject::tr("Edit Pocket")); PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp index 0cc0c85658..c94ad1ca6d 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp @@ -35,7 +35,7 @@ TaskDlgFeatureParameters *ViewProviderPolarPattern::getEditDialog() { void ViewProviderPolarPattern::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit polar pattern")); + addDefaultAction(menu, QObject::tr("Edit Polar Pattern")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h index 5d8a96769b..947eab2e13 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderPolarPattern : public ViewProviderTransfor PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderPolarPattern); public: ViewProviderPolarPattern() { - menuName = tr("PolarPattern parameters"); + menuName = tr("Polar Pattern Parameters"); sPixmap = "PartDesign_PolarPattern.svg"; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp index 2549e299b8..5fa3711bb3 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp @@ -52,7 +52,7 @@ void ViewProviderPrimitive::attach(App::DocumentObject* obj) { void ViewProviderPrimitive::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit primitive")); + addDefaultAction(menu, QObject::tr("Edit Primitive")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } @@ -67,7 +67,7 @@ bool ViewProviderPrimitive::setEdit(int ModNum) if (dlg && !primitiveDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp index 30cea1cf29..acd3c371eb 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp @@ -43,7 +43,7 @@ ViewProviderRevolution::~ViewProviderRevolution() = default; void ViewProviderRevolution::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit revolution")); + addDefaultAction(menu, QObject::tr("Edit Revolution")); PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp index 63b0158c8d..548ab64c94 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp @@ -36,7 +36,7 @@ TaskDlgFeatureParameters *ViewProviderScaled::getEditDialog() { void ViewProviderScaled::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit scaled")); + addDefaultAction(menu, QObject::tr("Edit Scale")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.h b/src/Mod/PartDesign/Gui/ViewProviderScaled.h index fe2628e81a..080a2cc4d3 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderScaled.h +++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.h @@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderScaled : public ViewProviderTransformed PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderScaled); public: ViewProviderScaled() { - menuName = tr("Scaled parameters"); + menuName = tr("Scale Parameters"); sPixmap = "PartDesign_Scaled.svg"; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp index 58b27f7177..f331a37283 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp @@ -94,7 +94,7 @@ bool ViewProviderShapeBinder::setEdit(int ModNum) { if (dlg && !sbDlg) { QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(QObject::tr("A dialog is already open in the task panel")); - msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?")); + msgBox.setInformativeText(QObject::tr("Close this dialog?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); int ret = msgBox.exec(); @@ -202,7 +202,7 @@ void ViewProviderShapeBinder::setupContextMenu(QMenu* menu, QObject* receiver, c Q_UNUSED(member) QAction* act; - act = menu->addAction(QObject::tr("Edit shape binder")); + act = menu->addAction(QObject::tr("Edit Shape Binder")); act->setData(QVariant((int)ViewProvider::Default)); Gui::ActionFunction* func = new Gui::ActionFunction(menu); @@ -316,7 +316,7 @@ void ViewProviderSubShapeBinder::setupContextMenu(QMenu* menu, QObject* receiver QAction* act; act = menu->addAction(QObject::tr("Synchronize"), receiver, member); act->setData(QVariant((int)Synchronize)); - act = menu->addAction(QObject::tr("Select bound object"), receiver, member); + act = menu->addAction(QObject::tr("Select Bound Object"), receiver, member); act->setData(QVariant((int)SelectObject)); ViewProviderPart::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp b/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp index 5866a58f08..e0f56e2e3a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp @@ -38,7 +38,7 @@ const std::string & ViewProviderThickness::featureName() const { void ViewProviderThickness::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - addDefaultAction(menu, QObject::tr("Edit thickness")); + addDefaultAction(menu, QObject::tr("Edit Thickness")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderThickness.h b/src/Mod/PartDesign/Gui/ViewProviderThickness.h index 177e7edeb5..d4e5e5d4b4 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderThickness.h +++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.h @@ -38,7 +38,7 @@ public: /// constructor ViewProviderThickness() { sPixmap = "PartDesign_Thickness.svg"; - menuName = tr("Thickness parameters"); } + menuName = tr("Thickness Parameters"); } /// return "Thickness" const std::string & featureName() const override; diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp index a29e63fdad..89763f4240 100644 --- a/src/Mod/PartDesign/Gui/Workbench.cpp +++ b/src/Mod/PartDesign/Gui/Workbench.cpp @@ -43,19 +43,20 @@ namespace sp = std::placeholders; qApp->translate("Workbench", "&Sketch"); // qApp->translate("Workbench", "&Part Design"); - qApp->translate("Workbench", "Create a datum"); - qApp->translate("Workbench", "Create an additive feature"); - qApp->translate("Workbench", "Create a subtractive feature"); - qApp->translate("Workbench", "Apply a pattern"); - qApp->translate("Workbench", "Apply a dress-up feature"); - qApp->translate("Workbench", "Sprocket..."); - qApp->translate("Workbench", "Involute gear..."); - qApp->translate("Workbench", "Shaft design wizard"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Face tools"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Edge tools"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Boolean tools"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Helper tools"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Modeling tools"); + qApp->translate("Workbench", "Datums"); + qApp->translate("Workbench", "Additive Features"); + qApp->translate("Workbench", "Subtractive Features"); + qApp->translate("Workbench", "Dress-Up Features"); + qApp->translate("Workbench", "Transformation Features"); + qApp->translate("Workbench", "Sprocket…"); + qApp->translate("Workbench", "Involute Gear"); + + qApp->translate("Workbench", "Shaft Design Wizard"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Face Tools"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Edge Tools"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Boolean Tools"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Helper Tools"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Modeling Tools"); qApp->translate("Gui::TaskView::TaskWatcherCommands", "Create Geometry"); // qApp->translate("Workbench", "Measure"); @@ -158,7 +159,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Part::Feature SUBELEMENT Vertex COUNT 1..", Vertex, - "Vertex tools", + "Vertex Tools", "PartDesign_Body" )); @@ -173,7 +174,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Part::Feature SUBELEMENT Edge COUNT 1..", Edge, - "Edge tools", + "Edge Tools", "PartDesign_Body" )); @@ -191,7 +192,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Part::Feature SUBELEMENT Face COUNT 1", Face, - "Face tools", + "Face Tools", "PartDesign_Body" )); @@ -201,7 +202,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Body COUNT 1", Body, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); @@ -211,7 +212,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Body COUNT 1..", Body2, - "Boolean tools", + "Boolean Tools", "PartDesign_Body" )); @@ -225,7 +226,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT App::Plane COUNT 1", Plane1, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); const char* Plane2[] = { @@ -238,7 +239,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Plane COUNT 1", Plane2, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); @@ -250,7 +251,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Line COUNT 1", Line, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); @@ -263,7 +264,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::Point COUNT 1", Point, - "Helper tools", + "Helper Tools", "PartDesign_Body" )); @@ -285,7 +286,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Part::Feature SUBELEMENT Face COUNT 2..", Faces, - "Face tools", + "Face Tools", "PartDesign_Body" )); @@ -306,7 +307,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT Sketcher::SketchObject COUNT 1", Sketch, - "Modeling tools", + "Modeling Tools", "PartDesign_Body" )); @@ -319,7 +320,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( "SELECT PartDesign::SketchBased", Transformed, - "Transformation tools", + "Transformation Tools", "PartDesign_MultiTransform" )); @@ -361,7 +362,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // additives Gui::MenuItem* additives = new Gui::MenuItem; - additives->setCommand("Create an additive feature"); + additives->setCommand("Additive Features"); *additives << "PartDesign_Pad" << "PartDesign_Revolution" @@ -371,7 +372,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // subtractives Gui::MenuItem* subtractives = new Gui::MenuItem; - subtractives->setCommand("Create a subtractive feature"); + subtractives->setCommand("Subtractive Features"); *subtractives << "PartDesign_Pocket" << "PartDesign_Hole" @@ -382,7 +383,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // transformations Gui::MenuItem* transformations = new Gui::MenuItem; - transformations->setCommand("Apply a pattern"); + transformations->setCommand("Transformation Features"); *transformations << "PartDesign_Mirrored" << "PartDesign_LinearPattern" @@ -391,7 +392,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // dressups Gui::MenuItem* dressups = new Gui::MenuItem; - dressups->setCommand("Apply a dress-up feature"); + dressups->setCommand("Dress-Up Features"); *dressups << "PartDesign_Fillet" << "PartDesign_Chamfer" @@ -410,15 +411,15 @@ Gui::MenuItem* Workbench::setupMenuBar() const << subtractives << "PartDesign_CompPrimitiveSubtractive" << "Separator" + << dressups + << "Separator" << transformations << "Separator" - << dressups + << "PartDesign_Boolean" << "Separator" << "Materials_InspectAppearance" << "Materials_InspectMaterial" << "Separator" - << "PartDesign_Boolean" - << "Separator" << "Part_CheckGeometry" << "Separator" << "PartDesign_InvoluteGear" @@ -452,7 +453,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const { Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* part = new Gui::ToolBarItem(root); - part->setCommand("Part Design Helper"); + part->setCommand("Part Design Helper Features"); *part << "PartDesign_Body" << "PartDesign_CompSketches" @@ -462,7 +463,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "PartDesign_Clone"; part = new Gui::ToolBarItem(root); - part->setCommand("Part Design Modeling"); + part->setCommand("Part Design Modeling Features"); *part << "PartDesign_Pad" << "PartDesign_Revolution" @@ -483,14 +484,14 @@ Gui::ToolBarItem* Workbench::setupToolBars() const part = new Gui::ToolBarItem(root); - part->setCommand("Part Design Dressup"); + part->setCommand("Part Design Dress-Up Features"); *part << "PartDesign_Fillet" << "PartDesign_Chamfer" << "PartDesign_Draft" << "PartDesign_Thickness"; part = new Gui::ToolBarItem(root); - part->setCommand("Part Design Patterns"); + part->setCommand("Part Design Transformation Features"); *part << "PartDesign_Mirrored" << "PartDesign_LinearPattern" diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.cpp b/src/Mod/PartDesign/Gui/WorkflowManager.cpp index 83ffff7592..443bb62a7b 100644 --- a/src/Mod/PartDesign/Gui/WorkflowManager.cpp +++ b/src/Mod/PartDesign/Gui/WorkflowManager.cpp @@ -138,16 +138,16 @@ Workflow WorkflowManager::determineWorkflow(App::Document *doc) { if ( rv == Workflow::Legacy ) { // legacy messages msgBox.setText( QObject::tr( "The document \"%1\" you are editing was designed with an old version of " - "PartDesign workbench." ).arg( QString::fromStdString ( doc->getName()) ) ); + "Part Design workbench." ).arg( QString::fromStdString ( doc->getName()) ) ); msgBox.setInformativeText ( - QObject::tr( "Do you want to migrate in order to use modern PartDesign features?" ) ); + QObject::tr( "Migrate in order to use modern Part Design features?" ) ); } else { // The document is already in the middle of migration msgBox.setText( QObject::tr( "The document \"%1\" seems to be either in the middle of" - " the migration process from legacy PartDesign or have a slightly broken structure." + " the migration process from legacy Part Design or have a slightly broken structure." ).arg( QString::fromStdString ( doc->getName()) ) ); msgBox.setInformativeText ( - QObject::tr( "Do you want to make the migration automatically?" ) ); + QObject::tr( "Make the migration automatically?" ) ); } msgBox.setDetailedText( QObject::tr( "Note: If you choose to migrate you won't be able to edit" " the file with an older FreeCAD version.\n" @@ -158,7 +158,7 @@ Workflow WorkflowManager::determineWorkflow(App::Document *doc) { msgBox.setIcon( QMessageBox::Question ); QPushButton * yesBtn = msgBox.addButton ( QMessageBox::Yes ); QPushButton * manuallyBtn = msgBox.addButton ( - QObject::tr ( "Migrate manually" ), QMessageBox::YesRole ); + QObject::tr ( "Migrate Manually" ), QMessageBox::YesRole ); // If it is already a document in the middle of the migration the user shouldn't refuse to migrate if ( rv != Workflow::Undetermined ) { diff --git a/src/Mod/PartDesign/InvoluteGearFeature.py b/src/Mod/PartDesign/InvoluteGearFeature.py index cd6f03d775..3a5a25e13a 100644 --- a/src/Mod/PartDesign/InvoluteGearFeature.py +++ b/src/Mod/PartDesign/InvoluteGearFeature.py @@ -55,9 +55,9 @@ class CommandInvoluteGear: "GUI command to create an InvoluteGear" def GetResources(self): return {'Pixmap' : 'PartDesign_InternalExternalGear', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Involute gear..."), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Involute Gear"), 'Accel': "", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Creates or edit the involute gear definition.")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Creates or edits the involute gear definition")} def Activated(self): FreeCAD.ActiveDocument.openTransaction("Create involute gear") diff --git a/src/Mod/PartDesign/InvoluteGearFeature.ui b/src/Mod/PartDesign/InvoluteGearFeature.ui index 91749efd95..dd57d50f88 100644 --- a/src/Mod/PartDesign/InvoluteGearFeature.ui +++ b/src/Mod/PartDesign/InvoluteGearFeature.ui @@ -11,13 +11,13 @@ - Involute parameter + Involute Parameter - Number of teeth: + Number of teeth @@ -37,7 +37,7 @@ - Module: + Module @@ -81,7 +81,7 @@ - Pressure angle: + Pressure angle @@ -122,7 +122,7 @@ - High precision: + High precision @@ -149,7 +149,7 @@ - External gear: + External gear @@ -176,7 +176,7 @@ - Addendum Coefficient + Addendum coefficient @@ -196,7 +196,7 @@ - Dedendum Coefficient + Dedendum coefficient @@ -216,7 +216,7 @@ - Root Fillet Coefficient + Root fillet coefficient @@ -236,7 +236,7 @@ - Profile Shift Coefficient + Profile shift coefficient diff --git a/src/Mod/PartDesign/Scripts/Gear.py b/src/Mod/PartDesign/Scripts/Gear.py index 8812757cf1..d357b52e34 100644 --- a/src/Mod/PartDesign/Scripts/Gear.py +++ b/src/Mod/PartDesign/Scripts/Gear.py @@ -42,7 +42,7 @@ def compute(): j = float(l6.text())*m # standard value 0,015 - 0,04*m width = float(l7.text()) # gear width except ValueError: - FreeCAD.Console.PrintError("Wrong input! Only numbers allowed...\n") + FreeCAD.Console.PrintError("Wrong input! Only numbers allowed.\n") # tooth height diff --git a/src/Mod/PartDesign/SprocketFeature.py b/src/Mod/PartDesign/SprocketFeature.py index 530b819403..35afaace08 100644 --- a/src/Mod/PartDesign/SprocketFeature.py +++ b/src/Mod/PartDesign/SprocketFeature.py @@ -59,9 +59,9 @@ class CommandSprocket: def GetResources(self): return {'Pixmap' : 'PartDesign_Sprocket', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Sprocket..."), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Sprocket"), 'Accel': "", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Creates or edit the sprocket definition.")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Creates or edits the sprocket definition.")} def Activated(self): diff --git a/src/Mod/PartDesign/SprocketFeature.ui b/src/Mod/PartDesign/SprocketFeature.ui index d33e4f37ec..99157c292e 100644 --- a/src/Mod/PartDesign/SprocketFeature.ui +++ b/src/Mod/PartDesign/SprocketFeature.ui @@ -11,7 +11,7 @@ - Sprocket parameters + Sprocket Parameters @@ -23,7 +23,7 @@ - Number of teeth: + Number of teeth @@ -49,7 +49,7 @@ - Sprocket Reference + Sprocket reference @@ -133,12 +133,12 @@ - Bicycle with Derailleur + Bicycle with derailleur - Bicycle without Derailleur + Bicycle without derailleur @@ -216,7 +216,7 @@ - Chain Pitch: + Chain pitch @@ -263,7 +263,7 @@ - Chain Roller Diameter: + Chain roller diameter @@ -307,7 +307,7 @@ - Tooth Width: + Tooth width diff --git a/src/Mod/PartDesign/WizardShaft/Shaft.py b/src/Mod/PartDesign/WizardShaft/Shaft.py index 14f50a0e2d..fc3be14aba 100644 --- a/src/Mod/PartDesign/WizardShaft/Shaft.py +++ b/src/Mod/PartDesign/WizardShaft/Shaft.py @@ -160,7 +160,7 @@ class Shaft: return self.segments[index].constraint def updateEdge(self, column, start): - App.Console.PrintMessage("Not implemented yet - waiting for robust references...") + App.Console.PrintMessage("Not implemented yet - waiting for robust references…") return """ if self.sketchClosed is not True: diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.py b/src/Mod/PartDesign/WizardShaft/WizardShaft.py index 412afe4d2c..2bdeca69bf 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaft.py +++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.py @@ -101,8 +101,8 @@ class TaskWizardShaft: except ImportError as e: msgBox = QtGui.QMessageBox() msgBox.setIcon(msgBox.Information) - msgBox.setWindowTitle(translate("TaskWizardShaft", "Missing module")) - msgBox.setText(translate("TaskWizardShaft", "You may have to install the Plot add-on")) + msgBox.setWindowTitle(translate("TaskWizardShaft", "Missing Module")) + msgBox.setText(translate("TaskWizardShaft", "The Plot add-on is not installed. Install it to enable this feature.")) msgBox.setDetailedText(traceback.format_exc()) msgBox.exec_() def slotAllx(self): @@ -185,8 +185,8 @@ class WizardShaftGui: def GetResources(self): IconPath = FreeCAD.ConfigGet("AppHomePath") + "Mod/PartDesign/WizardShaft/WizardShaft.svg" - MenuText = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Shaft design wizard...") - ToolTip = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Start the shaft design wizard") + MenuText = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Shaft Design Wizard") + ToolTip = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Starts the shaft design wizard") return {'Pixmap': IconPath, 'MenuText': MenuText, 'ToolTip': ToolTip} diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py index 991afd05e2..67916e5244 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py +++ b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py @@ -61,7 +61,7 @@ class WizardShaftTable: # Create table widget self.widget = QtGui.QTableWidget(len(self.rowDict), 0) self.widget.setObjectName("ShaftWizardTable") # Do not change or translate: Used in ViewProviderFemConstraintXXX - self.widget.setWindowTitle(translate("WizardShaftTable", "Shaft wizard")) + self.widget.setWindowTitle(translate("WizardShaftTable", "Shaft Wizard")) self.widget.resize(QtCore.QSize(300,200)) self.editedRow = None self.editedColumn = None diff --git a/src/Mod/PartDesign/fcsprocket/fcsprocketdialog.py b/src/Mod/PartDesign/fcsprocket/fcsprocketdialog.py index 18fcddf621..455ade00b1 100644 --- a/src/Mod/PartDesign/fcsprocket/fcsprocketdialog.py +++ b/src/Mod/PartDesign/fcsprocket/fcsprocketdialog.py @@ -44,7 +44,7 @@ class SprocketDialog(qt.QDialog): l = qt.QVBoxLayout(self) l.addWidget(self.gc) l.addWidget(buttonBox) - self.setWindowTitle('Sprocket creation dialog') + self.setWindowTitle('Sprocket Creation Dialog') def accept(self): if FreeCAD.ActiveDocument is None: diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 661321d07b..36929ba8cc 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -436,7 +436,7 @@ CmdSketcherReorientSketch::CmdSketcherReorientSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Reorient Sketch…"); + sMenuText = QT_TR_NOOP("Reorient Sketch"); sToolTipText = QT_TR_NOOP("Places the selected sketch on one of the global coordinate planes.\n" "This will clear the AttachmentSupport property."); sWhatsThis = "Sketcher_ReorientSketch"; @@ -573,7 +573,7 @@ CmdSketcherMapSketch::CmdSketcherMapSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Attach Sketch…"); + sMenuText = QT_TR_NOOP("Attach Sketch"); sToolTipText = QT_TR_NOOP( "Attaches a sketch to the selected geometry element"); sWhatsThis = "Sketcher_MapSketch"; @@ -829,7 +829,7 @@ CmdSketcherValidateSketch::CmdSketcherValidateSketch() { sAppModule = "Sketcher"; sGroup = "Sketcher"; - sMenuText = QT_TR_NOOP("Validate Sketch…"); + sMenuText = QT_TR_NOOP("Validate Sketch"); sToolTipText = QT_TR_NOOP("Validates a sketch by checking for missing coincidences,\n" "invalid constraints, and degenerate geometry"); sWhatsThis = "Sketcher_ValidateSketch"; diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.ui b/src/Mod/Sketcher/Gui/SketcherSettings.ui index 37d3e1c9db..3ccac90e36 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettings.ui @@ -126,7 +126,7 @@ Requires to re-enter edit mode to take effect. Allows to leave the sketch edit mode by pressing the Esc key - Esc can leave sketch edit mode + Esc key can leave sketch edit mode true @@ -145,7 +145,7 @@ Requires to re-enter edit mode to take effect. Notifies about automatic constraint substitutions - Notify automatic constraint substitutions + Notify about automatic constraint substitutions true @@ -183,7 +183,7 @@ Requires to re-enter edit mode to take effect. Unifies the horizontal and vertical constraints to an automatic command - Auto tool for horizontal/vertical constraints + Unified tool for automatic horizontal/vertical constraints true @@ -221,7 +221,7 @@ Requires to re-enter edit mode to take effect. Always adds external geometry as construction geometry. Otherwise, it is added according to the current construction mode. - Always add external geometry as reference + Always add external geometry as construction false diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp index 945d83dfef..ad0d03a09a 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp @@ -41,7 +41,7 @@ using namespace Gui::TaskView; namespace sp = std::placeholders; TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch* sketchView) - : TaskBox(Gui::BitmapFactory().pixmap("Sketcher_Sketch"), tr("Solver messages"), true, nullptr) + : TaskBox(Gui::BitmapFactory().pixmap("Sketcher_Sketch"), tr("Solver Messages"), true, nullptr) , sketchView(sketchView) , ui(new Ui_TaskSketcherMessages) { @@ -96,7 +96,7 @@ TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch* sketchView) sketchView->getSketchObject()->noRecomputes = !state; - QAction* action = new QAction(tr("Auto Update"), this); + QAction* action = new QAction(tr("Auto-update"), this); action->setToolTip(tr("Executes a recomputation of active document after every sketch action")); action->setCheckable(true); action->setChecked(state); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp index 050e279125..25e76254c3 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp @@ -55,7 +55,7 @@ using namespace Gui::TaskView; TaskSketcherSolverAdvanced::TaskSketcherSolverAdvanced(ViewProviderSketch* sketchView) : TaskBox(Gui::BitmapFactory().pixmap("document-new"), - tr("Advanced solver control"), + tr("Advanced Solver Controls"), true, nullptr) , sketchView(sketchView) diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui index ffbabb9a5e..b69fa653bb 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui @@ -619,7 +619,7 @@ Eigen Sparse QR algorithm is optimized for sparse matrices; usually faster - Iteration Level + Iteration level diff --git a/src/Mod/TechDraw/App/AppTechDraw.cpp b/src/Mod/TechDraw/App/AppTechDraw.cpp index a4a5435119..da18f26aba 100644 --- a/src/Mod/TechDraw/App/AppTechDraw.cpp +++ b/src/Mod/TechDraw/App/AppTechDraw.cpp @@ -82,7 +82,7 @@ PyMOD_INIT_FUNC(TechDraw) PyMOD_Return(nullptr); } PyObject* mod = TechDraw::initModule(); - Base::Console().log("Loading TechDraw module... done\n"); + Base::Console().log("Loading TechDraw module… done\n"); TechDraw::DrawPage ::init(); TechDraw::DrawView ::init(); diff --git a/src/Mod/TechDraw/App/ArrowPropEnum.cpp b/src/Mod/TechDraw/App/ArrowPropEnum.cpp index 858eb84d0d..ee9d86a743 100644 --- a/src/Mod/TechDraw/App/ArrowPropEnum.cpp +++ b/src/Mod/TechDraw/App/ArrowPropEnum.cpp @@ -29,13 +29,13 @@ namespace TechDraw { const int ArrowPropEnum::ArrowCount = 8; const char* ArrowPropEnum::ArrowTypeEnums[]= { - QT_TRANSLATE_NOOP("ArrowPropEnum", "Filled Arrow"), - QT_TRANSLATE_NOOP("ArrowPropEnum", "Open Arrow"), + QT_TRANSLATE_NOOP("ArrowPropEnum", "Filled arrow"), + QT_TRANSLATE_NOOP("ArrowPropEnum", "Open arrow"), QT_TRANSLATE_NOOP("ArrowPropEnum", "Tick"), QT_TRANSLATE_NOOP("ArrowPropEnum", "Dot"), - QT_TRANSLATE_NOOP("ArrowPropEnum", "Open Circle"), + QT_TRANSLATE_NOOP("ArrowPropEnum", "Open circle"), QT_TRANSLATE_NOOP("ArrowPropEnum", "Fork"), - QT_TRANSLATE_NOOP("ArrowPropEnum", "Filled Triangle"), + QT_TRANSLATE_NOOP("ArrowPropEnum", "Filled triangle"), QT_TRANSLATE_NOOP("ArrowPropEnum", "None"), nullptr}; diff --git a/src/Mod/TechDraw/App/CenterLinePyImp.cpp b/src/Mod/TechDraw/App/CenterLinePyImp.cpp index 28aa49a4e2..8e66c1496e 100644 --- a/src/Mod/TechDraw/App/CenterLinePyImp.cpp +++ b/src/Mod/TechDraw/App/CenterLinePyImp.cpp @@ -43,7 +43,7 @@ PyObject *CenterLinePy::PyMake(struct _typeobject *, PyObject *, PyObject *) // { // never create such objects with the constructor PyErr_SetString(PyExc_RuntimeError, - "You cannot create an instance of the abstract class 'CenterLine'."); + "Cannot create an instance of the abstract class 'CenterLine'."); return nullptr; } diff --git a/src/Mod/TechDraw/App/DrawBrokenView.cpp b/src/Mod/TechDraw/App/DrawBrokenView.cpp index a709bbc74e..f2dec32b9f 100644 --- a/src/Mod/TechDraw/App/DrawBrokenView.cpp +++ b/src/Mod/TechDraw/App/DrawBrokenView.cpp @@ -111,18 +111,18 @@ PROPERTY_SOURCE(TechDraw::DrawBrokenView, TechDraw::DrawViewPart) DrawBrokenView::DrawBrokenView() { - static const char* sgroup = "Broken View"; + static const char* sgroup = "Broken view"; constexpr double DefaultGapSizeMm{10.0}; ADD_PROPERTY_TYPE(Breaks, (nullptr), sgroup, App::Prop_None, - "Objects in the 3d view that define the start/end points and direction of breaks in this view."); + "Objects in the 3D view that define the start/end points and direction of breaks in this view."); Breaks.setScope(App::LinkScope::Global); Breaks.setAllowExternal(true); ADD_PROPERTY_TYPE(Gap, (DefaultGapSizeMm), sgroup, App::Prop_None, - "The separation distance for breaks in this view (unscaled 3d length)."); + "The separation distance for breaks in this view (unscaled 3D length)."); } @@ -557,7 +557,7 @@ std::pair DrawBrokenView::breakBoundsFromEdge(co } if (!DU::fpCompare(fabs(direction.Dot(stdY)), 1.0, EWTOLERANCE) ) { - Base::Console().message("DBV::breakBoundsFromEdge - direction is not X or Y\n"); + Base::Console().message("DBV::breakBoundsFromEdge - direction is neither X nor Y\n"); // TODO: throw? return nonsense? } diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp index fd100ed107..cfba4307fc 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp @@ -508,7 +508,7 @@ int DrawProjGroup::removeProjection(const char* viewProjType) // TODO: shouldn't be able to delete "Front" unless deleting whole group if (checkViewProjType(viewProjType)) { if (!hasProjection(viewProjType)) { - throw Base::RuntimeError("The projection doesn't exist in the group"); + throw Base::RuntimeError("The projection does not exist in the group"); } // Iterate through the child views and find the projection type diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp index 4150d95230..e004bdc555 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp @@ -206,7 +206,7 @@ bool DrawSVGTemplate::getTemplateDocument(std::string sourceFile, QDomDocument& } QFile templateFile(QString::fromStdString(sourceFile)); if (!templateFile.open(QIODevice::ReadOnly)) { - Base::Console().error("DrawSVGTemplate::processTemplate can't read embedded template %s!\n", PageResult.getValue()); + Base::Console().error("DrawSVGTemplate::processTemplate cannot read embedded template %s!\n", PageResult.getValue()); return false; } diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index 3ab0f9fdbc..94d8b2021e 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -118,7 +118,7 @@ DrawViewPart::DrawViewPart() ADD_PROPERTY_TYPE(XSource, (nullptr), group, App::Prop_None, "External 3D Shape to view"); ADD_PROPERTY_TYPE(Direction, (0.0, -1.0, 0.0), group, App::Prop_None, - "Projection Plane normal. The direction you are looking from."); + "Projection Plane normal. View direction for the projection plane"); ADD_PROPERTY_TYPE(XDirection, (1.0, 0.0, 0.0), group, App::Prop_None, "Projection Plane X Axis in R3. Rotates/Mirrors View"); ADD_PROPERTY_TYPE(Perspective, (false), group, App::Prop_None, @@ -562,7 +562,7 @@ void DrawViewPart::findFacesNew(const std::vector &goEdges) if (sortedWires.empty()) { Base::Console().warning( - "DVP::findFacesNew - %s - Can't make faces from projected edges\n", + "DVP::findFacesNew - %s - Cannot make faces from projected edges\n", getNameInDocument()); } else { @@ -685,7 +685,7 @@ void DrawViewPart::findFacesOld(const std::vector &goEdges) sortedWires = eWalker.execute(newEdges); if (sortedWires.empty()) { Base::Console().warning( - "DVP::findFacesOld - %s -Can't make faces from projected edges\n", + "DVP::findFacesOld - %s -Cannott make faces from projected edges\n", getNameInDocument()); return; } diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp index d3edfc3bde..5ee2e558c6 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.cpp +++ b/src/Mod/TechDraw/App/DrawViewSection.cpp @@ -558,7 +558,7 @@ void DrawViewSection::makeSectionCut(const TopoDS_Shape& baseShape) testBox.SetGap(0.0); if (testBox.IsVoid()) {// prism & input don't intersect. rawShape is // garbage, don't bother. - Base::Console().warning("DVS::makeSectionCut - prism & input don't intersect - %s\n", + Base::Console().warning("DVS::makeSectionCut - prism & input don not intersect - %s\n", Label.getValue()); return; } diff --git a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp index 2473b6d532..d786a747f1 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp @@ -57,7 +57,7 @@ PyObject* DrawViewSymbolPy::dumpSymbol(PyObject *args) if (outfile.good()) { outfile.close(); } else { - std::string error = std::string("Can't write "); + std::string error = std::string("Cannot write"); error += fileSpec; PyErr_SetString(PyExc_RuntimeError, error.c_str()); return nullptr; diff --git a/src/Mod/TechDraw/ConversionUtilities/moveViews.py b/src/Mod/TechDraw/ConversionUtilities/moveViews.py index 8313afb6e9..500b25e057 100644 --- a/src/Mod/TechDraw/ConversionUtilities/moveViews.py +++ b/src/Mod/TechDraw/ConversionUtilities/moveViews.py @@ -43,7 +43,7 @@ def moveViews(): s = FreeCADGui.Selection.getSelection() if len(s) != 2: - print("Please select 1 Drawing Page and 1 TechDraw Page") + print("Select 1 drawing page and 1 TechDraw page") return print("First object in selection is a: ", s[0].TypeId) @@ -59,7 +59,7 @@ def moveViews(): tPage = s[0] dPage = s[1] else: - print("Please select 1 Drawing Page and 1 TechDraw Page") + print("Select 1 drawing page and 1 TechDraw page") return for o in dPage.OutList: diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp index ec0172c29e..b29b9b35d2 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp @@ -121,7 +121,7 @@ PyMOD_INIT_FUNC(TechDrawGui) } PyObject* mod = TechDrawGui::initModule(); - Base::Console().log("Loading TechDrawGui module... done\n"); + Base::Console().log("Loading TechDrawGui module… done\n"); // instantiating the commands CreateTechDrawCommands(); diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index 23dc276c78..afbd3469c4 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -107,8 +107,8 @@ CmdTechDrawPageDefault::CmdTechDrawPageDefault() : Command("TechDraw_PageDefault { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Default Page"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("New Page"); + sToolTipText = QT_TR_NOOP("Creates a new page with the default template"); sWhatsThis = "TechDraw_PageDefault"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_PageDefault"; @@ -167,8 +167,8 @@ CmdTechDrawPageTemplate::CmdTechDrawPageTemplate() : Command("TechDraw_PageTempl { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Page using Template"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("New Page From Template"); + sToolTipText = QT_TR_NOOP("Creates a new page from a custom template"); sWhatsThis = "TechDraw_PageTemplate"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_PageTemplate"; @@ -180,7 +180,7 @@ void CmdTechDrawPageTemplate::activated(int iMsg) QString work_dir = Gui::FileDialog::getWorkingDirectory(); QString templateDir = Preferences::defaultTemplateDir(); QString templateFileName = Gui::FileDialog::getOpenFileName( - Gui::getMainWindow(), QString::fromUtf8(QT_TR_NOOP("Select a Template File")), templateDir, + Gui::getMainWindow(), QString::fromUtf8(QT_TR_NOOP("Select a template file")), templateDir, QString::fromUtf8(QT_TR_NOOP("Template (*.svg)"))); Gui::FileDialog::setWorkingDirectory(work_dir);// Don't overwrite WD with templateDir @@ -237,7 +237,7 @@ CmdTechDrawRedrawPage::CmdTechDrawRedrawPage() : Command("TechDraw_RedrawPage") sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Redraw Page"); - sToolTipText = sMenuText; + sToolTipText = QT_TR_NOOP("Redraws the current page"); sWhatsThis = "TechDraw_RedrawPage"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_RedrawPage"; @@ -273,7 +273,7 @@ CmdTechDrawPrintAll::CmdTechDrawPrintAll() : Command("TechDraw_PrintAll") sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Print All Pages"); - sToolTipText = sMenuText; + sToolTipText = QT_TR_NOOP("Prints all pages with the print dialog"); sWhatsThis = "TechDraw_PrintAll"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_PrintAll"; @@ -297,10 +297,11 @@ CmdTechDrawView::CmdTechDrawView() : Command("TechDraw_View") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert View"); - sToolTipText = QT_TR_NOOP("Insert a View in current page.\n" - "Selected objects, spreadsheets or BIM section planes will be added.\n" - "Without a selection, a file browser lets you select a SVG or image file."); + sMenuText = QT_TR_NOOP("New View"); + sToolTipText = QT_TR_NOOP( + "Inserts a new view into the current page based on the selected object in the tree view " + "or 3D view.\n" + "If no object is selected, a file browser opens to select an SVG or image file."); sWhatsThis = "TechDraw_View"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_View"; @@ -423,7 +424,9 @@ void CmdTechDrawView::activated(int iMsg) // If nothing was selected, then we offer to insert SVG or Images files. bool dontShowAgain = hGrp->GetBool("DontShowInsertFileMessage", false); if (!dontShowAgain) { - auto msgText = QObject::tr("If you want to insert a view from existing objects, please select them before invoking this tool. Without a selection, a file browser will open, to insert a SVG or image file."); + auto msgText = QObject::tr("to insert a view from existing objects, " + "select them before invoking this tool. Without a selection, a " + "file browser will open to insert a SVG or image file."); QMessageBox msgBox(Gui::getMainWindow()); msgBox.setText(msgText); auto dontShowMsg = QObject::tr("Do not show this message again"); @@ -476,7 +479,7 @@ void CmdTechDrawView::activated(int iMsg) std::string FeatName = getUniqueObjectName("Image"); filename = Base::Tools::escapeEncodeFilename(filename); auto filespec = DU::cleanFilespecBackslash(filename.toStdString()); - openCommand(QT_TRANSLATE_NOOP("Command", "Create Image")); + openCommand(QT_TRANSLATE_NOOP("Command", "Create image")); doCommand(Doc, "App.activeDocument().addObject('TechDraw::DrawViewImage', '%s')", FeatName.c_str()); doCommand(Doc, "App.activeDocument().%s.translateLabel('DrawViewImage', 'Image', '%s')", FeatName.c_str(), FeatName.c_str()); @@ -544,8 +547,8 @@ CmdTechDrawBrokenView::CmdTechDrawBrokenView() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Broken View"); - sToolTipText = QT_TR_NOOP("Insert Broken View"); + sMenuText = QT_TR_NOOP("Broken View"); + sToolTipText = QT_TR_NOOP("Inserts a new broken view for the selected objects or base view and break definition objects"); sWhatsThis = "TechDraw_BrokenView"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_BrokenView"; @@ -587,7 +590,7 @@ void CmdTechDrawBrokenView::activated(int iMsg) // we need either a base view (dvp) or some shape objects in the selection if (!dvp && (shapes.empty() && xShapes.empty())) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Empty selection"), - QObject::tr("Please select objects to break or a base view and break definition objects.")); + QObject::tr("Select objects to break or a base view and break definition objects")); return; } @@ -626,7 +629,7 @@ void CmdTechDrawBrokenView::activated(int iMsg) } if (breakObjects.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("No Break objects found in this selection")); + QObject::tr("No break objects found in this selection")); return; } @@ -636,7 +639,7 @@ void CmdTechDrawBrokenView::activated(int iMsg) if (shapes.empty() && xShapes.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("No Shapes, Groups or Links in this selection")); + QObject::tr("No shapes, groups, or links in this selection")); return; } @@ -693,9 +696,9 @@ CmdTechDrawActiveView::CmdTechDrawActiveView() : Command("TechDraw_ActiveView") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Active View"); - sToolTipText = "Insert an image of the active 3D model in current page.\n" - "If multiple 3D models are active, a selection dialog will be shown."; + sMenuText = QT_TR_NOOP("Active View"); + sToolTipText = "Inserts an image of the open 3D view in the current page.\n" + "If multiple 3D views are open, a selection dialog will be shown."; sWhatsThis = "TechDraw_ActiveView"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ActiveView"; @@ -724,8 +727,8 @@ CmdTechDrawSectionGroup::CmdTechDrawSectionGroup() : Command("TechDraw_SectionGr { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert a simple or complex Section View"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Section View (Simple or Complex)"); + sToolTipText = QT_TR_NOOP("Inserts a simple or complex section view in the current page"); sWhatsThis = "TechDraw_SectionGroup"; sStatusTip = sToolTipText; } @@ -735,8 +738,8 @@ void CmdTechDrawSectionGroup::activated(int iMsg) // Base::Console().message("CMD::SectionGrp - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -790,12 +793,12 @@ void CmdTechDrawSectionGroup::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdTechDrawSectionGroup", "Section View")); - arc1->setToolTip(QApplication::translate("TechDraw_SectionView", "Insert simple Section View")); + 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->setToolTip( - QApplication::translate("TechDraw_ComplexSection", "Insert complex Section View")); + QApplication::translate("TechDraw_ComplexSection", "Inserts a complex section view")); arc2->setStatusTip(arc2->toolTip()); } @@ -816,8 +819,8 @@ CmdTechDrawSectionView::CmdTechDrawSectionView() : Command("TechDraw_SectionView { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Section View"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Section View"); + sToolTipText = QT_TR_NOOP("Inserts a new section view based on the selected view in the current page"); sWhatsThis = "TechDraw_SectionView"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_SectionView"; @@ -828,8 +831,8 @@ void CmdTechDrawSectionView::activated(int iMsg) Q_UNUSED(iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -853,7 +856,7 @@ void execSimpleSection(Gui::Command* cmd) cmd->getSelection().getObjectsOfType(TechDraw::DrawViewPart::getClassTypeId()); if (baseObj.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select at least 1 DrawViewPart object as Base.")); + QObject::tr("Select at least 1 DrawViewPart object as base")); return; } @@ -879,8 +882,8 @@ CmdTechDrawComplexSection::CmdTechDrawComplexSection() : Command("TechDraw_Compl { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Complex Section View"); - sToolTipText = QT_TR_NOOP("Insert a Complex Section View"); + sMenuText = QT_TR_NOOP("Complex Section View"); + sToolTipText = QT_TR_NOOP("Inserts a complex section view based on the selected view in the current page"); sWhatsThis = "TechDraw_ComplexSection"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ComplexSection"; @@ -891,8 +894,8 @@ void CmdTechDrawComplexSection::activated(int iMsg) Q_UNUSED(iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -970,14 +973,14 @@ void execComplexSection(Gui::Command* cmd) if (!baseView) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("I do not know what base view to use.")); + QObject::tr("No base view selected")); return; } if (shapes.empty() && xShapes.empty() && !baseView) { QMessageBox::warning( Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("No Base View, Shapes, Groups or Links in this selection")); + QObject::tr("No base view, shapes, groups, or links in this selection")); return; } if (!profileObject) { @@ -1005,8 +1008,8 @@ CmdTechDrawDetailView::CmdTechDrawDetailView() : Command("TechDraw_DetailView") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Detail View"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Detail View"); + sToolTipText = QT_TR_NOOP("Inserts a new detail view based on the selected view in the current page"); sWhatsThis = "TechDraw_DetailView"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_DetailView"; @@ -1020,7 +1023,7 @@ void CmdTechDrawDetailView::activated(int iMsg) getSelection().getObjectsOfType(TechDraw::DrawViewPart::getClassTypeId()); if (baseObj.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select at least 1 DrawViewPart object as Base.")); + QObject::tr("Select at least 1 DrawViewPart object as base")); return; } TechDraw::DrawViewPart* dvp = static_cast(*(baseObj.begin())); @@ -1049,8 +1052,8 @@ CmdTechDrawProjectionGroup::CmdTechDrawProjectionGroup() : Command("TechDraw_Pro { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Projection Group"); - sToolTipText = QT_TR_NOOP("Insert multiple linked views of drawable object(s)"); + sMenuText = QT_TR_NOOP("Projection Group"); + sToolTipText = QT_TR_NOOP("Inserts multiple new linked views of the selected objects in the current page"); sWhatsThis = "TechDraw_ProjectionGroup"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ProjectionGroup"; @@ -1119,7 +1122,7 @@ void CmdTechDrawProjectionGroup::activated(int iMsg) } if (shapes.empty() && xShapes.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("No Shapes, Groups or Links in this selection")); + QObject::tr("No shapes, groups, or links in this selection")); return; } @@ -1132,7 +1135,7 @@ void CmdTechDrawProjectionGroup::activated(int iMsg) Base::Vector3d projDir; Gui::WaitCursor wc; - openCommand(QT_TRANSLATE_NOOP("Command", "Create Projection Group")); + openCommand(QT_TRANSLATE_NOOP("Command", "Create projection group")); std::string multiViewName = getUniqueObjectName("ProjGroup"); doCommand(Doc, "App.activeDocument().addObject('TechDraw::DrawProjGroup', '%s')", @@ -1202,7 +1205,7 @@ bool _checkSelectionBalloon(Gui::Command* cmd, unsigned maxObjs) cmd->getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); if (pages.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("Create a page first.")); + QObject::tr("Create a page first")); return false; } return true; @@ -1214,7 +1217,7 @@ bool _checkDrawViewPartBalloon(Gui::Command* cmd) auto objFeat(dynamic_cast(selection[0].getObject())); if (!objFeat) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.")); + QObject::tr("No view of a part in selection")); return false; } return true; @@ -1271,8 +1274,8 @@ CmdTechDrawBalloon::CmdTechDrawBalloon() : Command("TechDraw_Balloon") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Balloon Annotation"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Balloon Annotation"); + sToolTipText = QT_TR_NOOP("Inserts a new balloon annotation in the selected view"); sWhatsThis = "TechDraw_Balloon"; sStatusTip = sToolTipText; sPixmap = "TechDraw_Balloon"; @@ -1335,8 +1338,8 @@ CmdTechDrawClipGroup::CmdTechDrawClipGroup() : Command("TechDraw_ClipGroup") { // setting the sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Clip Group"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Clip Group"); + sToolTipText = QT_TR_NOOP("Inserts a new clip group for the selected view"); sWhatsThis = "TechDraw_ClipGroup"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ClipGroup"; @@ -1352,7 +1355,7 @@ void CmdTechDrawClipGroup::activated(int iMsg) std::string PageName = page->getNameInDocument(); std::string FeatName = getUniqueObjectName("Clip"); - openCommand(QT_TRANSLATE_NOOP("Command", "Create Clip")); + openCommand(QT_TRANSLATE_NOOP("Command", "Create clip")); doCommand(Doc, "App.activeDocument().addObject('TechDraw::DrawViewClip', '%s')", FeatName.c_str()); doCommand(Doc, "App.activeDocument().%s.addView(App.activeDocument().%s)", PageName.c_str(), @@ -1372,8 +1375,8 @@ DEF_STD_CMD_A(CmdTechDrawClipGroupAdd) CmdTechDrawClipGroupAdd::CmdTechDrawClipGroupAdd() : Command("TechDraw_ClipGroupAdd") { sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add View to Clip Group"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Add View To Clip Group"); + sToolTipText = QT_TR_NOOP("Adds the selected view to a clip group"); sWhatsThis = "TechDraw_ClipGroupAdd"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ClipGroupAdd"; @@ -1385,7 +1388,7 @@ void CmdTechDrawClipGroupAdd::activated(int iMsg) std::vector selection = getSelection().getSelectionEx(); if (selection.size() != 2) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select one Clip group and one View.")); + QObject::tr("Select one clip group and one view")); return; } @@ -1402,12 +1405,12 @@ void CmdTechDrawClipGroupAdd::activated(int iMsg) } if (!view) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select exactly one View to add to group.")); + QObject::tr("Select exactly one view to add to group")); return; } if (!clip) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select exactly one Clip group.")); + QObject::tr("Select exactly one clip group")); return; } @@ -1416,7 +1419,7 @@ void CmdTechDrawClipGroupAdd::activated(int iMsg) if (pageClip != pageView) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Clip and View must be from same Page.")); + QObject::tr("Clip and view must be from same page")); return; } @@ -1456,8 +1459,8 @@ DEF_STD_CMD_A(CmdTechDrawClipGroupRemove) CmdTechDrawClipGroupRemove::CmdTechDrawClipGroupRemove() : Command("TechDraw_ClipGroupRemove") { sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Remove View from Clip Group"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Remove From Clip Group"); + sToolTipText = QT_TR_NOOP("Removes a view based on the selected clip group"); sWhatsThis = "TechDraw_ClipGroupRemove"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ClipGroupRemove"; @@ -1469,7 +1472,7 @@ void CmdTechDrawClipGroupRemove::activated(int iMsg) auto dObj(getSelection().getObjectsOfType(TechDraw::DrawView::getClassTypeId())); if (dObj.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select exactly one View to remove from Group.")); + QObject::tr("Select exactly one view to remove from group")); return; } @@ -1488,7 +1491,7 @@ void CmdTechDrawClipGroupRemove::activated(int iMsg) if (!clip) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("View does not belong to a Clip")); + QObject::tr("View does not belong to a clip")); return; } @@ -1529,8 +1532,8 @@ CmdTechDrawSymbol::CmdTechDrawSymbol() : Command("TechDraw_Symbol") { // setting the Gui eye-candy sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert SVG Symbol"); - sToolTipText = QT_TR_NOOP("Insert symbol from an SVG file"); + sMenuText = QT_TR_NOOP("Insert SVG"); + sToolTipText = QT_TR_NOOP("Inserts a symbol from an SVG file"); sWhatsThis = "TechDraw_Symbol"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_Symbol"; @@ -1550,7 +1553,7 @@ void CmdTechDrawSymbol::activated(int iMsg) Gui::getMainWindow(), QObject::tr("Choose an SVG file to open"), Preferences::defaultSymbolDir(), QStringLiteral("%1 (*.svg *.svgz);;%2 (*.*)") - .arg(QObject::tr("Scalable Vector Graphic"), QObject::tr("All Files"))); + .arg(QObject::tr("Scalable vector graphic"), QObject::tr("All files"))); if (!filename.isEmpty()) { std::string FeatName = getUniqueObjectName("Symbol"); @@ -1594,8 +1597,9 @@ CmdTechDrawDraftView::CmdTechDrawDraftView() : Command("TechDraw_DraftView") { // setting the Gui eye-candy sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Draft Workbench Object"); - sToolTipText = QT_TR_NOOP("Insert a View of a Draft Workbench object"); + sMenuText = QT_TR_NOOP("Draft View"); + //: "Draft" is a workbench and should not be translated + sToolTipText = QT_TR_NOOP("Inserts a view of a Draft object"); sWhatsThis = "TechDraw_NewDraft"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_DraftView"; @@ -1610,7 +1614,7 @@ void CmdTechDrawDraftView::activated(int iMsg) if (objects.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select at least one object.")); + QObject::tr("Select at least one object")); return; } @@ -1657,8 +1661,8 @@ CmdTechDrawArchView::CmdTechDrawArchView() : Command("TechDraw_ArchView") { // setting the Gui eye-candy sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert BIM Workbench Object"); - sToolTipText = QT_TR_NOOP("Insert a View of a BIM Workbench section plane"); + sMenuText = QT_TR_NOOP("BIM View"); + sToolTipText = QT_TR_NOOP("Inserts a view of a BIM section plane"); sWhatsThis = "TechDraw_NewArch"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ArchView"; @@ -1685,13 +1689,13 @@ void CmdTechDrawArchView::activated(int iMsg) } if (archCount > 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Please select only 1 BIM section plane.")); + QObject::tr("Select only 1 BIM section plane")); return; } if (!archObject) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("No BIM section plane in selection.")); + QObject::tr("No BIM section plane in selection")); return; } @@ -1730,8 +1734,8 @@ CmdTechDrawSpreadsheetView::CmdTechDrawSpreadsheetView() : Command("TechDraw_Spr { // setting the sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Spreadsheet View"); - sToolTipText = QT_TR_NOOP("Insert View to a spreadsheet"); + sMenuText = QT_TR_NOOP("Spreadsheet View"); + sToolTipText = QT_TR_NOOP("Inserts a view of a spreadsheet in the current page"); sWhatsThis = "TechDraw_SpreadsheetView"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_SpreadsheetView"; @@ -1750,7 +1754,7 @@ void CmdTechDrawSpreadsheetView::activated(int iMsg) getSelection().getObjectsOfType(Spreadsheet::Sheet::getClassTypeId()); if (spreads.size() != 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select exactly one Spreadsheet object.")); + QObject::tr("Select exactly one spreadsheet object")); return; } std::string SpreadName = spreads.front()->getNameInDocument(); @@ -1804,7 +1808,7 @@ CmdTechDrawExportPageSVG::CmdTechDrawExportPageSVG() : Command("TechDraw_ExportP { sGroup = QT_TR_NOOP("File"); sMenuText = QT_TR_NOOP("Export Page as SVG"); - sToolTipText = sMenuText; + sToolTipText = QT_TR_NOOP("Exports the current page as an SVG"); sWhatsThis = "TechDraw_ExportPageSVG"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ExportPageSVG"; @@ -1829,7 +1833,7 @@ void CmdTechDrawExportPageSVG::activated(int iMsg) } else { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("No Drawing Page"), + QObject::tr("No drawing page"), QObject::tr("FreeCAD could not find a page to export")); return; } @@ -1847,7 +1851,7 @@ CmdTechDrawExportPageDXF::CmdTechDrawExportPageDXF() : Command("TechDraw_ExportP { sGroup = QT_TR_NOOP("File"); sMenuText = QT_TR_NOOP("Export Page as DXF"); - sToolTipText = sMenuText; + sToolTipText = QT_TR_NOOP("Exports the current page as a DXF"); sWhatsThis = "TechDraw_ExportPageDXF"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ExportPageDXF"; @@ -1865,7 +1869,7 @@ void CmdTechDrawExportPageDXF::activated(int iMsg) for (auto& v : views) { if (v->isDerivedFrom()) { QMessageBox::StandardButton rc = QMessageBox::question( - Gui::getMainWindow(), QObject::tr("Can not export selection"), + Gui::getMainWindow(), QObject::tr("Cannot export selection"), QObject::tr("Page contains DrawViewArch which will not be exported. Continue?"), QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No)); if (rc == QMessageBox::No) { @@ -1910,8 +1914,8 @@ CmdTechDrawProjectShape::CmdTechDrawProjectShape() : Command("TechDraw_ProjectSh { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Project shape..."); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Project Shape"); + sToolTipText = QT_TR_NOOP("Creates a projected geometry of the selected object in the 3D view from the current camera angle"); sWhatsThis = "TechDraw_ProjectShape"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ProjectShape"; diff --git a/src/Mod/TechDraw/Gui/CommandAlign.cpp b/src/Mod/TechDraw/Gui/CommandAlign.cpp index 0a4fd98a47..8f23ed5b5c 100644 --- a/src/Mod/TechDraw/Gui/CommandAlign.cpp +++ b/src/Mod/TechDraw/Gui/CommandAlign.cpp @@ -54,7 +54,7 @@ void incorrectSelection() QMessageBox::warning( Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("You must select 2 vertexes or 1 edge\n") + QObject::tr("You must select 2 vertices or 1 edge\n") ); } @@ -122,8 +122,8 @@ CmdTechDrawAlignVertexesVertically::CmdTechDrawAlignVertexesVertically() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Align vertexes/edge vertically by view rotation"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Align Vertices/Edge Vertically"); + sToolTipText = QT_TR_NOOP("Aligns the selected vertices or edges vertically to the view rotation"); sWhatsThis = "TechDraw_AlignGroup"; sStatusTip = sToolTipText; } @@ -155,8 +155,8 @@ CmdTechDrawAlignVertexesHorizontally::CmdTechDrawAlignVertexesHorizontally() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Align vertexes/edge horizontally by view rotation"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Align Vertices/Edge Horizontally"); + sToolTipText = QT_TR_NOOP("Aligns the selected vertices or edges horizontally to the view rotation"); sWhatsThis = "TechDraw_AlignGroup"; sStatusTip = sToolTipText; } diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp index 978ef62131..74d95361e6 100644 --- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp +++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp @@ -89,8 +89,8 @@ CmdTechDrawLeaderLine::CmdTechDrawLeaderLine() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Leaderline to View"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Leader Line"); + sToolTipText = QT_TR_NOOP("Adds a leader line"); sWhatsThis = "TechDraw_LeaderLine"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_LeaderLine"; @@ -102,8 +102,8 @@ void CmdTechDrawLeaderLine::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -117,13 +117,13 @@ void CmdTechDrawLeaderLine::activated(int iMsg) if (!selection.empty()) { baseFeat = dynamic_cast(selection[0].getObject()); if (!baseFeat) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Can not attach leader. No base View selected.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Cannot attach leader. No base view selected.")); return; } } else { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("You must select a base View for the line.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("You must select a base view for the line")); return; } @@ -151,8 +151,8 @@ CmdTechDrawRichTextAnnotation::CmdTechDrawRichTextAnnotation() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Rich Text Annotation"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Rich Text Annotation"); + sToolTipText = QT_TR_NOOP("Inserts a rich text annotation in the current page"); sWhatsThis = "TechDraw_RichTextAnnotation"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_RichTextAnnotation"; @@ -163,8 +163,8 @@ void CmdTechDrawRichTextAnnotation::activated(int iMsg) Q_UNUSED(iMsg); Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -203,8 +203,8 @@ CmdTechDrawCosmeticVertexGroup::CmdTechDrawCosmeticVertexGroup() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Cosmetic Vertex"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Cosmetic Vertex"); + sToolTipText = QT_TR_NOOP("Inserts a cosmetic vertex"); sWhatsThis = "TechDraw_CosmeticVertexGroup"; sStatusTip = sToolTipText; // eType = ForEdit; @@ -215,8 +215,8 @@ void CmdTechDrawCosmeticVertexGroup::activated(int iMsg) // Base::Console().message("CMD::CosmeticVertexGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -278,16 +278,16 @@ void CmdTechDrawCosmeticVertexGroup::languageChange() QList a = pcAction->actions(); QAction* arc1 = a[0]; - arc1->setText(QApplication::translate("CmdTechDrawCosmeticVertexGroup", "Add Cosmetic Vertex")); - arc1->setToolTip(QApplication::translate("TechDraw_CosmeticVertex", "Inserts a Cosmetic Vertex into a View")); + arc1->setText(QApplication::translate("CmdTechDrawCosmeticVertexGroup", "Cosmetic vertex")); + arc1->setToolTip(QApplication::translate("TechDraw_CosmeticVertex", "Inserts a cosmetic vertex into a view")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; - arc2->setText(QApplication::translate("CmdMidpoints", "Add Midpoint Vertices")); - arc2->setToolTip(QApplication::translate("TechDraw_Midpoints", "Inserts Cosmetic Vertices at Midpoint of selected Edges")); + arc2->setText(QApplication::translate("CmdMidpoints", "Midpoint vertices")); + arc2->setToolTip(QApplication::translate("TechDraw_Midpoints", "Inserts cosmetic vertices at the midpoint of the selected edges")); arc2->setStatusTip(arc2->toolTip()); QAction* arc3 = a[2]; - arc3->setText(QApplication::translate("CmdQuadrants", "Add Quadrant Vertices")); - arc3->setToolTip(QApplication::translate("TechDraw_Quadrants", "Inserts Cosmetic Vertices at Quadrant Points of selected Circles")); + arc3->setText(QApplication::translate("CmdQuadrants", "Quadrant vertices")); + arc3->setToolTip(QApplication::translate("TechDraw_Quadrants", "Inserts cosmetic vertices at the quadrant points of the selected circles")); arc3->setStatusTip(arc3->toolTip()); } @@ -336,7 +336,7 @@ void execMidpoints(Gui::Command* cmd) if (!dvp || selectedEdges.empty()) return; - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add Midpoint Vertices")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add midpoint vertices")); const TechDraw::BaseGeomPtrVector edges = dvp->getEdgeGeometry(); for (auto& s: selectedEdges) { @@ -363,7 +363,7 @@ void execQuadrants(Gui::Command* cmd) if (!dvp || selectedEdges.empty()) return; - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add Quadrant Vertices")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Quadrant vertices")); const TechDraw::BaseGeomPtrVector edges = dvp->getEdgeGeometry(); for (auto& s: selectedEdges) { @@ -390,8 +390,8 @@ CmdTechDrawCosmeticVertex::CmdTechDrawCosmeticVertex() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Vertex"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Cosmetic Vertex"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic vertex"); sWhatsThis = "TechDraw_CosmeticVertex"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_CosmeticVertex"; @@ -402,8 +402,8 @@ void CmdTechDrawCosmeticVertex::activated(int iMsg) Q_UNUSED(iMsg); Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -423,7 +423,7 @@ void CmdTechDrawCosmeticVertex::activated(int iMsg) TechDraw::DrawViewPart* baseFeat = nullptr; baseFeat = dynamic_cast((*shapes.begin())); if (!baseFeat) { - Base::Console().message("CMD::CosmeticVertex - 1st shape is not DVP. WTF?\n"); + Base::Console().message("CMD::CosmeticVertex - 1st shape is not DVP.\n"); return; } @@ -451,8 +451,8 @@ CmdTechDrawMidpoints::CmdTechDrawMidpoints() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Midpoint Vertices"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Midpoint Vertices"); + sToolTipText = QT_TR_NOOP("Adds cosmetic vertices at the midpoint of the selected edges"); sWhatsThis = "TechDraw_Midpoints"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_Midpoints"; @@ -463,8 +463,8 @@ void CmdTechDrawMidpoints::activated(int iMsg) Q_UNUSED(iMsg); Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } execMidpoints(this); @@ -490,8 +490,8 @@ CmdTechDrawQuadrants::CmdTechDrawQuadrants() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Quadrant Vertices"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Quadrant Vertices"); + sToolTipText = QT_TR_NOOP("Adds cosmetic vertices at the quadrant points of the selected circles"); sWhatsThis = "TechDraw_Quadrants"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_Quadrants"; @@ -502,8 +502,8 @@ void CmdTechDrawQuadrants::activated(int iMsg) Q_UNUSED(iMsg); Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } execQuadrants(this); @@ -529,8 +529,8 @@ CmdTechDrawAnnotation::CmdTechDrawAnnotation() { // setting the Gui eye-candy sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Annotation"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Text Annotation"); + sToolTipText = QT_TR_NOOP("Inserts an editable text block annotation to the current page"); sWhatsThis = "TechDraw_NewAnnotation"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_Annotation"; @@ -579,8 +579,8 @@ CmdTechDrawCenterLineGroup::CmdTechDrawCenterLineGroup() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Center Line"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Centerline"); + sToolTipText = QT_TR_NOOP("Inserts a centerline to a face, or between 2 lines or edges"); sWhatsThis = "TechDraw_CenterLineGroup"; sStatusTip = sToolTipText; // eType = ForEdit; @@ -591,8 +591,8 @@ void CmdTechDrawCenterLineGroup::activated(int iMsg) // Base::Console().message("CMD::CenterLineGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -652,16 +652,16 @@ void CmdTechDrawCenterLineGroup::languageChange() QList a = pcAction->actions(); QAction* arc1 = a[0]; - arc1->setText(QApplication::translate("CmdTechDrawCenterLineGroup", "Add Centerline to Faces")); - arc1->setToolTip(QApplication::translate("TechDraw_FaceCenterLine", "Adds a Centerline to Faces")); + arc1->setText(QApplication::translate("CmdTechDrawCenterLineGroup", "Centerline faces")); + arc1->setToolTip(QApplication::translate("TechDraw_FaceCenterLine", "Adds a centerline to selected faces")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; - arc2->setText(QApplication::translate("Cmd2LineCenterLine", "Add Centerline between 2 Lines")); - arc2->setToolTip(QApplication::translate("TechDraw_2LineCenterLine", "Adds a Centerline between 2 Lines")); + arc2->setText(QApplication::translate("Cmd2LineCenterLine", "Centerline 2 lines")); + arc2->setToolTip(QApplication::translate("TechDraw_2LineCenterLine", "Adds a centerline between 2 selected lines")); arc2->setStatusTip(arc2->toolTip()); QAction* arc3 = a[2]; - arc3->setText(QApplication::translate("Cmd2PointCenterLine", "Add Centerline between 2 Points")); - arc3->setToolTip(QApplication::translate("TechDraw_2PointCenterLine", "Adds a Centerline between 2 Points")); + arc3->setText(QApplication::translate("Cmd2PointCenterLine", "Centerline 2 points")); + arc3->setToolTip(QApplication::translate("TechDraw_2PointCenterLine", "Adds a centerline between 2 selected points")); arc3->setStatusTip(arc3->toolTip()); } @@ -682,8 +682,8 @@ CmdTechDrawFaceCenterLine::CmdTechDrawFaceCenterLine() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Centerline to Faces"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Centerline Between 2 Faces"); + sToolTipText = QT_TR_NOOP("Adds a centerline to selected faces"); sWhatsThis = "TechDraw_FaceCenterLine"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_FaceCenterLine"; @@ -695,8 +695,8 @@ void CmdTechDrawFaceCenterLine::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -722,14 +722,14 @@ void execCenterLine(Gui::Command* cmd) if (!selection.empty()) { baseFeat = dynamic_cast(selection[0].getObject()); if (!baseFeat) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("No base View in Selection.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("No base view in selection")); return; } } else { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("You must select a base View for the line.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("You must select a base view for the line")); return; } @@ -755,8 +755,8 @@ void execCenterLine(Gui::Command* cmd) if ( (faceNames.empty()) && (edgeNames.empty()) ) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("You must select Faces or an existing CenterLine.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("You must select faces or an existing centerline")); return; } if (!faceNames.empty()) { @@ -765,14 +765,14 @@ void execCenterLine(Gui::Command* cmd) faceNames, false)); } else if (edgeNames.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("No CenterLine in selection.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("No CenterLine in selection")); return; } else { TechDraw::CenterLine* cl = baseFeat->getCenterLineBySelection(edgeNames.front()); if (!cl) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Selection is not a CenterLine.")); + QObject::tr("Selection is not a centerline")); return; } Gui::Control().showDialog(new TaskDlgCenterLine(baseFeat, @@ -793,8 +793,8 @@ CmdTechDraw2LineCenterLine::CmdTechDraw2LineCenterLine() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Centerline between 2 Lines"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Centerline Between 2 Lines"); + sToolTipText = QT_TR_NOOP("Adds a centerline between 2 selected lines"); sWhatsThis = "TechDraw_2LineCenterLine"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_2LineCenterline"; @@ -806,8 +806,8 @@ void CmdTechDraw2LineCenterLine::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -842,8 +842,8 @@ void exec2LineCenterLine(Gui::Command* cmd) } else if (selectedEdges.size() == 1) { TechDraw::CenterLine* cl = dvp->getCenterLineBySelection(selectedEdges.front()); if (!cl) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Selection is not a CenterLine.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Selection is not a Centerline")); return; } Gui::Control().showDialog(new TaskDlgCenterLine(dvp, @@ -851,8 +851,8 @@ void exec2LineCenterLine(Gui::Command* cmd) selectedEdges.front(), true)); } else { //not create, not edit, what is this??? - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Selection not understood.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Selection not understood")); return; } } @@ -868,8 +868,8 @@ CmdTechDraw2PointCenterLine::CmdTechDraw2PointCenterLine() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Centerline between 2 Points"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Centerline Between 2 Points"); + sToolTipText = QT_TR_NOOP("Adds a centerline between 2 selected points"); sWhatsThis = "TechDraw_2PointCenterLine"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_2PointCenterline"; @@ -881,8 +881,8 @@ void CmdTechDraw2PointCenterLine::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -908,15 +908,15 @@ void exec2PointCenterLine(Gui::Command* cmd) std::vector selection = cmd->getSelection().getSelectionEx(); TechDraw::DrawViewPart* baseFeat = nullptr; if (selection.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("You must select a base View for the line.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("You must select a base view for the line")); return; } baseFeat = dynamic_cast(selection[0].getObject()); if (!baseFeat) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("No base View in Selection.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("No base view in selection")); return; } @@ -942,8 +942,8 @@ void exec2PointCenterLine(Gui::Command* cmd) if (vertexNames.empty() && edgeNames.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("You must select 2 Vertexes or an existing CenterLine.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("You must select 2 vertices or an existing centerline")); return; } if (!vertexNames.empty() && (vertexNames.size() == 2)) { @@ -954,8 +954,8 @@ void exec2PointCenterLine(Gui::Command* cmd) } else if (!edgeNames.empty() && (edgeNames.size() == 1)) { TechDraw::CenterLine* cl = baseFeat->getCenterLineBySelection(edgeNames.front()); if (!cl) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Selection is not a CenterLine.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Selection is not a centerline")); return; } @@ -964,8 +964,8 @@ void exec2PointCenterLine(Gui::Command* cmd) edgeNames.front(), false)); } else if (vertexNames.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Need 2 Vertices or 1 CenterLine.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Select 2 vertices or 1 centerline")); return; } } @@ -981,8 +981,8 @@ CmdTechDraw2PointCosmeticLine::CmdTechDraw2PointCosmeticLine() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Line Through 2 Points"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Cosmetic Line Through 2 Points"); + sToolTipText = QT_TR_NOOP("Add a cosmetic line that passes through 2 selected points"); sWhatsThis = "TechDraw_2PointCosmeticLine"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_Line2Points"; @@ -994,8 +994,8 @@ void CmdTechDraw2PointCosmeticLine::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -1025,7 +1025,7 @@ void execLine2Points(Gui::Command* cmd) std::vector< std::pair > objs3D; if (selection.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Selection is empty.")); + QObject::tr("Selection is empty")); return; } @@ -1047,16 +1047,16 @@ void execLine2Points(Gui::Command* cmd) } if (!baseFeat) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("You must select a base View for the line.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("You must select a base view for the line")); return; } //TODO: should be a smarter check if ( (subNames2D.empty()) && (objs3D.empty()) ) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Not enough points in selection.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Not enough points in the selection")); return; } @@ -1075,8 +1075,8 @@ void execLine2Points(Gui::Command* cmd) if (!edgeNames.empty() && (edgeNames.size() == 1)) { TechDraw::CosmeticEdge* ce = baseFeat->getCosmeticEdgeBySelection(edgeNames.front()); if (!ce || ce->m_geometry->getGeomType() != GeomType::GENERIC) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Selection is not a Cosmetic Line.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Selection is not a cosmetic line")); return; } @@ -1111,8 +1111,8 @@ void execLine2Points(Gui::Command* cmd) } if (points.size() != 2) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("You must select 2 Vertexes.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("You must select 2 vertices")); return; } @@ -1132,8 +1132,8 @@ CmdTechDrawCosmeticCircle::CmdTechDrawCosmeticCircle() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Circle"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Cosmetic Circle"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic circle to the current page"); sWhatsThis = "TechDraw_CosmeticCircle"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_CosmeticCircle"; @@ -1145,8 +1145,8 @@ void CmdTechDrawCosmeticCircle::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -1175,8 +1175,8 @@ void execCosmeticCircle(Gui::Command* cmd) std::vector subNames2D; std::vector< std::pair > objs3D; if (selection.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Selection is empty.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Selection is empty")); return; } @@ -1198,8 +1198,8 @@ void execCosmeticCircle(Gui::Command* cmd) } if (!baseFeat) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("You must select a base View for the circle.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("You must select a base view for the circle")); return; } @@ -1220,8 +1220,8 @@ void execCosmeticCircle(Gui::Command* cmd) if (!ce || !(ce->m_geometry->getGeomType() == GeomType::CIRCLE || ce->m_geometry->getGeomType() == GeomType::ARCOFCIRCLE)) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Selection is not a Cosmetic Circle or a Cosmetic Arc of Circle.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Selection is not a cosmetic circle or a cosmetic arc of a circle")); return; } @@ -1256,8 +1256,8 @@ void execCosmeticCircle(Gui::Command* cmd) } if (points.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("Please select a center for the circle.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("Please select a center for the circle")); return; } @@ -1283,7 +1283,7 @@ CmdTechDrawCosmeticEraser::CmdTechDrawCosmeticEraser() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Remove Cosmetic Object"); - sToolTipText = sMenuText; + sToolTipText = QT_TR_NOOP("Removes the selected cosmetic object from the page"); sWhatsThis = "TechDraw_CosmeticEraser"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_CosmeticEraser"; @@ -1294,8 +1294,8 @@ void CmdTechDrawCosmeticEraser::activated(int iMsg) Q_UNUSED(iMsg); Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -1400,8 +1400,8 @@ CmdTechDrawDecorateLine::CmdTechDrawDecorateLine() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Change Appearance of Lines"); - sToolTipText = QT_TR_NOOP("Change Appearance of selected Lines"); + sMenuText = QT_TR_NOOP("Edit Line Appearance"); + sToolTipText = QT_TR_NOOP("Opens the 'Line decoration' dialog to edit the selected lines"); sWhatsThis = "TechDraw_DecorateLine"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_DecorateLine"; @@ -1413,8 +1413,8 @@ void CmdTechDrawDecorateLine::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -1425,8 +1425,8 @@ void CmdTechDrawDecorateLine::activated(int iMsg) std::vector selection = getSelection().getSelectionEx(); if (selection.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("You must select a View and/or lines.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("You must select a view and/or lines")); return; } @@ -1445,8 +1445,8 @@ void CmdTechDrawDecorateLine::activated(int iMsg) } if (!baseFeat) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("No View in Selection.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("No view in selection")); return; } @@ -1482,8 +1482,8 @@ CmdTechDrawShowAll::CmdTechDrawShowAll() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Show/Hide Invisible Edges"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Toggle Edge Visibilty"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the selected edges"); sWhatsThis = "TechDraw_ShowAll"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ShowAll"; @@ -1494,8 +1494,8 @@ void CmdTechDrawShowAll::activated(int iMsg) Q_UNUSED(iMsg); Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -1515,7 +1515,7 @@ void CmdTechDrawShowAll::activated(int iMsg) baseFeat = dynamic_cast(selection[0].getObject()); if (!baseFeat) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("No Part Views in this selection")); + QObject::tr("No part views in this selection")); return; } @@ -1547,8 +1547,8 @@ CmdTechDrawWeldSymbol::CmdTechDrawWeldSymbol() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Welding Information to Leaderline"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Weld Symbol"); + sToolTipText = QT_TR_NOOP("Adds welding information to the selected leader line"); sWhatsThis = "TechDraw_WeldSymbol"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_WeldSymbol"; @@ -1560,8 +1560,8 @@ void CmdTechDrawWeldSymbol::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -1579,7 +1579,7 @@ void CmdTechDrawWeldSymbol::activated(int iMsg) if ( (leaders.size() != 1) && (welds.size() != 1) ) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select exactly one Leader line or one Weld symbol.")); + QObject::tr("Select exactly one leader line or one weld symbol")); return; } if (!leaders.empty()) { @@ -1611,10 +1611,8 @@ CmdTechDrawSurfaceFinishSymbols::CmdTechDrawSurfaceFinishSymbols() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create a Surface Finish Symbol"); - sToolTipText = QT_TR_NOOP("Select a view
    \ - - click this button
    \ - - select surface finish symbol attributes in opened panel"); + sMenuText = QT_TR_NOOP("Surface Finish Symbol"); + sToolTipText = QT_TR_NOOP("Adds a surface finish symbol in the selected view"); sWhatsThis = "TechDraw_SurfaceFinishSymbols"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_SurfaceFinishSymbols"; diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index 145a4e7f4c..ecbb6fb0c1 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -242,7 +242,7 @@ public: mdi->setDimensionsSelectability(false); } Gui::Selection().setSelectionStyle(Gui::SelectionSingleton::SelectionStyle::GreedySelection); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Insert Dimension")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Insert dimension")); handleInitialSelection(); } @@ -799,7 +799,7 @@ protected: { //area if (availableDimension == AvailableDimension::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Area dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add area dimension")); createAreaDimension(selFaces[0]); selAllowed = true; availableDimension = AvailableDimension::RESET; @@ -810,7 +810,7 @@ protected: { //distance if (availableDimension == AvailableDimension::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Distance dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distance dimension")); createDistanceDimension("Distance", { selPoints[0], selPoints[1] }); specialDimension = SpecialDimension::LineOr2PointsDistance; selAllowed = true; @@ -819,7 +819,7 @@ protected: } } if (availableDimension == AvailableDimension::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceX Chamfer dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distanceX chamfer dimension")); createDistanceDimension("DistanceX", { selPoints[0], selPoints[1] }, true); specialDimension = SpecialDimension::LineOr2PointsChamfer; availableDimension = AvailableDimension::RESET; @@ -872,7 +872,7 @@ protected: { //distance if (availableDimension == AvailableDimension::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add point to line Distance dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add point to line distance dimension")); createDistanceDimension("Distance", { selPoints[0], selLine[0] }); selAllowed = true; availableDimension = AvailableDimension::RESET; @@ -888,7 +888,7 @@ protected: selAllowed = true; } if (availableDimension == AvailableDimension::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add extent dimension")); createExtentDistanceDimension("DistanceX"); availableDimension = AvailableDimension::RESET; } @@ -903,7 +903,7 @@ protected: selAllowed = true; } if (availableDimension == AvailableDimension::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add extent dimension")); createExtentDistanceDimension("DistanceX"); availableDimension = AvailableDimension::RESET; } @@ -925,7 +925,7 @@ protected: //addCursorTail(pixmaps); } if (availableDimension == AvailableDimension::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceX Chamfer dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distanceX chamfer dimension")); createDistanceDimension("DistanceX", { selLine[0] }, true); specialDimension = SpecialDimension::LineOr2PointsChamfer; availableDimension = AvailableDimension::RESET; @@ -936,12 +936,12 @@ protected: { //angle (if parallel: Distance (see in createAngleDimension)). if (availableDimension == AvailableDimension::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Angle dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add angle dimension")); createAngleDimension(selLine[0], selLine[1]); selAllowed = true; } if (availableDimension == AvailableDimension::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add extent dimension")); createExtentDistanceDimension("DistanceX"); availableDimension = AvailableDimension::RESET; } @@ -951,12 +951,12 @@ protected: { //distance, extent distance if (availableDimension == AvailableDimension::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add circle to line Distance dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add circle to line distance dimension")); createDistanceDimension("Distance", { selCircleArc[0], selLine[0] }); selAllowed = true; } if (availableDimension == AvailableDimension::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add extent dimension")); createExtentDistanceDimension("DistanceX"); availableDimension = AvailableDimension::RESET; } @@ -966,12 +966,12 @@ protected: { //distance, extent distance if (availableDimension == AvailableDimension::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add ellipse to line Distance dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add ellipse to line distance dimension")); createDistanceDimension("Distance", { selEllipseArc[0], selLine[0] }); selAllowed = true; } if (availableDimension == AvailableDimension::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add extent dimension")); createExtentDistanceDimension("DistanceX"); availableDimension = AvailableDimension::RESET; } @@ -990,7 +990,7 @@ protected: } } if (availableDimension == AvailableDimension::THIRD) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Arc Length dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add arc length dimension")); createArcLengthDimension(selCircleArc[0]); availableDimension = AvailableDimension::RESET; } @@ -1000,12 +1000,12 @@ protected: { //Distance if (availableDimension == AvailableDimension::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add circle to circle Distance dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add circle to circle distance dimension")); createDistanceDimension("Distance", { selCircleArc[0], selCircleArc[1] }); selAllowed = true; } if (availableDimension == AvailableDimension::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add extent dimension")); createExtentDistanceDimension("DistanceX"); availableDimension = AvailableDimension::RESET; } @@ -1024,7 +1024,7 @@ protected: } } if (availableDimension == AvailableDimension::THIRD) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Arc Length dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add arc length dimension")); createArcLengthDimension(selEllipseArc[0]); availableDimension = AvailableDimension::RESET; } @@ -1034,12 +1034,12 @@ protected: { //Distance if (availableDimension == AvailableDimension::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add ellipse to ellipse Distance dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add ellipse to ellipse distance dimension")); createDistanceDimension("Distance", { selEllipseArc[0], selEllipseArc[1] }); selAllowed = true; } if (availableDimension == AvailableDimension::SECOND) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add extent dimension")); createExtentDistanceDimension("DistanceX"); availableDimension = AvailableDimension::RESET; } @@ -1060,7 +1060,7 @@ protected: { //Extend if (availableDimension == AvailableDimension::FIRST) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add extent dimension")); createExtentDistanceDimension("DistanceX"); selAllowed = true; availableDimension = AvailableDimension::RESET; @@ -1090,11 +1090,11 @@ protected: (!firstCstr && !dimensioningRadius && dimensioningDiameter) || (firstCstr && dimensioningRadius && dimensioningDiameter && !isCircleGeom) || (!firstCstr && dimensioningRadius && dimensioningDiameter && isCircleGeom)) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Radius dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add radius dimension")); dim = dimMaker(partFeat, "Radius", { ref }, {}); } else { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Diameter dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add diameter dimension")); dim = dimMaker(partFeat, "Diameter", { ref }, {}); } @@ -1105,7 +1105,7 @@ protected: void createAngleDimension(ReferenceEntry ref1, ReferenceEntry ref2) { if (TechDraw::isValidMultiEdge({ ref1, ref2 }) != DimensionGeometry::isAngle) { //isValidMultiEdge check if lines are parallel. - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Distance dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distance dimension")); createDistanceDimension("Distance", { ref1, ref2 }); return; } @@ -1186,27 +1186,27 @@ protected: if (fpos.x() > minX && fpos.x() < maxX && (fpos.y() < minY || fpos.y() > maxY) && type != DimensionType::DistanceX) { if (chamfer) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceX Chamfer dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distanceX chamfer dimension")); } else { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceX dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distanceX dimension")); } newType = "DistanceX"; } else if (fpos.y() > minY && fpos.y() < maxY && (fpos.x() < minX || fpos.x() > maxX) && type != DimensionType::DistanceY) { if (chamfer) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceY Chamfer dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distanceY chamfer dimension")); } else { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceY dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distanceY dimension")); } newType = "DistanceY"; } else if ((((fpos.y() < minY || fpos.y() > maxY) && (fpos.x() < minX || fpos.x() > maxX)) || (fpos.y() > minY && fpos.y() < maxY && fpos.x() > minX && fpos.x() < maxX)) && type != DimensionType::Distance && !chamfer) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add Distance dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distance dimension")); } else { return; @@ -1244,12 +1244,12 @@ protected: if (fpos.x() > minX && fpos.x() < maxX && (fpos.y() < minY || fpos.y() > maxY) && type != DimensionType::DistanceX) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceX extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distanceX extent dimension")); createExtentDistanceDimension("DistanceX"); } else if (fpos.y() > minY && fpos.y() < maxY && (fpos.x() < minX || fpos.x() > maxX) && type != DimensionType::DistanceY) { - restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceY extent dimension")); + restartCommand(QT_TRANSLATE_NOOP("Command", "Add distanceY extent dimension")); createExtentDistanceDimension("DistanceY"); } else { @@ -1405,10 +1405,10 @@ CmdTechDrawDimension::CmdTechDrawDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Dimension"); - sToolTipText = QT_TR_NOOP("Dimension contextually based on your selection.\n" + sMenuText = QT_TR_NOOP("Dimension"); + sToolTipText = QT_TR_NOOP("Inserts new contextual dimensions to the selection.\n" "Depending on your selection you might have several dimensions available. You can cycle through them using the M key.\n" - "Left clicking on empty space will validate the current Dimension. Right clicking or pressing Esc will cancel."); + "Left clicking on empty space will validate the current dimension. Right clicking or pressing Esc will cancel."); sWhatsThis = "TechDraw_Dimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_Dimension"; @@ -1445,7 +1445,7 @@ public: sAppModule = "TechDraw"; sGroup = "TechDraw"; sMenuText = QT_TR_NOOP("Dimension"); - sToolTipText = QT_TR_NOOP("Dimension tools."); + sToolTipText = QT_TR_NOOP("Dimension tools"); sWhatsThis = "TechDraw_CompDimensionTools"; sStatusTip = sToolTipText; @@ -1498,8 +1498,8 @@ CmdTechDrawRadiusDimension::CmdTechDrawRadiusDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Radius Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Radius Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a radius dimension of a circular edge or arc"); sWhatsThis = "TechDraw_RadiusDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_RadiusDimension"; @@ -1511,8 +1511,8 @@ void CmdTechDrawRadiusDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -1546,8 +1546,8 @@ CmdTechDrawDiameterDimension::CmdTechDrawDiameterDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Diameter Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Diameter Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a diameter dimension of a circular edge or arc"); sWhatsThis = "TechDraw_DiameterDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_DiameterDimension"; @@ -1559,8 +1559,8 @@ void CmdTechDrawDiameterDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -1594,8 +1594,8 @@ CmdTechDrawLengthDimension::CmdTechDrawLengthDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Length Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Length Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a length dimension of an edge or distance between two points"); sWhatsThis = "TechDraw_LengthDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_LengthDimension"; @@ -1607,8 +1607,8 @@ void CmdTechDrawLengthDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -1641,8 +1641,8 @@ CmdTechDrawHorizontalDimension::CmdTechDrawHorizontalDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Horizontal Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Horizontal Length Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a horizontal length dimension of an edge or distance between two points"); sWhatsThis = "TechDraw_HorizontalDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_HorizontalDimension"; @@ -1655,8 +1655,8 @@ void CmdTechDrawHorizontalDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -1689,8 +1689,8 @@ CmdTechDrawVerticalDimension::CmdTechDrawVerticalDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Vertical Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Vertical Length Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a vertical length dimension of an edge or distance between two points"); sWhatsThis = "TechDraw_VerticalDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_VerticalDimension"; @@ -1703,8 +1703,8 @@ void CmdTechDrawVerticalDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -1737,8 +1737,8 @@ CmdTechDrawAngleDimension::CmdTechDrawAngleDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Angle Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Angle Dimension"); + sToolTipText = QT_TR_NOOP("Inserts an angle dimension between two edges"); sWhatsThis = "TechDraw_AngleDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_AngleDimension"; @@ -1750,8 +1750,8 @@ void CmdTechDrawAngleDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -1784,8 +1784,8 @@ CmdTechDraw3PtAngleDimension::CmdTechDraw3PtAngleDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert 3-Point Angle Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Angle Dimension From 3 Points"); + sToolTipText = QT_TR_NOOP("Inserts an angle dimension between 3 selected points"); sWhatsThis = "TechDraw_3PtAngleDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_3PtAngleDimension"; @@ -1797,8 +1797,8 @@ void CmdTechDraw3PtAngleDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -1831,8 +1831,8 @@ CmdTechDrawAreaDimension::CmdTechDrawAreaDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Area Annotation"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Area Annotation"); + sToolTipText = QT_TR_NOOP("Inserts an annotation showing the area of a selected face"); sWhatsThis = "TechDraw_AreaDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_AreaDimension"; @@ -1844,8 +1844,8 @@ void CmdTechDrawAreaDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -1883,7 +1883,7 @@ CmdTechDrawLinkDimension::CmdTechDrawLinkDimension() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Link Dimension to 3D Geometry"); - sToolTipText = sMenuText; + sToolTipText = QT_TR_NOOP("Links the selected TechDraw dimensions to 3D geometry"); sWhatsThis = "TechDraw_LinkDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_LinkDimension"; @@ -1921,15 +1921,15 @@ void CmdTechDrawLinkDimension::activated(int iMsg) if (!obj3D) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Incorrect Selection"), + QObject::tr("Incorrect selection"), QObject::tr("There is no 3D object in your selection")); return; } if (subs.empty()) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Incorrect Selection"), - QObject::tr("There are no 3D Edges or Vertices in your selection")); + QObject::tr("Incorrect selection"), + QObject::tr("There are no 3D edges or vertices in your selection")); return; } @@ -1962,8 +1962,8 @@ CmdTechDrawExtentGroup::CmdTechDrawExtentGroup() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Extent Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Extent Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a dimension showing the extent (overall length) of an object or feature"); sWhatsThis = "TechDraw_ExtentGroup"; sStatusTip = sToolTipText; // eType = ForEdit; @@ -1975,8 +1975,8 @@ void CmdTechDrawExtentGroup::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -2030,14 +2030,14 @@ void CmdTechDrawExtentGroup::languageChange() QList a = pcAction->actions(); QAction* arc1 = a[0]; - arc1->setText(QApplication::translate("CmdTechDrawExtentGroup", "Horizontal Extent")); + arc1->setText(QApplication::translate("CmdTechDrawExtentGroup", "Horizontal extent")); arc1->setToolTip( - QApplication::translate("TechDraw_HorizontalExtent", "Insert Horizontal Extent Dimension")); + QApplication::translate("TechDraw_HorizontalExtent", "Insert horizontal extent dimension")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; - arc2->setText(QApplication::translate("CmdTechDrawExtentGroup", "Vertical Extent")); + arc2->setText(QApplication::translate("CmdTechDrawExtentGroup", "Vertical extent")); arc2->setToolTip(QApplication::translate("TechDraw_VerticalExtentDimension", - "Insert Vertical Extent Dimension")); + "Insert vertical extent dimension")); arc2->setStatusTip(arc2->toolTip()); } @@ -2057,8 +2057,8 @@ CmdTechDrawHorizontalExtentDimension::CmdTechDrawHorizontalExtentDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Horizontal Extent Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Horizontal Extent Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a dimension showing the horizontal extent (overall length) of an object or feature."); sWhatsThis = "TechDraw_HorizontalExtentDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_HorizontalExtentDimension"; @@ -2071,8 +2071,8 @@ void CmdTechDrawHorizontalExtentDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -2090,7 +2090,7 @@ void execExtent(Gui::Command* cmd, const std::string& dimType) if (!result) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.")); + QObject::tr("No view of a part in selection.")); return; } ReferenceVector references2d; @@ -2129,8 +2129,8 @@ void execExtent(Gui::Command* cmd, const std::string& dimType) references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); if (geometryRefs2d == DimensionGeometry::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Incorrect Selection"), - QObject::tr("Can not make 2D extent dimension from selection")); + QObject::tr("Incorrect selection"), + QObject::tr("Cannot make 2D extent dimension from selection")); return; } @@ -2145,7 +2145,7 @@ void execExtent(Gui::Command* cmd, const std::string& dimType) if (geometryRefs3d == DimensionGeometry::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("Can not make 3D extent dimension from selection")); + QObject::tr("Cannot make 3D extent dimension from selection")); return; } } @@ -2169,8 +2169,8 @@ CmdTechDrawVerticalExtentDimension::CmdTechDrawVerticalExtentDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Vertical Extent Dimension"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Vertical Extent Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a dimension showing the vertical extent (overall length) of an object or feature."); sWhatsThis = "TechDraw_VerticalExtentDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_VerticalExtentDimension"; @@ -2183,8 +2183,8 @@ void CmdTechDrawVerticalExtentDimension::activated(int iMsg) Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again")); return; } @@ -2208,7 +2208,7 @@ CmdTechDrawDimensionRepair::CmdTechDrawDimensionRepair() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Repair Dimension References"); - sToolTipText = sMenuText; + sToolTipText = QT_TR_NOOP("Repairs broken or incorrect dimension references"); sWhatsThis = "TechDraw_DimensionRepair"; sStatusTip = sToolTipText; sPixmap = "TechDraw_DimensionRepair"; @@ -2222,8 +2222,8 @@ void CmdTechDrawDimensionRepair::activated(int iMsg) TechDraw::DrawViewDimension* dim = nullptr; if (dimObjs.empty()) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Incorrect Selection"), - QObject::tr("There is no Dimension in your selection")); + QObject::tr("Incorrect selection"), + QObject::tr("There is no dimension in your selection")); return; } else { dim = static_cast(dimObjs.at(0)); @@ -2256,8 +2256,8 @@ CmdTechDrawLandmarkDimension::CmdTechDrawLandmarkDimension() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Landmark Dimension - EXPERIMENTAL"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Landmark Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a landmark dimension (experimental feature). Use with caution."); sWhatsThis = "TechDraw_LandmarkDimension"; sStatusTip = sToolTipText; sPixmap = "TechDraw_LandmarkDimension"; @@ -2276,7 +2276,7 @@ void CmdTechDrawLandmarkDimension::activated(int iMsg) if (objects.size() != 2) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select 2 point objects and 1 View. (1)")); + QObject::tr("Select 2 point objects and 1 view. (1)")); return; } @@ -2285,7 +2285,7 @@ void CmdTechDrawLandmarkDimension::activated(int iMsg) if (views.size() != 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select 2 point objects and 1 View. (2)")); + QObject::tr("Select 2 point objects and 1 view. (2)")); return; } @@ -2384,7 +2384,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr if (!result) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.")); + QObject::tr("No view of a part in selection.")); return; } @@ -2398,8 +2398,8 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); if (geometryRefs2d == DimensionGeometry::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Incorrect Selection"), - QObject::tr("Can not make 2D dimension from selection")); + QObject::tr("Incorrect selection"), + QObject::tr("Cannot make 2D dimension from selection")); return; } @@ -2415,7 +2415,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr if (geometryRefs3d == DimensionGeometry::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("Can not make 3D dimension from selection")); + QObject::tr("Cannot make 3D dimension from selection")); return; } } @@ -2428,7 +2428,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr if (geometryRefs2d == DimensionGeometry::isEllipse || geometryRefs3d == DimensionGeometry::isEllipse) { QMessageBox::StandardButton result = QMessageBox::warning( Gui::getMainWindow(), - QObject::tr("Ellipse Curve Warning"), + QObject::tr("Ellipse curve warning"), QObject::tr("Selected edge is an Ellipse. Value will be approximate. Continue?"), QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel); @@ -2439,7 +2439,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr if (geometryRefs2d == DimensionGeometry::isBSplineCircle || geometryRefs3d == DimensionGeometry::isBSplineCircle) { QMessageBox::StandardButton result = QMessageBox::warning( Gui::getMainWindow(), - QObject::tr("B-spline Curve Warning"), + QObject::tr("B-spline curve warning"), QObject::tr("Selected edge is a B-spline. Value will be approximate. Continue?"), QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel); @@ -2450,8 +2450,8 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr if (geometryRefs2d == DimensionGeometry::isBSpline || geometryRefs3d == DimensionGeometry::isBSpline) { QMessageBox::critical( Gui::getMainWindow(), - QObject::tr("B-spline Curve Error"), - QObject::tr("Selected edge is a B-spline and a radius/diameter can not be calculated.")); + QObject::tr("B-spline curve error"), + QObject::tr("Selected edge is a B-spline and a radius/diameter cannot be calculated.")); return; } } @@ -2468,7 +2468,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr DrawViewDimension* dimensionMaker(TechDraw::DrawViewPart* dvp, std::string dimType, ReferenceVector references2d, ReferenceVector references3d) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Dimension")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create dimension")); TechDraw::DrawViewDimension* dim = dimMaker(dvp, dimType, references2d, references3d); diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp index e2c0b35f72..3dd54d59db 100644 --- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp +++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp @@ -74,8 +74,8 @@ CmdTechDrawHatch::CmdTechDrawHatch() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Hatch a Face using Image File"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Image Hatch"); + sToolTipText = QT_TR_NOOP("Applies a hatch pattern to the selected faces using an image file"); sWhatsThis = "TechDraw_Hatch"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_Hatch"; @@ -108,8 +108,8 @@ void CmdTechDrawHatch::activated(int iMsg) int face = TechDraw::DrawUtil::getIndexFromName(s); if (TechDraw::DrawHatch::faceIsHatched(face, hatchObjs)) { QMessageBox::StandardButton rc = - QMessageBox::question(Gui::getMainWindow(), QObject::tr("Replace Hatch?"), - QObject::tr("Some Faces in selection are already hatched. Replace?")); + QMessageBox::question(Gui::getMainWindow(), QObject::tr("Replace hatch?"), + QObject::tr("Some faces in the selection are already hatched. Replace?")); if (rc == QMessageBox::StandardButton::NoButton) { return; } @@ -120,7 +120,7 @@ void CmdTechDrawHatch::activated(int iMsg) } if (removeOld) { - openCommand(QT_TRANSLATE_NOOP("Command", "Remove old Hatch")); + openCommand(QT_TRANSLATE_NOOP("Command", "Remove old hatch")); std::vector > toRemove; for (auto& h: hatchObjs) { //all the hatch objects for selected DVP std::vector hatchSubs = h->Source.getSubValues(); @@ -169,8 +169,8 @@ CmdTechDrawGeometricHatch::CmdTechDrawGeometricHatch() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Apply Geometric Hatch to Face"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Geometric Hatch"); + sToolTipText = QT_TR_NOOP("Applies a geometric hatch pattern to the selected faces"); sWhatsThis = "TechDraw_GeometricHatch"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_GeometricHatch"; @@ -240,10 +240,10 @@ CmdTechDrawImage::CmdTechDrawImage() { // setting the Gui eye-candy sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Bitmap Image"); - sToolTipText = QT_TR_NOOP("Insert Bitmap from a file into a page"); + sMenuText = QT_TR_NOOP("Bitmap Image"); + sToolTipText = QT_TR_NOOP("Inserts a bitmap from a file into the current page"); sWhatsThis = "TechDraw_Image"; - sStatusTip = QT_TR_NOOP("Insert Bitmap from a file into a page"); + sStatusTip = QT_TR_NOOP("Insert bitmap from a file into a page"); sPixmap = "actions/TechDraw_Image"; } @@ -258,7 +258,7 @@ void CmdTechDrawImage::activated(int iMsg) // Reading an image QString fileName = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), - QString::fromUtf8(QT_TR_NOOP("Select an Image File")), + QString::fromUtf8(QT_TR_NOOP("Select an image file")), Preferences::defaultSymbolDir(), QString::fromUtf8(QT_TR_NOOP("Image files (*.jpg *.jpeg *.png *.bmp);;All files (*)"))); if (fileName.isEmpty()) { @@ -303,8 +303,8 @@ CmdTechDrawToggleFrame::CmdTechDrawToggleFrame() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Turn View Frames On/Off"); - sToolTipText = QT_TR_NOOP("Turn View Frames On/Off"); + sMenuText = QT_TR_NOOP("Toggle View Frames"); + sToolTipText = QT_TR_NOOP("Toggles the visibility of the view frames"); sWhatsThis = "TechDraw_Toggle"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_ToggleFrame"; @@ -331,8 +331,8 @@ void CmdTechDrawToggleFrame::activated(int iMsg) ViewProviderPage* vpPage = freecad_cast(vp); if (!vpPage) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No TechDraw Page"), - QObject::tr("Need a TechDraw Page for this command")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No TechDraw page"), + QObject::tr("A TechDraw page is required for this command")); return; } @@ -384,7 +384,7 @@ bool _checkSelectionHatch(Gui::Command* cmd) { std::vector selection = cmd->getSelection().getSelectionEx(); if (selection.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("Select a Face first")); + QObject::tr("Select a face first")); return false; } @@ -398,20 +398,20 @@ bool _checkSelectionHatch(Gui::Command* cmd) { std::vector pages = cmd->getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); if (pages.empty()){ QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("Create a page to insert.")); + QObject::tr("Create a page to insert")); return false; } const std::vector &SubNames = selection[0].getSubNames(); if (SubNames.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("No Faces to hatch in this selection")); + QObject::tr("No faces to hatch in this selection")); return false; } std::string gType = TechDraw::DrawUtil::getGeomTypeFromName(SubNames.at(0)); if (!(gType == "Face")) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("No Faces to hatch in this selection")); + QObject::tr("No faces to hatch in this selection")); return false; } diff --git a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp index 5f351ac2d6..0feee202cc 100644 --- a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp @@ -115,7 +115,7 @@ void execInsertPrefixChar(Gui::Command* cmd, const std::string& prefixFormat) { std::string prefixText(prefixFormat); if (prefixFormat.find("%s") != std::string::npos) { DlgTemplateField ui(Gui::getMainWindow()); - ui.setFieldName(QObject::tr("Repeat Count").toStdString()); + ui.setFieldName(QObject::tr("Repeat count").toStdString()); ui.setFieldContent("1"); if (ui.exec() != QDialog::Accepted) { return; @@ -149,9 +149,7 @@ CmdTechDrawExtensionInsertDiameter::CmdTechDrawExtensionInsertDiameter() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert '⌀' Prefix"); - sToolTipText = QT_TR_NOOP("Insert a '⌀' symbol at the beginning of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Inserts a '⌀' symbol at the beginning of the dimension"); sWhatsThis = "TechDraw_ExtensionInsertDiameter"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionInsertDiameter"; @@ -182,9 +180,7 @@ CmdTechDrawExtensionInsertSquare::CmdTechDrawExtensionInsertSquare() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert '□' Prefix"); - sToolTipText = QT_TR_NOOP("Insert a '□' symbol at the beginning of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Inserts a '□' symbol at the beginning of the dimension"); sWhatsThis = "TechDraw_ExtensionInsertSquare"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionInsertSquare"; @@ -215,9 +211,7 @@ CmdTechDrawExtensionInsertRepetition::CmdTechDrawExtensionInsertRepetition() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert 'n×' Prefix"); - sToolTipText = QT_TR_NOOP("Insert repeated feature count at the beginning of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Inserts a repeated feature count at the beginning of the dimension"); sWhatsThis = "TechDraw_ExtensionInsertRepetition"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionInsertRepetition"; @@ -274,9 +268,7 @@ CmdTechDrawExtensionRemovePrefixChar::CmdTechDrawExtensionRemovePrefixChar() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Remove Prefix"); - sToolTipText = QT_TR_NOOP("Remove prefix symbols at the beginning of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Removes the prefix symbols at the beginning of the dimension"); sWhatsThis = "TechDraw_ExtensionRemovePrefixChar"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionRemovePrefixChar"; @@ -307,9 +299,7 @@ CmdTechDrawExtensionInsertPrefixGroup::CmdTechDrawExtensionInsertPrefixGroup() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert '⌀' Prefix"); - sToolTipText = QT_TR_NOOP("Insert a '⌀' symbol at the beginning of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Inserts a '⌀' symbol at the beginning of the dimension text"); sWhatsThis = "TechDraw_ExtensionInsertPrefixGroup"; sStatusTip = sMenuText; } @@ -319,8 +309,8 @@ void CmdTechDrawExtensionInsertPrefixGroup::activated(int iMsg) // Base::Console().message("CMD::ExtensionLinePPGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -389,30 +379,22 @@ void CmdTechDrawExtensionInsertPrefixGroup::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdTechDrawExtensionInsertDiameter", "Insert '⌀' Prefix")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionInsertDiameter", -"Insert a '⌀' symbol at the beginning of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool")); +"Inserts a '⌀' symbol at the beginning of the dimension")); arc1->setStatusTip(arc1->text()); QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdTechDrawExtensionInsertSquare", "Insert '□' Prefix")); arc2->setToolTip(QApplication::translate("CmdTechDrawExtensionInsertSquare", -"Insert a '□' symbol at the beginning of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool")); +"Inserts a '□' symbol at the beginning of the dimension")); arc2->setStatusTip(arc2->text()); QAction* arc3 = a[2]; arc3->setText(QApplication::translate("CmdTechDrawExtensionInsertRepetition", "Insert 'n×' Prefix")); arc3->setToolTip(QApplication::translate("CmdTechDrawExtensionInsertRepetition", -"Insert repeated feature count at the beginning of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool")); +"Inserts a repeated feature count at the beginning of the dimension")); arc3->setStatusTip(arc3->text()); QAction* arc4 = a[3]; arc4->setText(QApplication::translate("TechDraw_ExtensionremovePrefixChar", "Remove Prefix")); arc4->setToolTip(QApplication::translate("TechDraw_ExtensionremovePrefixChar", -"Remove prefix symbols at the beginning of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool")); +"Removes the prefix symbols at the beginning of the dimension")); arc4->setStatusTip(arc4->text()); } @@ -464,9 +446,7 @@ CmdTechDrawExtensionIncreaseDecimal::CmdTechDrawExtensionIncreaseDecimal() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Increase Decimal Places"); - sToolTipText = QT_TR_NOOP("Increase the number of decimal places of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Increases the number of decimal places of the dimension"); sWhatsThis = "TechDraw_ExtensionIncreaseDecimal"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionIncreaseDecimal"; @@ -497,9 +477,7 @@ CmdTechDrawExtensionDecreaseDecimal::CmdTechDrawExtensionDecreaseDecimal() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Decrease Decimal Places"); - sToolTipText = QT_TR_NOOP("Decrease the number of decimal places of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Decreases the number of decimal places of the dimension"); sWhatsThis = "TechDraw_ExtensionDecreaseDecimal"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionDecreaseDecimal"; @@ -530,9 +508,7 @@ CmdTechDrawExtensionIncreaseDecreaseGroup::CmdTechDrawExtensionIncreaseDecreaseG sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Increase Decimal Places"); - sToolTipText = QT_TR_NOOP("Increase the number of decimal places of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Increases the number of decimal places of the dimension"); sWhatsThis = "TechDraw_ExtensionIncreaseDecreaseGroup"; sStatusTip = sMenuText; } @@ -542,8 +518,8 @@ void CmdTechDrawExtensionIncreaseDecreaseGroup::activated(int iMsg) // Base::Console().message("CMD::ExtensionIncreaseDecreaseGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -598,16 +574,12 @@ void CmdTechDrawExtensionIncreaseDecreaseGroup::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdTechDrawExtensionIncreaseDecimal", "Increase Decimal Places")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionIncreaseDecimal", -"Increase the number of decimal places of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool")); +"Increases the number of decimal places of the dimension")); arc1->setStatusTip(arc1->text()); QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdTechDrawExtensionDecreaseDecimal", "Decrease Decimal Places")); arc2->setToolTip(QApplication::translate("CmdTechDrawExtensionDecreaseDecimal", -"Decrease the number of decimal places of the dimension text:
    \ -- Select one or more dimensions
    \ -- Click this tool")); +"Decreases the number of decimal places of the dimension")); arc2->setStatusTip(arc2->text()); } @@ -629,7 +601,7 @@ void execPosHorizChainDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Pos Horiz Chain Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Position Horizontal Chain Dimension")); std::vector validDimension; validDimension = _getDimensions(selection, "DistanceX"); if (validDimension.empty()) { @@ -656,8 +628,8 @@ CmdTechDrawExtensionPosHorizChainDimension::CmdTechDrawExtensionPosHorizChainDim { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Position Horizontal Chain Dimensions"); - sToolTipText = QT_TR_NOOP("Align horizontal dimensions to create a chain dimension:
    \ + sMenuText = QT_TR_NOOP("Align Chain Dimensions Horizontally"); + sToolTipText = QT_TR_NOOP("Aligns the horizontal dimensions to create a chain dimension:
    \ - Select two or more horizontal dimensions
    \ - The first dimension defines the position
    \ - Click this tool"); @@ -690,7 +662,7 @@ void execPosVertChainDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Pos Vert Chain Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Position Vert Chain Dimension")); std::vector validDimension; validDimension = _getDimensions(selection, "DistanceY"); if (validDimension.empty()) { @@ -718,8 +690,8 @@ CmdTechDrawExtensionPosVertChainDimension::CmdTechDrawExtensionPosVertChainDimen { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Position Vertical Chain Dimensions"); - sToolTipText = QT_TR_NOOP("Align vertical dimensions to create a chain dimension:
    \ + sMenuText = QT_TR_NOOP("Align Chain Dimensions Vertically"); + sToolTipText = QT_TR_NOOP("Aligns the vertical dimensions to create a chain dimension:
    \ - Select two or more vertical dimensions
    \ - The first dimension defines the position
    \ - Click this tool"); @@ -752,7 +724,7 @@ void execPosObliqueChainDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Pos Oblique Chain Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Position Oblique Chain Dimension")); std::vector validDimension; validDimension = _getDimensions(selection, "Distance"); if (validDimension.empty()) { @@ -785,8 +757,8 @@ CmdTechDrawExtensionPosObliqueChainDimension::CmdTechDrawExtensionPosObliqueChai { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Position Oblique Chain Dimensions"); - sToolTipText = QT_TR_NOOP("Align oblique dimensions to create a chain dimension:
    \ + sMenuText = QT_TR_NOOP("Align Oblique Chain Dimensions"); + sToolTipText = QT_TR_NOOP("Aligns the oblique dimensions to create a chain dimension:
    \ - Select two or more parallel oblique dimensions
    \ - The first dimension defines the position
    \ - Click this tool"); @@ -820,8 +792,8 @@ CmdTechDrawExtensionPosChainDimensionGroup::CmdTechDrawExtensionPosChainDimensio { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Position Horizontal Chain Dimensions"); - sToolTipText = QT_TR_NOOP("Align horizontal dimensions to create a chain dimension:
    \ + sMenuText = QT_TR_NOOP("Align Horizontal Chain Dimensions"); + sToolTipText = QT_TR_NOOP("Aligns the horizontal dimensions to create a chain dimension:
    \ - Select two or more horizontal dimensions
    \ - The first dimension defines the position
    \ - Click this tool"); @@ -834,8 +806,8 @@ void CmdTechDrawExtensionPosChainDimensionGroup::activated(int iMsg) // Base::Console().message("CMD::ExtensionPosChainDimensionGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -897,7 +869,7 @@ void CmdTechDrawExtensionPosChainDimensionGroup::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdTechDrawExtensionPosHorizChainDimension", "Position Horizontal Chain Dimensions")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionPosHorizChainDimension", -"Align horizontal dimensions to create a chain dimension:
    \ +"Aligns the horizontal dimensions to create a chain dimension:
    \ - Select two or more horizontal dimensions
    \ - The first dimension defines the position
    \ - Click this tool")); @@ -905,7 +877,7 @@ void CmdTechDrawExtensionPosChainDimensionGroup::languageChange() QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdTechDrawExtensionPosVertChainDimension", "Position Vertical Chain Dimensions")); arc2->setToolTip(QApplication::translate("CmdTechDrawExtensionPosVertChainDimension", -"Align vertical dimensions to create a chain dimension:
    \ +"Aligns the vertical dimensions to create a chain dimension:
    \ - Select two or more vertical dimensions
    \ - The first dimension defines the position
    \ - Click this tool")); @@ -913,7 +885,7 @@ void CmdTechDrawExtensionPosChainDimensionGroup::languageChange() QAction* arc3 = a[2]; arc3->setText(QApplication::translate("CmdTechDrawExtensionPosObliqueChainDimension", "Position Oblique Chain Dimensions")); arc3->setToolTip(QApplication::translate("CmdTechDrawExtensionPosObliqueChainDimension", -"Align oblique dimensions to create a chain dimension:
    \ +"Aligns the oblique dimensions to create a chain dimension:
    \ - Select two or more parallel oblique dimensions
    \ - The first dimension defines the position
    \ - Click this tool")); @@ -938,7 +910,7 @@ void execCascadeHorizDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cascade Horiz Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cascade Horizontal Dimension")); std::vector validDimension; validDimension = _getDimensions(selection, "DistanceX"); if (validDimension.empty()) { @@ -970,7 +942,7 @@ CmdTechDrawExtensionCascadeHorizDimension::CmdTechDrawExtensionCascadeHorizDimen sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Cascade Horizontal Dimensions"); - sToolTipText = QT_TR_NOOP("Evenly space horizontal dimensions:
    \ + sToolTipText = QT_TR_NOOP("Evenly spaces the selected horizontal dimensions:
    \ - Specify the cascade spacing (optional)
    \ - Select two or more horizontal dimensions
    \ - The first dimension defines the position
    \ @@ -1004,7 +976,7 @@ void execCascadeVertDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cascade Vert Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cascade Vertical Dimension")); std::vector validDimension; validDimension = _getDimensions(selection, "DistanceY"); if (validDimension.empty()) { @@ -1037,7 +1009,7 @@ CmdTechDrawExtensionCascadeVertDimension::CmdTechDrawExtensionCascadeVertDimensi sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Cascade Vertical Dimensions"); - sToolTipText = QT_TR_NOOP("Evenly space vertical dimensions:
    \ + sToolTipText = QT_TR_NOOP("Evenly spaces the selected vertical dimensions:
    \ - Specify the cascade spacing (optional)
    \ - Select two or more vertical dimensions
    \ - The first dimension defines the position
    \ @@ -1071,7 +1043,7 @@ void execCascadeObliqueDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cascade Oblique Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cascade Oblique Dimension")); std::vector validDimension; validDimension = _getDimensions(selection, "Distance"); if (validDimension.empty()) { @@ -1112,7 +1084,7 @@ CmdTechDrawExtensionCascadeObliqueDimension::CmdTechDrawExtensionCascadeObliqueD sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Cascade Oblique Dimensions"); - sToolTipText = QT_TR_NOOP("Evenly space oblique dimensions:
    \ + sToolTipText = QT_TR_NOOP("Evenly spaces the selected oblique dimensions:
    \ - Specify the cascade spacing (optional)
    \ - Select two or more parallel oblique dimensions
    \ - The first dimension defines the position
    \ @@ -1148,7 +1120,7 @@ CmdTechDrawExtensionCascadeDimensionGroup::CmdTechDrawExtensionCascadeDimensionG sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Cascade Horizontal Dimensions"); - sToolTipText = QT_TR_NOOP("Evenly space horizontal dimensions:
    \ + sToolTipText = QT_TR_NOOP("Evenly spaces the selected horizontal dimensions:
    \ - Specify the cascade spacing (optional)
    \ - Select two or more horizontal dimensions
    \ - The first dimension defines the position
    \ @@ -1162,8 +1134,8 @@ void CmdTechDrawExtensionCascadeDimensionGroup::activated(int iMsg) // Base::Console().message("CMD::ExtensionCascadeDimansionGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -1225,7 +1197,7 @@ void CmdTechDrawExtensionCascadeDimensionGroup::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdTechDrawExtensionCascadeHorizDimension", "Cascade Horizontal Dimensions")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionCascadeHorizDimension", -"Evenly space horizontal dimensions:
    \ +"Evenly spaces the selected horizontal dimensions:
    \ - Specify the cascade spacing (optional)
    \ - Select two or more horizontal dimensions
    \ - The first dimension defines the position
    \ @@ -1234,7 +1206,7 @@ void CmdTechDrawExtensionCascadeDimensionGroup::languageChange() QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdTechDrawExtensionCascadeVertDimension", "Cascade Vertical Dimensions")); arc2->setToolTip(QApplication::translate("CmdTechDrawExtensionCascadeVertDimension", -"Evenly space vertical dimensions:
    \ +"Evenly spaces the selected vertical dimensions:
    \ - Specify the cascade spacing (optional)
    \ - Select two or more vertical dimensions
    \ - The first dimension defines the position
    \ @@ -1243,7 +1215,7 @@ void CmdTechDrawExtensionCascadeDimensionGroup::languageChange() QAction* arc3 = a[2]; arc3->setText(QApplication::translate("CmdTechDrawExtensionCascadeObliqueDimension", "Cascade Oblique Dimensions")); arc3->setToolTip(QApplication::translate("CmdTechDrawExtensionCascadeObliqueDimension", -"Evenly space oblique dimensions:
    \ +"Evenly spaces the selected oblique dimensions:
    \ - Specify the cascade spacing (optional)
    \ - Select two or more parallel oblique dimensions
    \ - The first dimension defines the position
    \ @@ -1270,7 +1242,7 @@ void execCreateHorizChainDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Horiz Chain Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Horizontal Chain Dimension")); const std::vector subNames = selection[0].getSubNames(); std::vector allVertexes; allVertexes = _getVertexInfo(objFeat, subNames); @@ -1301,10 +1273,9 @@ CmdTechDrawExtensionCreateHorizChainDimension::CmdTechDrawExtensionCreateHorizCh { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Horizontal Chain Dimensions"); - sToolTipText = QT_TR_NOOP("Create a sequence of aligned horizontal dimensions:
    \ -- Select three or more vertexes
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Horizontal Chain Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a sequence of aligned horizontal dimensions to at least " + "three selected vertices"); sWhatsThis = "TechDraw_ExtensionCreateHorizChainDimension"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCreateHorizChainDimension"; @@ -1336,7 +1307,7 @@ void execCreateVertChainDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Vert Chain Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Vert Chain dimension")); const std::vector subNames = selection[0].getSubNames(); std::vector allVertexes; allVertexes = _getVertexInfo(objFeat, subNames); @@ -1368,10 +1339,9 @@ CmdTechDrawExtensionCreateVertChainDimension::CmdTechDrawExtensionCreateVertChai { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Vertical Chain Dimensions"); - sToolTipText = QT_TR_NOOP("Create a sequence of aligned vertical dimensions:
    \ -- Select three or more vertexes
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Vertical Chain Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a sequence of aligned vertical dimensions to at least " + "three selected vertices"); sWhatsThis = "TechDraw_ExtensionCreateVertChainDimension"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCreateVertChainDimension"; @@ -1402,7 +1372,7 @@ void execCreateObliqueChainDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Oblique Chain Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create oblique chain dimension")); std::vector refs; for (auto& subName : selection[0].getSubNames()) { @@ -1491,11 +1461,9 @@ CmdTechDrawExtensionCreateObliqueChainDimension::CmdTechDrawExtensionCreateObliq { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Oblique Chain Dimensions"); - sToolTipText = QT_TR_NOOP("Create a sequence of aligned oblique dimensions:
    \ -- Select three or more vertexes
    \ -- The first two vertexes define the direction
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Oblique Chain Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a sequence of aligned oblique dimensions to at least " + "three selected vertices, where the first two define the direction"); sWhatsThis = "TechDraw_ExtensionCreateObliqueChainDimension"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCreateObliqueChainDimension"; @@ -1525,10 +1493,9 @@ CmdTechDrawExtensionCreateChainDimensionGroup::CmdTechDrawExtensionCreateChainDi { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Horizontal Chain Dimensions"); - sToolTipText = QT_TR_NOOP("Create a sequence of aligned horizontal dimensions:
    \ -- Select three or more vertexes
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Horizontal Chain Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a sequence of aligned horizontal dimensions to at least " + "three selected vertices, where the first two define the direction"); sWhatsThis = "TechDraw_ExtensionCreateChainDimensionGroup"; sStatusTip = sMenuText; } @@ -1538,8 +1505,8 @@ void CmdTechDrawExtensionCreateChainDimensionGroup::activated(int iMsg) // Base::Console().message("CMD::ExtensionCascadeDimansionGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -1599,26 +1566,19 @@ void CmdTechDrawExtensionCreateChainDimensionGroup::languageChange() QList a = pcAction->actions(); QAction* arc1 = a[0]; - arc1->setText(QApplication::translate("CmdTechDrawExtensionCreateHorizChainDimension", "Create Horizontal Chain Dimensions")); + arc1->setText(QApplication::translate("CmdTechDrawExtensionCreateHorizChainDimension", "Horizontal Chain Dimension")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionCreateHorizChainDimension", -"Create a sequence of aligned horizontal dimensions:
    \ -- Select three or more vertexes
    \ -- Click this tool")); +"Inserts a sequence of aligned horizontal dimensions to at least three selected vertices, where the first two define the direction")); arc1->setStatusTip(arc1->text()); QAction* arc2 = a[1]; - arc2->setText(QApplication::translate("CmdTechDrawExtensionCreateVertChainDimension", "Create Vertical Chain Dimensions")); + arc2->setText(QApplication::translate("CmdTechDrawExtensionCreateVertChainDimension", "Vertical Chain Dimension")); arc2->setToolTip(QApplication::translate("CmdTechDrawExtensionCreateVertChainDimension", -"Create a sequence of aligned vertical dimensions:
    \ -- Select three or more vertexes
    \ -- Click this tool")); +"Inserts a sequence of aligned vertical dimensions to at least three selected vertices, where the first two define the direction")); arc2->setStatusTip(arc2->text()); QAction* arc3 = a[2]; - arc3->setText(QApplication::translate("CmdTechDrawExtensionCreateObliqueChainDimension", "Create Oblique Chain Dimensions")); + arc3->setText(QApplication::translate("CmdTechDrawExtensionCreateObliqueChainDimension", "Oblique Chain Dimension")); arc3->setToolTip(QApplication::translate("CmdTechDrawExtensionCreateObliqueChainDimension", -"Create a sequence of aligned oblique dimensions:
    \ -- Select three or more vertexes
    \ -- The first two vertexes define the direction
    \ -- Click this tool")); +"Inserts a sequence of aligned oblique dimensions to at least three selected vertices, where the first two define the direction")); arc3->setStatusTip(arc3->text()); } @@ -1637,11 +1597,11 @@ void execCreateHorizCoordDimension(Gui::Command* cmd) { //create horizontal coordinate dimensions std::vector selection; TechDraw::DrawViewPart* objFeat; - if (!_checkSelObjAndSubs(cmd, selection, objFeat, QT_TRANSLATE_NOOP("QObject","TechDraw Create Horizontal Coord Dimension"))) { + if (!_checkSelObjAndSubs(cmd, selection, objFeat, QT_TRANSLATE_NOOP("QObject","TechDraw Create Horizontal Coordinate Dimension"))) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Horiz Coord Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Horizontal Coord Dimension")); const std::vector subNames = selection[0].getSubNames(); std::vector allVertexes; allVertexes = _getVertexInfo(objFeat, subNames); @@ -1678,12 +1638,8 @@ CmdTechDrawExtensionCreateHorizCoordDimension::CmdTechDrawExtensionCreateHorizCo { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Horizontal Coordinate Dimensions"); - sToolTipText = QT_TR_NOOP("Create multiple evenly spaced horizontal dimensions starting from the same baseline:
    \ -- Specify the cascade spacing (optional)
    \ -- Select three or more vertexes
    \ -- The selection order of the first two vertexes determines the position of the baseline
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Horizontal Coordinate Dimension"); + sToolTipText = QT_TR_NOOP("Adds evenly spaced horizontal dimensions between 3 or more vertices aligned to a shared baseline"); sWhatsThis = "TechDraw_ExtensionCreateHorizCoordDimension"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCreateHorizCoordDimension"; @@ -1710,10 +1666,10 @@ void execCreateVertCoordDimension(Gui::Command* cmd) { //create vertical coordinate dimensions std::vector selection; TechDraw::DrawViewPart* objFeat; - if (!_checkSelObjAndSubs(cmd, selection, objFeat, QT_TRANSLATE_NOOP("QObject","TechDraw Create Vertical Coord Dimension"))) { + if (!_checkSelObjAndSubs(cmd, selection, objFeat, QT_TRANSLATE_NOOP("QObject","TechDraw Create Vertical Coord dimension"))) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Vert Coord Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create vert coord dimension")); const std::vector subNames = selection[0].getSubNames(); std::vector allVertexes; allVertexes = _getVertexInfo(objFeat, subNames); @@ -1751,12 +1707,8 @@ CmdTechDrawExtensionCreateVertCoordDimension::CmdTechDrawExtensionCreateVertCoor { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Vertical Coordinate Dimensions"); - sToolTipText = QT_TR_NOOP("Create multiple evenly spaced vertical dimensions starting from the same baseline:
    \ -- Specify the cascade spacing (optional)
    \ -- Select three or more vertexes
    \ -- The selection order of the first two vertexes determines the position of the baseline
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Vertical Coordinate Dimension"); + sToolTipText = QT_TR_NOOP("Adds evenly spaced vertical dimensions between 3 or more vertices aligned to a shared baseline"); sWhatsThis = "TechDraw_ExtensionCreateVertCoordDimension"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCreateVertCoordDimension"; @@ -1787,7 +1739,7 @@ void execCreateObliqueCoordDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Oblique Coord Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create oblique coord dimension")); std::vector refs; for (auto& subName : selection[0].getSubNames()) { @@ -1880,13 +1832,8 @@ CmdTechDrawExtensionCreateObliqueCoordDimension::CmdTechDrawExtensionCreateObliq { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Oblique Coordinate Dimensions"); - sToolTipText = QT_TR_NOOP("Create multiple evenly spaced oblique dimensions starting from the same baseline:
    \ -- Specify the cascade spacing (optional)
    \ -- Select three or more vertexes
    \ -- The selection order of the first two vertexes determines the position of the baseline
    \ -- The first two vertexes also define the direction
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Oblique Coordinate Dimension"); + sToolTipText = QT_TR_NOOP("Adds evenly spaced oblique dimensions between 3 or more vertices aligned to a shared baseline"); sWhatsThis = "TechDraw_ExtensionCreateObliqueCoordDimension"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCreateObliqueCoordDimension"; @@ -1916,12 +1863,8 @@ CmdTechDrawExtensionCreateCoordDimensionGroup::CmdTechDrawExtensionCreateCoordDi { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Horizontal Coordinate Dimensions"); - sToolTipText = QT_TR_NOOP("Create multiple evenly spaced horizontal dimensions starting from the same baseline:
    \ -- Specify the cascade spacing (optional)
    \ -- Select three or more vertexes
    \ -- The selection order of the first two vertexes determines the position of the baseline
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Horizontal Coordinate Dimension"); + sToolTipText = QT_TR_NOOP("Adds evenly spaced horizontal dimensions between 3 or more vertices aligned to a shared baseline"); sWhatsThis = "TechDraw_ExtensionCreateCoordDimensionGroup"; sStatusTip = sMenuText; } @@ -1931,8 +1874,8 @@ void CmdTechDrawExtensionCreateCoordDimensionGroup::activated(int iMsg) // Base::Console().message("CMD::ExtensionCascadeDimansionGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -1992,32 +1935,19 @@ void CmdTechDrawExtensionCreateCoordDimensionGroup::languageChange() QList a = pcAction->actions(); QAction* arc1 = a[0]; - arc1->setText(QApplication::translate("CmdTechDrawExtensionCreateHorizCoordDimension", "Create Horizontal Coordinate Dimensions")); + arc1->setText(QApplication::translate("CmdTechDrawExtensionCreateHorizCoordDimension", "Horizontal Coordinate Dimension")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionCreateHorizCoordDimension", -"Create multiple evenly spaced horizontal dimensions starting from the same baseline:
    \ -- Specify the cascade spacing (optional)
    \ -- Select three or more vertexes
    \ -- The selection order of the first two vertexes determines the position of the baseline
    \ -- Click this tool")); +"Adds evenly spaced horizontal dimensions between 3 or more vertices aligned to a shared baseline")); arc1->setStatusTip(arc1->text()); QAction* arc2 = a[1]; - arc2->setText(QApplication::translate("CmdTechDrawExtensionCreateVertCoordDimension", "Create Vertical Coordinate Dimensions")); + arc2->setText(QApplication::translate("CmdTechDrawExtensionCreateVertCoordDimension", "Vertical Coordinate Dimension")); arc2->setToolTip(QApplication::translate("CmdTechDrawExtensionCreateVertCoordDimension", -"Create multiple evenly spaced vertical dimensions starting from the same baseline:
    \ -- Specify the cascade spacing (optional)
    \ -- Select three or more vertexes
    \ -- The selection order of the first two vertexes determines the position of the baseline
    \ -- Click this tool")); +"Adds evenly spaced vertical dimensions between 3 or more vertices aligned to a shared baseline")); arc2->setStatusTip(arc2->text()); QAction* arc3 = a[2]; - arc3->setText(QApplication::translate("CmdTechDrawExtensionCreateObliqueCoordDimension", "Create Oblique Coordinate Dimensions")); + arc3->setText(QApplication::translate("CmdTechDrawExtensionCreateObliqueCoordDimension", "Oblique Coordinate Dimension")); arc3->setToolTip(QApplication::translate("CmdTechDrawExtensionCreateObliqueCoordDimension", -"Create multiple evenly spaced oblique dimensions starting from the same baseline:
    \ -- Specify the cascade spacing (optional)
    \ -- Select three or more vertexes
    \ -- The selection order of the first two vertexes determines the position of the baseline
    \ -- The first two vertexes also define the direction
    \ -- Click this tool")); +"Adds evenly spaced oblique dimensions between 3 or more vertices aligned to a shared baseline")); arc3->setStatusTip(arc3->text()); } @@ -2040,7 +1970,7 @@ void execCreateHorizChamferDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Horiz Chamfer Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Horizontal Chamfer Dimension")); const std::vector subNames = selection[0].getSubNames(); std::vector allVertexes; allVertexes = _getVertexInfo(objFeat, subNames); @@ -2074,10 +2004,8 @@ CmdTechDrawExtensionCreateHorizChamferDimension::CmdTechDrawExtensionCreateHoriz { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Horizontal Chamfer Dimension"); - sToolTipText = QT_TR_NOOP("Create a horizontal size and angle dimension for a chamfer:
    \ -- Select two vertexes
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Horizontal Chamfer Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a horizontal size and angle dimension for a chamfer from 2 selected vertices"); sWhatsThis = "TechDraw_ExtensionCreateHorizChamferDimension"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCreateHorizChamferDimension"; @@ -2108,7 +2036,7 @@ void execCreateVertChamferDimension(Gui::Command* cmd) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Vert Chamfer Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Vert Chamfer Dimension")); const std::vector subNames = selection[0].getSubNames(); std::vector allVertexes; allVertexes = _getVertexInfo(objFeat, subNames); @@ -2142,10 +2070,8 @@ CmdTechDrawExtensionCreateVertChamferDimension::CmdTechDrawExtensionCreateVertCh { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Vertical Chamfer Dimension"); - sToolTipText = QT_TR_NOOP("Create a vertical size and angle dimension for a chamfer:
    \ -- Select two vertexes
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Vertical Chamfer Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a vertical size and angle dimension for a chamfer from 2 selected vertices"); sWhatsThis = "TechDraw_ExtensionCreateVertChamferDimension"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCreateVertChamferDimension"; @@ -2175,10 +2101,8 @@ CmdTechDrawExtensionChamferDimensionGroup::CmdTechDrawExtensionChamferDimensionG { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Horizontal Chamfer Dimension"); - sToolTipText = QT_TR_NOOP("Create a horizontal size and angle dimension for a chamfer:
    \ -- Select two vertexes
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Horizontal Chamfer Dimension"); + sToolTipText = QT_TR_NOOP("Inserts a horizontal size and angle dimension for a chamfer from 2 selected vertices"); sWhatsThis = "TechDraw_ExtensionChamferDimensionGroup"; sStatusTip = sMenuText; } @@ -2188,8 +2112,8 @@ void CmdTechDrawExtensionChamferDimensionGroup::activated(int iMsg) // Base::Console().message("CMD::ExtensionIncreaseDecreaseGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close active task dialog and try again")); return; } @@ -2242,18 +2166,14 @@ void CmdTechDrawExtensionChamferDimensionGroup::languageChange() QList a = pcAction->actions(); QAction* arc1 = a[0]; - arc1->setText(QApplication::translate("CmdTechDrawExtensionCreateHorizChamferDimension", "Create Horizontal Chamfer Dimension")); + arc1->setText(QApplication::translate("CmdTechDrawExtensionCreateHorizChamferDimension", "Horizontal Chamfer Dimension")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionCreateHorizChamferDimension", -"Create a horizontal size and angle dimension for a chamfer:
    \ -- Select two vertexes
    \ -- Click this tool")); +"Inserts a horizontal size and angle dimension for a chamfer from 2 selected vertices")); arc1->setStatusTip(arc1->text()); QAction* arc2 = a[1]; - arc2->setText(QApplication::translate("CmdTechDrawExtensionCreateVertChamferDimension", "Create Vertical Chamfer Dimension")); + arc2->setText(QApplication::translate("CmdTechDrawExtensionCreateVertChamferDimension", "Vertical Chamfer Dimension")); arc2->setToolTip(QApplication::translate("CmdTechDrawExtensionCreateVertChamferDimension", -"Create a vertical size and angle dimension for a chamfer:
    \ -- Select two vertexes
    \ -- Click this tool")); +"Inserts a vertical size and angle dimension for a chamfer from 2 selected vertices")); arc2->setStatusTip(arc2->text()); } @@ -2275,10 +2195,8 @@ CmdTechDrawExtensionCreateLengthArc::CmdTechDrawExtensionCreateLengthArc() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Create Arc Length Dimension"); - sToolTipText = QT_TR_NOOP("Create an arc length dimension:
    \ -- Select a single arc
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Arc Length Dimension"); + sToolTipText = QT_TR_NOOP("Inserts an arc length dimension to the selected arc"); sWhatsThis = "TechDraw_ExtensionCreateLengthArc"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCreateLengthArc"; @@ -2293,7 +2211,7 @@ void CmdTechDrawExtensionCreateLengthArc::activated(int iMsg) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Arc Length Dim")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Arc Length Dimension")); ReferenceEntry ref(objFeat, selection[0].getSubNames()[0]); TechDraw::DrawViewDimension* dim = makeArcLengthDimension(ref); @@ -2327,9 +2245,7 @@ CmdTechDrawExtensionCustomizeFormat::CmdTechDrawExtensionCustomizeFormat() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Customize Format Label"); - sToolTipText = QT_TR_NOOP("Select a dimension or a balloon
    \ - - click this tool
    \ - - edit the Format field, using the keyboard and/or the special buttons"); + sToolTipText = QT_TR_NOOP("Customizes the format label of a selected dimension or balloon"); sWhatsThis = "TechDraw_ExtensionCustomizeFormat"; sStatusTip = sToolTipText; sPixmap = "TechDraw_ExtensionCustomizeFormat"; @@ -2448,7 +2364,7 @@ namespace TechDrawGui { if (subs.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr(message.c_str()), - QObject::tr("No subelements selected")); + QObject::tr("No sub-elements selected")); return false; } } else { diff --git a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp index 4c1c911495..2cef5cad8c 100644 --- a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp +++ b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp @@ -103,7 +103,7 @@ void execHoleCircle(Gui::Command* cmd) //create centerlines of a hole/bolt circle std::vector selection; TechDraw::DrawViewPart* objFeat{nullptr}; - if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw Hole Circle"))) { + if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw hole circle"))) { return; } const std::vector SubNames = selection[0].getSubNames(); @@ -120,11 +120,11 @@ void execHoleCircle(Gui::Command* cmd) } } if (Circles.size() <= 2) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("TechDraw Hole Circle"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("TechDraw hole circle"), QObject::tr("Fewer than three circles selected")); return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Bolt Circle Centerlines")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Bolt circle centerlines")); // make the bolt hole circle from 3 scaled and rotated points Base::Vector3d bigCenter = @@ -169,11 +169,8 @@ CmdTechDrawExtensionHoleCircle::CmdTechDrawExtensionHoleCircle() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Bolt Circle Centerlines"); - sToolTipText = QT_TR_NOOP("Add centerlines to a circular pattern of circles:
    \ -- Specify the line attributes (optional)
    \ -- Select three or more circles forming a circular pattern
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Bolt Circle Centerlines"); + sToolTipText = QT_TR_NOOP("Adds centerlines to a circular pattern of three or more selected circles"); sWhatsThis = "TechDraw_ExtensionHoleCircle"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionHoleCircle"; @@ -202,7 +199,7 @@ void execCircleCenterLines(Gui::Command* cmd) // create circle centerlines std::vector selection; TechDraw::DrawViewPart* objFeat{nullptr}; - if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw Circle Centerlines"))) { + if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw circle centerlines"))) { return; } Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Circle Centerlines")); @@ -245,11 +242,8 @@ CmdTechDrawExtensionCircleCenterLines::CmdTechDrawExtensionCircleCenterLines() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Circle Centerlines"); - sToolTipText = QT_TR_NOOP("Add centerlines to circles and arcs:
    \ -- Specify the line attributes (optional)
    \ -- Select one or more circles or arcs
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Circle Centerlines"); + sToolTipText = QT_TR_NOOP("Adds centerlines to the selected circles and arcs"); sWhatsThis = "TechDraw_ExtensionCircleCenterLines"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionCircleCenterLines"; @@ -279,11 +273,8 @@ CmdTechDrawExtensionCircleCenterLinesGroup::CmdTechDrawExtensionCircleCenterLine { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Circle Centerlines"); - sToolTipText = QT_TR_NOOP("Add centerlines to circles and arcs:
    \ -- Specify the line attributes (optional)
    \ -- Select one or more circles or arcs
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Circle Centerlines"); + sToolTipText = QT_TR_NOOP("Adds centerlines to selected circles and arcs"); sWhatsThis = "TechDraw_ExtensionCircleCenterLinesGroup"; sStatusTip = sMenuText; } @@ -292,7 +283,7 @@ void CmdTechDrawExtensionCircleCenterLinesGroup::activated(int iMsg) { Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), QObject::tr("Close active task dialog and try again.")); return; } @@ -348,21 +339,15 @@ void CmdTechDrawExtensionCircleCenterLinesGroup::languageChange() QAction* arc1 = action[0]; arc1->setText( - QApplication::translate("CmdTechDrawExtensionCircleCenterLines", "Add Circle Centerlines")); + QApplication::translate("CmdTechDrawExtensionCircleCenterLines", "Circle Centerlines")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionCircleCenterLines", - "Add centerlines to circles and arcs:
    \ -- Specify the line attributes (optional)
    \ -- Select one or more circles or arcs
    \ -- Click this tool")); + "Adds centerlines to selected circles and arcs:")); arc1->setStatusTip(arc1->text()); QAction* arc2 = action[1]; arc2->setText( - QApplication::translate("CmdTechDrawExtensionHoleCircle", "Add Bolt Circle Centerlines")); + QApplication::translate("CmdTechDrawExtensionHoleCircle", "Bolt Circle Centerlines")); arc2->setToolTip(QApplication::translate("CmdTechDrawExtensionHoleCircle", - "Add centerlines to a circular pattern of circles:
    \ -- Specify the line attributes (optional)
    \ -- Select three or more circles forming a circular pattern
    \ -- Click this tool")); + "Adds centerlines to a circular pattern of selected circles")); arc2->setStatusTip(arc2->text()); } @@ -404,11 +389,8 @@ CmdTechDrawExtensionThreadHoleSide::CmdTechDrawExtensionThreadHoleSide() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Thread Hole Side View"); - sToolTipText = QT_TR_NOOP("Add a cosmetic thread to the side view of a hole:
    \ -- Specify the line attributes (optional)
    \ -- Select two parallel lines
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Thread Hole Side View"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic thread to the side view of a hole or circle"); sWhatsThis = "TechDraw_ExtensionThreadHoleSide"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionThreadHoleSide"; @@ -458,11 +440,9 @@ CmdTechDrawExtensionThreadBoltSide::CmdTechDrawExtensionThreadBoltSide() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Thread Bolt Side View"); - sToolTipText = QT_TR_NOOP("Add a cosmetic thread to the side view of a bolt/screw/rod:
    \ -- Specify the line attributes (optional)
    \ -- Select two parallel lines
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Thread Bolt Side View"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic thread to the side view of a " + "bolt/screw/rod between two selected parallel lines"); sWhatsThis = "TechDraw_ExtensionThreadBoltSide"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionThreadBoltSide"; @@ -494,7 +474,7 @@ void execThreadHoleBottom(Gui::Command* cmd) if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw Thread Hole Bottom"))) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic Thread Hole Bottom")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic thread hole bottom")); const std::vector SubNames = selection[0].getSubNames(); for (const std::string& Name : SubNames) { _createThreadCircle(Name, objFeat, ThreadFactor); @@ -512,11 +492,8 @@ CmdTechDrawExtensionThreadHoleBottom::CmdTechDrawExtensionThreadHoleBottom() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Thread Hole Bottom View"); - sToolTipText = QT_TR_NOOP("Add a cosmetic thread to the top or bottom view of holes:
    \ -- Specify the line attributes (optional)
    \ -- Select one or more circles
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Thread Hole Bottom View"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic thread to the top or bottom view of selected holes or circles"); sWhatsThis = "TechDraw_ExtensionThreadHoleBottom"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionThreadHoleBottom"; @@ -566,12 +543,9 @@ CmdTechDrawExtensionThreadBoltBottom::CmdTechDrawExtensionThreadBoltBottom() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Thread Bolt Bottom View"); + sMenuText = QT_TR_NOOP("Cosmetic Thread Bolt Bottom View"); sToolTipText = - QT_TR_NOOP("Add a cosmetic thread to the top or bottom view of bolts/screws/rods:
    \ -- Specify the line attributes (optional)
    \ -- Select one or more circles
    \ -- Click this tool"); + QT_TR_NOOP("Adds a cosmetic thread to the top or bottom view of the selected bolts/screws/rods"); sWhatsThis = "TechDraw_ExtensionThreadBoltBottom"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionThreadBoltBottom"; @@ -601,11 +575,8 @@ CmdTechDrawExtensionThreadsGroup::CmdTechDrawExtensionThreadsGroup() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Thread Hole Side View"); - sToolTipText = QT_TR_NOOP("Add a cosmetic thread to the side view of a hole:
    \ -- Specify the line attributes (optional)
    \ -- Select two parallel lines
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Thread Hole Side View"); + sToolTipText = QT_TR_NOOP("Add a cosmetic thread to the side view of a selected hole between two selected parallel lines"); sWhatsThis = "TechDraw_ExtensionThreadsGroup"; sStatusTip = sMenuText; } @@ -615,7 +586,7 @@ void CmdTechDrawExtensionThreadsGroup::activated(int iMsg) // Base::Console().message("CMD::TechDrawExtensionThreadsGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), QObject::tr("Close active task dialog and try again.")); return; } @@ -685,42 +656,32 @@ void CmdTechDrawExtensionThreadsGroup::languageChange() QAction* arc1 = action[0]; arc1->setText(QApplication::translate("CmdTechDrawExtensionThreadHoleSide", - "Add Cosmetic Thread Hole Side View")); + "Cosmetic Thread Hole Side View")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionThreadHoleSide", - "Add a cosmetic thread to the side view of a hole:
    \ -- Specify the line attributes (optional)
    \ -- Select two parallel lines
    \ -- Click this tool")); + "Adds a cosmetic thread to the side view of a " + "selected hole between two selected parallel lines")); arc1->setStatusTip(arc1->text()); QAction* arc2 = action[1]; arc2->setText(QApplication::translate("CmdTechDrawExtensionThreadHoleBottom", - "Add Cosmetic Thread Hole Bottom View")); + "Cosmetic Thread Hole Bottom View")); arc2->setToolTip( QApplication::translate("CmdTechDrawExtensionThreadHoleBottom", - "Add a cosmetic thread to the top or bottom view of holes:
    \ -- Specify the line attributes (optional)
    \ -- Select one or more circles
    \ -- Click this tool")); + "Adds a cosmetic thread to the top or bottom view of holes or circles")); arc2->setStatusTip(arc2->text()); QAction* arc3 = action[2]; arc3->setText(QApplication::translate("CmdTechDrawExtensionThreadBoltSide", - "Add Cosmetic Thread Bolt Side View")); + "Cosmetic Thread Bolt Side View")); arc3->setToolTip( QApplication::translate("CmdTechDrawExtensionThreadBoltSide", - "Add a cosmetic thread to the side view of a bolt/screw/rod:
    \ -- Specify the line attributes (optional)
    \ -- Select two parallel lines
    \ -- Click this tool")); + "Adds a cosmetic thread to the side view of a bolt/screw/rod " + "between two selected parallel lines")); arc3->setStatusTip(arc3->text()); QAction* arc4 = action[3]; arc4->setText(QApplication::translate("CmdTechDrawExtensionThreadBoltBottom", - "Add Cosmetic Thread Bolt Bottom View")); + "Cosmetic Thread Bolt Bottom View")); arc4->setToolTip(QApplication::translate( "CmdTechDrawExtensionThreadBoltBottom", - "Add a cosmetic thread to the top or bottom view of bolts/screws/rods:
    \ -- Specify the line attributes (optional)
    \ -- Select one or more circles
    \ -- Click this tool")); + "Adds a cosmetic thread to the top or bottom view of the selected bolts/screws/rods")); arc4->setStatusTip(arc4->text()); } @@ -744,10 +705,7 @@ CmdTechDrawExtensionSelectLineAttributes::CmdTechDrawExtensionSelectLineAttribut sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Select Line Attributes, Cascade Spacing and Delta Distance"); sToolTipText = QT_TR_NOOP( - "Select the attributes for new cosmetic lines and centerlines, and specify the cascade spacing and delta distance:
    \ -- Click this tool
    \ -- Specify the attributes, spacing and distance in the dialog box
    \ -- Press OK"); + "Configures the default attributes for cosmetic lines and centerlines, including cascade spacing and delta distance"); sWhatsThis = "TechDraw_ExtensionSelectLineAttributes"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionSelectLineAttributes"; @@ -778,10 +736,7 @@ CmdTechDrawExtensionChangeLineAttributes::CmdTechDrawExtensionChangeLineAttribut sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Change Line Attributes"); - sToolTipText = QT_TR_NOOP("Change the attributes of cosmetic lines and centerlines:
    \ -- Specify the line attributes (optional)
    \ -- Select one or more lines
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Changes the selected cosmetic lines and centerlines to the specified attributes"); sWhatsThis = "TechDraw_ExtensionChangeLineAttributes"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionChangeLineAttributes"; @@ -793,10 +748,10 @@ void CmdTechDrawExtensionChangeLineAttributes::activated(int iMsg) Q_UNUSED(iMsg); std::vector selection; TechDraw::DrawViewPart* objFeat{nullptr}; - if (!_checkSel(this, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw Change Line Attributes"))) { + if (!_checkSel(this, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw change line attributes"))) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Change Line Attributes")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Change line attributes")); const std::vector subNames = selection[0].getSubNames(); for (const std::string& name : subNames) { int num = DrawUtil::getIndexFromName(name); @@ -838,11 +793,9 @@ CmdTechDrawExtensionVertexAtIntersection::CmdTechDrawExtensionVertexAtIntersecti { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Intersection Vertex(es)"); + sMenuText = QT_TR_NOOP("Cosmetic Intersection Vertices"); sToolTipText = - QT_TR_NOOP("Add cosmetic vertex(es) at the intersection(s) of selected edges:
    \ -- Select two edges
    \ -- Click this tool"); + QT_TR_NOOP("Adds cosmetic vertices at the intersections of selected edges"); sWhatsThis = "TechDraw_ExtensionVertexAtIntersection"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionVertexAtIntersection"; @@ -854,10 +807,10 @@ void CmdTechDrawExtensionVertexAtIntersection::activated(int iMsg) //Base::Console().message("VertexAtIntersection started\n"); std::vector selection; TechDraw::DrawViewPart* objFeat{nullptr}; - if (!_checkSel(this, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw Cosmetic Intersection Vertex(es)"))) { + if (!_checkSel(this, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw cosmetic intersection vertices"))) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic Intersection Vertex(es)")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic intersection vertices")); const std::vector SubNames = selection[0].getSubNames(); if (SubNames.size() >= 2) { std::string GeoType1 = TechDraw::DrawUtil::getGeomTypeFromName(SubNames[0]); @@ -900,10 +853,10 @@ void execDrawCosmArc(Gui::Command* cmd) //draw a cosmetic arc of circle std::vector selection; TechDraw::DrawViewPart* objFeat{nullptr}; - if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw Cosmetic Arc"))) { + if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw cosmetic arc"))) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic Arc")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic arc")); const std::vector SubNames = selection[0].getSubNames(); std::vector vertexPoints; vertexPoints = _getVertexPoints(SubNames, objFeat); @@ -938,13 +891,9 @@ CmdTechDrawExtensionDrawCosmArc::CmdTechDrawExtensionDrawCosmArc() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Arc"); - sToolTipText = QT_TR_NOOP("Add a cosmetic counter clockwise arc based on three vertexes:
    \ -- Specify the line attributes (optional)
    \ -- Select vertex 1 (center point)
    \ -- Select vertex 2 (radius and start angle)
    \ -- Select vertex 3 (end angle)
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Arc"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic counter clockwise arc based on three vertices, " + "where the first selection is the center point and the second is the radius and start point"); sWhatsThis = "TechDraw_ExtensionDrawCosmArc"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionDrawCosmArc"; @@ -973,7 +922,7 @@ void execDrawCosmCircle(Gui::Command* cmd) //draw a cosmetic circle std::vector selection; TechDraw::DrawViewPart* objFeat{nullptr}; - if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw Cosmetic Circle"))) { + if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw cosmetic circle"))) { return; } Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic Circle")); @@ -1002,12 +951,9 @@ CmdTechDrawExtensionDrawCosmCircle::CmdTechDrawExtensionDrawCosmCircle() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Circle"); - sToolTipText = QT_TR_NOOP("Add a cosmetic circle based on two vertexes:
    \ -- Specify the line attributes (optional)
    \ -- Select vertex 1 (center point)
    \ -- Select vertex 2 (radius)
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Circle"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic circle based on two selected vertices, where the " + "first is the ceneter point and the second is the radius"); sWhatsThis = "TechDraw_ExtensionDrawCosmCircle"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionDrawCosmCircle"; @@ -1068,11 +1014,8 @@ CmdTechDrawExtensionDrawCosmCircle3Points::CmdTechDrawExtensionDrawCosmCircle3Po { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Circle 3 Points"); - sToolTipText = QT_TR_NOOP("Add a cosmetic circle based on three vertexes:
    \ -- Specify the line attributes (optional)
    \ -- Select 3 vertexes
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Circle 3 Points"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic circle to three selected vertices"); sWhatsThis = "TechDraw_ExtensionDrawCosmCircle3Points"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionDrawCosmCircle3Points"; @@ -1103,12 +1046,8 @@ CmdTechDrawExtensionDrawCirclesGroup::CmdTechDrawExtensionDrawCirclesGroup() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Circle"); - sToolTipText = QT_TR_NOOP("Add a cosmetic circle based on two vertexes:
    \ -- Specify the line attributes (optional)
    \ -- Select vertex 1 (center point)
    \ -- Select vertex 2 (radius)
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Circle"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic circle based on two vertices, where the first selection is the centerpoint and the second is the radius"); sWhatsThis = "TechDraw_ExtensionDrawCirclesGroup"; sStatusTip = sMenuText; } @@ -1118,7 +1057,7 @@ void CmdTechDrawExtensionDrawCirclesGroup::activated(int iMsg) // Base::Console().message("CMD::ExtensionDrawCirclesGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), QObject::tr("Close active task dialog and try again.")); return; } @@ -1181,33 +1120,23 @@ void CmdTechDrawExtensionDrawCirclesGroup::languageChange() QAction* arc1 = action[0]; arc1->setText( - QApplication::translate("CmdTechDrawExtensionDrawCosmCircle", "Add Cosmetic Circle")); + QApplication::translate("CmdTechDrawExtensionDrawCosmCircle", "Cosmetic Circle")); arc1->setToolTip(QApplication::translate("CmdTechDrawExtensionDrawCosmCircle", - "Add a cosmetic circle based on two vertexes:
    \ -- Specify the line attributes (optional)
    \ -- Select vertex 1 (center point)
    \ -- Select vertex 2 (radius)
    \ -- Click this tool")); + "Adds a cosmetic circle based on two vertices, where " + "the first selection is the centerpoint and the second is the radius")); arc1->setStatusTip(arc1->text()); QAction* arc2 = action[1]; - arc2->setText(QApplication::translate("CmdTechDrawExtensionDrawCosmArc", "Add Cosmetic Arc")); + arc2->setText(QApplication::translate("CmdTechDrawExtensionDrawCosmArc", "Cosmetic Arc")); arc2->setToolTip( QApplication::translate("CmdTechDrawExtensionDrawCosmArc", - "Add a cosmetic counter clockwise arc based on three vertexes:
    \ -- Specify the line attributes (optional)
    \ -- Select vertex 1 (center point)
    \ -- Select vertex 2 (radius and start angle)
    \ -- Select vertex 3 (end angle)
    \ -- Click this tool")); + "Adds a cosmetic counter clockwise arc based on three vertices, " + "where the first selection is the center point and the second is the radius and start point.")); arc2->setStatusTip(arc2->text()); QAction* arc3 = action[2]; arc3->setText(QApplication::translate("CmdTechDrawExtensionDrawCosmCircle3Points", - "Add Cosmetic Circle 3 Points")); + "Cosmetic 3 Point Circle")); arc3->setToolTip(QApplication::translate("CmdTechDrawExtensionDrawCosmCircle3Points", - "Add a cosmetic circle based on three vertexes:
    \ -- Specify the line attributes (optional)
    \ -- Select three vertexes
    \ -- Click this tool")); + "Adds a cosmetic circle to 3 selected vertices")); arc3->setStatusTip(arc3->text()); } @@ -1284,11 +1213,8 @@ CmdTechDrawExtensionLineParallel::CmdTechDrawExtensionLineParallel() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Parallel Line"); - sToolTipText = QT_TR_NOOP("Add a cosmetic line parallel to another line through a vertex:
    \ -- Select a line
    \ -- Select a vertex
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Parallel Line"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic circle to 3 selected vertices"); sWhatsThis = "TechDraw_ExtensionLineParallel"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionLineParallel"; @@ -1318,12 +1244,9 @@ CmdTechDrawExtensionLinePerpendicular::CmdTechDrawExtensionLinePerpendicular() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Perpendicular Line"); + sMenuText = QT_TR_NOOP("Cosmetic Perpendicular Line"); sToolTipText = - QT_TR_NOOP("Add a cosmetic line perpendicular to another line through a vertex:
    \ -- Select a line
    \ -- Select a vertex
    \ -- Click this tool"); + QT_TR_NOOP("Adds a cosmetic line perpendicular to the selected line through the selected vertex"); sWhatsThis = "TechDraw_ExtensionLinePerpendicular"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionLinePerpendicular"; @@ -1353,11 +1276,8 @@ CmdTechDrawExtensionLinePPGroup::CmdTechDrawExtensionLinePPGroup() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Add Cosmetic Parallel Line"); - sToolTipText = QT_TR_NOOP("Add a cosmetic line parallel to another line through a vertex:
    \ -- Select a line
    \ -- Select a vertex
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Cosmetic Parallel Line"); + sToolTipText = QT_TR_NOOP("Adds a cosmetic line parallel to the selected line through the selected vertex"); sWhatsThis = "TechDraw_ExtensionLinePPGroup"; sStatusTip = sMenuText; } @@ -1367,7 +1287,7 @@ void CmdTechDrawExtensionLinePPGroup::activated(int iMsg) // Base::Console().message("CMD::ExtensionLinePPGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), QObject::tr("Close active task dialog and try again.")); return; } @@ -1423,23 +1343,17 @@ void CmdTechDrawExtensionLinePPGroup::languageChange() QAction* arc1 = action[0]; arc1->setText( - QApplication::translate("CmdTechDrawExtensionLineParallel", "Add Cosmetic Parallel Line")); + QApplication::translate("CmdTechDrawExtensionLineParallel", "Cosmetic Parallel Line")); arc1->setToolTip( QApplication::translate("CmdTechDrawExtensionLineParallel", - "Add a cosmetic line parallel to another line through a vertex:
    \ -- Select a line
    \ -- Select a vertex
    \ -- Click this tool")); + "Adds a cosmetic line parallel to the selected line through the selected vertex")); arc1->setStatusTip(arc1->text()); QAction* arc2 = action[1]; arc2->setText(QApplication::translate("CmdTechDrawExtensionLinePerpendicular", - "Add Cosmetic Perpendicular Line")); + "Cosmetic Perpendicular Line")); arc2->setToolTip(QApplication::translate( "CmdTechDrawExtensionLinePerpendicular", - "Add a cosmetic line perpendicular to another line through a vertex:
    \ -- Select a line
    \ -- Select a vertex
    \ -- Click this tool")); + "Adds a cosmetic line perpendicular to the selected line through the selected vertex")); arc2->setStatusTip(arc2->text()); } @@ -1461,10 +1375,8 @@ CmdTechDrawExtensionLockUnlockView::CmdTechDrawExtensionLockUnlockView() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Lock/Unlock View"); - sToolTipText = QT_TR_NOOP("Lock or unlock the position of a view:
    \ -- Select view(s)
    \ -- Click this tool"); + sMenuText = QT_TR_NOOP("Toggle View Lock"); + sToolTipText = QT_TR_NOOP("Locks or unlocks the position of the selected views"); sWhatsThis = "TechDraw_ExtensionLockUnlockView"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionLockUnlockView"; @@ -1511,7 +1423,7 @@ void execExtendShortenLine(Gui::Command* cmd, bool extend) if (!_checkSel(cmd, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw Extend/Shorten Line"))) { return; } - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Extend/Shorten Line")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Extend/shorten line")); const std::vector subNames = selection[0].getSubNames(); if (!subNames.empty()) { std::string name = subNames[0]; @@ -1594,12 +1506,9 @@ CmdTechDrawExtensionExtendLine::CmdTechDrawExtensionExtendLine() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Extend Line"); - sToolTipText = QT_TR_NOOP("Extend a cosmetic line or centerline at both ends:
    \ -- Specify the delta distance (optional)
    \ -- Select a single line
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Extends a selected cosmetic line or centerline at both ends by the specified delta distance"); sWhatsThis = "TechDraw_ExtensionExtendLine"; - sStatusTip = sMenuText; + sStatusTip = sToolTipText; sPixmap = "TechDraw_ExtensionExtendLine"; } @@ -1629,10 +1538,7 @@ CmdTechDrawExtensionShortenLine::CmdTechDrawExtensionShortenLine() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Shorten Line"); - sToolTipText = QT_TR_NOOP("Shorten a cosmetic line or centerline at both ends:
    \ -- Specify the delta distance (optional)
    \ -- Select a single line
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Shortens a selected cosmetic line or centerline at both ends by the specified delta distance"); sWhatsThis = "TechDraw_ExtensionShortenLine"; sStatusTip = sMenuText; sPixmap = "TechDraw_ExtensionShortenLine"; @@ -1664,10 +1570,7 @@ CmdTechDrawExtendShortenLineGroup::CmdTechDrawExtendShortenLineGroup() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Extend Line"); - sToolTipText = QT_TR_NOOP("Extend a cosmetic line or centerline at both ends:
    \ -- Specify the delta distance (optional)
    \ -- Select a single line
    \ -- Click this tool"); + sToolTipText = QT_TR_NOOP("Extends a selected cosmetic line or centerline at both ends by the specified delta distance"); sWhatsThis = "TechDraw_ExtensionExtendShortenLineGroup"; sStatusTip = sMenuText; } @@ -1677,7 +1580,7 @@ void CmdTechDrawExtendShortenLineGroup::activated(int iMsg) // Base::Console().message("CMD::ExtendShortenLineGroup - activated(%d)\n", iMsg); Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), QObject::tr("Close active task dialog and try again.")); return; } @@ -1734,18 +1637,12 @@ void CmdTechDrawExtendShortenLineGroup::languageChange() QAction* arc1 = action[0]; arc1->setText(QApplication::translate("CmdTechDrawExtensionExtendLine", "Extend Line")); arc1->setToolTip(QApplication::translate( - "CmdTechDrawExtensionExtendLine", "Extend a cosmetic line or centerline at both ends:
    \ -- Specify the delta distance (optional)
    \ -- Select a single line
    \ -- Click this tool")); + "CmdTechDrawExtensionExtendLine", "Extends a selected cosmetic line or centerline at both ends by the specified delta distance")); arc1->setStatusTip(arc1->text()); QAction* arc2 = action[1]; arc2->setText(QApplication::translate("CmdTechDrawExtensionShortenLine", "Shorten Line")); arc2->setToolTip(QApplication::translate( - "CmdTechDrawExtensionShortenLine", "Shorten a cosmetic line or centerline at both ends:
    \ -- Specify the delta distance (optional)
    \ -- Select a single line
    \ -- Click this tool")); + "CmdTechDrawExtensionShortenLine", "Shortens a selected cosmetic line or centerline at both ends by the specified delta distance")); arc2->setStatusTip(arc2->text()); } @@ -1767,8 +1664,8 @@ CmdTechDrawExtensionAreaAnnotation::CmdTechDrawExtensionAreaAnnotation() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Calculate the area of selected faces"); - sToolTipText = QT_TR_NOOP("Select several faces then click this tool"); + sMenuText = QT_TR_NOOP("Area Annotation"); + sToolTipText = QT_TR_NOOP("Calculates the area of multiple selected faces"); sWhatsThis = "TechDraw_ExtensionAreaAnnotation"; sStatusTip = sToolTipText; sPixmap = "TechDraw_ExtensionAreaAnnotation"; @@ -1780,7 +1677,7 @@ void CmdTechDrawExtensionAreaAnnotation::activated(int iMsg) Q_UNUSED(iMsg); std::vector selection; TechDraw::DrawViewPart* objFeat{nullptr}; - if (!_checkSel(this, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw calculate selected area"))) { + if (!_checkSel(this, selection, objFeat, QT_TRANSLATE_NOOP("Command","TechDraw Calculate Selected Area"))) { return; } @@ -1797,7 +1694,7 @@ void CmdTechDrawExtensionAreaAnnotation::activated(int iMsg) if (subNames.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No faces in selection.")); + QObject::tr("No faces in selection")); return; } @@ -1897,9 +1794,8 @@ CmdTechDrawExtensionArcLengthAnnotation::CmdTechDrawExtensionArcLengthAnnotation { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Calculate the arc length of selected edges"); - sToolTipText = QT_TR_NOOP("Select several edges
    \ - - click this tool"); + sMenuText = QT_TR_NOOP("Arc Length Annotation"); + sToolTipText = QT_TR_NOOP("Inserts an annotation with the calculated arc length of the selected edges"); sWhatsThis = "TechDraw_ExtensionArcLengthAnnotation"; sStatusTip = sToolTipText; sPixmap = "TechDraw_ExtensionArcLengthAnnotation"; @@ -1912,7 +1808,7 @@ void CmdTechDrawExtensionArcLengthAnnotation::activated(int iMsg) std::vector selection; TechDraw::DrawViewPart *objFeat{nullptr}; - if (!_checkSel(this, selection, objFeat, QT_TRANSLATE_NOOP("Command", "TechDraw calculate selected arc length"))) { + if (!_checkSel(this, selection, objFeat, QT_TRANSLATE_NOOP("Command", "TechDraw Calculate Selected Arc Length"))) { return; } @@ -1927,7 +1823,7 @@ void CmdTechDrawExtensionArcLengthAnnotation::activated(int iMsg) if (subNames.empty()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No edges in selection.")); + QObject::tr("No edges in selection")); return; } @@ -2152,8 +2048,8 @@ void _createThreadLines(const std::vector& SubNames, TechDraw::Draw TechDraw::BaseGeomPtr geom0 = objFeat->getGeomByIndex(GeoId0); TechDraw::BaseGeomPtr geom1 = objFeat->getGeomByIndex(GeoId1); if (geom0->getGeomType() != GeomType::GENERIC || geom1->getGeomType() != GeomType::GENERIC) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("TechDraw Thread Hole Side"), - QObject::tr("Please select two straight lines")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("TechDraw thread hole side"), + QObject::tr("Select 2 straight lines")); return; } diff --git a/src/Mod/TechDraw/Gui/CommandHelpers.cpp b/src/Mod/TechDraw/Gui/CommandHelpers.cpp index 44ee90a48d..7555fd83e7 100644 --- a/src/Mod/TechDraw/Gui/CommandHelpers.cpp +++ b/src/Mod/TechDraw/Gui/CommandHelpers.cpp @@ -87,8 +87,8 @@ std::vector CommandHelpers::getSelectedSubElements(Gui::Command* cm } } if (!dvp) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong Selection"), - QObject::tr("No Part View in Selection")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), + QObject::tr("No part view in selection")); return selectedSubs; } @@ -100,8 +100,8 @@ std::vector CommandHelpers::getSelectedSubElements(Gui::Command* cm if (selectedSubs.empty()) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Wrong Selection"), - QObject::tr("No %1 in Selection") + QObject::tr("Wrong selection"), + QObject::tr("No %1 in selection") .arg(QString::fromStdString(subType))); return selectedSubs; } diff --git a/src/Mod/TechDraw/Gui/CommandStack.cpp b/src/Mod/TechDraw/Gui/CommandStack.cpp index c6a9f50e9a..4281123bff 100644 --- a/src/Mod/TechDraw/Gui/CommandStack.cpp +++ b/src/Mod/TechDraw/Gui/CommandStack.cpp @@ -62,8 +62,8 @@ CmdTechDrawStackGroup::CmdTechDrawStackGroup() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Adjust stacking order of views"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("View Stacking Order"); + sToolTipText = QT_TR_NOOP("Adjusts the stacking order of the selected views"); sWhatsThis = "TechDraw_StackGroup"; sStatusTip = sToolTipText; } @@ -72,8 +72,8 @@ void CmdTechDrawStackGroup::activated(int iMsg) { Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again.")); return; } @@ -141,19 +141,19 @@ void CmdTechDrawStackGroup::languageChange() QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdTechDrawStackGroup","Stack Top")); - arc1->setToolTip(QApplication::translate("TechDraw_StackTop","Move view to top of stack")); + arc1->setToolTip(QApplication::translate("TechDraw_StackTop","Moves the view to the top of the stack")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdTechDrawStackGroup","Stack Bottom")); - arc2->setToolTip(QApplication::translate("TechDraw_StackBottom","Move view to bottom of stack")); + arc2->setToolTip(QApplication::translate("TechDraw_StackBottom","Moves the view to the bottom of the stack")); arc2->setStatusTip(arc2->toolTip()); QAction* arc3 = a[2]; arc3->setText(QApplication::translate("CmdTechDrawStackGroup","Stack Up")); - arc3->setToolTip(QApplication::translate("TechDraw_StackUp","Move view up one level")); + arc3->setToolTip(QApplication::translate("TechDraw_StackUp","Moves the view up one level")); arc3->setStatusTip(arc3->toolTip()); QAction* arc4 = a[3]; arc4->setText(QApplication::translate("CmdTechDrawStackGroup","Stack Down")); - arc4->setToolTip(QApplication::translate("TechDraw_StackDown","Move view down one level")); + arc4->setToolTip(QApplication::translate("TechDraw_StackDown","Moves the view down one level")); arc4->setStatusTip(arc4->toolTip()); } @@ -175,8 +175,8 @@ CmdTechDrawStackTop::CmdTechDrawStackTop() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Move view to top of stack"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Stack Top"); + sToolTipText = QT_TR_NOOP("Moves the selected view to the top of the stack"); sWhatsThis = "TechDraw_StackTop"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_StackTop"; @@ -188,8 +188,8 @@ void CmdTechDrawStackTop::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again.")); return; } @@ -235,8 +235,8 @@ CmdTechDrawStackBottom::CmdTechDrawStackBottom() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Move view to bottom of stack"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Stack Bottom"); + sToolTipText = QT_TR_NOOP("Moves the selected view to the bottom of the stack"); sWhatsThis = "TechDraw_StackBottom"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_StackBottom"; @@ -248,8 +248,8 @@ void CmdTechDrawStackBottom::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again.")); return; } @@ -295,8 +295,8 @@ CmdTechDrawStackUp::CmdTechDrawStackUp() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Move view up one level"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Stack Up"); + sToolTipText = QT_TR_NOOP("Moves the selected view up 1 level in the view stack"); sWhatsThis = "TechDraw_StackUp"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_StackUp"; @@ -308,8 +308,8 @@ void CmdTechDrawStackUp::activated(int iMsg) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task in progress"), + QObject::tr("Close the active task dialog and try again.")); return; } @@ -355,8 +355,8 @@ CmdTechDrawStackDown::CmdTechDrawStackDown() { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Move view down one level"); - sToolTipText = sMenuText; + sMenuText = QT_TR_NOOP("Stack Down"); + sToolTipText = QT_TR_NOOP("Moves the selected view down 1 level in the view stack"); sWhatsThis = "TechDraw_StackDown"; sStatusTip = sToolTipText; sPixmap = "actions/TechDraw_StackDown"; diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.ui b/src/Mod/TechDraw/Gui/DlgPageChooser.ui index fb52e45d20..f60f92058a 100644 --- a/src/Mod/TechDraw/Gui/DlgPageChooser.ui +++ b/src/Mod/TechDraw/Gui/DlgPageChooser.ui @@ -26,7 +26,7 @@ - FreeCAD could not determine which Page to use. Please select a Page. + FreeCAD could not determine which page to use. Select a page. true @@ -36,7 +36,7 @@ - Select a Page that should be used + Select a page that should be used diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui index ce8d0d00a3..32bc765667 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui @@ -34,7 +34,7 @@ If this box is checked, double-clicking on a page in the tree will automatically switch to TechDraw and the page will be made visible. - Switch Workbench on Click + Switch workbench on click true @@ -56,10 +56,10 @@ - Dump intermediate results during Section view processing + Dump intermediate results during section view processing - Debug Section + Debug section debugSection @@ -72,17 +72,17 @@ - Edge Fuzz + Edge fuzz - If checked, FreeCAD will use the new face finder algorithm. If not checked, FreeCAD will use the legacy face finder algorithm. + If checked, FreeCAD will use the new face finder algorithm. If not checked, FreeCAD will use the legacy face finder algorithm. - Use New Face Finder Algorithm + Use new face finder algorithm true @@ -104,10 +104,10 @@ - Dump intermediate results during Detail view processing + Dump intermediate results during detail view processing - Debug Detail + Debug detail debugDetail @@ -132,7 +132,7 @@ Faces must be detected in order to use hatching, but there can be a performance penalty in complex models. - Detect Faces + Detect faces true @@ -154,7 +154,7 @@ can be a performance penalty in complex models. - Auto Correct Dimension Refs + Auto-correct dimension references true @@ -174,7 +174,7 @@ can be a performance penalty in complex models. - Validate Shapes + Validate shapes CheckShapesBeforeUse @@ -196,7 +196,7 @@ can be a performance penalty in complex models. Include edges with unexpected geometry (zero length etc.) in results - Allow Crazy Edges + Allow crazy edges allowCrazyEdge @@ -209,10 +209,10 @@ can be a performance penalty in complex models. - Issue progress messages while building View geometry + Issue progress messages while building view geometry - Report Progress + Report progress ReportProgress @@ -225,7 +225,7 @@ can be a performance penalty in complex models. - The number of times FreeCAD should try to remove overlapping edges returned by the Hidden Line Removal algorithm. A value of 0 indicates no scrubbing, 1 indicates a single pass and 2 indicates a second pass should be performed. Values above 2 are generally not productive. Each pass adds to the time required to produce the drawing. + The number of times FreeCAD should try to remove overlapping edges returned by the hidden line removal algorithm. A value of 0 indicates no scrubbing, 1 indicates a single pass and 2 indicates a second pass should be performed. Values above 2 are generally not productive. Each pass adds to the time required to produce the drawing. Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -255,14 +255,14 @@ can be a performance penalty in complex models. - Overlap Edges Scrub Passes + Overlap edges scrub passes - Mark Fuzz + Mark fuzz @@ -298,7 +298,7 @@ when hatching a face with a PAT pattern - Max SVG Hatch Tiles + Max SVG hatch tiles @@ -308,7 +308,7 @@ when hatching a face with a PAT pattern If checked, shapes that fail validation will be saved as BREP files for later analysis. - Debug Bad Shape + Debug bad shape debugBadShape @@ -332,10 +332,10 @@ when hatching a face with a PAT pattern - Perform a fuse operation on input shape(s) before Section view processing + Perform a fuse operation on input shapes before section view processing - Fuse Before Section + Fuse before section SectionFuseFirst @@ -409,7 +409,7 @@ Each unit is approx. 0.1 mm wide Size of selection area around edges -Each unit is approx. 0.1 mm wide +Each unit is approximately 0.1mm wide @@ -440,7 +440,7 @@ Each unit is approx. 0.1 mm wide Highlights border of section cut in section views - Show Section Edges + Show section edges true @@ -456,16 +456,16 @@ Each unit is approx. 0.1 mm wide - Max PAT Hatch Segments + Maximum PAT hatch segments - Limit of 64x64 pixel SVG tiles used to hatch a single face. -For large scalings, you might get an error about too many SVG tiles. -Then you need to increase the tile limit. + Limits the number of 64×64 pixel SVG tiles used to hatch a single face. +For large scales, errors may occur due to excessive tiling. +Increase the limit if necessary. Qt::AlignmentFlag::AlignRight @@ -498,7 +498,7 @@ Then you need to increase the tile limit. - Some combinations of OS and Navigation style key bindings may conflict with the default modifier keys for Balloon dragging and View snapping override. You can make adjustments here to find a non-conflicting key binding. + Choose non-conflicting key bindings as some combinations of OS and navigation style key bindings may conflict with the default modifier keys for balloon dragging and view snapping override. Behaviour Overrides @@ -512,7 +512,7 @@ Then you need to increase the tile limit. Check this box to use the default modifier keys. Uncheck this box to set a different key combination. - Use Default + Use default true @@ -529,7 +529,7 @@ Then you need to increase the tile limit. - Balloon Drag + Balloon drag diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui index ef51dadf78..510780c88f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui @@ -40,7 +40,7 @@ Show arc centers in printed output - Print Center Marks + Print center marks PrintCenterMarks @@ -67,7 +67,7 @@ Show arc center marks in views - Show Center Marks + Show center marks true @@ -88,10 +88,10 @@ - If checked, the section annotation will be drawn on the Source view. If unchecked, no section line, arrows or symbol will be shown in the Source view. + Draws the section annotation on the source view. Otherwise, no section line, arrows or symbol will be shown in the source view. - Show Section Line in Source View + Show section line in source view true @@ -131,10 +131,10 @@ - If checked, the cut line will be drawn on the Source view. If unchecked, only the change marks, arrows and symbols will be displayed. + Draws a cut line on the source view. Otherwise, only the change marks, arrows and symbols will be displayed. - Include Cut Line in Section Annotation + Include cut line in section annotation true @@ -174,10 +174,10 @@ - Length of horizontal portion of Balloon leader + Length of horizontal portion of balloon leader - Balloon Leader Kink Length + Balloon leader kink length @@ -189,7 +189,7 @@ - Broken View Break Type + Broken view break type @@ -202,10 +202,10 @@ - Restrict Filled Triangle line end to vertical or horizontal directions + Restrict filled triangle line end to vertical or horizontal directions - Balloon Orthogonal Triangle + Balloon orthogonal triangle true @@ -239,17 +239,17 @@ - Solid Color + Solid color - SVG Hatch + SVG hatch - PAT Hatch + PAT hatch @@ -257,10 +257,10 @@ - This checkbox controls whether or not to display the outline around a detail view. + Displays the outline around a detail view - Detail View Show Matting + Detail view show matting true @@ -276,10 +276,10 @@ - This checkbox controls whether or not to display a highlight around the detail area in the detail's source view. + Highlights the detail area in the source view of the detail - Detail Source Show Highlight + Detail source show highlight true @@ -300,7 +300,7 @@ - Detail View Outline Shape + Detail view outline shape @@ -321,7 +321,7 @@ Forces last leader line segment to be horizontal - Leader Line Auto Horizontal + Leader line auto horizontal true @@ -355,7 +355,7 @@ - Balloon Leader End + Balloon leader end @@ -372,17 +372,17 @@ - No Break Lines + No break lines - ZigZag Lines + Zigzag lines - Simple Lines + Simple lines @@ -395,7 +395,7 @@
    - Balloon Shape + Balloon shape
    @@ -407,7 +407,7 @@
    - Section Cut Surface + Section cut surface
    @@ -438,10 +438,10 @@
    - Show or hide marks at direction changes on ComplexSection lines. + Shows markers at direction changes on complex section lines - Complex Section Line Marks + Complex section line marks true @@ -479,10 +479,10 @@ - If this box is checked, templates will auto fill date fields using ccyy-mm-dd format even if that is not the standard format for the current locale. + Fills out template date fields using ccyy-mm-dd format automatically, even if that is not the standard format for the current locale. - Enforce ISO 8601 Date Format + Enforce ISO 8601 date format EnforceISODate @@ -547,7 +547,7 @@ - Center Line Style + Center line style @@ -628,7 +628,7 @@ Line style of detail highlight on base view - Detail Highlight Style + Detail highlight style
    @@ -640,7 +640,7 @@
    - Section Line Style + Section line style
    @@ -677,7 +677,7 @@
    - Line Standard + Line standard
    @@ -695,9 +695,9 @@
    - Shape of line end caps. The default (round) should almost + Shape of line end caps. The default (round) should almost always be the right choice. Flat or square caps are useful -if you are planning to use a drawing as a 1:1 cutting guide. +for using drawings a 1:1 cutting guide. @@ -765,7 +765,7 @@ if you are planning to use a drawing as a 1:1 cutting guide. Line group used to set line widths - Line Width Group + Line width group
    @@ -777,14 +777,14 @@ if you are planning to use a drawing as a 1:1 cutting guide.
    - Line End Cap Shape + Line end cap shape
    - Hidden Line Style + Hidden line style @@ -809,14 +809,14 @@ if you are planning to use a drawing as a 1:1 cutting guide.
    - Break Line Style + Break line style
    - Style of line to be used in BrokenView. + Style of line to be used in broken view. diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp index d10ec83b15..955cbc9453 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp @@ -228,7 +228,7 @@ int DlgPrefsTechDrawAnnotationImp::prefMattingStyle() const void DlgPrefsTechDrawAnnotationImp::onLineGroupChanged(int index) { if (index == -1) { // there is no valid index yet - ui->pcbLineGroup->setToolTip(QObject::tr("Please select a Line Group")); + ui->pcbLineGroup->setToolTip(QObject::tr("Select a line group")); return; } // get the definition of the selected LineGroup (includes the name) diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui index b9ed36be83..ff01a9b369 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui @@ -57,7 +57,7 @@ - Geometric Hatch + Geometric hatch @@ -81,7 +81,7 @@ - If checked, FreeCAD will use a single color for all text and lines. + Use a single colour for all text and lines Monochrome @@ -167,7 +167,7 @@ - Section Face + Section face @@ -257,7 +257,7 @@
    - Leaderline + Leader line
    @@ -277,7 +277,7 @@ - Color of dimension lines and text. + Color of dimension lines and text @@ -297,7 +297,7 @@ - Use a light color for dark text and dark color for light text. + Use a light color for dark text and dark color for light text @@ -389,7 +389,7 @@ - Detail Highlight + Detail highlight @@ -408,21 +408,21 @@ - Page Color + Page color - Section Line + Section line - Check this to use light text and lines on dark backgrounds. Set Page Color to a dark color. Transparent or light color faces are recommended with this option. + Uses light text and lines on dark backgrounds and sets page color to a dark color. Transparent or light color faces are recommended with this option. Light on dark @@ -492,7 +492,7 @@ Object faces will be transparent - Transparent Faces + Transparent faces ClearFace @@ -589,7 +589,7 @@ - Grid Color + Grid color @@ -601,7 +601,7 @@ - Hidden Line + Hidden line @@ -640,7 +640,7 @@ - Template Underline + Template underline diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui index ace78652d9..4d8cf95f89 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui @@ -64,7 +64,7 @@ - Dimension Format + Dimension format @@ -93,7 +93,7 @@ - Diameter Symbol + Diameter symbol @@ -116,22 +116,22 @@
    - ISO Oriented + ISO oriented - ISO Referencing + ISO referencing - ASME Inlined + ASME inlined - ASME Referencing + ASME referencing
    @@ -144,7 +144,7 @@
    - Font Size + Font size
    @@ -165,7 +165,7 @@ Append unit to dimension values
    - Show Units + Show units ShowUnits @@ -183,7 +183,7 @@ - Standard and Style + Standard and style
    @@ -217,7 +217,7 @@
    - Arrow Size + Arrow size
    @@ -229,7 +229,7 @@
    - Arrow Style + Arrow style
    @@ -255,7 +255,7 @@
    Tolerance text scale -Multiplier of 'Font Size' +Multiplier of 'Font size' @@ -288,7 +288,7 @@ Multiplier of 'Font Size' - Tolerance Text Scale + Tolerance text scale
    @@ -304,7 +304,7 @@ Multiplier of 'Font Size'
    - Number of decimals if 'Use Global Decimals' is not used + Number of decimals if 'Use global decimals' is not used 2 @@ -361,7 +361,7 @@ Multiplier of 'Font Size' Use system setting for number of decimals - Use Global Decimals + Use global decimals true @@ -395,7 +395,7 @@ Multiplier of 'Font Size' - Alternate Decimals + Alternate decimals
    @@ -407,10 +407,10 @@ Multiplier of 'Font Size'
    - Controls the gap size between the dimension point and the start of the extension line for ISO dimensions. + Controls the gap size between the dimension point and the start of the extension line for ISO dimensions - Extension Gap Factor - ISO + Extension gap factor - ISO
    @@ -435,10 +435,10 @@ Multiplier of 'Font Size'
    - Controls the gap size between the dimension point and the start of the extension line for ASME dimensions. + Controls the gap size between the dimension point and the start of the extension line for ASME dimensions - Extension Gap Factor - ASME + Extension gap factor - ASME
    @@ -446,7 +446,7 @@ Multiplier of 'Font Size' Controls the gap size between the dimension point and the start of the extension line for ISO dimensions. - Value * linewidth is the gap. + Value multiplied by the line width is the gap. Normally, no gap is used. If using a gap, the recommended value is 8. @@ -463,7 +463,7 @@ Multiplier of 'Font Size' - Controls the gap size between the dimension point and the start of the extension line for ASME dimensions. Value * linewidth is the gap. + Controls the gap size between the dimension point and the start of the extension line for ASME dimensions. Value multiplied by the line width is the gap. Normally, no gap is used. If using a gap, the recommended value is 6. @@ -488,7 +488,7 @@ Multiplier of 'Font Size' Controls the gap size between dimension line and dimension text for ISO dimensions. - Line Spacing - ISO + Line spacing - ISO @@ -496,7 +496,7 @@ Multiplier of 'Font Size' Controls the gap size between dimension line and dimension text. - Value * linewidth is the line spacing. + Value multiplied by the line width is the line spacing. 2.000000000000000 @@ -545,18 +545,18 @@ Multiplier of 'Font Size' - Dimensioning tools: + Dimensioning tools - Select the type of dimensioning tools for your toolbar: -'Single tool': A single tool for all dimensioning in the toolbar: Distance, Distance X / Y, Angle, Radius. (Others in dropdown) -'Separated tools': Individual tools for each dimensioning tool. -'Both': You will have both the 'Dimension' tool and the separated tools. -This setting is only for the toolbar. Whichever you choose, all tools are always available in the menu and through shortcuts. + Choose the type of dimensioning tools shown in the toolbar: +‘Single tool’ provides one unified tool for all dimension types (Distance, X/Y, Angle, Radius) with others in a drop-down. +‘Separated tools’ displays individual tools for each dimension type. +‘Both’ enables both the unified tool and the individual tools. +This affects only the toolbar; all tools remain available via the menu and shortcuts. @@ -570,7 +570,7 @@ This setting is only for the toolbar. Whichever you choose, all tools are always - While using the Dimension tool you may choose how to handle circles and arcs: + While using the dimension tool you may choose how to handle circles and arcs: 'Auto': The tool will apply radius to arcs and diameter to circles. 'Diameter': The tool will apply diameter to all. 'Radius': The tool will apply radius to all. diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui index fb821d651e..88ed2db755 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui @@ -49,7 +49,7 @@ Whether or not pages are updated every time the 3D model is changed - Update With 3D (global policy) + Update with 3D (global policy) true @@ -71,11 +71,11 @@ - Whether or not a page's 'Keep Updated' property -can override the global 'Update With 3D' parameter + Controls whether or not a page's 'Keep Updated' property +can override the global 'Update with 3D' parameter - Allow Page Override (global policy) + Allow page override (global policy) true @@ -106,7 +106,7 @@ can override the global 'Update With 3D' parameter This can slow down the response time. - Keep Page Up To Date + Keep page up to date true @@ -137,7 +137,7 @@ This can slow down the response time. for ProjectionGroups - Auto-distribute Secondary Views + Auto-distribute secondary views true @@ -178,11 +178,11 @@ for ProjectionGroups - * this font is also used for dimensions + * This font is also used for dimensions. Changes have no effect on existing dimensions. - Label Font* + Label font* @@ -236,7 +236,7 @@ for ProjectionGroups - Label Size + Label size @@ -316,7 +316,7 @@ for ProjectionGroups - Projection Group Angle + Projection group angle @@ -329,7 +329,7 @@ for ProjectionGroups - Use first- or third-angle multiview projection convention + Use first or third-angle multiview projection convention QComboBox::AdjustToContents @@ -366,7 +366,7 @@ for ProjectionGroups - Standard to be used to draw section lines. This affects the position of arrows and symbol. + Standard to be used to draw section lines. This affects the position of arrows and symbol. 0 @@ -397,7 +397,7 @@ for ProjectionGroups - Section Line Convention + Section line convention
    @@ -441,7 +441,7 @@ for ProjectionGroups
    - PAT File + PAT file
    @@ -454,7 +454,7 @@ for ProjectionGroups
    - Preferred SVG or bitmap file for hatching. This value will also control the initial directory for choosing hatch patterns. You can use this to get hatch files from a local directory. + Preferred SVG or bitmap file for hatching. This value will also control the initial directory for choosing hatch patterns. You can use this to get hatch files from a local directory. FileHatch @@ -510,7 +510,7 @@ for ProjectionGroups - Welding Directory + Welding directory
    @@ -561,7 +561,7 @@ for ProjectionGroups
    - Starting directory for menu 'Insert Page using Template' + Starting directory for 'Insert Page From Template' tool TemplateDir @@ -574,7 +574,7 @@ for ProjectionGroups - Template Directory + Template directory @@ -605,14 +605,14 @@ for ProjectionGroups - Hatch Pattern File + Hatch pattern file
    - Default Template + Default template @@ -624,7 +624,7 @@ for ProjectionGroups
    - Symbol Directory + Symbol directory
    @@ -661,7 +661,7 @@ for ProjectionGroups
    - Line Group File + Line group file
    @@ -673,7 +673,7 @@ for ProjectionGroups
    - Pattern Name + Pattern name
    @@ -711,10 +711,10 @@ for ProjectionGroups
    - Set ShowGrid property to true on new Pages. + Set 'Show grid' property to true on new pages - Show Grid + Show grid true @@ -735,14 +735,14 @@ for ProjectionGroups - Grid Spacing + Grid spacing
    - Distance between Page grid lines. + Distance between page grid lines 10.000000000000000 @@ -786,7 +786,7 @@ for ProjectionGroups If enabled, clicking without Ctrl does not clear existing vertex/edge/face selection - Enable Multiselection Mode + Enable multi-selection mode false @@ -832,10 +832,10 @@ for ProjectionGroups - If checked, the 3D camera direction (or normal of a selected face) will be used as the view direction. If not checked, Views will be created as Front Views. + Uses the 3D camera direction (or normal of a selected face) as the view direction. Otherwise, views will be created as front views. - Use 3D Camera Direction + Use 3D camera direction UseCameraDirection @@ -853,7 +853,7 @@ for ProjectionGroups - If checked, view labels will be displayed even when frames are suppressed. + Displays view labels even when frames are suppressed Always Show Label @@ -888,10 +888,10 @@ for ProjectionGroups - Check this box if you want views to snap into alignment when being dragged. + Snaps views into alignment when being dragged - Snap View Alignment + Snap view alignment true @@ -910,7 +910,7 @@ for ProjectionGroups Check this box if you want detail view highlights to snap to the nearest vertex when dragging in TaskDetail. - Snap Detail Highlights + Snap detail highlights true @@ -958,14 +958,14 @@ for ProjectionGroups - View Snapping Factor + View snapping factor - Highlight SnappingFactor + Highlight snapping factor diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui index dbccf1d150..a2097c73b7 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui @@ -67,7 +67,7 @@ Fast, but result is a collection of short straight lines. - Use Polygon Approximation + Use polygon approximation UsePolygon @@ -137,10 +137,10 @@ Fast, but result is a collection of short straight lines. Qt::NoFocus - Show hard and outline edges (always shown) + Shows hard and outline edges (always shown) - Show Hard Lines + Show hard lines true @@ -170,10 +170,10 @@ Fast, but result is a collection of short straight lines. - Show hidden hard and outline edges + Shows hidden hard and outline edges - Show Hard Lines + Show hard lines HardHid @@ -197,10 +197,10 @@ Fast, but result is a collection of short straight lines. - Show smooth lines + Shows smooth lines - Show Smooth Lines + Show smooth lines true @@ -227,10 +227,10 @@ Fast, but result is a collection of short straight lines. - Show hidden smooth edges + Shows hidden smooth edges - Show Smooth Lines + Show smooth lines SmoothHid @@ -254,10 +254,10 @@ Fast, but result is a collection of short straight lines. - Show seam lines + Shows seam lines - Show Seam Lines + Show seam lines false @@ -284,10 +284,10 @@ Fast, but result is a collection of short straight lines. - Show hidden seam lines + Shows hidden seam lines - Show Seam Lines + Show seam lines SeamHid @@ -311,10 +311,10 @@ Fast, but result is a collection of short straight lines. - Make lines of equal parameterization + Makes lines of equal parameterization - Show UV ISO Lines + Show UV ISO lines IsoViz @@ -338,10 +338,10 @@ Fast, but result is a collection of short straight lines. - Show hidden equal parameterization lines + Shows hidden equal parameterization lines - Show UV ISO Lines + Show UV ISO lines IsoHid @@ -365,7 +365,7 @@ Fast, but result is a collection of short straight lines. - ISO Count + ISO count diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui index 3402bb854f..ff5c7b1300 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui @@ -70,7 +70,7 @@ - Page Scale + Page scale @@ -82,7 +82,7 @@
    - View Custom Scale + View custom scale
    @@ -181,7 +181,7 @@
    - Default scale for views if 'View Scale Type' is 'Custom' + Default scale for views if 'View scale type' is 'Custom' @@ -211,7 +211,7 @@ - View Scale Type + View scale type
    @@ -223,10 +223,10 @@
    - <html><head/><body><p>If checked, Svg symbols, spreadsheet views and Draft views will use the original (incorrect) scaling method as used in v1.0 and earlier. If unchecked, a more accurate method will be used. </p></body></html> + Uses the original (incorrect) scaling method for SVG symbols, Spreadsheet views and Draft views as used in v1.0 and earlier. Otherwise, a more accurate method will be used. - Legacy Symbol Scaling + Legacy symbol scaling LegacySvgScaling @@ -256,7 +256,7 @@ - Size Adjustments + Size adjustments @@ -264,7 +264,7 @@ - Vertex Scale + Vertex scale @@ -310,7 +310,7 @@
    - Center Mark Scale + Center mark scale
    @@ -367,7 +367,7 @@ - Template Edit Mark + Template edit mark @@ -402,7 +402,7 @@ - Welding Symbol Scale + Welding symbol scale diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.ui b/src/Mod/TechDraw/Gui/DlgTemplateField.ui index 0f4c5fb626..f6aa4718c2 100644 --- a/src/Mod/TechDraw/Gui/DlgTemplateField.ui +++ b/src/Mod/TechDraw/Gui/DlgTemplateField.ui @@ -25,7 +25,7 @@ - Text Name: + Text name @@ -39,7 +39,7 @@ - Value: + Value @@ -49,7 +49,7 @@ - Check this box to reapply autofill to this field. + Reapplies auto-fill to this field Autofill @@ -62,7 +62,7 @@ false - The autofill replacement value. + The autofill replacement value true diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 9344c82ee0..d5c6983119 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -94,15 +94,19 @@ MDIViewPage::MDIViewPage(ViewProviderPage* pageVp, Gui::Document* doc, QWidget* connect(m_toggleFrameAction, &QAction::triggered, this, &MDIViewPage::toggleFrame); m_exportSVGAction = new QAction(tr("&Export SVG"), this); + connect(m_exportSVGAction, &QAction::triggered, this, qOverload<>(&MDIViewPage::saveSVG)); m_exportDXFAction = new QAction(tr("Export DXF"), this); + connect(m_exportDXFAction, &QAction::triggered, this, qOverload<>(&MDIViewPage::saveDXF)); m_exportPDFAction = new QAction(tr("Export PDF"), this); + connect(m_exportPDFAction, &QAction::triggered, this, qOverload<>(&MDIViewPage::savePDF)); m_printAllAction = new QAction(tr("Print All Pages"), this); + connect(m_printAllAction, &QAction::triggered, this, qOverload<>(&MDIViewPage::printAllPages)); isSelectionBlocked = false; @@ -312,7 +316,8 @@ void MDIViewPage::printPdf() filter << QObject::tr("PDF (*.pdf)"); filter << QObject::tr("All Files (*.*)"); QString fn = - Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export Page As PDF"), + Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export Page as PDF"), + QString(), filter.join(QLatin1String(";;"))); if (fn.isEmpty()) { return; @@ -488,9 +493,10 @@ void MDIViewPage::saveSVG() { QStringList filter; filter << QStringLiteral("SVG (*.svg)"); - filter << QObject::tr("All Files (*.*)"); + filter << QObject::tr("All files (*.*)"); QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export page as SVG"), + defaultFileName(), filter.join(QLatin1String(";;"))); if (fn.isEmpty()) { return; @@ -509,9 +515,10 @@ void MDIViewPage::saveDXF() { QStringList filter; filter << QStringLiteral("DXF (*.dxf)"); - filter << QObject::tr("All Files (*.*)"); + filter << QObject::tr("All files (*.*)"); QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export page as DXF"), + defaultFileName(), filter.join(QLatin1String(";;"))); if (fn.isEmpty()) { return; @@ -536,6 +543,7 @@ void MDIViewPage::savePDF() filter << QObject::tr("All Files (*.*)"); QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export page as PDF"), + defaultFileName(), filter.join(QLatin1String(";;"))); if (fn.isEmpty()) { return; diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.ui b/src/Mod/TechDraw/Gui/SymbolChooser.ui index c7bc556075..3766073278 100644 --- a/src/Mod/TechDraw/Gui/SymbolChooser.ui +++ b/src/Mod/TechDraw/Gui/SymbolChooser.ui @@ -45,14 +45,14 @@ - Symbol Dir + Symbol directory - Directory to welding symbols. + Directory to welding symbols Gui::FileChooser::Directory diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.ui b/src/Mod/TechDraw/Gui/TaskActiveView.ui index dfabe47340..befe9e8f1d 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.ui +++ b/src/Mod/TechDraw/Gui/TaskActiveView.ui @@ -23,7 +23,7 @@ - ActiveView to TD View + Active View @@ -41,7 +41,8 @@ - If Crop Image is checked, crop captured image to this width. + Crops captured image to this width + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -89,14 +90,14 @@ - Crop To Height + Crop to height - Use 3D Background + Use 3D background true @@ -112,7 +113,8 @@ - If Crop Image is checked, crop captured image to this height. + Crops captured image to this height + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -134,7 +136,7 @@ Paint background yes/no - Solid Background + Solid background true @@ -144,7 +146,7 @@ - No Background + No background true @@ -157,14 +159,14 @@ - Crop To Width + Crop to width - Crop Image + Crop image diff --git a/src/Mod/TechDraw/Gui/TaskAddOffsetVertex.ui b/src/Mod/TechDraw/Gui/TaskAddOffsetVertex.ui index 9966885c1d..c5479235ca 100644 --- a/src/Mod/TechDraw/Gui/TaskAddOffsetVertex.ui +++ b/src/Mod/TechDraw/Gui/TaskAddOffsetVertex.ui @@ -45,14 +45,14 @@ - X-Offset + X-offset - Y-Offset + Y-offset diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.ui b/src/Mod/TechDraw/Gui/TaskBalloon.ui index 5b24c77ace..a65a6a6c41 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.ui +++ b/src/Mod/TechDraw/Gui/TaskBalloon.ui @@ -33,14 +33,14 @@ - Text Color: + Text color: - Color for 'Text' + Color for text @@ -54,7 +54,7 @@ - Font Size: + Font size @@ -73,7 +73,7 @@ - Fontsize for 'Text' + Font size for text Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -92,7 +92,7 @@ - Bubble Shape: + Bubble shape: @@ -178,7 +178,7 @@ - Shape Scale: + Shape scale @@ -210,7 +210,7 @@ - End Symbol: + End symbol @@ -224,7 +224,7 @@ - End Symbol Scale: + End symbol scale @@ -256,14 +256,14 @@ - Line Visible: + Line visible - Whether the leader line is visible or not + Controls whether the leader line is visible or not 0 @@ -283,7 +283,7 @@ - Line Width: + Line width @@ -321,7 +321,7 @@ - Leader Kink Length: + Leader kink length diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp index ab4990a0de..f5a7933a4f 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp @@ -115,7 +115,7 @@ TaskCenterLine::TaskCenterLine(TechDraw::DrawViewPart* partFeat, } else if (geomType == "Vertex") { m_type = Type::VERTEX; } else { - Base::Console().error("TaskCenterLine - unknown geometry type: %s. Can not proceed.\n", geomType.c_str()); + Base::Console().error("TaskCenterLine - unknown geometry type: %s. Cannot proceed.\n", geomType.c_str()); return; } @@ -163,7 +163,7 @@ void TaskCenterLine::setUiConnect() void TaskCenterLine::setUiPrimary() { - setWindowTitle(QObject::tr("Create Center Line")); + setWindowTitle(QObject::tr("Centerline")); if (m_partFeat) { std::string baseName = m_partFeat->getNameInDocument(); @@ -206,7 +206,7 @@ void TaskCenterLine::setUiPrimary() void TaskCenterLine::setUiEdit() { - setWindowTitle(QObject::tr("Edit Center Line")); + setWindowTitle(QObject::tr("Edit Centerline")); if (m_partFeat) { std::string baseName = m_partFeat->getNameInDocument(); ui->leBaseView->setText(QString::fromStdString(baseName)); diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.ui b/src/Mod/TechDraw/Gui/TaskCenterLine.ui index 7b6c8ad7d0..1151a508d8 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.ui +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.ui @@ -14,7 +14,7 @@ - Center Line + Centerline @@ -26,7 +26,7 @@ - Base View + Base view @@ -86,7 +86,7 @@ - Top to Bottom line + Top to bottom line Vertical @@ -105,7 +105,7 @@ true - Left to Right line + Left to right line Horizontal @@ -121,10 +121,11 @@ true - centerline between -- lines: in equal distance to the lines and with - half of the angle the lines have to each other -- points: in equal distance to the points + + Centerline between: + - Lines: equidistant from both lines and at half the angle between them + - Points: equidistant from both points + Aligned @@ -205,7 +206,7 @@ - Shift Horizontal + Shift horizontal @@ -218,7 +219,7 @@ - Move line +Up or -Down + Move line +up or -down Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -237,7 +238,7 @@ - Move line -Left or +Right + Move line -left or +right Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -250,7 +251,7 @@ - Shift Vertical + Shift vertical @@ -286,7 +287,7 @@ - Extend By + Extend by diff --git a/src/Mod/TechDraw/Gui/TaskComplexSection.cpp b/src/Mod/TechDraw/Gui/TaskComplexSection.cpp index 55da4ba321..db436150de 100644 --- a/src/Mod/TechDraw/Gui/TaskComplexSection.cpp +++ b/src/Mod/TechDraw/Gui/TaskComplexSection.cpp @@ -487,7 +487,7 @@ bool TaskComplexSection::apply(bool forceUpdate) if (!DrawComplexSection::canBuild(m_baseView->localVectorToCS(localUnit), m_profileObject)) { Base::Console().error( - "Can not build Complex Section with this profile and direction (1)\n"); + "Cannot build complex section with this profile and direction (1)\n"); return false; } } @@ -497,7 +497,7 @@ bool TaskComplexSection::apply(bool forceUpdate) Base::convertTo(m_saveXDir)); if (!DrawComplexSection::canBuild(sectionCS, m_profileObject)) { Base::Console().error( - "Can not build Complex Section with this profile and direction (2)\n"); + "Cannot build complex section with this profile and direction (2)\n"); return false; } } @@ -524,7 +524,7 @@ bool TaskComplexSection::apply(bool forceUpdate) m_baseView->requestPaint(); } if (!m_section->checkSectionCS()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Possible Coordinate System Error"), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Possible coordinate system error"), QObject::tr("Check SectionNormal, Direction and/or XDirection.")); } @@ -553,7 +553,7 @@ void TaskComplexSection::applyAligned() //pointer to created view is not returned, but stored in m_section void TaskComplexSection::createComplexSection() { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create ComplexSection")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Complex Section")); if (!m_section) { const std::string objectName{QT_TR_NOOP("ComplexSection")}; m_sectionName = m_page->getDocument()->getUniqueObjectName(objectName.c_str()); diff --git a/src/Mod/TechDraw/Gui/TaskComplexSection.ui b/src/Mod/TechDraw/Gui/TaskComplexSection.ui index de55fb8c3c..5756cc98f6 100644 --- a/src/Mod/TechDraw/Gui/TaskComplexSection.ui +++ b/src/Mod/TechDraw/Gui/TaskComplexSection.ui @@ -49,6 +49,7 @@ Use Selection + @@ -77,6 +78,7 @@ Use Selection + @@ -131,7 +133,7 @@ - Scale Type + Scale type @@ -157,7 +159,7 @@ - Projection Strategy + Projection strategy @@ -199,7 +201,7 @@ - NoParallel + No parallel @@ -227,7 +229,7 @@ - BaseView + Base view @@ -269,7 +271,7 @@ - Preset view direction looking up. + Preset view direction looking up @@ -299,7 +301,7 @@ - Preset view direction looking down. + Preset view direction looking down @@ -326,7 +328,7 @@ - Preset view direction looking left. + Preset view direction looking left @@ -353,7 +355,7 @@ - Preset view direction looking right. + Preset view direction looking right @@ -390,7 +392,7 @@ - Check to update display after every property change. + Check to update display after every property change Live Update @@ -400,7 +402,7 @@ - Rebuild display now. May be slow for complex models. + Rebuild display now. May be slow for complex models Update Now diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp index 6db3c7f74f..4f99d6c0f2 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp @@ -156,7 +156,7 @@ void TaskCosVertex::onTrackerClicked(bool clicked) if (m_pbTrackerState == TrackerAction::CANCEL) { m_pbTrackerState = TrackerAction::PICK; - ui->pbTracker->setText(tr("Pick Points")); + ui->pbTracker->setText(tr("Pick points")); enableTaskButtons(true); setEditCursor(Qt::ArrowCursor); @@ -245,7 +245,7 @@ void TaskCosVertex::onTrackerFinished(std::vector pts, QGIView* qgParen m_tracker->sleep(true); m_inProgressLock = false; m_pbTrackerState = TrackerAction::PICK; - ui->pbTracker->setText(tr("Pick Points")); + ui->pbTracker->setText(tr("Pick points")); ui->pbTracker->setEnabled(true); enableTaskButtons(true); setEditCursor(Qt::ArrowCursor); diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.ui b/src/Mod/TechDraw/Gui/TaskCosVertex.ui index 328ba13ec2..2ee2696868 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.ui +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.ui @@ -23,7 +23,7 @@ - Base View + Base view diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp index d9c8f9d2b1..d00fea667b 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp +++ b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp @@ -62,7 +62,7 @@ TaskCosmeticCircle::TaskCosmeticCircle(TechDraw::DrawViewPart* partFeat, m_ce = m_partFeat->getCosmeticEdgeBySelection(m_circleName); if (!m_ce) { - Base::Console().error("TaskCosmeticCircle - bad parameters. Can not proceed.\n"); + Base::Console().error("TaskCosmeticCircle - bad parameters. Cannot proceed.\n"); return; } @@ -289,7 +289,7 @@ bool TaskCosmeticCircle::accept() { if (ui->qsbRadius->value().getValue() <= 0.0) { // this won't work! - Base::Console().error("TaskCosmeticCircle - can not create a circle with radius: %.3f\n", + Base::Console().error("TaskCosmeticCircle - cannot create a circle with radius: %.3f\n", ui->qsbRadius->value().getValue()); return false; } @@ -300,7 +300,7 @@ bool TaskCosmeticCircle::accept() m_partFeat->requestPaint(); } else { //update mode - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Update CosmeticCircle")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Update Cosmetic Circle")); updateCosmeticCircle(); m_partFeat->refreshCEGeoms(); m_partFeat->requestPaint(); diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui index b238e20ad5..b38f711cf4 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui +++ b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.ui @@ -58,10 +58,10 @@ - Treat the center point as a 2D point within the parent View. Z coordinate is ignored. + Treats the center point as a 2D point within the parent view. The Z coordinate is ignored. - 2D Point + 2D point true @@ -74,10 +74,10 @@ - Treat the center point as a 3D point and project it onto the parent View. + Treats the center point as a 3D point and project it onto the parent view - 3D Point + 3D point true @@ -87,7 +87,7 @@ - Circle Center + Circle center @@ -178,14 +178,14 @@ - End Angle: + End angle: - Check this box to make an arc from start angle to end angle in a clockwise direction. + Creates an arc from start angle to end angle in a clockwise direction Clockwise Angle @@ -195,7 +195,7 @@ - End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees @@ -205,17 +205,17 @@ - Start Angle: + Start angle - Select to enter angles and create a circular arc. + Uses angles and create a circular arc - Arc of Circle + Arc of circle diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp index cae9f9c5d4..f35a5d96c7 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp @@ -59,7 +59,7 @@ TaskCosmeticLine::TaskCosmeticLine(TechDraw::DrawViewPart* partFeat, m_ce = m_partFeat->getCosmeticEdgeBySelection(m_edgeName); if (!m_ce) { - Base::Console().error("TaskCosmeticLine - bad parameters. Can not proceed.\n"); + Base::Console().error("TaskCosmeticLine - bad parameters. Cannot proceed.\n"); return; } @@ -250,7 +250,7 @@ bool TaskCosmeticLine::accept() m_partFeat->requestPaint(); } else { //update mode - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Update CosmeticLine")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Update Cosmetic Line")); updateCosmeticLine(); m_partFeat->refreshCEGeoms(); m_partFeat->requestPaint(); diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui b/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui index 40877bcfd1..b525e8d60b 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui @@ -58,7 +58,7 @@ - 2D Point + 2D point true @@ -74,7 +74,7 @@ - 3D Point + 3D point true @@ -137,7 +137,7 @@ - 2D Point + 2D point true @@ -153,7 +153,7 @@ - 3D Point + 3D point true diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui index 1dbac42ba3..79b6085c22 100644 --- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui +++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui @@ -199,7 +199,7 @@ - derived geometry element + Derived geometry element @@ -304,7 +304,7 @@ - least inscribed geometry element + Least inscribed geometry element @@ -379,7 +379,7 @@ - Unequal Bilateral + Unequal bilateral @@ -394,7 +394,7 @@ - most inscribed geometry element + Most inscribed geometry element @@ -486,7 +486,7 @@ - (Arc) Minute + (Arc) minute @@ -496,7 +496,7 @@ - (Arc) Second + (Arc) second @@ -506,7 +506,7 @@ - (Arc) Tertie + (Arc) tertie @@ -570,7 +570,7 @@ - Plus - Minus + Plus - minus ± @@ -622,7 +622,7 @@ - Greek Letters + Greek letters @@ -705,7 +705,7 @@ - Format: + Format @@ -715,7 +715,7 @@ - Preview: + Preview diff --git a/src/Mod/TechDraw/Gui/TaskDetail.cpp b/src/Mod/TechDraw/Gui/TaskDetail.cpp index 4650b2f577..e41f7e218b 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.cpp +++ b/src/Mod/TechDraw/Gui/TaskDetail.cpp @@ -77,7 +77,7 @@ TaskDetail::TaskDetail(TechDraw::DrawViewPart* baseFeat): m_basePage = m_baseFeat->findParentPage(); //it is possible that the basePage could be unparented and have no corresponding Page if (!m_basePage) { - Base::Console().error("TaskDetail - bad parameters - base page. Can not proceed.\n"); + Base::Console().error("TaskDetail - bad parameters - base page. Cannot proceed.\n"); return; } @@ -141,7 +141,7 @@ TaskDetail::TaskDetail(TechDraw::DrawViewDetail* detailFeat): { if (!m_detailFeat) { //should be caught in CMD caller - Base::Console().error("TaskDetail - bad parameters. Can not proceed.\n"); + Base::Console().error("TaskDetail - bad parameters. Cannot proceed.\n"); return; } @@ -156,7 +156,7 @@ TaskDetail::TaskDetail(TechDraw::DrawViewDetail* detailFeat): App::DocumentObject* baseObj = m_detailFeat->BaseView.getValue(); m_baseFeat = dynamic_cast(baseObj); if (!m_baseFeat) { - Base::Console().error("TaskDetail - no BaseView. Can not proceed.\n"); + Base::Console().error("TaskDetail - no base view. Cannot proceed.\n"); return; } m_baseName = m_baseFeat->getNameInDocument(); @@ -431,7 +431,7 @@ void TaskDetail::enableTaskButtons(bool button) //***** Feature create & edit stuff ******************************************* void TaskDetail::createDetail() { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Detail View")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Detail view")); const std::string objectName{"Detail"}; m_detailName = m_doc->getUniqueObjectName(objectName.c_str()); @@ -493,7 +493,7 @@ void TaskDetail::updateDetail() } catch (...) { //this is probably due to appl closing while dialog is still open - Base::Console().error("Task Detail - detail feature update failed.\n"); + Base::Console().error("Task detail - detail feature update failed.\n"); } detailFeat->recomputeFeature(); diff --git a/src/Mod/TechDraw/Gui/TaskDetail.ui b/src/Mod/TechDraw/Gui/TaskDetail.ui index 5877379998..abe73cfe55 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.ui +++ b/src/Mod/TechDraw/Gui/TaskDetail.ui @@ -52,7 +52,7 @@ - Detail View + Detail view @@ -83,7 +83,7 @@ - Click to drag detail highlight to new position + Enables dragging of the detail highlight to a new position Drag Highlight @@ -117,14 +117,14 @@ - Scale Type + Scale type - reference label + Reference label Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -137,7 +137,7 @@ false - scale factor for detail view + Scale factor for detail view Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -165,7 +165,7 @@ - y position of detail highlight within view + Y-position of detail highlight within view Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -181,7 +181,7 @@ - Scale Factor + Scale factor @@ -194,7 +194,7 @@ - size of detail view + Size of detail view Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -226,7 +226,7 @@ - x position of detail highlight within view + X position of detail highlight within view Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/Mod/TechDraw/Gui/TaskDimRepair.cpp b/src/Mod/TechDraw/Gui/TaskDimRepair.cpp index 6c0ff02956..9f4d6dcdbf 100644 --- a/src/Mod/TechDraw/Gui/TaskDimRepair.cpp +++ b/src/Mod/TechDraw/Gui/TaskDimRepair.cpp @@ -79,7 +79,7 @@ void TaskDimRepair::setUiPrimary() fillList(ui->lwGeometry2d, labelsInOut, subElements2d); QStringList headers; - headers << tr("Object Name") << tr("Object Label") << tr("SubElement"); + headers << tr("Object name") << tr("Object label") << tr("Sub-element"); ui->twReferences3d->setHorizontalHeaderLabels(headers); ReferenceVector references3d = m_dim->getReferences3d(); @@ -137,8 +137,8 @@ void TaskDimRepair::slotUseSelection() references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); if (geometryRefs2d == DimensionGeometry::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Incorrect Selection"), - QObject::tr("Can not make dimension from selection")); + QObject::tr("Incorrect selection"), + QObject::tr("Cannot make dimension from selection")); return; } //what 3d geometry configuration did we receive? @@ -148,8 +148,8 @@ void TaskDimRepair::slotUseSelection() dvp, references3d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); if (geometryRefs3d == DimensionGeometry::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Incorrect Selection"), - QObject::tr("Can not make dimension from selection")); + QObject::tr("Incorrect selection"), + QObject::tr("Cannot make dimension from selection")); return; } } @@ -245,7 +245,7 @@ bool TaskDimRepair::accept() { Gui::Command::doCommand(Gui::Command::Gui, "Gui.ActiveDocument.resetEdit()"); - Gui::Command::openCommand(tr("Repair Dimension").toStdString().c_str()); + Gui::Command::openCommand(tr("Repair dimension").toStdString().c_str()); replaceReferences(); Gui::Command::commitCommand(); diff --git a/src/Mod/TechDraw/Gui/TaskDimRepair.ui b/src/Mod/TechDraw/Gui/TaskDimRepair.ui index f7a5c2bc12..e1185c3d86 100644 --- a/src/Mod/TechDraw/Gui/TaskDimRepair.ui +++ b/src/Mod/TechDraw/Gui/TaskDimRepair.ui @@ -83,7 +83,7 @@ - Replace References with Current Selection + Replace references with current selection @@ -116,7 +116,7 @@ - The View that owns this Dimension + The view that owns this dimension Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -160,7 +160,7 @@ - The subelements of the View that define the geometry for this Dimension + The sub-elements of the view that define the geometry for this dimension QAbstractItemView::NoEditTriggers diff --git a/src/Mod/TechDraw/Gui/TaskDimension.cpp b/src/Mod/TechDraw/Gui/TaskDimension.cpp index 1c85ef5cff..1dbe068f4e 100644 --- a/src/Mod/TechDraw/Gui/TaskDimension.cpp +++ b/src/Mod/TechDraw/Gui/TaskDimension.cpp @@ -166,7 +166,7 @@ bool TaskDimension::accept() { if (m_dimensionVP.expired()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Missing Dimension"), - QObject::tr("Dimension not found. Was it deleted? Can not continue.")); + QObject::tr("Dimension not found. Was it deleted? Cannot continue.")); return true; } Gui::Document* doc = m_dimensionVP->getDocument(); @@ -181,7 +181,7 @@ bool TaskDimension::reject() { if (m_dimensionVP.expired()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Missing Dimension"), - QObject::tr("Dimension not found. Was it deleted? Can not continue.")); + QObject::tr("Dimension not found. Was it deleted? Cannot continue.")); return true; } Gui::Document* doc = m_dimensionVP->getDocument(); @@ -462,7 +462,7 @@ std::pair TaskDimension::getAngleFromSelection() } QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("Select 2 Vertexes or 1 Edge")); + QObject::tr("Select 2 vertices or 1 edge")); result.second = false; return result; } diff --git a/src/Mod/TechDraw/Gui/TaskDimension.ui b/src/Mod/TechDraw/Gui/TaskDimension.ui index 318161aa9a..c6e4984ef4 100644 --- a/src/Mod/TechDraw/Gui/TaskDimension.ui +++ b/src/Mod/TechDraw/Gui/TaskDimension.ui @@ -25,10 +25,10 @@ - If theoretical exact (basic) dimension + If theoretically exact (basic) dimension - Theoretically Exact + Theoretically exact @@ -38,14 +38,14 @@ Assign same value to over and under tolerance - Equal Tolerance + Equal tolerance - Overtolerance: + Overtolerance @@ -59,8 +59,8 @@ Overtolerance value -If 'Equal Tolerance' is checked this is also -the negated value for 'Under Tolerance'. +If 'Equal tolerance' is checked this is also +the negated value for 'Undertolerance'. Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -90,8 +90,8 @@ the negated value for 'Under Tolerance'. Undertolerance value -If 'Equal Tolerance' is checked it will be replaced -by negative value of 'Over Tolerance'. +If 'Equal tolerance' is checked it will be replaced +by negative value of 'Overtolerance'. Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -120,7 +120,7 @@ by negative value of 'Over Tolerance'. - Format Specifier: + Format specifier @@ -134,18 +134,17 @@ by negative value of 'Over Tolerance'. - If checked, the content of 'Format Spec' will -be used instead of the dimension value + Sets use of 'Format spec' instead of the dimension value - Arbitrary Text + Arbitrary text - OverTolerance Format Specifier: + Overtolerance format specifier @@ -159,7 +158,7 @@ be used instead of the dimension value - UnderTolerance Format Specifier: + Undertolerance format specifier @@ -173,10 +172,10 @@ be used instead of the dimension value - <html><head/><body><p>If checked, the content of tolerance format spec will</p><p>be used instead of the tolerance value</p></body></html> + <html><head/><body><p>Uses the tolerance format spec</p><p>instead of the tolerance value</p></body></html> - Arbitrary Tolerance Text + Arbitrary tolerance text @@ -199,7 +198,7 @@ be used instead of the dimension value Reverses usual direction of dimension line terminators - Flip Arrowheads + Flip arrowheads @@ -227,7 +226,7 @@ be used instead of the dimension value - Font Size: + Font size @@ -246,7 +245,7 @@ be used instead of the dimension value - Fontsize for 'Text' + Font size for text Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -258,7 +257,7 @@ be used instead of the dimension value 4.000000000000000 - FontSize + Font size /Mod/TechDraw/Dimensions @@ -268,7 +267,7 @@ be used instead of the dimension value - Drawing Style: + Drawing style @@ -279,22 +278,22 @@ be used instead of the dimension value - ISO Oriented + ISO oriented - ISO Referencing + ISO referencing - ASME Inlined + ASME inlined - ASME Referencing + ASME referencing @@ -348,20 +347,20 @@ be used instead of the dimension value - Set dimension line angle to default (ortho view). + Set dimension line angle to default (orthographic view) - Use default + Use Default - Set dimension line angle to match selected edge or vertices. + Set dimension line angle to match selected edge or vertices - Use selection + Use Selection @@ -391,20 +390,20 @@ be used instead of the dimension value - Set extension line angle to default (ortho). + Set extension line angle to default (orthographic) - Use default + Use Default - Set extension line angle to match selected edge or vertices. + Set extension line angle to match selected edge or vertices - Use selection + Use Selection diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp index 5069c27905..05b7a6f4cf 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp @@ -70,7 +70,7 @@ void TaskGeomHatch::initUi() if (nameIndex > -1) { ui->cbName->setCurrentIndex(nameIndex); } else { - Base::Console().warning("Warning - Pattern name *%s* not found in current PAT File\n", m_name.c_str()); + Base::Console().warning("Warning - Pattern name *%s* not found in current PAT file\n", m_name.c_str()); } connect(ui->cbName, qOverload(&QComboBox::currentIndexChanged), this, &TaskGeomHatch::onNameChanged); diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.ui b/src/Mod/TechDraw/Gui/TaskGeomHatch.ui index a9ab22aaef..a705ebf489 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.ui +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.ui @@ -23,7 +23,7 @@ - Apply Geometric Hatch to Face + Geometric Hatch @@ -35,7 +35,7 @@
    - Define your pattern + Define Pattern @@ -43,7 +43,7 @@ - Pattern File + Pattern file @@ -56,7 +56,7 @@
    - The PAT file containing your pattern + The PAT file containing the pattern
    @@ -67,7 +67,7 @@ - Pattern Scale + Pattern scale @@ -94,7 +94,7 @@ - Pattern Name + Pattern name @@ -121,7 +121,7 @@ - Line Width + Line width @@ -150,7 +150,7 @@
    - Thickness of lines within the pattern + Thickness of the lines within the pattern Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -185,7 +185,7 @@ - Line Color + Line color diff --git a/src/Mod/TechDraw/Gui/TaskHatch.cpp b/src/Mod/TechDraw/Gui/TaskHatch.cpp index b28849d49d..000e9c35d4 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.cpp +++ b/src/Mod/TechDraw/Gui/TaskHatch.cpp @@ -227,7 +227,7 @@ void TaskHatch::createHatch() Base::Vector3d offset(ui->dsbOffsetX->value(), ui->dsbOffsetY->value(), 0.0); m_vp->HatchOffset.setValue(offset); } else { - Base::Console().error("TaskHatch - Hatch has no ViewProvider\n"); + Base::Console().error("TaskHatch - hatch has no ViewProvider\n"); } Command::commitCommand(); } diff --git a/src/Mod/TechDraw/Gui/TaskHatch.ui b/src/Mod/TechDraw/Gui/TaskHatch.ui index 7022aa0388..f1fcc6a69c 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.ui +++ b/src/Mod/TechDraw/Gui/TaskHatch.ui @@ -23,7 +23,7 @@ - Apply Hatch to Face + Apply Geometric Hatch @@ -35,7 +35,7 @@
    - Select an SVG or Bitmap file + Select an SVG or bitmap file Pattern Parameters @@ -52,14 +52,14 @@ - Choose an SVG or Bitmap file as a pattern + Choose an SVG or bitmap file as a pattern
    - Pattern File + Pattern file @@ -82,7 +82,7 @@
    - Enlarges/shrinks the pattern (SVG Only) + Enlarges/shrinks the pattern (SVG only) Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -104,7 +104,7 @@ - SVG Line Color + SVG line color @@ -130,14 +130,14 @@ - Color of pattern lines (SVG Only) + Color of pattern lines (SVG only)
    - Rotation the pattern (degrees) + Rotate the pattern (degrees) true @@ -156,7 +156,7 @@ - SVG Pattern Scale + SVG pattern scale diff --git a/src/Mod/TechDraw/Gui/TaskHoleShaftFit.ui b/src/Mod/TechDraw/Gui/TaskHoleShaftFit.ui index fdf5d40c11..36ffdedfbf 100644 --- a/src/Mod/TechDraw/Gui/TaskHoleShaftFit.ui +++ b/src/Mod/TechDraw/Gui/TaskHoleShaftFit.ui @@ -26,7 +26,7 @@ - Hole /Shaft Fit ISO 286 + Hole/Shaft Fit ISO 286 @@ -142,14 +142,14 @@ - loose fit + Loose fit - H11/ + H11/ diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp index aa649c099f..382198d8bc 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp @@ -87,7 +87,7 @@ TaskLeaderLine::TaskLeaderLine(TechDrawGui::ViewProviderLeader* leadVP) : m_basePage = m_lineFeat->findParentPage(); if (!m_basePage) { - Base::Console().error("TaskRichAnno - bad parameters (2). Can not proceed.\n"); + Base::Console().error("TaskRichAnno - bad parameters (2). Cannot proceed.\n"); return; } App::DocumentObject* obj = m_lineFeat->LeaderParent.getValue(); @@ -108,7 +108,7 @@ TaskLeaderLine::TaskLeaderLine(TechDrawGui::ViewProviderLeader* leadVP) : //TODO: when/if leaders are allowed to be parented to Page, check for m_baseFeat will be removed if (!m_baseFeat || !m_basePage) { - Base::Console().error("TaskLeaderLine - bad parameters (2). Can not proceed.\n"); + Base::Console().error("TaskLeaderLine - bad parameters (2). Cannot proceed.\n"); return; } @@ -488,7 +488,7 @@ void TaskLeaderLine::onTrackerClicked(bool clicked) { Q_UNUSED(clicked); if (!m_vpp->getMDIViewPage()) { - Base::Console().message("TLL::onTrackerClicked - no Mdi, no Tracker!\n"); + Base::Console().message("TLL::onTrackerClicked - no MDI, no tracker!\n"); return; } @@ -498,7 +498,7 @@ void TaskLeaderLine::onTrackerClicked(bool clicked) m_tracker->terminateDrawing(); } m_pbTrackerState = TrackerAction::PICK; - ui->pbTracker->setText(tr("Pick Points")); + ui->pbTracker->setText(tr("Pick points")); ui->pbCancelEdit->setEnabled(false); enableTaskButtons(true); @@ -512,7 +512,7 @@ void TaskLeaderLine::onTrackerClicked(bool clicked) m_qgLeader->closeEdit(); } m_pbTrackerState = TrackerAction::PICK; - ui->pbTracker->setText(tr("Edit Points")); + ui->pbTracker->setText(tr("Edit points")); ui->pbCancelEdit->setEnabled(false); enableTaskButtons(true); @@ -532,7 +532,7 @@ void TaskLeaderLine::onTrackerClicked(bool clicked) QString msg = tr("Pick a starting point for leader line"); getMainWindow()->statusBar()->show(); Gui::getMainWindow()->showMessage(msg, MessageDisplayTime); - ui->pbTracker->setText(tr("Save Points")); + ui->pbTracker->setText(tr("Save points")); ui->pbTracker->setEnabled(true); ui->pbCancelEdit->setEnabled(true); m_pbTrackerState = TrackerAction::SAVE; @@ -557,7 +557,7 @@ void TaskLeaderLine::onTrackerClicked(bool clicked) if (!qgLead) { //tarfu - Base::Console().error("TaskLeaderLine - can't find leader graphic\n"); + Base::Console().error("TaskLeaderLine - cannot find leader graphic\n"); //now what? throw will generate "unknown unhandled exception" } else { m_qgLeader = qgLead; @@ -636,9 +636,9 @@ void TaskLeaderLine::onTrackerFinished(std::vector trackerScenePoints, m_attachPoint = Base::Vector3d(mapped.x(), mapped.y(), 0.0); m_sceneDeltas = scenePointsToDeltas(trackerScenePoints); } else { - Base::Console().message("TTL::onTrackerFinished - can't find parent graphic!\n"); + Base::Console().message("TTL::onTrackerFinished - cannot find parent graphic!\n"); //blow up!? - throw Base::RuntimeError("TaskLeaderLine - can not find parent graphic"); + throw Base::RuntimeError("TaskLeaderLine - cannot find parent graphic"); } QString msg = tr("Press OK or Cancel to continue"); diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.ui b/src/Mod/TechDraw/Gui/TaskLeaderLine.ui index a6f5fcf8dd..87aae54ffe 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.ui +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.ui @@ -35,7 +35,7 @@ - Base View + Base view @@ -111,7 +111,7 @@ First pick the start point of the line, -then at least a second point. +then at least one more point. You can pick further points to get line segments. @@ -146,7 +146,7 @@ You can pick further points to get line segments. - Start Symbol + Start symbol @@ -166,7 +166,7 @@ You can pick further points to get line segments. - End Symbol + End symbol @@ -275,7 +275,7 @@ You can pick further points to get line segments. - NoLine + No line diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp index 2b9e55091d..3295363506 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp @@ -464,7 +464,7 @@ TaskDlgLineDecor::TaskDlgLineDecor(TechDraw::DrawViewPart* partFeat, if (parent) { restore = new TaskRestoreLines(partFeat, parent); restoreBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_DecorateLine"), - tr("Restore Invisible Lines"), true, nullptr); + tr("Restore invisible lines"), true, nullptr); restoreBox->groupLayout()->addWidget(restore); Content.push_back(restoreBox); } diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.ui b/src/Mod/TechDraw/Gui/TaskLineDecor.ui index ae6b8fbf35..39b16bc8c8 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.ui +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.ui @@ -96,7 +96,7 @@ - The use of the Qt line style is being phased out. Please use a standard line style instead. + The use of the Qt line style is being phased out. Use a standard line style instead. -1 @@ -142,7 +142,7 @@ - Thickness of pattern lines. + Thickness of pattern lines Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.ui b/src/Mod/TechDraw/Gui/TaskLinkDim.ui index 98e1f7ad21..b32beb3c4e 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.ui +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.ui @@ -51,7 +51,7 @@ - Link This 3D Geometry + Link this 3D geometry @@ -150,7 +150,7 @@ - To These Dimensions + To these dimensions diff --git a/src/Mod/TechDraw/Gui/TaskMoveView.ui b/src/Mod/TechDraw/Gui/TaskMoveView.ui index 4d723ee860..009e6ca215 100644 --- a/src/Mod/TechDraw/Gui/TaskMoveView.ui +++ b/src/Mod/TechDraw/Gui/TaskMoveView.ui @@ -33,14 +33,14 @@ - ... + - From Page + From page @@ -54,14 +54,14 @@ - ... + - To Page + To page @@ -75,7 +75,7 @@ - ... + diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index b7b8543105..5155f554db 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -186,7 +186,7 @@ void TaskProjGroup::updateUi() ui->label_11->show(); } else { - setWindowTitle(QObject::tr("Part View")); + setWindowTitle(QObject::tr("New View")); ui->projection->hide(); ui->cbAutoDistribute->hide(); ui->sbXSpacing->hide(); diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.ui b/src/Mod/TechDraw/Gui/TaskProjGroup.ui index c099880db7..5c615fd293 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.ui +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.ui @@ -73,7 +73,7 @@ - Scale Numerator + Scale numerator false @@ -96,7 +96,7 @@ - Scale Denominator + Scale denominator false @@ -123,7 +123,7 @@ - Spin clock wise + Spin clockwise @@ -171,7 +171,7 @@ - Spin counter clock wise + Spin counter-clockwise @@ -249,7 +249,7 @@ - Set document front view as primary direction. + Sets the document front view as primary direction @@ -300,7 +300,7 @@ - Set direction of the camera, or selected face if any, as primary direction. + Sets the direction of the camera, or selected face if any, as the primary direction @@ -556,16 +556,16 @@ height: 24px; - First or Third Angle + First or third angle - First Angle + First angle - Third Angle + Third angle @@ -581,10 +581,10 @@ height: 24px; Distributes projections automatically -using the given X/Y Spacing +using the given X/Y spacings - Auto Distribute + Auto distribute @@ -605,7 +605,7 @@ using the given X/Y Spacing - X Spacing + X spacing @@ -665,7 +665,7 @@ using the given X/Y Spacing - Y Spacing + Y spacing diff --git a/src/Mod/TechDraw/Gui/TaskProjection.cpp b/src/Mod/TechDraw/Gui/TaskProjection.cpp index 067b67ff94..bff679120c 100644 --- a/src/Mod/TechDraw/Gui/TaskProjection.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjection.cpp @@ -61,13 +61,13 @@ bool TaskProjection::accept() { Gui::Document* document = Gui::Application::Instance->activeDocument(); if (!document) { - QMessageBox::warning(Gui::getMainWindow(), tr("No active document"), + QMessageBox::warning(Gui::getMainWindow(), tr("No Active Document"), tr("There is currently no active document to complete the operation")); return true; } std::list mdis = document->getMDIViewsOfType(Gui::View3DInventor::getClassTypeId()); if (mdis.empty()) { - QMessageBox::warning(Gui::getMainWindow(), tr("No active view"), + QMessageBox::warning(Gui::getMainWindow(), tr("No Active View"), tr("There is currently no active view to complete the operation")); return false; } diff --git a/src/Mod/TechDraw/Gui/TaskProjection.ui b/src/Mod/TechDraw/Gui/TaskProjection.ui index 0000c8ad57..f8be10d970 100644 --- a/src/Mod/TechDraw/Gui/TaskProjection.ui +++ b/src/Mod/TechDraw/Gui/TaskProjection.ui @@ -11,7 +11,7 @@ - Project shapes + Project Shapes @@ -97,7 +97,7 @@ - Hidden isoparameters + Hidden iso-parameters diff --git a/src/Mod/TechDraw/Gui/TaskRestoreLines.ui b/src/Mod/TechDraw/Gui/TaskRestoreLines.ui index 9a6b73e0b4..0af9b7b468 100644 --- a/src/Mod/TechDraw/Gui/TaskRestoreLines.ui +++ b/src/Mod/TechDraw/Gui/TaskRestoreLines.ui @@ -70,7 +70,7 @@ - CenterLine + Centerline diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp index 831f10be24..1ba6d728a5 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp @@ -75,7 +75,7 @@ TaskRichAnno::TaskRichAnno(TechDrawGui::ViewProviderRichAnno* annoVP) : m_basePage = m_annoFeat->findParentPage(); if (!m_basePage) { - Base::Console().error("TaskRichAnno - bad parameters (2). Can not proceed.\n"); + Base::Console().error("TaskRichAnno - bad parameters (2). Cannot proceed.\n"); return; } @@ -98,7 +98,7 @@ TaskRichAnno::TaskRichAnno(TechDrawGui::ViewProviderRichAnno* annoVP) : ui->setupUi(this); - m_title = QObject::tr("Rich text editor"); + m_title = QObject::tr("Rich Text Editor"); setUiEdit(); m_attachPoint = Rez::guiX(Base::Vector3d(m_annoFeat->X.getValue(), @@ -136,7 +136,7 @@ TaskRichAnno::TaskRichAnno(TechDraw::DrawView* baseFeat, } ui->setupUi(this); - m_title = QObject::tr("Rich text creator"); + m_title = QObject::tr("Rich Text Creator"); setUiPrimary(); diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.ui b/src/Mod/TechDraw/Gui/TaskRichAnno.ui index fb10466766..ff1233af22 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.ui +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.ui @@ -50,7 +50,7 @@ - Base Feature + Base feature @@ -64,7 +64,7 @@ - Max Width + Max width @@ -118,7 +118,7 @@ - Show Frame + Show frame diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp index 735bab1506..0392659c9d 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp +++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp @@ -493,7 +493,7 @@ TechDraw::DrawViewSection* TaskSectionView::createSectionView(void) std::string baseName = m_base->getNameInDocument(); - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create SectionView")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Section View")); if (!m_section) { const std::string objectName("SectionView"); m_sectionName = m_base->getDocument()->getUniqueObjectName(objectName.c_str()); diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.ui b/src/Mod/TechDraw/Gui/TaskSectionView.ui index 2fd045bbf6..fc1bef4497 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.ui +++ b/src/Mod/TechDraw/Gui/TaskSectionView.ui @@ -25,7 +25,7 @@ - BaseView + Base view @@ -78,7 +78,7 @@ - Scale Type + Scale type @@ -164,7 +164,7 @@ - Preset view direction looking up. + Preset view direction looking up @@ -200,7 +200,7 @@ - Preset view direction looking down. + Preset view direction looking down @@ -230,7 +230,7 @@ - Preset view direction looking left. + Preset view direction looking left @@ -260,7 +260,7 @@ - Preset view direction looking right. + Preset view direction looking right @@ -452,7 +452,7 @@ - <html><head/><body><p>Rebuild display now. May be slow for complex models.</p></body></html> + <html><head/><body><p>Rebuild display now. May be slow for complex models.</p></body></html> Update Now @@ -462,10 +462,10 @@ - Check to update display after every property change. + Check to update display after every property change - Live Update + Live update diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp index 0c5782c654..82863371bc 100644 --- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp +++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp @@ -112,7 +112,7 @@ void TaskSelectLineAttributes::changeEvent(QEvent *e) void TaskSelectLineAttributes::setUiEdit() { - setWindowTitle(tr("Select line attributes")); + setWindowTitle(tr("Select Line Attributes")); int lineStyle = LineFormat::getCurrentLineFormat().getStyle(); // line numbering starts at 1, not 0 DrawGuiUtil::loadLineStyleChoices(ui->cbLineStyle, m_lineGenerator); diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui index 57eef4ca3e..fc5c39c8af 100644 --- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui +++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui @@ -23,7 +23,7 @@ - Line attributes + Line Attributes @@ -101,7 +101,7 @@ - Line color: + Line color diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.ui b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.ui index 6ee7c358c1..06ff5b724b 100644 --- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.ui +++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.ui @@ -245,7 +245,7 @@ - Symbol angle: + Symbol angle diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp index 015e2b796b..ec5503d4ae 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp @@ -96,7 +96,7 @@ TaskWeldingSymbol::TaskWeldingSymbol(TechDraw::DrawWeldSymbol* weld) : App::DocumentObject* obj = m_weldFeat->Leader.getValue(); if (!obj || !obj->isDerivedFrom() ) { - Base::Console().error("TaskWeldingSymbol - no leader for welding symbol. Can not proceed.\n"); + Base::Console().error("TaskWeldingSymbol - no leader for welding symbol. Cannot proceed.\n"); return; } @@ -558,7 +558,7 @@ bool TaskWeldingSymbol::accept() { // Base::Console().message("TWS::accept()\n"); if (m_createMode) { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create WeldSymbol")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Weld Symbol")); m_weldFeat = createWeldingSymbol(); updateTiles(); Gui::Command::updateActive(); @@ -566,7 +566,7 @@ bool TaskWeldingSymbol::accept() m_weldFeat->recomputeFeature(); // m_weldFeat->requestPaint(); //not a dv! } else { - Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit WeldSymbol")); + Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit Weld Symbol")); try { updateWeldingSymbol(); updateTiles(); diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui index 51eae239ff..e746f26bba 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui @@ -213,7 +213,7 @@ Angle, surface finish, root Flips the sides - Flip Sides + Flip sides @@ -235,22 +235,22 @@ Angle, surface finish, root - Adds the 'Field Weld' symbol (flag) + Adds the 'Field weld' symbol (flag) at the kink in the leader line - Field Weld + Field weld - Adds the 'All Around' symbol (circle) + Adds the 'All around' symbol (circle) at the kink in the leader line - All Around + All around @@ -271,7 +271,7 @@ at the kink in the leader line - Tail Text + Tail text @@ -291,7 +291,7 @@ at the kink in the leader line - Symbol Directory + Symbol directory diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.cpp b/src/Mod/TechDraw/Gui/TemplateTextField.cpp index 722015a880..da4d89ef89 100644 --- a/src/Mod/TechDraw/Gui/TemplateTextField.cpp +++ b/src/Mod/TechDraw/Gui/TemplateTextField.cpp @@ -48,7 +48,7 @@ TemplateTextField::TemplateTextField(QGraphicsItem *parent, tmplte(myTmplte), fieldNameStr(myFieldName) { - setToolTip(QObject::tr("Click to update text")); + setToolTip(QObject::tr("Updates text")); m_rect = new QGraphicsRectItem(); addToGroup(m_rect); QPen rectPen(Qt::transparent); diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index 56231fb757..b87c924306 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -84,9 +84,9 @@ ViewProviderPage::ViewProviderPage() // NOLINTBEGIN ADD_PROPERTY_TYPE(ShowFrames, (true), group, App::Prop_None, - "Show or hide View frames and Labels on this Page"); + "Show or hide view frames and labels on this page"); ADD_PROPERTY_TYPE(ShowGrid, (PreferencesGui::showGrid()), group, App::Prop_None, - "Show or hide a grid on this Page"); + "Show or hide a grid on this page"); ADD_PROPERTY_TYPE(GridSpacing, (PreferencesGui::gridSpacing()), group, (App::PropertyType::Prop_None), "Grid line spacing in mm"); // NOLINTEND @@ -232,6 +232,7 @@ void ViewProviderPage::setupContextMenu(QMenu* menu, QObject* receiver, const ch QAction* act = menu->addAction(QObject::tr("Show drawing"), receiver, member); act->setData(QVariant((int)ShowDrawing)); QAction* act2 = menu->addAction(QObject::tr("Toggle Keep Updated"), receiver, member); + act2->setData(QVariant((int)ToggleUpdate)); } diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp index c5bb4a6570..bf75910303 100644 --- a/src/Mod/TechDraw/Gui/Workbench.cpp +++ b/src/Mod/TechDraw/Gui/Workbench.cpp @@ -234,6 +234,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // views from other workbenches Gui::MenuItem* other = new Gui::MenuItem; other->setCommand("Views From Other Workbenches"); + *other << "TechDraw_ActiveView"; *other << "TechDraw_DraftView"; *other << "TechDraw_ArchView"; diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.ui b/src/Mod/TechDraw/Gui/mrichtextedit.ui index 0d13ef2a2f..9b4ce3032a 100644 --- a/src/Mod/TechDraw/Gui/mrichtextedit.ui +++ b/src/Mod/TechDraw/Gui/mrichtextedit.ui @@ -93,7 +93,7 @@ Qt::ClickFocus - Undo (CTRL+Z) + Undo (Ctrl+Z) Undo @@ -142,7 +142,7 @@ Qt::ClickFocus - Cut (CTRL+X) + Cut (Ctrl+X) Cut @@ -165,7 +165,7 @@ Qt::ClickFocus - Copy (CTRL+C) + Copy (Ctrl+C) Copy @@ -188,7 +188,7 @@ Qt::ClickFocus - Paste (CTRL+V) + Paste (Ctrl+V) Paste @@ -218,7 +218,7 @@ Qt::ClickFocus - Link (CTRL+L) + Link (Ctrl+L) Link @@ -251,7 +251,7 @@ Qt::ClickFocus - Bold (CTRL+B) + Bold (Ctrl+B) Bold @@ -277,7 +277,7 @@ Qt::ClickFocus - Italic (CTRL+I) + Italic (Ctrl+I) Italic @@ -303,7 +303,7 @@ Qt::ClickFocus - Underline (CTRL+U) + Underline (Ctrl+U) Underline @@ -326,10 +326,10 @@ - Strikethrough + Strikethrough text - Strike Out + Strikethrough @@ -359,7 +359,7 @@ Qt::ClickFocus - Bullet list (CTRL+-) + Bullet list (Ctrl+-) @@ -385,7 +385,7 @@ Qt::ClickFocus - Ordered list (CTRL+=) + Ordered list (Ctrl+=) @@ -411,10 +411,10 @@ Qt::ClickFocus - Decrease indentation (CTRL+,) + Decrease indentation (Ctrl+,) - Decrease indentation + Decrease Indentation @@ -434,10 +434,10 @@ Qt::ClickFocus - Increase indentation (CTRL+.) + Increase indentation (Ctrl+.) - Increase indentation + Increase Indentation diff --git a/src/Mod/TechDraw/TechDrawTools/CommandAxoLengthDimension.py b/src/Mod/TechDraw/TechDrawTools/CommandAxoLengthDimension.py index ce2d49b292..728fa4b813 100644 --- a/src/Mod/TechDraw/TechDrawTools/CommandAxoLengthDimension.py +++ b/src/Mod/TechDraw/TechDrawTools/CommandAxoLengthDimension.py @@ -51,12 +51,9 @@ class CommandAxoLengthDimension: """Return a dictionary with data that will be used by the button or menu item.""" return {'Pixmap': 'actions/TechDraw_AxoLengthDimension.svg', 'Accel': "", - 'MenuText': QT_TRANSLATE_NOOP("TechDraw_AxoLengthDimension", "Axonometric length dimension"), - 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_AxoLengthDimension", "Create an axonometric length dimension
    \ - - select first edge to define direction and length of the dimension line
    \ - - select second edge to define the direction of the extension lines
    \ - - optional: select two more vertexes which define the measurement instead of the length
    \ - of the first selected edge")} + 'MenuText': QT_TRANSLATE_NOOP("TechDraw_AxoLengthDimension", "Axonometric Length Dimension"), + 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_AxoLengthDimension", "Creates a length dimension in with " + "axonometric view, using selected edges or vertex pairs to define direction and measurement")} def Activated(self): """Run the following code when the command is activated (button press).""" diff --git a/src/Mod/TechDraw/TechDrawTools/CommandFillTemplateFields.py b/src/Mod/TechDraw/TechDrawTools/CommandFillTemplateFields.py index c573502ade..3ec1ab5759 100644 --- a/src/Mod/TechDraw/TechDrawTools/CommandFillTemplateFields.py +++ b/src/Mod/TechDraw/TechDrawTools/CommandFillTemplateFields.py @@ -46,11 +46,11 @@ class CommandFillTemplateFields: "Pixmap": "actions/TechDraw_FillTemplateFields.svg", "Accel": "", "MenuText": QT_TRANSLATE_NOOP( - "TechDraw_FillTemplateFields", "Update template fields" + "TechDraw_FillTemplateFields", "Update Template Fields" ), "ToolTip": QT_TRANSLATE_NOOP( "TechDraw_FillTemplateFields", - "Use document info to populate the template fields", + "Uses document info to populate the template fields", ), } diff --git a/src/Mod/TechDraw/TechDrawTools/CommandHoleShaftFit.py b/src/Mod/TechDraw/TechDrawTools/CommandHoleShaftFit.py index 0362de79cb..dc1096cf01 100644 --- a/src/Mod/TechDraw/TechDrawTools/CommandHoleShaftFit.py +++ b/src/Mod/TechDraw/TechDrawTools/CommandHoleShaftFit.py @@ -47,15 +47,11 @@ class CommandHoleShaftFit: "Pixmap": "actions/TechDraw_HoleShaftFit.svg", "Accel": "", "MenuText": QT_TRANSLATE_NOOP( - "TechDraw_HoleShaftFit", "Add hole or shaft fit" + "TechDraw_HoleShaftFit", "Hole/Shaft Fit" ), "ToolTip": QT_TRANSLATE_NOOP( "TechDraw_HoleShaftFit", - "Add a hole or shaft fit to a dimension\n" - "- select one length dimension or diameter dimension\n" - "- click the tool button, a panel opens\n" - "- select shaft fit / hole fit\n" - "- select the desired ISO 286 fit field using the combo box", + "Adds a hole or shaft fit to a selected length or diameter dimension" ), } @@ -73,7 +69,7 @@ class CommandHoleShaftFit: ) msg = translate( "TechDraw_HoleShaftFit", - "Please select one length dimension or diameter dimension and retry", + "Select one length dimension or diameter dimension and retry", ) msgBox.setText(msg) msgBox.setWindowTitle(msgTitle) diff --git a/src/Mod/TechDraw/TechDrawTools/CommandMoveView.py b/src/Mod/TechDraw/TechDrawTools/CommandMoveView.py index 110815f0a2..a6fbbd6b68 100644 --- a/src/Mod/TechDraw/TechDrawTools/CommandMoveView.py +++ b/src/Mod/TechDraw/TechDrawTools/CommandMoveView.py @@ -45,7 +45,7 @@ class CommandMoveView: return {'Pixmap': 'actions/TechDraw_MoveView.svg', 'Accel': "", 'MenuText': QT_TRANSLATE_NOOP("TechDraw_MoveView", "Move View"), - 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_MoveView", "Move a View to a new Page")} + 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_MoveView", "Moves a view to a new page")} def Activated(self): """Run the following code when the command is activated (button press).""" diff --git a/src/Mod/TechDraw/TechDrawTools/CommandPositionSectionView.py b/src/Mod/TechDraw/TechDrawTools/CommandPositionSectionView.py index af6bf2a4e3..1c0bff1b50 100644 --- a/src/Mod/TechDraw/TechDrawTools/CommandPositionSectionView.py +++ b/src/Mod/TechDraw/TechDrawTools/CommandPositionSectionView.py @@ -21,7 +21,7 @@ """ Provides the TechDraw PositionSectionView GuiCommand. 00.01 2021/03/17 C++ Basic version -00.02 2023/12/21 Option to select an edge and it's corresponding vertex +00.02 2023/12/21 Option to select an edge and its corresponding vertex """ __title__ = "TechDrawTools.CommandPositionSectionView" @@ -50,11 +50,7 @@ class CommandPositionSectionView: 'Accel': "", 'MenuText': QT_TRANSLATE_NOOP("TechDraw_PositionSectionView", "Position Section View"), 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_PositionSectionView", - "Orthogonally align a section view with its source view:
    \ - - Select a single section view
    \ - - Click this tool
    \ - - optional: select one edge in the section view and it's corresponding vertex in the base view
    \ - Click this tool")} + "Aligns the selected section view with its source view orthogonally or the selected edge in the section view to the selected vertex in the base view")} def Activated(self): """Run the following code when the command is activated (button pressed).""" @@ -113,8 +109,14 @@ class CommandPositionSectionView: def getTrianglePoint(self,p1,dir,p2): ''' - Get third point of a perpendicular triangle - p1, p2 ...vertexes of hypothenusis, dir ...direction of one kathete, p3 ...3rd vertex + Calculate the third vertex of a right triangle. + + Parameters: + p1, p2 : vertices of the hypotenuse + dir : direction vector of one leg (kathete) + + Returns: + p3 : the third vertex completing the right triangle ''' a = -dir.y b = dir.x diff --git a/src/Mod/TechDraw/TechDrawTools/CommandShareView.py b/src/Mod/TechDraw/TechDrawTools/CommandShareView.py index fc642507d2..f06a867089 100644 --- a/src/Mod/TechDraw/TechDrawTools/CommandShareView.py +++ b/src/Mod/TechDraw/TechDrawTools/CommandShareView.py @@ -34,7 +34,7 @@ import FreeCADGui as Gui import TechDrawTools class CommandShareView: - """Shares a View on current Page to another Page.""" + """Shares a view on current page to another page.""" def __init__(self): """Initialize variables for the command that must exist at all times.""" @@ -45,7 +45,7 @@ class CommandShareView: return {'Pixmap': 'actions/TechDraw_ShareView.svg', 'Accel': "", 'MenuText': QT_TRANSLATE_NOOP("TechDraw_ShareView", "Share View"), - 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_ShareView", "Share a View on a second Page")} + 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_ShareView", "Shares a view on a second page")} def Activated(self): """Run the following code when the command is activated (button press).""" diff --git a/src/Mod/TechDraw/TechDrawTools/CommandVertexCreations.py b/src/Mod/TechDraw/TechDrawTools/CommandVertexCreations.py index b66aa1fecf..6d95bebb43 100644 --- a/src/Mod/TechDraw/TechDrawTools/CommandVertexCreations.py +++ b/src/Mod/TechDraw/TechDrawTools/CommandVertexCreations.py @@ -57,10 +57,8 @@ class CommandVertexCreationGroup: """Return a dictionary with data that will be used by the button or menu item.""" return {'Pixmap': 'TechDraw_ExtensionVertexAtIntersection.svg', 'Accel': "", - 'MenuText': QT_TRANSLATE_NOOP("TechDraw_ExtensionVertexAtIntersection","Add Cosmetic Intersection Vertex(es)"), - 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_ExtensionVertexAtIntersection", "Add cosmetic vertex(es) at the intersection(s) of selected edges:
    \ - - Select two edges
    \ - - Click this tool")} + 'MenuText': QT_TRANSLATE_NOOP("TechDraw_ExtensionVertexAtIntersection","Cosmetic Intersection Vertices"), + 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_ExtensionVertexAtIntersection", "Adds cosmetic vertices at the intersectionss of selected edges")} def IsActive(self): """Return True when the command should be active or False when it should be disabled (greyed).""" @@ -80,11 +78,8 @@ class CommandAddOffsetVertex: """Return a dictionary with data that will be used by the button or menu item.""" return {'Pixmap': 'actions/TechDraw_AddOffsetVertex.svg', 'Accel': "", - 'MenuText': QT_TRANSLATE_NOOP("TechDraw_AddOffsetVertex", "Add an offset vertex"), - 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_AddOffsetVertex", "Create an offset vertex
    \ - - select one vertex
    \ - - start the tool
    \ - - enter offset values in panel")} + 'MenuText': QT_TRANSLATE_NOOP("TechDraw_AddOffsetVertex", "Offset Vertex"), + 'ToolTip': QT_TRANSLATE_NOOP("TechDraw_AddOffsetVertex", "Creates an offset from one selected vertex")} def Activated(self): """Run the following code when the command is activated (button pressed).""" diff --git a/src/Mod/TechDraw/TechDrawTools/TaskFillTemplateFields.py b/src/Mod/TechDraw/TechDrawTools/TaskFillTemplateFields.py index f4560d2226..e234c78f9b 100644 --- a/src/Mod/TechDraw/TechDrawTools/TaskFillTemplateFields.py +++ b/src/Mod/TechDraw/TechDrawTools/TaskFillTemplateFields.py @@ -103,7 +103,7 @@ class TaskFillTemplateFields: msgBox = QtGui.QMessageBox() msgTitle = QtCore.QT_TRANSLATE_NOOP( "Techdraw_FillTemplateFields", - "View or Projection Group missing", + "View or projection group missing", ) msg = QtCore.QT_TRANSLATE_NOOP( "Techdraw_FillTemplateFields", @@ -131,7 +131,7 @@ class TaskFillTemplateFields: self.dialog.resize(1050, 400) self.dialog.setWindowTitle( QtCore.QT_TRANSLATE_NOOP( - "TechDraw_FillTemplateFields", "Fill Template Fields in " + "TechDraw_FillTemplateFields", "Fill Template Fields In " ) + self.page.Label ) diff --git a/src/Mod/TechDraw/TechDrawTools/TaskHoleShaftFit.py b/src/Mod/TechDraw/TechDrawTools/TaskHoleShaftFit.py index 96605f69e1..6cb64a536a 100644 --- a/src/Mod/TechDraw/TechDrawTools/TaskHoleShaftFit.py +++ b/src/Mod/TechDraw/TechDrawTools/TaskHoleShaftFit.py @@ -39,9 +39,9 @@ translate = App.Qt.translate class TaskHoleShaftFit: def __init__(self, sel): - loose = translate("TechDraw_HoleShaftFit", "loose fit") - snug = translate("TechDraw_HoleShaftFit", "snug fit") - press = translate("TechDraw_HoleShaftFit", "press fit") + loose = translate("TechDraw_HoleShaftFit", "Loose fit") + snug = translate("TechDraw_HoleShaftFit", "Snug fit") + press = translate("TechDraw_HoleShaftFit", "Press fit") self.isHole = True self.sel = sel self.holeValues = [ @@ -88,7 +88,7 @@ class TaskHoleShaftFit: self.form = Gui.PySideUic.loadUi(self._uiPath) self.form.setWindowTitle( - translate("TechDraw_HoleShaftFit", "Hole / Shaft Fit ISO 286") + translate("TechDraw_HoleShaftFit", "Hole/Shaft Fit ISO 286") ) self.form.rbHoleBase.clicked.connect(partial(self.on_HoleShaftChanged, True)) diff --git a/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py b/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py index a82c5e1dc8..4268506195 100644 --- a/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py +++ b/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py @@ -45,7 +45,7 @@ class TaskMoveView: self._uiPath = os.path.join(self._uiPath, "Mod/TechDraw/TechDrawTools/Gui/TaskMoveView.ui") self.form = Gui.PySideUic.loadUi(self._uiPath) - self.form.setWindowTitle(translate("TechDraw_MoveView", "Move View to a different Page")) + self.form.setWindowTitle(translate("TechDraw_MoveView", "Move View to Different Page")) self.form.pbView.clicked.connect(self.pickView) self.form.pbFromPage.clicked.connect(self.pickFromPage) @@ -77,7 +77,7 @@ class TaskMoveView: _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui") dlg = Gui.PySideUic.loadUi(_dlgPath) self.dialogOpen = True - dlg.lPrompt.setText(translate("TechDraw_MoveView", "Select View to move from list.")) + dlg.lPrompt.setText(translate("TechDraw_MoveView", "Select view to move from list.")) dlg.setWindowTitle(translate("TechDraw_MoveView", "Select View")) views = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawView")] @@ -100,7 +100,7 @@ class TaskMoveView: _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui") dlg = Gui.PySideUic.loadUi(_dlgPath) self.dialogOpen = True - dlg.lPrompt.setText(translate("TechDraw_MoveView", "Select From Page.")) + dlg.lPrompt.setText(translate("TechDraw_MoveView", "Select from page.")) dlg.setWindowTitle(translate("TechDraw_MoveView", "Select Page")) pages = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawPage")] @@ -123,7 +123,7 @@ class TaskMoveView: _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui") dlg = Gui.PySideUic.loadUi(_dlgPath) self.dialogOpen = True - dlg.lPrompt.setText(translate("TechDraw_MoveView", "Select To Page.")) + dlg.lPrompt.setText(translate("TechDraw_MoveView", "Select to page.")) dlg.setWindowTitle(translate("TechDraw_MoveView", "Select Page")) pages = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawPage")] diff --git a/src/Mod/TechDraw/TechDrawTools/TaskShareView.py b/src/Mod/TechDraw/TechDrawTools/TaskShareView.py index c57ffae662..bb9c4a786e 100644 --- a/src/Mod/TechDraw/TechDrawTools/TaskShareView.py +++ b/src/Mod/TechDraw/TechDrawTools/TaskShareView.py @@ -44,7 +44,7 @@ class TaskShareView: self._uiPath = os.path.join(self._uiPath, "Mod/TechDraw/TechDrawTools/Gui/TaskMoveView.ui") self.form = Gui.PySideUic.loadUi(self._uiPath) - self.form.setWindowTitle(translate("TechDraw_ShareView", "Share View with another Page")) + self.form.setWindowTitle(translate("TechDraw_ShareView", "Share View With Another Page")) self.form.lViewName.setText(translate("TechDraw_ShareView", "View to share")) self.form.pbView.clicked.connect(self.pickView) @@ -77,7 +77,7 @@ class TaskShareView: _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui") dlg = Gui.PySideUic.loadUi(_dlgPath) self.dialogOpen = True - dlg.lPrompt.setText(translate("TechDraw_ShareView", "Select View to share from list.")) + dlg.lPrompt.setText(translate("TechDraw_ShareView", "Select view to share from list.")) dlg.setWindowTitle(translate("TechDraw_ShareView", "Select View")) views = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawView")] @@ -100,7 +100,7 @@ class TaskShareView: _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui") dlg = Gui.PySideUic.loadUi(_dlgPath) self.dialogOpen = True - dlg.lPrompt.setText(translate("TechDraw_ShareView", "Select From Page.")) + dlg.lPrompt.setText(translate("TechDraw_ShareView", "Select from page.")) dlg.setWindowTitle(translate("TechDraw_ShareView", "Select Page")) pages = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawPage")] @@ -124,7 +124,7 @@ class TaskShareView: _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui") dlg = Gui.PySideUic.loadUi(_dlgPath) self.dialogOpen = True - dlg.lPrompt.setText(translate("TechDraw_ShareView", "Select To Page.")) + dlg.lPrompt.setText(translate("TechDraw_ShareView", "Select to page.")) dlg.setWindowTitle(translate("TechDraw_ShareView", "Select Page")) pages = [x for x in App.ActiveDocument.Objects if x.isDerivedFrom("TechDraw::DrawPage")] diff --git a/src/Mod/TechDraw/moveViews.py b/src/Mod/TechDraw/moveViews.py index 8313afb6e9..6b6a860df5 100644 --- a/src/Mod/TechDraw/moveViews.py +++ b/src/Mod/TechDraw/moveViews.py @@ -43,7 +43,7 @@ def moveViews(): s = FreeCADGui.Selection.getSelection() if len(s) != 2: - print("Please select 1 Drawing Page and 1 TechDraw Page") + print("Select 1 Drawing page and 1 TechDraw page") return print("First object in selection is a: ", s[0].TypeId) @@ -59,7 +59,7 @@ def moveViews(): tPage = s[0] dPage = s[1] else: - print("Please select 1 Drawing Page and 1 TechDraw Page") + print("Select 1 Drawing page and 1 TechDraw page") return for o in dPage.OutList: diff --git a/src/Mod/Test/Gui/AppTestGui.cpp b/src/Mod/Test/Gui/AppTestGui.cpp index f78e70064d..93e977087f 100644 --- a/src/Mod/Test/Gui/AppTestGui.cpp +++ b/src/Mod/Test/Gui/AppTestGui.cpp @@ -247,7 +247,7 @@ PyMOD_INIT_FUNC(QtUnitGui) // with the Python runtime system PyObject* mod = TestGui::initModule(); - Base::Console().log("Loading GUI of Test module... done\n"); + Base::Console().log("Loading GUI of Test module… done\n"); // add resources and reloads the translators loadTestResource(); diff --git a/src/Mod/Test/Gui/UnitTest.ui b/src/Mod/Test/Gui/UnitTest.ui index 5159828a55..ffc52ab53e 100644 --- a/src/Mod/Test/Gui/UnitTest.ui +++ b/src/Mod/Test/Gui/UnitTest.ui @@ -14,7 +14,7 @@
    - FreeCAD UnitTest + FreeCAD Unit Test true @@ -41,7 +41,7 @@ - Select test name: + Select test name @@ -185,7 +185,7 @@ - Run: + Run @@ -202,7 +202,7 @@ - Failures: + Failures @@ -219,7 +219,7 @@ - Errors: + Errors @@ -236,7 +236,7 @@ - Remaining: + Remaining @@ -256,7 +256,7 @@ - Failures and errors + Failures and Errors