From 1850c5dc0f76706fa70fecb74e0dfb12caa36d41 Mon Sep 17 00:00:00 2001 From: Max Wilfinger Date: Fri, 8 Aug 2025 09:39:11 +0200 Subject: [PATCH] Fix missed strings for UI consistency Fix ellipsis rendering --- src/Gui/CommandView.cpp | 22 ++++++------ src/Gui/Dialogs/DlgMacroExecuteImp.cpp | 4 +-- src/Gui/Dialogs/DlgPreferencesImp.cpp | 4 +-- src/Gui/FileDialog.cpp | 10 +++--- src/Gui/MainWindow.cpp | 4 +-- src/Gui/Multisample.cpp | 2 +- src/Gui/PreferencePages/DlgSettingsGeneral.ui | 2 +- src/Gui/PythonConsole.cpp | 8 ++--- src/Gui/QuantitySpinBox_p.h | 2 +- src/Gui/SoFCColorBar.cpp | 2 +- src/Gui/Tree.cpp | 22 ++++++------ src/Gui/ViewProviderImagePlane.cpp | 2 +- src/Gui/ViewProviderLink.cpp | 4 +-- src/Gui/Widgets.cpp | 6 ++-- src/Gui/Workbench.cpp | 2 +- src/Gui/propertyeditor/PropertyEditor.cpp | 2 +- src/Gui/propertyeditor/PropertyItem.cpp | 4 +-- src/Mod/BIM/ArchBuildingPart.py | 8 ++--- src/Mod/BIM/ArchStructure.py | 12 +++---- .../BIM/Resources/ui/dialogProjectManager.ui | 2 +- src/Mod/BIM/Resources/ui/preferences-ifc.ui | 2 +- src/Mod/BIM/bimcommands/BimArchUtils.py | 2 +- src/Mod/BIM/bimcommands/BimProjectManager.py | 6 ++-- src/Mod/Draft/draftutils/init_tools.py | 6 ++-- src/Mod/Fem/femcommands/commands.py | 2 +- src/Mod/Mesh/App/AppMeshPy.cpp | 2 +- src/Mod/Mesh/Gui/Command.cpp | 34 +++++++++---------- src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp | 4 +-- src/Mod/Mesh/Gui/SegmentationBestFit.ui | 6 ++-- src/Mod/MeshPart/Gui/MeshFlatteningCommand.py | 8 ++--- src/Mod/OpenSCAD/OpenSCADCommands.py | 10 +++--- src/Mod/Part/BasicShapes/CommandShapes.py | 2 +- src/Mod/Part/Gui/Workbench.cpp | 1 - src/Mod/Points/Gui/Command.cpp | 2 +- src/Mod/Robot/Gui/Command.cpp | 2 +- src/Mod/Robot/Gui/CommandExport.cpp | 4 +-- src/Mod/Robot/Gui/CommandTrajectory.cpp | 6 ++-- src/Mod/Spreadsheet/Gui/Command.cpp | 2 +- src/Mod/Surface/Gui/Command.cpp | 6 ++-- src/Mod/TechDraw/Gui/ViewProviderPage.cpp | 2 +- .../Gui/ViewProviderProjGroupItem.cpp | 2 +- 41 files changed, 117 insertions(+), 118 deletions(-) diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 414d793034..9c04617983 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -878,7 +878,7 @@ StdCmdToggleVisibility::StdCmdToggleVisibility() void StdCmdToggleVisibility::activated(int iMsg) { Q_UNUSED(iMsg); - TransactionView transaction(getActiveGuiDocument(), QT_TRANSLATE_NOOP("Command", "Toggle visibility")); + TransactionView transaction(getActiveGuiDocument(), QT_TRANSLATE_NOOP("Command", "Toggle Visibility")); Selection().setVisible(SelectionSingleton::VisToggle); } @@ -912,7 +912,7 @@ StdCmdToggleTransparency::StdCmdToggleTransparency() void StdCmdToggleTransparency::activated(int iMsg) { Q_UNUSED(iMsg); - getActiveGuiDocument()->openCommand(QT_TRANSLATE_NOOP("Command", "Toggle transparency")); + getActiveGuiDocument()->openCommand(QT_TRANSLATE_NOOP("Command", "Toggle Transparency")); std::vector sels = Gui::Selection().getCompleteSelection(); @@ -1029,7 +1029,7 @@ void StdCmdToggleSelectability::activated(int iMsg) continue; } - TransactionView transaction(pcDoc, QT_TRANSLATE_NOOP("Command", "Toggle selectability")); + TransactionView transaction(pcDoc, QT_TRANSLATE_NOOP("Command", "Toggle Selectability")); for (const auto & ft : sel) { ViewProvider *pr = pcDoc->getViewProviderByName(ft->getNameInDocument()); @@ -1157,7 +1157,7 @@ StdCmdToggleObjects::StdCmdToggleObjects() : Command("Std_ToggleObjects") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("To&ggle all Objects"); + 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"; @@ -1198,7 +1198,7 @@ StdCmdShowObjects::StdCmdShowObjects() : Command("Std_ShowObjects") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Show &all Objects"); + sMenuText = QT_TR_NOOP("Show &All Objects"); sToolTipText = QT_TR_NOOP("Shows all objects in the document"); sStatusTip = sToolTipText; sWhatsThis = "Std_ShowObjects"; @@ -1235,7 +1235,7 @@ StdCmdHideObjects::StdCmdHideObjects() : Command("Std_HideObjects") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Hide all &Objects"); + sMenuText = QT_TR_NOOP("Hide All &Objects"); sToolTipText = QT_TR_NOOP("Hides all objects in the document"); sStatusTip = sToolTipText; sWhatsThis = "Std_HideObjects"; @@ -3088,7 +3088,7 @@ StdCmdTreeSelectAllInstances::StdCmdTreeSelectAllInstances() : Command("Std_TreeSelectAllInstances") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Select all Instances"); + sMenuText = QT_TR_NOOP("Select All Instances"); sToolTipText = QT_TR_NOOP("Selects all instances of the currently selected object"); sWhatsThis = "Std_TreeSelectAllInstances"; sStatusTip = sToolTipText; @@ -3141,7 +3141,7 @@ StdCmdSceneInspector::StdCmdSceneInspector() { // setting the sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Scene I&nspector…"); + sMenuText = QT_TR_NOOP("Scene I&nspector"); sToolTipText = QT_TR_NOOP("Opens the scene inspector"); sWhatsThis = "Std_SceneInspector"; sStatusTip = sToolTipText; @@ -3174,7 +3174,7 @@ StdCmdTextureMapping::StdCmdTextureMapping() { // setting the sGroup = "Tools"; - sMenuText = QT_TR_NOOP("Text&ure Mapping…"); + sMenuText = QT_TR_NOOP("Text&ure Mapping"); sToolTipText = QT_TR_NOOP("Maps textures to shapes"); sWhatsThis = "Std_TextureMapping"; sStatusTip = sToolTipText; @@ -3201,7 +3201,7 @@ StdCmdDemoMode::StdCmdDemoMode() : Command("Std_DemoMode") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("View &Turntable…"); + sMenuText = QT_TR_NOOP("View &Turntable"); sToolTipText = QT_TR_NOOP("Opens a turntable view"); sWhatsThis = "Std_DemoMode"; sStatusTip = sToolTipText; @@ -3601,7 +3601,7 @@ StdCmdDockOverlayAll::StdCmdDockOverlayAll() :Command("Std_DockOverlayAll") { sGroup = "View"; - sMenuText = QT_TR_NOOP("Toggle Overl&ay for all Panels"); + 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; diff --git a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp index b24d8517f9..5df607e2a6 100644 --- a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp +++ b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp @@ -863,7 +863,7 @@ void DlgMacroExecuteImp::onRenameButtonClicked() // query new name QString fn = QInputDialog::getText(this, tr("Renaming Macro File"), - tr("Enter new name:"), + tr("Enter new name"), QLineEdit::Normal, oldName, nullptr, @@ -1024,7 +1024,7 @@ void DlgMacroExecuteImp::onDuplicateButtonClicked() // give user a chance to pick a different name from digitized name suggested QString fn = QInputDialog::getText(this, tr("Duplicate Macro"), - tr("Enter new name:"), + tr("Enter new name"), QLineEdit::Normal, oldNameDigitized, nullptr, diff --git a/src/Gui/Dialogs/DlgPreferencesImp.cpp b/src/Gui/Dialogs/DlgPreferencesImp.cpp index 0267f432d1..bf11f16ae5 100644 --- a/src/Gui/Dialogs/DlgPreferencesImp.cpp +++ b/src/Gui/Dialogs/DlgPreferencesImp.cpp @@ -953,8 +953,8 @@ void DlgPreferencesImp::restartIfRequired() restartBox.setDefaultButton(QMessageBox::Cancel); auto okBtn = restartBox.button(QMessageBox::Ok); auto cancelBtn = restartBox.button(QMessageBox::Cancel); - okBtn->setText(tr("Restart now")); - cancelBtn->setText(tr("Restart later")); + okBtn->setText(tr("Restart Now")); + cancelBtn->setText(tr("Restart Later")); int exec = restartBox.exec(); diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp index c7eeddb17f..faa41ba82e 100644 --- a/src/Gui/FileDialog.cpp +++ b/src/Gui/FileDialog.cpp @@ -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(QStringLiteral("…"), this); #if defined (Q_OS_MACOS) button->setAttribute(Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct @@ -741,12 +741,12 @@ void FileChooser::chooseFile() QString fn; if ( mode() == File ) { if (acceptMode() == AcceptOpen) - fn = QFileDialog::getOpenFileName(this, tr( "Select a file" ), prechosenDirectory, _filter, nullptr, dlgOpt); + fn = QFileDialog::getOpenFileName(this, tr( "Select a File" ), prechosenDirectory, _filter, nullptr, dlgOpt); else - fn = QFileDialog::getSaveFileName(this, tr( "Select a file" ), prechosenDirectory, _filter, nullptr, dlgOpt); + fn = QFileDialog::getSaveFileName(this, tr( "Select a File" ), prechosenDirectory, _filter, nullptr, dlgOpt); } else { QFileDialog::Options option = QFileDialog::ShowDirsOnly | dlgOpt; - fn = QFileDialog::getExistingDirectory( this, tr( "Select a directory" ), prechosenDirectory,option ); + fn = QFileDialog::getExistingDirectory( this, tr( "Select a Directory" ), prechosenDirectory,option ); } if (!fn.isEmpty()) { @@ -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(), QStringLiteral(" … ")); button->setMinimumWidth(std::max(w1, w2)); Q_EMIT buttonTextChanged(txt); } diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 70a1f660dc..914d3b692a 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -590,7 +590,7 @@ bool MainWindow::setupReportView() auto pcReport = new ReportOutput(this); pcReport->setWindowIcon(BitmapFactory().pixmap("MacroEditor")); pcReport->setObjectName - (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Report view"))); + (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Report View"))); DockWindowManager* pDockMgr = DockWindowManager::instance(); pDockMgr->registerDockWindow("Std_ReportView", pcReport); @@ -610,7 +610,7 @@ bool MainWindow::setupPythonConsole() auto pcPython = new PythonConsole(this); pcPython->setWindowIcon(Gui::BitmapFactory().iconFromTheme("applications-python")); pcPython->setObjectName - (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Python console"))); + (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Python Console"))); DockWindowManager* pDockMgr = DockWindowManager::instance(); pDockMgr->registerDockWindow("Std_PythonView", pcPython); diff --git a/src/Gui/Multisample.cpp b/src/Gui/Multisample.cpp index b00f5d2620..5f0ee75bed 100644 --- a/src/Gui/Multisample.cpp +++ b/src/Gui/Multisample.cpp @@ -40,7 +40,7 @@ static constexpr auto idEnum {1}; static constexpr auto idMSAA {2}; static constexpr std::array, numMSAA> textMSAA {{ {QT_TRANSLATE_NOOP("Gui::Dialog::DlgSettings3DView", "None"), AntiAliasing::None, 0}, - {QT_TRANSLATE_NOOP("Gui::Dialog::DlgSettings3DView", "Line Smoothing"), AntiAliasing::MSAA1x, 1}, + {QT_TRANSLATE_NOOP("Gui::Dialog::DlgSettings3DView", "Line smoothing"), AntiAliasing::MSAA1x, 1}, {QT_TRANSLATE_NOOP("Gui::Dialog::DlgSettings3DView", "MSAA 2x"), AntiAliasing::MSAA2x, 2}, {QT_TRANSLATE_NOOP("Gui::Dialog::DlgSettings3DView", "MSAA 4x"), AntiAliasing::MSAA4x, 4}, {QT_TRANSLATE_NOOP("Gui::Dialog::DlgSettings3DView", "MSAA 6x"), AntiAliasing::MSAA6x, 6}, diff --git a/src/Gui/PreferencePages/DlgSettingsGeneral.ui b/src/Gui/PreferencePages/DlgSettingsGeneral.ui index aa6a45121c..44cfbaf976 100644 --- a/src/Gui/PreferencePages/DlgSettingsGeneral.ui +++ b/src/Gui/PreferencePages/DlgSettingsGeneral.ui @@ -474,7 +474,7 @@ display the splash screen. - Import Configuration… + Import Configuration diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp index d05d48fab6..559f1164ad 100644 --- a/src/Gui/PythonConsole.cpp +++ b/src/Gui/PythonConsole.cpp @@ -839,16 +839,16 @@ void PythonConsole::runSource(const QString& line) } } catch (const Py::Exception&) { - QMessageBox::critical(this, tr("Python console"), tr("Unhandled PyCXX exception.")); + QMessageBox::critical(this, tr("Python Console"), tr("Unhandled PyCXX exception.")); } catch (const Base::Exception&) { - QMessageBox::critical(this, tr("Python console"), tr("Unhandled FreeCAD exception.")); + QMessageBox::critical(this, tr("Python Console"), tr("Unhandled FreeCAD exception.")); } catch (const std::exception&) { - QMessageBox::critical(this, tr("Python console"), tr("Unhandled std C++ exception.")); + QMessageBox::critical(this, tr("Python Console"), tr("Unhandled std C++ exception.")); } catch (...) { - QMessageBox::critical(this, tr("Python console"), tr("Unhandled unknown C++ exception.")); + QMessageBox::critical(this, tr("Python Console"), tr("Unhandled unknown C++ exception.")); } printPrompt(incomplete ? PythonConsole::Incomplete diff --git a/src/Gui/QuantitySpinBox_p.h b/src/Gui/QuantitySpinBox_p.h index b7b1b9a351..9cba517407 100644 --- a/src/Gui/QuantitySpinBox_p.h +++ b/src/Gui/QuantitySpinBox_p.h @@ -61,7 +61,7 @@ Q_SIGNALS: private: const QString genericExpressionEditorTooltip = tr("Enter expression… (=)"); - const QString expressionEditorTooltipPrefix = tr("Expression:") + QLatin1String(" "); + const QString expressionEditorTooltipPrefix = tr("Expression:") + QStringLiteral(" "); }; #endif // QUANTITYSPINBOX_P_H diff --git a/src/Gui/SoFCColorBar.cpp b/src/Gui/SoFCColorBar.cpp index eab9e67c40..34cefad4d4 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/Tree.cpp b/src/Gui/Tree.cpp index 5573779acf..9047597f54 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -3359,25 +3359,25 @@ void TreeWidget::setupText() this->headerItem()->setText(1, tr("Description")); this->headerItem()->setText(2, tr("Internal name")); - this->showHiddenAction->setText(tr("Show items hidden in tree view")); + this->showHiddenAction->setText(tr("Show Items Hidden in 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->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->setText(tr("Create Group")); this->createGroupAction->setStatusTip(tr("Creates a group")); this->relabelObjectAction->setText(tr("Rename")); this->relabelObjectAction->setStatusTip(tr("Renames object")); - this->finishEditingAction->setText(tr("Finish editing")); + this->finishEditingAction->setText(tr("Finish Editing")); this->finishEditingAction->setStatusTip(tr("Finishes editing object")); - this->selectDependentsAction->setText(tr("Add dependent objects to selection")); + 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->setText(tr("Close Document")); this->closeDocAction->setStatusTip(tr("Closes the document")); #ifdef Q_OS_MAC @@ -3388,21 +3388,21 @@ void TreeWidget::setupText() this->openFileLocationAction->setStatusTip(tr("Opens the current file location")); #endif - this->reloadDocAction->setText(tr("Reload document")); + this->reloadDocAction->setText(tr("Reload Document")); this->reloadDocAction->setStatusTip(tr("Reloads a partially loaded document")); - this->skipRecomputeAction->setText(tr("Skip recomputes")); + this->skipRecomputeAction->setText(tr("Skip Recomputes")); this->skipRecomputeAction->setStatusTip(tr("Enables or disables the recomputations of document")); - this->allowPartialRecomputeAction->setText(tr("Allow partial recomputes")); + this->allowPartialRecomputeAction->setText(tr("Allow Partial Recomputes")); this->allowPartialRecomputeAction->setStatusTip( tr("Enables or disables the recomputating editing object when 'skip recomputation' is enabled")); - this->markRecomputeAction->setText(tr("Mark to recompute")); + this->markRecomputeAction->setText(tr("Mark to Recompute")); 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->setText(tr("Recompute Object")); this->recomputeObjectAction->setStatusTip(tr("Recomputes the selected object")); this->recomputeObjectAction->setIcon(BitmapFactory().iconFromTheme("view-refresh")); } diff --git a/src/Gui/ViewProviderImagePlane.cpp b/src/Gui/ViewProviderImagePlane.cpp index b48f5adbcd..b177877bc5 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 1233c1051d..240bd9381c 100644 --- a/src/Gui/ViewProviderLink.cpp +++ b/src/Gui/ViewProviderLink.cpp @@ -2649,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/Widgets.cpp b/src/Gui/Widgets.cpp index 72920e3ac7..17d1b1a397 100644 --- a/src/Gui/Widgets.cpp +++ b/src/Gui/Widgets.cpp @@ -996,7 +996,7 @@ LabelButton::LabelButton (QWidget * parent) label->setAutoFillBackground(true); layout->addWidget(label); - button = new QPushButton(QLatin1String("…"), this); + button = new QPushButton(QStringLiteral("…"), this); #if defined (Q_OS_MACOS) button->setAttribute(Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct #endif @@ -1384,7 +1384,7 @@ LabelEditor::LabelEditor (QWidget * parent) connect(lineEdit, &QLineEdit::textChanged, this, &LabelEditor::validateText); - button = new QPushButton(QLatin1String("…"), this); + button = new QPushButton(QStringLiteral("…"), this); #if defined (Q_OS_MACOS) button->setAttribute(Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct #endif @@ -1460,7 +1460,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(), QStringLiteral(" … ")); button->setFixedWidth((w1 > w2 ? w1 : w2)); } diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index eb2648cd1d..e1ce0534ab 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -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 diff --git a/src/Gui/propertyeditor/PropertyEditor.cpp b/src/Gui/propertyeditor/PropertyEditor.cpp index e560325569..3da6cf7f8e 100644 --- a/src/Gui/propertyeditor/PropertyEditor.cpp +++ b/src/Gui/propertyeditor/PropertyEditor.cpp @@ -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 c90b4870a6..4b679d8324 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(QStringLiteral("…"), this); #if defined(Q_OS_MACOS) button->setAttribute( Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct @@ -4544,7 +4544,7 @@ LinkLabel::LinkLabel(QWidget* parent, const App::Property* prop) label->setTextInteractionFlags(Qt::TextBrowserInteraction); layout->addWidget(label); - editButton = new QPushButton(QLatin1String("…"), this); + editButton = new QPushButton(QStringLiteral("…"), this); #if defined(Q_OS_MACOS) editButton->setAttribute( Qt::WA_LayoutUsesWidgetRect); // layout size from QMacStyle was not correct diff --git a/src/Mod/BIM/ArchBuildingPart.py b/src/Mod/BIM/ArchBuildingPart.py index bfb7a49959..c635ffb092 100644 --- a/src/Mod/BIM/ArchBuildingPart.py +++ b/src/Mod/BIM/ArchBuildingPart.py @@ -821,7 +821,7 @@ class ViewProviderBuildingPart: menu.addAction(actionActivate) actionSetWorkingPlane = QtGui.QAction(QtGui.QIcon(":/icons/Draft_SelectPlane.svg"), - translate("Arch", "Set working plane"), + translate("Arch", "Set Working Plane"), menu) QtCore.QObject.connect(actionSetWorkingPlane, QtCore.SIGNAL("triggered()"), @@ -829,7 +829,7 @@ class ViewProviderBuildingPart: menu.addAction(actionSetWorkingPlane) actionWriteCamera = QtGui.QAction(QtGui.QIcon(":/icons/Draft_SelectPlane.svg"), - translate("Arch", "Write camera position"), + translate("Arch", "Write Camera Position"), menu) QtCore.QObject.connect(actionWriteCamera, QtCore.SIGNAL("triggered()"), @@ -843,14 +843,14 @@ class ViewProviderBuildingPart: self.createGroup) menu.addAction(actionCreateGroup) - actionReorder = QtGui.QAction(translate("Arch", "Reorder children alphabetically"), + actionReorder = QtGui.QAction(translate("Arch", "Reorder Children Alphabetically"), menu) QtCore.QObject.connect(actionReorder, QtCore.SIGNAL("triggered()"), self.reorder) menu.addAction(actionReorder) - actionCloneUp = QtGui.QAction(translate("Arch", "Clone level up"), + actionCloneUp = QtGui.QAction(translate("Arch", "Clone Level Up"), menu) QtCore.QObject.connect(actionCloneUp, QtCore.SIGNAL("triggered()"), diff --git a/src/Mod/BIM/ArchStructure.py b/src/Mod/BIM/ArchStructure.py index 29291419e0..5b57eac616 100644 --- a/src/Mod/BIM/ArchStructure.py +++ b/src/Mod/BIM/ArchStructure.py @@ -1326,34 +1326,34 @@ class StructureTaskPanel(ArchComponent.ComponentTaskPanel): self.resetButton = QtGui.QPushButton(self.nodes_widget) self.resetButton.setIcon(QtGui.QIcon(":/icons/edit-undo.svg")) - self.resetButton.setText(QtGui.QApplication.translate("Arch", "Reset nodes", None)) + self.resetButton.setText(QtGui.QApplication.translate("Arch", "Reset Nodes", None)) lay.addWidget(self.resetButton) QtCore.QObject.connect(self.resetButton, QtCore.SIGNAL("clicked()"), self.resetNodes) self.editButton = QtGui.QPushButton(self.nodes_widget) self.editButton.setIcon(QtGui.QIcon(":/icons/Draft_Edit.svg")) - self.editButton.setText(QtGui.QApplication.translate("Arch", "Edit nodes", None)) + self.editButton.setText(QtGui.QApplication.translate("Arch", "Edit Nodes", None)) lay.addWidget(self.editButton) QtCore.QObject.connect(self.editButton, QtCore.SIGNAL("clicked()"), self.editNodes) self.extendButton = QtGui.QPushButton(self.nodes_widget) self.extendButton.setIcon(QtGui.QIcon(":/icons/Snap_Perpendicular.svg")) - self.extendButton.setText(QtGui.QApplication.translate("Arch", "Extend nodes", None)) + self.extendButton.setText(QtGui.QApplication.translate("Arch", "Extend Nodes", None)) self.extendButton.setToolTip(QtGui.QApplication.translate("Arch", "Extends the nodes of this element to reach the nodes of another element", None)) lay.addWidget(self.extendButton) QtCore.QObject.connect(self.extendButton, QtCore.SIGNAL("clicked()"), self.extendNodes) self.connectButton = QtGui.QPushButton(self.nodes_widget) self.connectButton.setIcon(QtGui.QIcon(":/icons/Snap_Intersection.svg")) - self.connectButton.setText(QtGui.QApplication.translate("Arch", "Connect nodes", None)) + self.connectButton.setText(QtGui.QApplication.translate("Arch", "Connect Nodes", None)) self.connectButton.setToolTip(QtGui.QApplication.translate("Arch", "Connects nodes of this element with the nodes of another element", None)) lay.addWidget(self.connectButton) QtCore.QObject.connect(self.connectButton, QtCore.SIGNAL("clicked()"), self.connectNodes) self.toggleButton = QtGui.QPushButton(self.nodes_widget) self.toggleButton.setIcon(QtGui.QIcon(":/icons/dagViewVisible.svg")) - self.toggleButton.setText(QtGui.QApplication.translate("Arch", "Toggle all nodes", None)) + self.toggleButton.setText(QtGui.QApplication.translate("Arch", "Toggle All Nodes", None)) self.toggleButton.setToolTip(QtGui.QApplication.translate("Arch", "Toggles all structural nodes of the document on/off", None)) lay.addWidget(self.toggleButton) QtCore.QObject.connect(self.toggleButton, QtCore.SIGNAL("clicked()"), self.toggleNodes) @@ -1365,7 +1365,7 @@ class StructureTaskPanel(ArchComponent.ComponentTaskPanel): self.selectToolButton = QtGui.QPushButton(self.extrusion_widget) self.selectToolButton.setIcon(QtGui.QIcon()) self.selectToolButton.setText(QtGui.QApplication.translate("Arch", "Select Tool", None)) - self.selectToolButton.setToolTip(QtGui.QApplication.translate("Arch", "Select object or edges to be used as a Tool (extrusion path)", None)) + self.selectToolButton.setToolTip(QtGui.QApplication.translate("Arch", "Selects object or edges to be used as a tool (extrusion path)", None)) lay.addWidget(self.selectToolButton) QtCore.QObject.connect(self.selectToolButton, QtCore.SIGNAL("clicked()"), self.setSelectionFromTool) diff --git a/src/Mod/BIM/Resources/ui/dialogProjectManager.ui b/src/Mod/BIM/Resources/ui/dialogProjectManager.ui index ebcd194564..f0eb08d4b7 100644 --- a/src/Mod/BIM/Resources/ui/dialogProjectManager.ui +++ b/src/Mod/BIM/Resources/ui/dialogProjectManager.ui @@ -56,7 +56,7 @@ The settings below can be saved as a preset. Presets are stored as .txt files in the local FreeCAD user folder - Save preset + Save Preset diff --git a/src/Mod/BIM/Resources/ui/preferences-ifc.ui b/src/Mod/BIM/Resources/ui/preferences-ifc.ui index ab883ae7bd..7cf558a2d5 100644 --- a/src/Mod/BIM/Resources/ui/preferences-ifc.ui +++ b/src/Mod/BIM/Resources/ui/preferences-ifc.ui @@ -190,7 +190,7 @@ if crashes occur when multiple cores are set. - Do not import Arch objects + Do not import BIM objects diff --git a/src/Mod/BIM/bimcommands/BimArchUtils.py b/src/Mod/BIM/bimcommands/BimArchUtils.py index 1c96fd543f..eb3279f5de 100644 --- a/src/Mod/BIM/bimcommands/BimArchUtils.py +++ b/src/Mod/BIM/bimcommands/BimArchUtils.py @@ -294,7 +294,7 @@ class Arch_ToggleIfcBrepFlag: def GetResources(self): return {'Pixmap' : 'Arch_ToggleIfcBrepFlag', - 'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Toggle IFC B-rep Flag"), + 'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Toggle IFC B-Rep Flag"), 'ToolTip': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Forces an object to be exported as B-rep or not")} def IsActive(self): diff --git a/src/Mod/BIM/bimcommands/BimProjectManager.py b/src/Mod/BIM/bimcommands/BimProjectManager.py index 0f12a59e27..0b356aa10e 100644 --- a/src/Mod/BIM/bimcommands/BimProjectManager.py +++ b/src/Mod/BIM/bimcommands/BimProjectManager.py @@ -40,7 +40,7 @@ class BIM_ProjectManager: return { "Pixmap": "BIM_ProjectManager", - "MenuText": QT_TRANSLATE_NOOP("BIM_ProjectManager", "Setup Project…"), + "MenuText": QT_TRANSLATE_NOOP("BIM_ProjectManager", "Setup Project"), "ToolTip": QT_TRANSLATE_NOOP( "BIM_ProjectManager", "Creates or manages a BIM project" ), @@ -420,8 +420,8 @@ class BIM_ProjectManager: res = QtGui.QInputDialog.getText( None, - translate("BIM", "Save preset"), - translate("BIM", "Preset name:"), + translate("BIM", "Save Preset"), + translate("BIM", "Preset name"), QtGui.QLineEdit.Normal, "DefaultProject", ) diff --git a/src/Mod/Draft/draftutils/init_tools.py b/src/Mod/Draft/draftutils/init_tools.py index 62f3822655..62762e6f5b 100644 --- a/src/Mod/Draft/draftutils/init_tools.py +++ b/src/Mod/Draft/draftutils/init_tools.py @@ -47,7 +47,7 @@ def get_draft_drawing_commands(): return ["Draft_Line", "Draft_Wire", "Draft_Fillet", - ([QT_TRANSLATE_NOOP("Workbench", "Arc tools")], + ([QT_TRANSLATE_NOOP("Workbench", "Arc Tools")], list(arc_group.GetCommands(arc_group))), # tuple len=2: submenu ("Draft_ArcTools", ), # tuple len=1: toolbar flyout "Draft_Circle", @@ -55,7 +55,7 @@ def get_draft_drawing_commands(): "Draft_Rectangle", "Draft_Polygon", "Draft_BSpline", - ([QT_TRANSLATE_NOOP("Workbench", "Bézier tools")], + ([QT_TRANSLATE_NOOP("Workbench", "Bézier Tools")], list(bez_group.GetCommands(bez_group))), ("Draft_BezierTools", ), "Draft_Point", @@ -86,7 +86,7 @@ def get_draft_modification_commands(): "Draft_Stretch", "Separator", "Draft_Clone", - ([QT_TRANSLATE_NOOP("Workbench", "Array tools")], + ([QT_TRANSLATE_NOOP("Workbench", "Array Tools")], list(arr_group.GetCommands(arr_group))), # tuple len=2: submenu ("Draft_ArrayTools", ), # tuple len=1: toolbar flyout "Separator", diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py index 061561cd26..b167c65068 100644 --- a/src/Mod/Fem/femcommands/commands.py +++ b/src/Mod/Fem/femcommands/commands.py @@ -509,7 +509,7 @@ class _EquationMagnetodynamic2D(CommandManager): def __init__(self): super().__init__() self.menutext = Qt.QT_TRANSLATE_NOOP( - "FEM_EquationMagnetodynamic2D", "Magnetodynamic2D Equation" + "FEM_EquationMagnetodynamic2D", "Magnetodynamic 2D Equation" ) self.tooltip = Qt.QT_TRANSLATE_NOOP( "FEM_EquationMagnetodynamic2D", diff --git a/src/Mod/Mesh/App/AppMeshPy.cpp b/src/Mod/Mesh/App/AppMeshPy.cpp index cb4bd8ae98..77a97d37c1 100644 --- a/src/Mod/Mesh/App/AppMeshPy.cpp +++ b/src/Mod/Mesh/App/AppMeshPy.cpp @@ -306,7 +306,7 @@ private: Mesh::Feature* pcFeature = pcDoc->addObject(name); Mesh::MeshObject* mo = pMesh->getMeshObjectPtr(); if (!mo) { - throw Py::Exception(PyExc_ReferenceError, "object doesn't reference a valid mesh"); + throw Py::Exception(PyExc_ReferenceError, "object does not reference a valid mesh"); } // copy the data pcFeature->Mesh.setValue(*mo); diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index e1ebe7789c..ae39ba613e 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -345,7 +345,7 @@ void CmdMeshImport::activated(int) // Allow multi selection QStringList fn = Gui::FileDialog::getOpenFileNames(Gui::getMainWindow(), - QObject::tr("Import mesh"), + QObject::tr("Import Mesh"), QString(), filter.join(QLatin1String(";;"))); for (const auto& it : fn) { @@ -420,7 +420,7 @@ void CmdMeshExport::activated(int) QString format; QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), - QObject::tr("Export mesh"), + QObject::tr("Export Mesh"), dir, filter.join(QLatin1String(";;")), &format); @@ -456,7 +456,7 @@ CmdMeshFromGeometry::CmdMeshFromGeometry() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Mesh From Geometry…"); + sMenuText = QT_TR_NOOP("Mesh From Geometry"); sToolTipText = QT_TR_NOOP("Creates a mesh from the selected geometry"); sWhatsThis = "Mesh_FromGeometry"; sStatusTip = sToolTipText; @@ -527,7 +527,7 @@ CmdMeshFromPartShape::CmdMeshFromPartShape() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Mesh From Shape…"); + sMenuText = QT_TR_NOOP("Mesh From Shape"); sToolTipText = QT_TR_NOOP("Tessellates the selected shape to a mesh"); sWhatsThis = "Mesh_FromPartShape"; sStatusTip = sToolTipText; @@ -952,7 +952,7 @@ CmdMeshCrossSections::CmdMeshCrossSections() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Cross-Sections…"); + sMenuText = QT_TR_NOOP("Cross-Sections"); sToolTipText = QT_TR_NOOP("Creates cross-sections of the mesh"); sStatusTip = sToolTipText; sPixmap = "Mesh_CrossSections"; @@ -1039,7 +1039,7 @@ CmdMeshEvaluation::CmdMeshEvaluation() sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); // needs two ampersands to display one - sMenuText = QT_TR_NOOP("Evaluate and Repair…"); + sMenuText = QT_TR_NOOP("Evaluate and Repair"); sToolTipText = QT_TR_NOOP("Opens a dialog to analyze and repair a mesh"); sWhatsThis = "Mesh_Evaluation"; sStatusTip = sToolTipText; @@ -1129,7 +1129,7 @@ CmdMeshRemoveComponents::CmdMeshRemoveComponents() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Remove Components…"); + sMenuText = QT_TR_NOOP("Remove Components"); sToolTipText = QT_TR_NOOP("Removes topologically independent components from the mesh"); sWhatsThis = "Mesh_RemoveComponents"; sStatusTip = sToolTipText; @@ -1177,7 +1177,7 @@ CmdMeshRemeshGmsh::CmdMeshRemeshGmsh() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Refinement…"); + sMenuText = QT_TR_NOOP("Refinement"); sToolTipText = QT_TR_NOOP("Refines an existing mesh"); sStatusTip = sToolTipText; sWhatsThis = "Mesh_RemeshGmsh"; @@ -1211,7 +1211,7 @@ CmdMeshRemoveCompByHand::CmdMeshRemoveCompByHand() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Remove Components Manually…"); + sMenuText = QT_TR_NOOP("Remove Components Manually"); sToolTipText = QT_TR_NOOP("Marks a component to remove it from the mesh"); sWhatsThis = "Mesh_RemoveCompByHand"; sStatusTip = sToolTipText; @@ -1299,7 +1299,7 @@ CmdMeshSmoothing::CmdMeshSmoothing() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Smooth…"); + sMenuText = QT_TR_NOOP("Smooth"); sToolTipText = QT_TR_NOOP("Smoothes the selected meshes"); sWhatsThis = "Mesh_Smoothing"; sStatusTip = sToolTipText; @@ -1328,7 +1328,7 @@ CmdMeshDecimating::CmdMeshDecimating() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Decimate…"); + sMenuText = QT_TR_NOOP("Decimate"); sToolTipText = QT_TR_NOOP("Decimates a mesh"); sWhatsThis = "Mesh_Decimating"; sStatusTip = sToolTipText; @@ -1432,7 +1432,7 @@ CmdMeshBoundingBox::CmdMeshBoundingBox() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Boundings Info…"); + sMenuText = QT_TR_NOOP("Boundings Info"); sToolTipText = QT_TR_NOOP("Shows the boundings of the selected mesh"); sWhatsThis = "Mesh_BoundingBox"; sStatusTip = sToolTipText; @@ -1484,7 +1484,7 @@ CmdMeshBuildRegularSolid::CmdMeshBuildRegularSolid() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Regular Solid…"); + sMenuText = QT_TR_NOOP("Regular Solid"); sToolTipText = QT_TR_NOOP("Builds a regular solid"); sWhatsThis = "Mesh_BuildRegularSolid"; sStatusTip = sToolTipText; @@ -1516,7 +1516,7 @@ CmdMeshFillupHoles::CmdMeshFillupHoles() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Fill Holes…"); + sMenuText = QT_TR_NOOP("Fill Holes"); sToolTipText = QT_TR_NOOP("Fills holes in the mesh"); sWhatsThis = "Mesh_FillupHoles"; sStatusTip = sToolTipText; @@ -1614,7 +1614,7 @@ CmdMeshSegmentation::CmdMeshSegmentation() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Segmentation…"); + sMenuText = QT_TR_NOOP("Segmentation"); sToolTipText = QT_TR_NOOP("Creates new mesh segments from the mesh"); sWhatsThis = "Mesh_Segmentation"; sStatusTip = sToolTipText; @@ -1650,7 +1650,7 @@ CmdMeshSegmentationBestFit::CmdMeshSegmentationBestFit() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Segmentation From Best-Fit Surfaces…"); + sMenuText = QT_TR_NOOP("Segmentation From Best-Fit Surfaces"); sToolTipText = QT_TR_NOOP("Creates new mesh segments from the best-fit surfaces"); sWhatsThis = "Mesh_SegmentationBestFit"; sStatusTip = sToolTipText; @@ -1779,7 +1779,7 @@ CmdMeshScale::CmdMeshScale() { sAppModule = "Mesh"; sGroup = QT_TR_NOOP("Mesh"); - sMenuText = QT_TR_NOOP("Scale…"); + sMenuText = QT_TR_NOOP("Scale"); sToolTipText = QT_TR_NOOP("Scales the selected mesh objects"); sWhatsThis = "Mesh_Scale"; sStatusTip = sToolTipText; diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp index 00c5a2beaa..bd7ab14aaa 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp @@ -138,7 +138,7 @@ DlgEvaluateMeshImp::DlgEvaluateMeshImp(QWidget* parent, Qt::WindowFlags fl) d->showFoldsFunction(d->enableFoldsCheck); QPushButton* button = d->ui.buttonBox->button(QDialogButtonBox::Open); - button->setText(tr("Settings…")); + button->setText(tr("Settings")); // try to attach to the active document this->onRefreshButtonClicked(); @@ -1176,7 +1176,7 @@ void DlgEvaluateMeshImp::onRepairAllTogetherClicked() const char* docName = App::GetApplication().getDocumentName(d->meshFeature->getDocument()); const char* objName = d->meshFeature->getNameInDocument(); Gui::Document* doc = Gui::Application::Instance->getDocument(docName); - doc->openCommand(QT_TRANSLATE_NOOP("Command", "Repair mesh")); + doc->openCommand(QT_TRANSLATE_NOOP("Command", "Repair Mesh")); bool run = false; bool self = true; diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.ui b/src/Mod/Mesh/Gui/SegmentationBestFit.ui index 6d7080347c..6b5d918dfa 100644 --- a/src/Mod/Mesh/Gui/SegmentationBestFit.ui +++ b/src/Mod/Mesh/Gui/SegmentationBestFit.ui @@ -26,7 +26,7 @@ - Parameters… + Parameters @@ -79,7 +79,7 @@ - Parameters… + Parameters @@ -132,7 +132,7 @@ - Parameters… + Parameters diff --git a/src/Mod/MeshPart/Gui/MeshFlatteningCommand.py b/src/Mod/MeshPart/Gui/MeshFlatteningCommand.py index cd53f9a46c..0c4c100e2c 100644 --- a/src/Mod/MeshPart/Gui/MeshFlatteningCommand.py +++ b/src/Mod/MeshPart/Gui/MeshFlatteningCommand.py @@ -46,9 +46,9 @@ class CreateFlatMesh(BaseCommand): def GetResources(self): return { "Pixmap": "MeshPart_CreateFlatMesh.svg", - "MenuText": QT_TRANSLATE_NOOP("MeshPart_CreateFlatMesh", "Unwrap mesh"), + "MenuText": QT_TRANSLATE_NOOP("MeshPart_CreateFlatMesh", "Unwrap Mesh"), "ToolTip": QT_TRANSLATE_NOOP( - "MeshPart_CreateFlatMesh", "Find a flat representation of a mesh." + "MeshPart_CreateFlatMesh", "Finds a flat representation of a mesh" ), } @@ -85,9 +85,9 @@ class CreateFlatFace(BaseCommand): def GetResources(self): return { "Pixmap": "MeshPart_CreateFlatFace.svg", - "MenuText": QT_TRANSLATE_NOOP("MeshPart_CreateFlatFace", "Unwrap face"), + "MenuText": QT_TRANSLATE_NOOP("MeshPart_CreateFlatFace", "Unwrap Face"), "ToolTip": QT_TRANSLATE_NOOP( - "MeshPart_CreateFlatFace", "Find a flat representation of a face." + "MeshPart_CreateFlatFace", "Finds a flat representation of a face" ), } diff --git a/src/Mod/OpenSCAD/OpenSCADCommands.py b/src/Mod/OpenSCAD/OpenSCADCommands.py index d14a7a2121..e038b8c0d2 100644 --- a/src/Mod/OpenSCAD/OpenSCADCommands.py +++ b/src/Mod/OpenSCAD/OpenSCADCommands.py @@ -183,7 +183,7 @@ class MirrorMeshFeature: FreeCAD.ActiveDocument.recompute() def GetResources(self): return {'Pixmap' : 'OpenSCAD_MirrorMeshFeature', - 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MirrorMeshFeature', 'Mirror Mesh Feature...'), + 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MirrorMeshFeature', 'Mirror Mesh Feature'), 'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MirrorMeshFeature', 'Mirrors the mesh')} class ScaleMeshFeature: @@ -212,7 +212,7 @@ class ScaleMeshFeature: FreeCAD.ActiveDocument.recompute() def GetResources(self): return {'Pixmap' : 'OpenSCAD_ScaleMeshFeature', - 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ScaleMeshFeature', 'Scale Mesh Feature…'), + 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ScaleMeshFeature', 'Scale Mesh Feature'), 'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ScaleMeshFeature', 'Scales the mesh')} @@ -242,7 +242,7 @@ class ResizeMeshFeature: FreeCAD.ActiveDocument.recompute() def GetResources(self): return {'Pixmap' : 'OpenSCAD_ResizeMeshFeature', - 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ResizeMeshFeature', 'Resize Mesh Feature…'), + 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ResizeMeshFeature', 'Resize Mesh Feature'), 'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ResizeMeshFeature', 'Resizes the mesh')} @@ -526,7 +526,7 @@ class AddOpenSCADElement: def GetResources(self): return {'Pixmap' : 'OpenSCAD_AddOpenSCADElement', - 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_AddOpenSCADElement', 'Add OpenSCAD Element…'), + 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_AddOpenSCADElement', 'Add OpenSCAD Element'), 'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_AddOpenSCADElement', 'Adds an OpenSCAD element by entering OpenSCAD code and executing the OpenSCAD binary')} @@ -541,7 +541,7 @@ class OpenSCADMeshBoolean: def GetResources(self): return {'Pixmap' : 'OpenSCAD_MeshBooleans', - 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MeshBoolean','Mesh Boolean…'), + 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MeshBoolean','Mesh Boolean'), 'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MeshBoolean', 'Exports objects as meshes and use OpenSCAD to perform a boolean operation')} diff --git a/src/Mod/Part/BasicShapes/CommandShapes.py b/src/Mod/Part/BasicShapes/CommandShapes.py index 8c0086b531..7d6118a6de 100644 --- a/src/Mod/Part/BasicShapes/CommandShapes.py +++ b/src/Mod/Part/BasicShapes/CommandShapes.py @@ -41,7 +41,7 @@ import sys class CommandTube: """Command for creating Tube.""" def GetResources(self): - return {'MenuText': Qt.QT_TRANSLATE_NOOP("Part_Tube","Create tube"), + return {'MenuText': Qt.QT_TRANSLATE_NOOP("Part_Tube","Tube"), 'Accel': "", 'CmdType': "AlterDoc:Alter3DView:AlterSelection", 'Pixmap': "Part_Tube_Parametric", diff --git a/src/Mod/Part/Gui/Workbench.cpp b/src/Mod/Part/Gui/Workbench.cpp index 48571a4218..2bfd14978c 100644 --- a/src/Mod/Part/Gui/Workbench.cpp +++ b/src/Mod/Part/Gui/Workbench.cpp @@ -81,7 +81,6 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Part_Sphere" << "Part_Cone" << "Part_Torus" - << "Separator" << "Part_Tube"; Gui::MenuItem* copy = new Gui::MenuItem; diff --git a/src/Mod/Points/Gui/Command.cpp b/src/Mod/Points/Gui/Command.cpp index 6800e7bd39..5aaa6683b8 100644 --- a/src/Mod/Points/Gui/Command.cpp +++ b/src/Mod/Points/Gui/Command.cpp @@ -237,7 +237,7 @@ CmdPointsConvert::CmdPointsConvert() { sAppModule = "Points"; sGroup = QT_TR_NOOP("Points"); - sMenuText = QT_TR_NOOP("Convert to Points…"); + sMenuText = QT_TR_NOOP("Convert to Points"); sToolTipText = QT_TR_NOOP("Converts to points"); sWhatsThis = "Points_Convert"; sStatusTip = sToolTipText; diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp index 5b017efcb6..0bb7cc4d4b 100644 --- a/src/Mod/Robot/Gui/Command.cpp +++ b/src/Mod/Robot/Gui/Command.cpp @@ -161,7 +161,7 @@ CmdRobotConstraintAxle::CmdRobotConstraintAxle() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Place Robot…"); + sMenuText = QT_TR_NOOP("Place Robot"); sToolTipText = QT_TR_NOOP("Places a robot in the scene"); sWhatsThis = "Robot_Create"; diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp index 8597a0247c..3eb102d632 100644 --- a/src/Mod/Robot/Gui/CommandExport.cpp +++ b/src/Mod/Robot/Gui/CommandExport.cpp @@ -44,7 +44,7 @@ CmdRobotExportKukaCompact::CmdRobotExportKukaCompact() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Kuka Compact Subroutine…"); + sMenuText = QT_TR_NOOP("Kuka Compact Subroutine"); sToolTipText = QT_TR_NOOP("Exports the trajectory as a compact KRL subroutine"); sWhatsThis = "Robot_ExportKukaCompact"; sStatusTip = sToolTipText; @@ -119,7 +119,7 @@ CmdRobotExportKukaFull::CmdRobotExportKukaFull() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Kuka Full Subroutine…"); + sMenuText = QT_TR_NOOP("Kuka Full Subroutine"); sToolTipText = QT_TR_NOOP("Exports the trajectory as a full KRL subroutine"); sWhatsThis = "Robot_ExportKukaFull"; sStatusTip = sToolTipText; diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp index 4d974bfc87..cd4230f411 100644 --- a/src/Mod/Robot/Gui/CommandTrajectory.cpp +++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp @@ -358,7 +358,7 @@ CmdRobotEdge2Trac::CmdRobotEdge2Trac() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Edge to Trajectory…"); + sMenuText = QT_TR_NOOP("Edge to Trajectory"); sToolTipText = QT_TR_NOOP("Generates a trajectory from the selected edges"); sWhatsThis = "Robot_Edge2Trac"; sStatusTip = sToolTipText; @@ -424,7 +424,7 @@ CmdRobotTrajectoryDressUp::CmdRobotTrajectoryDressUp() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Dress-Up Trajectory…"); + sMenuText = QT_TR_NOOP("Dress-Up Trajectory"); sToolTipText = QT_TR_NOOP("Creates a dress-up object that overrides aspects of a trajectory"); sWhatsThis = "Robot_TrajectoryDressUp"; sStatusTip = sToolTipText; @@ -480,7 +480,7 @@ CmdRobotTrajectoryCompound::CmdRobotTrajectoryCompound() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Trajectory Compound…"); + sMenuText = QT_TR_NOOP("Trajectory Compound"); sToolTipText = QT_TR_NOOP("Groups and connects multiple trajectories into one"); sWhatsThis = "Robot_TrajectoryCompound"; sStatusTip = sToolTipText; diff --git a/src/Mod/Spreadsheet/Gui/Command.cpp b/src/Mod/Spreadsheet/Gui/Command.cpp index fdf8db56bb..094831c932 100644 --- a/src/Mod/Spreadsheet/Gui/Command.cpp +++ b/src/Mod/Spreadsheet/Gui/Command.cpp @@ -705,7 +705,7 @@ CmdSpreadsheetStyleItalic::CmdSpreadsheetStyleItalic() { sAppModule = "Spreadsheet"; sGroup = QT_TR_NOOP("Spreadsheet"); - sMenuText = QT_TR_NOOP("&Italic Iext"); + sMenuText = QT_TR_NOOP("&Italic Text"); sToolTipText = QT_TR_NOOP("Sets the text in the selected cells italic"); sWhatsThis = "Spreadsheet_StyleItalic"; sStatusTip = sToolTipText; diff --git a/src/Mod/Surface/Gui/Command.cpp b/src/Mod/Surface/Gui/Command.cpp index 9bfa5c0bd6..8c9422155e 100644 --- a/src/Mod/Surface/Gui/Command.cpp +++ b/src/Mod/Surface/Gui/Command.cpp @@ -111,7 +111,7 @@ CmdSurfaceFilling::CmdSurfaceFilling() { sAppModule = "Surface"; sGroup = QT_TR_NOOP("Surface"); - sMenuText = QT_TR_NOOP("Filling…"); + sMenuText = QT_TR_NOOP("Filling"); sToolTipText = QT_TR_NOOP("Creates a surface from a series of selected boundary edges.\n" "Additionally, the surface may be constrained by edges and\n" "vertices that are not on the boundary."); @@ -177,7 +177,7 @@ CmdSurfaceCurveOnMesh::CmdSurfaceCurveOnMesh() { sAppModule = "MeshPart"; sGroup = QT_TR_NOOP("Surface"); - sMenuText = QT_TR_NOOP("Curve on Mesh…"); + sMenuText = QT_TR_NOOP("Curve on Mesh"); sToolTipText = QT_TR_NOOP("Creates an approximated curve on top of a mesh.\n" "This command only works with a mesh object."); sWhatsThis = "Surface_CurveOnMesh"; @@ -322,7 +322,7 @@ CmdSurfaceSections::CmdSurfaceSections() { sAppModule = "Surface"; sGroup = QT_TR_NOOP("Surface"); - sMenuText = QT_TR_NOOP("Sections…"); + sMenuText = QT_TR_NOOP("Sections"); sToolTipText = QT_TR_NOOP("Creates a surface from a series of sectional edges"); sStatusTip = sToolTipText; sWhatsThis = "Surface_Sections"; diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index b87c924306..a5c9756482 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -229,7 +229,7 @@ bool ViewProviderPage::onDelete(const std::vector& parms) void ViewProviderPage::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { Gui::ViewProviderDocumentObject::setupContextMenu(menu, receiver, member); - QAction* act = menu->addAction(QObject::tr("Show drawing"), receiver, member); + QAction* act = menu->addAction(QObject::tr("Show Drawing"), receiver, member); act->setData(QVariant((int)ShowDrawing)); QAction* act2 = menu->addAction(QObject::tr("Toggle Keep Updated"), receiver, member); diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp index 97438bdae8..fdaccfcf0b 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp @@ -102,7 +102,7 @@ void ViewProviderProjGroupItem::setupContextMenu(QMenu* menu, QObject* receiver, Q_UNUSED(receiver); Q_UNUSED(member); //QAction* act; - //act = menu->addAction(QObject::tr("Show drawing"), receiver, member); + //act = menu->addAction(QObject::tr("Show Drawing"), receiver, member); } bool ViewProviderProjGroupItem::setEdit(int ModNum)