diff --git a/src/Mod/Material/App/AppMaterial.cpp b/src/Mod/Material/App/AppMaterial.cpp index 50975b3330..a6bc448cf1 100644 --- a/src/Mod/Material/App/AppMaterial.cpp +++ b/src/Mod/Material/App/AppMaterial.cpp @@ -85,7 +85,7 @@ PyMOD_INIT_FUNC(Materials) #endif PyObject* module = Materials::initModule(); - Base::Console().log("Loading Material module... done\n"); + Base::Console().log("Loading Material module… done\n"); Base::Interpreter().addType(&Materials::Array2DPy::Type, module, "Array2D"); Base::Interpreter().addType(&Materials::Array3DPy::Type, module, "Array3D"); diff --git a/src/Mod/Material/App/ExternalManager.cpp b/src/Mod/Material/App/ExternalManager.cpp index d9af3c53dc..ad4b358fcc 100644 --- a/src/Mod/Material/App/ExternalManager.cpp +++ b/src/Mod/Material/App/ExternalManager.cpp @@ -100,7 +100,7 @@ void ExternalManager::getConfiguration() void ExternalManager::instantiate() { _instantiated = false; - Base::Console().log("Loading external manager...\n"); + Base::Console().log("Loading external manager…\n"); if (_moduleName.empty() || _className.empty()) { Base::Console().log("External module not defined\n"); diff --git a/src/Mod/Material/Gui/AppMatGui.cpp b/src/Mod/Material/Gui/AppMatGui.cpp index f406363590..e3500fca45 100644 --- a/src/Mod/Material/Gui/AppMatGui.cpp +++ b/src/Mod/Material/Gui/AppMatGui.cpp @@ -94,7 +94,7 @@ PyMOD_INIT_FUNC(MatGui) PyObject* matGuiModule = MatGui::initModule(); - Base::Console().log("Loading GUI of Material module... done\n"); + Base::Console().log("Loading GUI of Material module… done\n"); MatGui::Workbench ::init(); auto manip = std::make_shared(); @@ -107,7 +107,7 @@ PyMOD_INIT_FUNC(MatGui) // widget Gui::Dialog::DlgPreferencesImp::setGroupData("Material", "Material", - QObject::tr("Material workbench")); + QObject::tr("Material Workbench")); new Gui::PrefPageProducer( QT_TRANSLATE_NOOP("QObject", "Material")); new Gui::PrefPageProducer( diff --git a/src/Mod/Material/Gui/Array2D.cpp b/src/Mod/Material/Gui/Array2D.cpp index 558562f614..85cdcb71e6 100644 --- a/src/Mod/Material/Gui/Array2D.cpp +++ b/src/Mod/Material/Gui/Array2D.cpp @@ -76,7 +76,7 @@ Array2D::Array2D(const QString& propertyName, ui->tableView->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->tableView, &QWidget::customContextMenuRequested, this, &Array2D::onContextMenu); - _deleteAction.setText(tr("Delete row")); + _deleteAction.setText(tr("Delete Row")); _deleteAction.setShortcut(Gui::QtTools::deleteKeySequence()); connect(&_deleteAction, &QAction::triggered, this, &Array2D::onDelete); @@ -135,7 +135,7 @@ void Array2D::onDataChanged(const QModelIndex& topLeft, void Array2D::onContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); contextMenu.addAction(&_deleteAction); @@ -169,7 +169,7 @@ int Array2D::confirmDelete() box.setIcon(QMessageBox::Question); box.setWindowTitle(QObject::tr("Confirm Delete")); - QString prompt = QObject::tr("Are you sure you want to delete the row?"); + QString prompt = QObject::tr("Delete the row?"); box.setText(prompt); box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); diff --git a/src/Mod/Material/Gui/Array3D.cpp b/src/Mod/Material/Gui/Array3D.cpp index fe32438761..fc4397b3dd 100644 --- a/src/Mod/Material/Gui/Array3D.cpp +++ b/src/Mod/Material/Gui/Array3D.cpp @@ -74,11 +74,11 @@ Array3D::Array3D(const QString& propertyName, ui->table2D->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->table2D, &QWidget::customContextMenuRequested, this, &Array3D::on2DContextMenu); - _deleteDepthAction.setText(tr("Delete row")); + _deleteDepthAction.setText(tr("Delete Row")); connect(&_deleteDepthAction, &QAction::triggered, this, &Array3D::onDepthDelete); ui->table3D->addAction(&_deleteDepthAction); - _delete2DAction.setText(tr("Delete row")); + _delete2DAction.setText(tr("Delete Row")); connect(&_delete2DAction, &QAction::triggered, this, &Array3D::on2DDelete); ui->table2D->addAction(&_delete2DAction); @@ -228,7 +228,7 @@ void Array3D::update2DArray() void Array3D::onDepthContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); contextMenu.addAction(&_deleteDepthAction); @@ -262,7 +262,7 @@ int Array3D::confirmDepthDelete() box.setIcon(QMessageBox::Question); box.setWindowTitle(tr("Confirm Delete")); - QString prompt = tr("Are you sure you want to delete the row?"); + QString prompt = tr("Delete the row?"); box.setText(prompt); box.setInformativeText(tr("Removing this will also remove all 2D contents.")); @@ -299,7 +299,7 @@ void Array3D::deleteDepthSelected() void Array3D::on2DContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); contextMenu.addAction(&_delete2DAction); @@ -334,7 +334,7 @@ int Array3D::confirm2dDelete() box.setIcon(QMessageBox::Question); box.setWindowTitle(tr("Confirm Delete")); - QString prompt = tr("Are you sure you want to delete the row?"); + QString prompt = tr("Delete the row?"); box.setText(prompt); box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); diff --git a/src/Mod/Material/Gui/Command.cpp b/src/Mod/Material/Gui/Command.cpp index ae1ddcda95..3390541ff9 100644 --- a/src/Mod/Material/Gui/Command.cpp +++ b/src/Mod/Material/Gui/Command.cpp @@ -51,8 +51,8 @@ CmdMaterialEdit::CmdMaterialEdit() { sAppModule = "Material"; sGroup = QT_TR_NOOP("Material"); - sMenuText = QT_TR_NOOP("Edit..."); - sToolTipText = QT_TR_NOOP("Edit material properties"); + sMenuText = QT_TR_NOOP("Edit"); + sToolTipText = QT_TR_NOOP("Edits material properties"); sWhatsThis = "Material_Edit"; sStatusTip = sToolTipText; sPixmap = "Material_Edit"; @@ -85,7 +85,7 @@ StdCmdSetAppearance::StdCmdSetAppearance() : Command("Std_SetAppearance") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Appearance..."); + sMenuText = QT_TR_NOOP("&Appearance"); sToolTipText = QT_TR_NOOP("Sets the display properties of the selected object"); sWhatsThis = "Std_SetAppearance"; sStatusTip = QT_TR_NOOP("Sets the display properties of the selected object"); @@ -114,7 +114,7 @@ StdCmdSetMaterial::StdCmdSetMaterial() : Command("Std_SetMaterial") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("&Material..."); + sMenuText = QT_TR_NOOP("&Material"); sToolTipText = QT_TR_NOOP("Sets the material of the selected object"); sWhatsThis = "Std_SetMaterial"; sStatusTip = QT_TR_NOOP("Sets the material of the selected object"); @@ -143,8 +143,8 @@ CmdInspectAppearance::CmdInspectAppearance() : Command("Materials_InspectAppearance") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Inspect Appearance..."); - sToolTipText = QT_TR_NOOP("Inspect the appearance properties of the selected object"); + sMenuText = QT_TR_NOOP("Inspect Appearance"); + sToolTipText = QT_TR_NOOP("Inspects the appearance properties of the selected object"); sWhatsThis = "Materials_InspectAppearance"; sStatusTip = QT_TR_NOOP("Inspect the appearance properties of the selected object"); // sPixmap = "Material_Edit"; @@ -170,8 +170,8 @@ CmdInspectMaterial::CmdInspectMaterial() : Command("Materials_InspectMaterial") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Inspect Material..."); - sToolTipText = QT_TR_NOOP("Inspect the material properties of the selected object"); + sMenuText = QT_TR_NOOP("Inspect Material"); + sToolTipText = QT_TR_NOOP("Inspects the material properties of the selected object"); sWhatsThis = "Materials_InspectMaterial"; sStatusTip = QT_TR_NOOP("Inspect the material properties of the selected object"); // sPixmap = "Material_Edit"; @@ -199,8 +199,8 @@ CmdMigrateToExternal::CmdMigrateToExternal() : Command("Materials_MigrateToExternal") { sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Migrate..."); - sToolTipText = QT_TR_NOOP("Migrate the materials to the external materials manager"); + sMenuText = QT_TR_NOOP("Migrate"); + sToolTipText = QT_TR_NOOP("Migrates the materials to the external materials manager"); sWhatsThis = "Materials_MigrateToDatabase"; sStatusTip = QT_TR_NOOP("Migrate existing materials to the external materials manager"); // sPixmap = "Materials_Edit"; diff --git a/src/Mod/Material/Gui/DlgDisplayProperties.ui b/src/Mod/Material/Gui/DlgDisplayProperties.ui index f90f5551ce..ad13aa5bd4 100644 --- a/src/Mod/Material/Gui/DlgDisplayProperties.ui +++ b/src/Mod/Material/Gui/DlgDisplayProperties.ui @@ -11,13 +11,13 @@ - Display properties + Display Properties - Viewing mode + Viewing Mode @@ -52,7 +52,7 @@ - Document window: + Document window @@ -84,7 +84,7 @@ false - Plot mode: + Plot mode @@ -141,7 +141,7 @@ - Point size: + Point size @@ -196,7 +196,7 @@ - Line width: + Line width @@ -234,7 +234,7 @@ - Transparency: + Transparency @@ -286,7 +286,7 @@ - Line transparency: + Line transparency @@ -362,14 +362,14 @@ - Color plot: + Color plot - Custom appearance: + Custom appearance @@ -379,21 +379,21 @@ - Point color: + Point color - Line color: + Line color - ... + Color Plot @@ -403,7 +403,7 @@ - ... + Appearance diff --git a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp index aa2aaa0095..0c83cf8a0d 100644 --- a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp +++ b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp @@ -178,17 +178,17 @@ void DlgDisplayPropertiesImp::setupFilters() auto filterList = std::make_shared>>(); auto filter = std::make_shared(); - filter->setName(tr("Basic Appearance")); + filter->setName(tr("Basic appearance")); filter->addRequiredComplete(Materials::ModelUUIDs::ModelUUID_Rendering_Basic); filterList->push_back(filter); filter = std::make_shared(); - filter->setName(tr("Texture Appearance")); + filter->setName(tr("Texture appearance")); filter->addRequiredComplete(Materials::ModelUUIDs::ModelUUID_Rendering_Texture); filterList->push_back(filter); filter = std::make_shared(); - filter->setName(tr("All Materials")); + filter->setName(tr("All materials")); filterList->push_back(filter); d->ui.widgetMaterial->setIncludeEmptyFolders(false); diff --git a/src/Mod/Material/Gui/DlgInspectAppearance.cpp b/src/Mod/Material/Gui/DlgInspectAppearance.cpp index 2d67cfe676..0316b5ae62 100644 --- a/src/Mod/Material/Gui/DlgInspectAppearance.cpp +++ b/src/Mod/Material/Gui/DlgInspectAppearance.cpp @@ -199,7 +199,7 @@ QWidget* DlgInspectAppearance::makeAppearanceTab(const App::Material& material) int row = 0; auto* labelDiffuse = new QLabel(); - labelDiffuse->setText(tr("Diffuse Color")); + labelDiffuse->setText(tr("Diffuse color")); auto* colorDiffuse = new ColorWidget(material.diffuseColor); colorDiffuse->setMaximumHeight(23); @@ -208,7 +208,7 @@ QWidget* DlgInspectAppearance::makeAppearanceTab(const App::Material& material) row += 1; auto* labelAmbient = new QLabel(); - labelAmbient->setText(tr("Ambient Color")); + labelAmbient->setText(tr("Ambient color")); auto* colorAmbient = new ColorWidget(material.ambientColor); colorAmbient->setMaximumHeight(23); @@ -217,7 +217,7 @@ QWidget* DlgInspectAppearance::makeAppearanceTab(const App::Material& material) row += 1; auto* labelEmissive = new QLabel(); - labelEmissive->setText(tr("Emissive Color")); + labelEmissive->setText(tr("Emissive color")); auto* colorEmissive = new ColorWidget(material.emissiveColor); colorEmissive->setMaximumHeight(23); @@ -226,7 +226,7 @@ QWidget* DlgInspectAppearance::makeAppearanceTab(const App::Material& material) row += 1; auto* labelSpecular = new QLabel(); - labelSpecular->setText(tr("Specular Color")); + labelSpecular->setText(tr("Specular color")); auto* colorSpecular = new ColorWidget(material.specularColor); colorSpecular->setMaximumHeight(23); diff --git a/src/Mod/Material/Gui/DlgInspectAppearance.ui b/src/Mod/Material/Gui/DlgInspectAppearance.ui index 0136f599e1..cf16e9de78 100644 --- a/src/Mod/Material/Gui/DlgInspectAppearance.ui +++ b/src/Mod/Material/Gui/DlgInspectAppearance.ui @@ -47,7 +47,7 @@ - Document Name + Document name @@ -61,7 +61,7 @@ - Label / Internal Name + Label / internal name diff --git a/src/Mod/Material/Gui/DlgInspectMaterial.cpp b/src/Mod/Material/Gui/DlgInspectMaterial.cpp index e5512ba0a3..f1eb8c7537 100644 --- a/src/Mod/Material/Gui/DlgInspectMaterial.cpp +++ b/src/Mod/Material/Gui/DlgInspectMaterial.cpp @@ -169,7 +169,7 @@ void DlgInspectMaterial::update(std::vector& views) ui->editObjectLabel->setText(QStringLiteral("")); } ui->editObjectName->setText(QLatin1String(obj->getNameInDocument())); - appendClip(tr("Internal Name: ") + QString::fromUtf8(obj->getNameInDocument())); + appendClip(tr("Internal name: ") + QString::fromUtf8(obj->getNameInDocument())); auto subElement = Gui::Selection().getSelectionEx(); if (subElement.size() > 0) { @@ -270,10 +270,10 @@ void DlgInspectMaterial::addModelDetails(QTreeView* tree, addExpanded(tree, parent, library); auto libraryPath = - clipItem(tr("Library Directory: ") + model->getLibrary()->getDirectoryPath()); + clipItem(tr("Library directory: ") + model->getLibrary()->getDirectoryPath()); addExpanded(tree, parent, libraryPath); - auto directory = clipItem(tr("Sub Directory: ") + model->getDirectory()); + auto directory = clipItem(tr("Subdirectory: ") + model->getDirectory()); addExpanded(tree, parent, directory); auto inherits = clipItem(tr("Inherits:")); @@ -343,9 +343,9 @@ void DlgInspectMaterial::addMaterialDetails(QTreeView* tree, auto library = clipItem(tr("Library: ") + material.getLibrary()->getName()); addExpanded(tree, parent, library); - auto libraryPath = clipItem(tr("Library Directory: ") + material.getLibrary()->getDirectoryPath()); + auto libraryPath = clipItem(tr("Library directory: ") + material.getLibrary()->getDirectoryPath()); addExpanded(tree, parent, libraryPath); - auto directory = clipItem(tr("Sub Directory: ") + material.getDirectory()); + auto directory = clipItem(tr("Sub directory: ") + material.getDirectory()); addExpanded(tree, parent, directory); auto inherits = clipItem(tr("Inherits:")); addExpanded(tree, parent, inherits); @@ -362,25 +362,25 @@ void DlgInspectMaterial::addMaterialDetails(QTreeView* tree, } unindent(); - auto appearance = clipItem(tr("Appearance Models:")); + auto appearance = clipItem(tr("Appearance models:")); addExpanded(tree, parent, appearance); indent(); addModels(tree, appearance, material.getAppearanceModels()); unindent(); - auto physical = clipItem(tr("Physical Models:")); + auto physical = clipItem(tr("Physical models:")); addExpanded(tree, parent, physical); indent(); addModels(tree, physical, material.getPhysicalModels()); unindent(); - auto appearanceProperties = clipItem(tr("Appearance Properties:")); + auto appearanceProperties = clipItem(tr("Appearance properties:")); addExpanded(tree, parent, appearanceProperties); indent(); addProperties(tree, appearanceProperties, material.getAppearanceProperties()); unindent(); - auto physicalProperties = clipItem(tr("Physical Properties:")); + auto physicalProperties = clipItem(tr("Physical properties:")); addExpanded(tree, parent, physicalProperties); indent(); addProperties(tree, physicalProperties, material.getPhysicalProperties()); diff --git a/src/Mod/Material/Gui/DlgInspectMaterial.ui b/src/Mod/Material/Gui/DlgInspectMaterial.ui index dec62fce7c..e939dfc958 100644 --- a/src/Mod/Material/Gui/DlgInspectMaterial.ui +++ b/src/Mod/Material/Gui/DlgInspectMaterial.ui @@ -47,7 +47,7 @@ - Document Name + Document name @@ -61,7 +61,7 @@ - Label / Internal Name + Label / internal name @@ -125,7 +125,7 @@ - Copy to clipboard + Copy to Clipboard diff --git a/src/Mod/Material/Gui/DlgMaterialImp.cpp b/src/Mod/Material/Gui/DlgMaterialImp.cpp index d72450a14d..6addf027f6 100644 --- a/src/Mod/Material/Gui/DlgMaterialImp.cpp +++ b/src/Mod/Material/Gui/DlgMaterialImp.cpp @@ -96,7 +96,7 @@ DlgMaterialImp::DlgMaterialImp(bool floating, QWidget* parent, Qt::WindowFlags f if (floating) { Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance(); QDockWidget* dw = - pDockMgr->addDockWindow("Display properties", this, Qt::AllDockWidgetAreas); + pDockMgr->addDockWindow("Display Properties", this, Qt::AllDockWidgetAreas); dw->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable); dw->setFloating(true); dw->show(); diff --git a/src/Mod/Material/Gui/DlgSettingsExternal.ui b/src/Mod/Material/Gui/DlgSettingsExternal.ui index e714904929..e88bafa134 100644 --- a/src/Mod/Material/Gui/DlgSettingsExternal.ui +++ b/src/Mod/Material/Gui/DlgSettingsExternal.ui @@ -26,7 +26,7 @@ - External Interface + External interface @@ -88,14 +88,14 @@ - Model Cache Size + Model cache size - Hit Rate + Hit rate Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -121,7 +121,7 @@ - Hit Rate + Hit rate Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -131,7 +131,7 @@ - Material Cache Size + Material cache size diff --git a/src/Mod/Material/Gui/DlgSettingsMaterial.ui b/src/Mod/Material/Gui/DlgSettingsMaterial.ui index f3f63bdc2f..5bd8cc4ad4 100644 --- a/src/Mod/Material/Gui/DlgSettingsMaterial.ui +++ b/src/Mod/Material/Gui/DlgSettingsMaterial.ui @@ -20,7 +20,7 @@ - Card resources + Card Resources @@ -28,7 +28,7 @@ - The cards built-in to FreeCAD will be listed as available. + The cards built-in to FreeCAD will be listed as available Use built-in materials @@ -47,7 +47,7 @@ - Use materials added by external workbenches. + Use materials added by external workbenches Use materials from external workbenches @@ -66,10 +66,10 @@ - Also cards from FreeCAD's preferences directory will be listed as available. + Cards from FreeCAD’s preferences directory are also listed as available - Use materials from Materials directory in user's FreeCAD preference directory + Use materials from the Materials preference directory true @@ -85,11 +85,10 @@ - Also material cards also from the specified directory -will be listed as available. + Material cards from the specified directory will also be listed as available - Use materials from user defined directory + Use materials from user-defined directory true @@ -152,13 +151,13 @@ will be listed as available. - Card sorting and duplicates + Card Sorting and Duplicates - Duplicate cards will be deleted from the displayed material card list. + Duplicate cards will be deleted from the displayed material card list Delete card duplicates diff --git a/src/Mod/Material/Gui/ImageEdit.ui b/src/Mod/Material/Gui/ImageEdit.ui index 2c1fc90d4d..9f47ab731a 100644 --- a/src/Mod/Material/Gui/ImageEdit.ui +++ b/src/Mod/Material/Gui/ImageEdit.ui @@ -92,7 +92,7 @@ - File... + File diff --git a/src/Mod/Material/Gui/ListEdit.cpp b/src/Mod/Material/Gui/ListEdit.cpp index 4a74054cec..162cbc0710 100644 --- a/src/Mod/Material/Gui/ListEdit.cpp +++ b/src/Mod/Material/Gui/ListEdit.cpp @@ -141,7 +141,7 @@ int ListEdit::confirmDelete() box.setIcon(QMessageBox::Question); box.setWindowTitle(QObject::tr("Confirm Delete")); - QString prompt = QObject::tr("Are you sure you want to delete the row?"); + QString prompt = QObject::tr("Delete the row?"); box.setText(prompt); box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); diff --git a/src/Mod/Material/Gui/MaterialDelegate.cpp b/src/Mod/Material/Gui/MaterialDelegate.cpp index e547c111f5..397e247548 100644 --- a/src/Mod/Material/Gui/MaterialDelegate.cpp +++ b/src/Mod/Material/Gui/MaterialDelegate.cpp @@ -158,7 +158,7 @@ void MaterialDelegate::setValue(QAbstractItemModel* model, property->getUnits().toStdString().c_str()); QMessageBox msgBox; - msgBox.setWindowTitle(QStringLiteral("Property units mismatch")); + msgBox.setWindowTitle(QStringLiteral("Property Units Mismatch")); msgBox.setText(QStringLiteral("Units mismatch '%1' = '%2', " "setting to default property units '%3'\n") .arg(propertyName) diff --git a/src/Mod/Material/Gui/MaterialSave.cpp b/src/Mod/Material/Gui/MaterialSave.cpp index 2acac7579f..6c360dbb37 100644 --- a/src/Mod/Material/Gui/MaterialSave.cpp +++ b/src/Mod/Material/Gui/MaterialSave.cpp @@ -190,7 +190,7 @@ int MaterialSave::confirmOverwrite(const QString& filename) box.setWindowTitle(QObject::tr("Confirm Overwrite")); QFileInfo info(_selectedFull); - QString prompt = tr("Are you sure you want to save over '%1'?").arg(filename); + QString prompt = tr("Save over '%1'?").arg(filename); box.setText(prompt); box.setInformativeText(tr("Saving over the original file may cause other documents to break. " @@ -215,13 +215,13 @@ int MaterialSave::confirmNewMaterial() { QMessageBox box(this); box.setIcon(QMessageBox::Question); - box.setWindowTitle(tr("Confirm Save As New Material")); + box.setWindowTitle(tr("Confirm Save as New Material")); QString prompt = tr("Save as new material"); box.setText(prompt); box.setInformativeText(tr( - "This material already exists in this library. Would you like to save as a new material?")); + "This material already exists in this library. Save as a new material?")); box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); box.setDefaultButton(QMessageBox::Cancel); @@ -242,13 +242,13 @@ int MaterialSave::confirmCopy() { QMessageBox box(this); box.setIcon(QMessageBox::Question); - box.setWindowTitle(tr("Confirm Save As Copy")); + box.setWindowTitle(tr("Confirm Save as Copy")); - QString prompt = tr("Save as Copy"); + QString prompt = tr("Save as copy"); box.setText(prompt); box.setInformativeText(tr("Saving a copy is not recommended as it can break other documents. " - "We recommend you save as a new material.")); + "It is recommended to save as a new material.")); QPushButton* duplicateButton = box.addButton(tr("Save Copy"), QMessageBox::AcceptRole); QPushButton* newButton = box.addButton(tr("Save As New"), QMessageBox::ActionRole); @@ -483,7 +483,7 @@ void MaterialSave::onNewFolder(bool checked) if (item->hasChildren()) { for (auto i = 0; i < item->rowCount(); i++) { auto child = item->child(i); - if (child->text().startsWith(tr("New Folder"))) { + if (child->text().startsWith(tr("New folder"))) { newCount++; } } @@ -493,7 +493,7 @@ void MaterialSave::onNewFolder(bool checked) if (item->data(Qt::UserRole).isNull()) { QIcon folderIcon(QStringLiteral(":/icons/folder.svg")); - QString folderName = tr("New Folder"); + QString folderName = tr("New folder"); if (newCount > 0) { folderName += QString::number(newCount); } @@ -533,7 +533,7 @@ QString MaterialSave::pathFromIndex(const QModelIndex& index) const void MaterialSave::onContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); contextMenu.addAction(&_deleteAction); @@ -565,7 +565,7 @@ int MaterialSave::confirmDelete(QWidget* parent) box.setWindowTitle(QObject::tr("Confirm Delete")); QFileInfo info(_selectedFull); - QString prompt = QObject::tr("Are you sure you want to delete '%1'?").arg(info.fileName()); + QString prompt = QObject::tr("Delete '%1'?").arg(info.fileName()); box.setText(prompt); if (selectedHasChildren()) { diff --git a/src/Mod/Material/Gui/MaterialSave.ui b/src/Mod/Material/Gui/MaterialSave.ui index 7298e6a23a..eb8a231678 100644 --- a/src/Mod/Material/Gui/MaterialSave.ui +++ b/src/Mod/Material/Gui/MaterialSave.ui @@ -19,7 +19,7 @@ - Library: + Library @@ -67,7 +67,7 @@ - Filename: + Filename @@ -101,7 +101,7 @@ - Save as Inherited + Save as inherited diff --git a/src/Mod/Material/Gui/MaterialTreeWidget.cpp b/src/Mod/Material/Gui/MaterialTreeWidget.cpp index 12599e3295..200ab22a8f 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidget.cpp +++ b/src/Mod/Material/Gui/MaterialTreeWidget.cpp @@ -137,7 +137,7 @@ void MaterialTreeWidget::createLayout() m_expand->setIcon(style()->standardIcon(QStyle::SP_TitleBarUnshadeButton)); m_materialTree = new QTreeView(this); m_filterCombo = new QComboBox(this); - m_editor = new QPushButton(tr("Launch editor"), this); + m_editor = new QPushButton(tr("Launch Editor"), this); m_materialTree->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_materialTree->setMinimumSize(m_treeSizeHint); diff --git a/src/Mod/Material/Gui/MaterialsEditor.cpp b/src/Mod/Material/Gui/MaterialsEditor.cpp index 44d33e5d06..e4f63a4809 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.cpp +++ b/src/Mod/Material/Gui/MaterialsEditor.cpp @@ -589,7 +589,7 @@ void MaterialsEditor::saveMaterial() void MaterialsEditor::accept() { if (_material->isOldFormat()) { - Base::Console().log("*** Old Format File ***\n"); + Base::Console().log("*** Old format file ***\n"); oldFormatError(); return; @@ -606,7 +606,7 @@ void MaterialsEditor::oldFormatError() box.setWindowTitle(tr("Old Format Material")); box.setText(tr("This file is in the old material card format.")); - box.setInformativeText(QObject::tr("You must save the material before using it.")); + box.setInformativeText(QObject::tr("Save the material before using it.")); box.adjustSize(); // Silence warnings from Qt on Windows box.exec(); } @@ -1317,13 +1317,13 @@ void MaterialsEditor::onDoubleClick(const QModelIndex& index) void MaterialsEditor::onContextMenu(const QPoint& pos) { - QMenu contextMenu(tr("Context menu"), this); + QMenu contextMenu(tr("Context Menu"), this); - QAction action1(tr("Inherit from"), this); + QAction action1(tr("Inherit From"), this); connect(&action1, &QAction::triggered, this, &MaterialsEditor::onInherit); contextMenu.addAction(&action1); - QAction action2(tr("Inherit new material"), this); + QAction action2(tr("Inherit New Material"), this); connect(&action2, &QAction::triggered, this, &MaterialsEditor::onInheritNew); contextMenu.addAction(&action2); @@ -1345,9 +1345,8 @@ int MaterialsEditor::confirmSave(QWidget* parent) QMessageBox box(parent ? parent : this); box.setIcon(QMessageBox::Question); box.setWindowTitle(QObject::tr("Unsaved Material")); - box.setText(QObject::tr("Do you want to save your changes to the material before closing?")); - - box.setInformativeText(QObject::tr("If you don't save, your changes will be lost.")); + box.setText(QObject::tr("Save changes to the material before closing?")); + box.setInformativeText(QObject::tr("Otherwise, all changes will be lost.")); box.setStandardButtons(QMessageBox::Discard | QMessageBox::Cancel | QMessageBox::Save); box.setDefaultButton(QMessageBox::Save); box.setEscapeButton(QMessageBox::Cancel); diff --git a/src/Mod/Material/Gui/MaterialsEditor.ui b/src/Mod/Material/Gui/MaterialsEditor.ui index c676cf2451..01a3286e01 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.ui +++ b/src/Mod/Material/Gui/MaterialsEditor.ui @@ -148,7 +148,7 @@ - Source Reference + Source reference @@ -199,10 +199,10 @@ - Add to favorites + Adds or removes to/from favorites - * + Toggle Favorite diff --git a/src/Mod/Material/Gui/ModelSelect.ui b/src/Mod/Material/Gui/ModelSelect.ui index 085993f36c..68085f868d 100644 --- a/src/Mod/Material/Gui/ModelSelect.ui +++ b/src/Mod/Material/Gui/ModelSelect.ui @@ -156,10 +156,10 @@ - Add to favorites + Adds or removes to/from favorites - * + Toggle Favorites diff --git a/src/Mod/Material/Gui/Resources/ui/materials-editor.ui b/src/Mod/Material/Gui/Resources/ui/materials-editor.ui index ba901ad1fe..2b8c667192 100644 --- a/src/Mod/Material/Gui/Resources/ui/materials-editor.ui +++ b/src/Mod/Material/Gui/Resources/ui/materials-editor.ui @@ -19,7 +19,7 @@ - Material card + Material Card @@ -67,7 +67,7 @@ Opens an existing material card - Open... + Open… @@ -77,7 +77,7 @@ Saves this material as a card - Save as... + Save As… @@ -93,7 +93,7 @@ - Material parameter + Material Parameter @@ -112,7 +112,7 @@ - Add / remove parameter + Add/Remove Parameter @@ -123,14 +123,14 @@ - Add property + Add Property - Delete property + Delete Property diff --git a/src/Mod/Material/Gui/TaskMigrateExternal.cpp b/src/Mod/Material/Gui/TaskMigrateExternal.cpp index 63319e4fe3..11295e4ae1 100644 --- a/src/Mod/Material/Gui/TaskMigrateExternal.cpp +++ b/src/Mod/Material/Gui/TaskMigrateExternal.cpp @@ -74,7 +74,7 @@ void DlgMigrateExternal::showLibraries() void DlgMigrateExternal::migrate() { try { - statusUpdate(tr("Migrating Models...")); + statusUpdate(tr("Migrating models…")); for (int row = 0; row < ui->listModelLibraries->count(); row++) { auto item = ui->listModelLibraries->item(row); if (item->checkState() == Qt::Checked) { @@ -86,7 +86,7 @@ void DlgMigrateExternal::migrate() } statusUpdate(tr("done")); - statusUpdate(tr("Validating Models...")); + statusUpdate(tr("Validating models…")); for (int row = 0; row < ui->listModelLibraries->count(); row++) { auto item = ui->listModelLibraries->item(row); if (item->checkState() == Qt::Checked) { @@ -98,7 +98,7 @@ void DlgMigrateExternal::migrate() } statusUpdate(tr("done")); - statusUpdate(tr("Migrating Materials...")); + statusUpdate(tr("Migrating materials…")); for (int row = 0; row < ui->listMaterialLibraries->count(); row++) { auto item = ui->listMaterialLibraries->item(row); if (item->checkState() == Qt::Checked) { @@ -110,7 +110,7 @@ void DlgMigrateExternal::migrate() } statusUpdate(tr("done")); - statusUpdate(tr("Validating Materials...")); + statusUpdate(tr("Validating materials…")); for (int row = 0; row < ui->listMaterialLibraries->count(); row++) { auto item = ui->listMaterialLibraries->item(row); if (item->checkState() == Qt::Checked) { @@ -144,10 +144,10 @@ void DlgMigrateExternal::migrate() } catch (const Base::Exception& e) { statusUpdate(QString::fromStdString(e.what())); - statusUpdate(tr("Unknown exception - Aborted")); + statusUpdate(tr("Unknown exception - aborted")); } catch (...) { - statusUpdate(tr("Unknown exception - Aborted")); + statusUpdate(tr("Unknown exception - aborted")); } } diff --git a/src/Mod/Material/Gui/TaskMigrateExternal.ui b/src/Mod/Material/Gui/TaskMigrateExternal.ui index 65c82761b3..cd4ef35ba8 100644 --- a/src/Mod/Material/Gui/TaskMigrateExternal.ui +++ b/src/Mod/Material/Gui/TaskMigrateExternal.ui @@ -17,7 +17,7 @@ - Select Material Libraries + Select material libraries @@ -31,7 +31,7 @@ - Select Model Libraries + Select model libraries diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py index 1c2e3e3882..d340e969a4 100644 --- a/src/Mod/Material/MaterialEditor.py +++ b/src/Mod/Material/MaterialEditor.py @@ -262,7 +262,7 @@ class MaterialEditor: if self.edited: reply = QtGui.QMessageBox.question(self.widget, #FreeCADGui.getMainWindow(), translate("Material","The document has been modified."), - translate("Material","Do you want to save your changes?"), + translate("Material","Save changes?"), QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Save) @@ -330,7 +330,7 @@ class MaterialEditor: if self.edited: reply = QtGui.QMessageBox.question(self.widget, #FreeCADGui.getMainWindow(), translate("Material","The document has been modified."), - translate("Material","Do you want to save your changes?"), + translate("Material","Save changes?"), QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Save) @@ -586,7 +586,7 @@ class MaterialEditor: self.card_path = directory filetuple = QtGui.QFileDialog.getOpenFileName( QtGui.QApplication.activeWindow(), - "Open FreeCAD Material file", + "Open FreeCAD material file", self.card_path, "*.FCMat" ) @@ -664,7 +664,7 @@ class MaterialEditor: name = "Material" filetuple = QtGui.QFileDialog.getSaveFileName( QtGui.QApplication.activeWindow(), - "Save FreeCAD Material file", + "Save FreeCAD material file", self.save_directory + "/" + name + ".FCMat", "*.FCMat" )