aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-06-18 15:37:35 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-19 14:14:38 +0000
commit8fcc2bc5834645ebf023d431036e5a5cd2d0aee3 (patch)
treea093e4f5bbdf40e188439af62185450b3e105dc6
parent90608633361c977f70f2ccf00c5cf1f48d78ed79 (diff)
Fix some spelling errors in translated messages and comments
Change-Id: I34869a9f6aa8cf0e4eadbd2fbeb6d6aca52f9ca7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 47b7bb33463cd45f6c67020d0c64f309010db1bb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qmldom/qqmldomelements.cpp8
-rw-r--r--src/qmldom/qqmldompath.cpp2
-rw-r--r--src/qmldom/qqmldomtop.cpp4
-rw-r--r--src/qmlxmllistmodel/qqmlxmllistmodel.cpp20
-rw-r--r--tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp6
5 files changed, 20 insertions, 20 deletions
diff --git a/src/qmldom/qqmldomelements.cpp b/src/qmldom/qqmldomelements.cpp
index 7688c845d7..914c72e34f 100644
--- a/src/qmldom/qqmldomelements.cpp
+++ b/src/qmldom/qqmldomelements.cpp
@@ -322,7 +322,7 @@ Import Import::fromUriString(QString importStr, Version v, QString importId, Err
v = Version::fromString(m.captured(2));
else if (!m.captured(u"version").isEmpty())
domParsingErrors()
- .warning(tr("Version %1 in import string '%2' overridden by explicit "
+ .warning(tr("Version %1 in import string '%2' overridden by explicit "
"version %3")
.arg(m.captured(2), importStr, v.stringValue()))
.handle(handler);
@@ -330,14 +330,14 @@ Import Import::fromUriString(QString importStr, Version v, QString importId, Err
importId = m.captured(u"importId");
else if (!m.captured(u"importId").isEmpty())
domParsingErrors()
- .warning(tr("namespace %1 in import string '%2' overridden by explicit "
+ .warning(tr("namespace %1 in import string '%2' overridden by explicit "
"importId %3")
.arg(m.captured(u"importId"), importStr, importId))
.handle(handler);
return Import(m.captured(u"uri").trimmed(), v, importId);
}
domParsingErrors()
- .error(tr("Unexpected uri format in import '%1'").arg(importStr))
+ .error(tr("Unexpected URI format in import '%1'").arg(importStr))
.handle(handler);
return Import();
}
@@ -356,7 +356,7 @@ Import Import::fromFileString(QString importStr, QString baseDir, QString import
QString path = p.canonicalFilePath();
if (path.isEmpty()) {
domParsingErrors()
- .warning(tr("Non existing directory or file referred in uri of import '%1'")
+ .warning(tr("Non existing directory or file referred in URI of import '%1'")
.arg(importStr))
.handle(handler);
path = p.filePath();
diff --git a/src/qmldom/qqmldompath.cpp b/src/qmldom/qqmldompath.cpp
index 21bcf4c8b8..c2ceeaf3cc 100644
--- a/src/qmldom/qqmldompath.cpp
+++ b/src/qmldom/qqmldompath.cpp
@@ -500,7 +500,7 @@ Path Path::fromString(QStringView s, ErrorHandler errorHandler)
.arg(QString::number(i0))).handle(errorHandler);
return Path();
} else {
- myErrors().info(tr("Index shound use square brackets and not a dot (at char %1).")
+ myErrors().info(tr("Index should use square brackets and not a dot (at char %1).")
.arg(QString::number(i0))).handle(errorHandler);
}
state = PathEls::ParserState::End;
diff --git a/src/qmldom/qqmldomtop.cpp b/src/qmldom/qqmldomtop.cpp
index b1f410e102..c41402d761 100644
--- a/src/qmldom/qqmldomtop.cpp
+++ b/src/qmldom/qqmldomtop.cpp
@@ -1518,7 +1518,7 @@ std::shared_ptr<ModuleIndex> DomEnvironment::moduleIndexWithUri(DomItem &self, Q
"Version::Latest)");
std::shared_ptr<ModuleIndex> res;
if (changeable == Changeable::Writable && (m_options & Option::Exported))
- myErrors().error(tr("asked mutable module in Multithreaded env")).handle(errorHandler);
+ myErrors().error(tr("A mutable module was requested in a multithreaded environment")).handle(errorHandler);
if (options != EnvLookup::BaseOnly) {
QMutexLocker l(mutex());
auto it = m_moduleIndexWithUri.find(uri);
@@ -1831,7 +1831,7 @@ void DomEnvironment::addLoadInfo(DomItem &self, std::shared_ptr<LoadInfo> loadIn
}
if (oldVal && oldVal->status() != LoadInfo::Status::Done) {
self.addError(myErrors()
- .error(tr("addLoadinfo replaces a non finished load info for %1")
+ .error(tr("addLoadinfo replaces unfinished load info for %1")
.arg(p.toString()))
.handle());
}
diff --git a/src/qmlxmllistmodel/qqmlxmllistmodel.cpp b/src/qmlxmllistmodel/qqmlxmllistmodel.cpp
index af8f434c07..2249eaeac5 100644
--- a/src/qmlxmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/qmlxmllistmodel/qqmlxmllistmodel.cpp
@@ -112,7 +112,7 @@ void QQmlXmlListModelRole::setName(const QString &name)
/*!
\qmlproperty string QtQml.XmlListModel::XmlListModelRole::elementName
- The name of the xml element, or a path to the xml element, that will be
+ The name of the XML element, or a path to the XML element, that will be
used to read the data. The element must actually contain text.
Optionally the \l attributeName property can be specified to extract
@@ -120,8 +120,8 @@ void QQmlXmlListModelRole::setName(const QString &name)
//! [basic-example]
For example, the following model has a role named "title", which reads the
- data from the xml element \c {<title>}. It also has another role named
- "timestamp", which uses the same xml element \c {<title>}, but reads its
+ data from the XML element \c {<title>}. It also has another role named
+ "timestamp", which uses the same XML element \c {<title>}, but reads its
"created" attribute to extract the actual value.
\qml
@@ -147,7 +147,7 @@ void QQmlXmlListModelRole::setName(const QString &name)
//! [empty-elementName-example]
When the \l attributeName is specified, the \l elementName can be left
- empty. In this case the attribute of the top level xml element of the query
+ empty. In this case the attribute of the top level XML element of the query
will be read.
For example, if you have the following xml document:
@@ -224,13 +224,13 @@ QString QQmlXmlListModelRole::elementName() const
void QQmlXmlListModelRole::setElementName(const QString &name)
{
if (name.startsWith(QLatin1Char('/'))) {
- qmlWarning(this) << tr("An xml element must not start with '/'");
+ qmlWarning(this) << tr("An XML element must not start with '/'");
return;
} else if (name.endsWith(QLatin1Char('/'))) {
- qmlWarning(this) << tr("An xml element must not end with '/'");
+ qmlWarning(this) << tr("An XML element must not end with '/'");
return;
} else if (name.contains(QStringLiteral("//"))) {
- qmlWarning(this) << tr("An xml element must not contain \"//\"");
+ qmlWarning(this) << tr("An XML element must not contain \"//\"");
return;
}
@@ -243,14 +243,14 @@ void QQmlXmlListModelRole::setElementName(const QString &name)
/*!
\qmlproperty string QtQml.XmlListModel::XmlListModelRole::attributeName
- The attribute of the xml element that will be used to read the data.
- The xml element is specified by \l elementName property.
+ The attribute of the XML element that will be used to read the data.
+ The XML element is specified by \l elementName property.
\include qqmlxmllistmodel.cpp basic-example
\include qqmlxmllistmodel.cpp empty-elementName-example
- If you do not need to parse any attributes for the specified xml element,
+ If you do not need to parse any attributes for the specified XML element,
simply leave this property blank.
\sa elementName
diff --git a/tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp b/tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp
index ed91bba069..804a10ba72 100644
--- a/tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp
+++ b/tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp
@@ -277,17 +277,17 @@ void tst_QQmlXmlListModel::elementErrors()
QQmlComponent component(&engine, testFileUrl("elementErrors.qml"));
QTest::ignoreMessage(QtWarningMsg,
(testFileUrl("elementErrors.qml").toString()
- + ":6:5: QML XmlListModelRole: An xml element must not start with '/'")
+ + ":6:5: QML XmlListModelRole: An XML element must not start with '/'")
.toUtf8()
.constData());
QTest::ignoreMessage(QtWarningMsg,
(testFileUrl("elementErrors.qml").toString()
- + ":7:5: QML XmlListModelRole: An xml element must not end with '/'")
+ + ":7:5: QML XmlListModelRole: An XML element must not end with '/'")
.toUtf8()
.constData());
QTest::ignoreMessage(QtWarningMsg,
(testFileUrl("elementErrors.qml").toString()
- + ":8:5: QML XmlListModelRole: An xml element must not contain \"//\"")
+ + ":8:5: QML XmlListModelRole: An XML element must not contain \"//\"")
.toUtf8()
.constData());