diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.ui b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.ui index 5f30cc3815e..379069aa6be 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.ui +++ b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.ui @@ -76,7 +76,7 @@ - Tab View + Tab view true @@ -86,7 +86,7 @@ - Table View + Table view @@ -135,7 +135,7 @@ - Custom ID + Name diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp index b7134c09c79..ec8a1a69d9b 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp @@ -109,10 +109,10 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) : m_onboardingLabel = new QLabel(this); QString labelText = tr("Your file does not import Qt Quick 3D.

" - "To create a 3D view, add the QtQuick3D import to your file in the QML Imports tab of the Library view. Or click" + "To create a 3D view, add the QtQuick3D module in the Library view. Or click" " here " "here to add it immediately.

" - "To import 3D assets from another tool, click on the \"Add New Assets...\" button in the Assets tab of the Library view."); + "To import 3D assets from another tool, click the \"Add New Assets...\" button in the Assets tab of the Library view."); m_onboardingLabel->setText(labelText.arg(Utils::creatorTheme()->color(Utils::Theme::TextColorLink).name())); m_onboardingLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); connect(m_onboardingLabel, &QLabel::linkActivated, this, &Edit3DWidget::linkActivated); diff --git a/src/plugins/qmldesigner/components/eventlist/nodelistview.cpp b/src/plugins/qmldesigner/components/eventlist/nodelistview.cpp index c2174487316..a322d56ebc9 100644 --- a/src/plugins/qmldesigner/components/eventlist/nodelistview.cpp +++ b/src/plugins/qmldesigner/components/eventlist/nodelistview.cpp @@ -56,7 +56,7 @@ QVariant eventIdsToVariant(const QStringList &eventIds) NodeListModel::NodeListModel(QObject *parent) : QStandardItemModel(0, 4, parent) { - setHeaderData(idColumn, Qt::Horizontal, tr("Id")); + setHeaderData(idColumn, Qt::Horizontal, tr("ID")); setHeaderData(typeColumn, Qt::Horizontal, tr("Type")); setHeaderData(fromColumn, Qt::Horizontal, tr("From")); setHeaderData(toColumn, Qt::Horizontal, tr("To")); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 8797f90dc26..b6716939f96 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -242,14 +242,14 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) } }; - m_zoomInAction = new QAction(zoomInIcon, tr("Zoom in"), this); + m_zoomInAction = new QAction(zoomInIcon, tr("Zoom In"), this); m_zoomInAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_Plus)); addAction(m_zoomInAction.data()); upperActions.append(m_zoomInAction.data()); m_toolBox->addRightSideAction(m_zoomInAction.data()); connect(m_zoomInAction.data(), &QAction::triggered, zoomIn); - m_zoomOutAction = new QAction(zoomOutIcon, tr("Zoom out"), this); + m_zoomOutAction = new QAction(zoomOutIcon, tr("Zoom Out"), this); m_zoomOutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_Minus)); addAction(m_zoomOutAction.data()); upperActions.append(m_zoomOutAction.data()); @@ -262,7 +262,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) m_toolBox->addRightSideAction(m_zoomAction.data()); connect(m_zoomAction.data(), &ZoomAction::zoomLevelChanged, setZoomLevel); - m_zoomAllAction = new QAction(zoomAllIcon, tr("Zoom screen to fit all content"), this); + m_zoomAllAction = new QAction(zoomAllIcon, tr("Zoom screen to fit all content."), this); m_zoomAllAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_0)); addAction(m_zoomAllAction.data()); upperActions.append(m_zoomAllAction.data()); @@ -270,7 +270,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) connect(m_zoomAllAction.data(), &QAction::triggered, frameAll); m_zoomSelectionAction = new QAction(zoomSelectionIcon, - tr("Zoom screen to fit current selection"), + tr("Zoom screen to fit current selection."), this); m_zoomSelectionAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_I)); addAction(m_zoomSelectionAction.data()); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index 6cc2b31f173..69ac3ff3165 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -89,7 +89,7 @@ void ItemLibraryAssetImporter::importQuick3D(const QStringList &inputFiles, const auto parseData = m_parseData; for (const auto &pd : parseData) { if (!startImportProcess(pd)) { - addError(tr("Failed to start import 3D asset process"), + addError(tr("Failed to start import 3D asset process."), pd.sourceInfo.absoluteFilePath()); m_parseData.remove(pd.importId); } @@ -153,7 +153,7 @@ void ItemLibraryAssetImporter::importProcessFinished(int exitCode, QProcess::Exi if (m_parseData.contains(-exitCode)) { const ParseData pd = m_parseData.take(-exitCode); - addError(tr("Asset import process failed for: \"%1\"").arg(pd.sourceInfo.absoluteFilePath())); + addError(tr("Asset import process failed for: \"%1\".").arg(pd.sourceInfo.absoluteFilePath())); } if (m_qmlImportFinishedCount == m_qmlPuppetCount) { @@ -256,7 +256,7 @@ bool ItemLibraryAssetImporter::preParseQuick3DAsset(const QString &file, ParseDa pd.targetDirPath = pd.targetDir.filePath(pd.assetName); if (pd.outDir.exists(pd.assetName)) { - addWarning(tr("Skipped import of duplicate asset: \"%1\"").arg(pd.assetName)); + addWarning(tr("Skipped import of duplicate asset: \"%1\".").arg(pd.assetName)); return false; } @@ -274,7 +274,7 @@ bool ItemLibraryAssetImporter::preParseQuick3DAsset(const QString &file, ParseDa ? confirmAssetOverwrite(pd.assetName) : OverwriteResult::Update; if (result == OverwriteResult::Skip) { - addWarning(tr("Skipped import of existing asset: \"%1\"").arg(pd.assetName)); + addWarning(tr("Skipped import of existing asset: \"%1\".").arg(pd.assetName)); return false; } else if (result == OverwriteResult::Update) { // Add generated icons and existing source asset file, as those will always need @@ -305,7 +305,7 @@ bool ItemLibraryAssetImporter::preParseQuick3DAsset(const QString &file, ParseDa overwriteFiles.append(Utils::toList(alwaysOverwrite)); m_overwrittenImports.insert(pd.targetDirPath, overwriteFiles); } else { - addWarning(tr("No files selected for overwrite, skipping import: \"%1\"").arg(pd.assetName)); + addWarning(tr("No files selected for overwrite, skipping import: \"%1\".").arg(pd.assetName)); return false; } @@ -317,7 +317,7 @@ bool ItemLibraryAssetImporter::preParseQuick3DAsset(const QString &file, ParseDa pd.outDir.mkpath(pd.assetName); if (!pd.outDir.cd(pd.assetName)) { - addError(tr("Could not access temporary asset directory: \"%1\"") + addError(tr("Could not access temporary asset directory: \"%1\".") .arg(pd.outDir.filePath(pd.assetName))); return false; } @@ -427,7 +427,7 @@ void ItemLibraryAssetImporter::postParseQuick3DAsset(const ParseData &pd) qmldirFile.write(qmlInfo.toUtf8()); qmldirFile.commit(); } else { - addError(tr("Failed to create qmldir file for asset: \"%1\"").arg(pd.assetName)); + addError(tr("Failed to create qmldir file for asset: \"%1\".").arg(pd.assetName)); } } } diff --git a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp index 0d3d0898be5..7e5c957f91f 100644 --- a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp +++ b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp @@ -72,9 +72,9 @@ ListModelEditorDialog::ListModelEditorDialog(QWidget *parent) m_addColumnAction = toolBar->addAction(getIcon(Theme::Icon::addColumnAfter), tr("Add Column")); m_removeColumnsAction = toolBar->addAction(getIcon(Theme::Icon::deleteColumn), tr("Remove Columns")); - m_moveDownAction = toolBar->addAction(Icons::ARROW_DOWN.icon(), tr("Move down (CTRL + Down).")); + m_moveDownAction = toolBar->addAction(Icons::ARROW_DOWN.icon(), tr("Move Down (Ctrl + Down)")); m_moveDownAction->setShortcut(QKeySequence(Qt::Key_Down | Qt::CTRL)); - m_moveUpAction = toolBar->addAction(Icons::ARROW_UP.icon(), tr("Move up (CTRL + Up).")); + m_moveUpAction = toolBar->addAction(Icons::ARROW_UP.icon(), tr("Move Up (Ctrl + Up)")); m_moveDownAction->setShortcut(QKeySequence(Qt::Key_Up | Qt::CTRL)); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 611006a3510..4dbe773adb5 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -680,7 +680,7 @@ QString PropertyEditorQmlBackend::templateGeneration(const NodeMetaInfo &type, QString qmlInnerTemplate = ""; qmlInnerTemplate += "Section {\n"; - qmlInnerTemplate += "caption: \""+ QObject::tr("User added properties") + "\"\n"; + qmlInnerTemplate += "caption: \""+ QObject::tr("User Added Properties") + "\"\n"; qmlInnerTemplate += anchorLeftRight; qmlInnerTemplate += "leftPadding: 0\n"; qmlInnerTemplate += "rightPadding: 0\n"; diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitionform.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitionform.cpp index 239817197ba..dea51a59704 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitionform.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitionform.cpp @@ -67,11 +67,11 @@ TransitionForm::TransitionForm(QWidget *parent) bool error = false; if (!ModelNode::isValidId(newId)) { - Core::AsynchronousMessageBox::warning(tr("Invalid Id"), - tr("%1 is an invalid id.").arg(newId)); + Core::AsynchronousMessageBox::warning(tr("Invalid ID"), + tr("%1 is an invalid ID.").arg(newId)); error = true; } else if (m_transition.view()->hasId(newId)) { - Core::AsynchronousMessageBox::warning(tr("Invalid Id"), + Core::AsynchronousMessageBox::warning(tr("Invalid ID"), tr("%1 already exists.").arg(newId)); error = true; } else { diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index 1d31be37cd3..57759022ba2 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -407,7 +407,7 @@ void SubComponentManager::parseQuick3DAssetsItem(const QString &importUrl, const ItemLibraryEntry itemLibraryEntry; itemLibraryEntry.setType(type.toUtf8(), 1, 0); itemLibraryEntry.setName(name); - itemLibraryEntry.setCategory(tr("My Quick3D Components")); + itemLibraryEntry.setCategory(tr("My 3D Components")); itemLibraryEntry.setRequiredImport(importUrl); QString iconPath = qmlIt.fileInfo().absolutePath() + '/' + Constants::QUICK_3D_ASSET_ICON_DIR + '/' + name