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 a16c801daf..6796012924 100644 --- a/src/Gui/CommandFeat.cpp +++ b/src/Gui/CommandFeat.cpp @@ -56,9 +56,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"; } @@ -78,10 +78,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"; } @@ -158,7 +158,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.") + "

"; @@ -220,7 +220,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/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 919c2ffaa9..1f62cb88d2 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -1124,14 +1124,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; } @@ -1143,13 +1143,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"); @@ -1164,7 +1164,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)); @@ -3353,50 +3353,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")); } @@ -3739,7 +3739,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);