summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-02-24 11:34:06 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-24 14:53:00 +0000
commit4bc08dcb9481b700128f2aa3299e63f3f0d8466a (patch)
treea9cdfc4f3e1212803cbf725bf2c9030f2ef7e33f
parente6bcb7e2a68582303976448b32227d4170847c4a (diff)
Fix some issues in translated messages
- Fix spelling errors - Remove whitespace from message Change-Id: I44889f63d67f85e11fb0aac6296e4e36ec996121 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit cccef3886fc50df5e0b39540885e3b5518ece2b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qmldom/qqmldomitem.cpp7
-rw-r--r--src/qmldom/qqmldompath.cpp6
2 files changed, 7 insertions, 6 deletions
diff --git a/src/qmldom/qqmldomitem.cpp b/src/qmldom/qqmldomitem.cpp
index c2acbaebf2..296083c99b 100644
--- a/src/qmldom/qqmldomitem.cpp
+++ b/src/qmldom/qqmldomitem.cpp
@@ -614,7 +614,7 @@ bool DomItem::resolve(Path path,
root = root.environment()[u"universe"];
break;
case PathRoot::Other:
- myResolveErrors().error(tr("Root context %1 is not knwon").arg(path.headName())).handle(errorHandler);
+ myResolveErrors().error(tr("Root context %1 is not known").arg(path.headName())).handle(errorHandler);
return false;
}
toDos[0] = {root, 1};
@@ -660,7 +660,8 @@ bool DomItem::resolve(Path path,
}
if (visitedRefs->contains(toResolve)) {
myResolveErrors().error([visitedRefs, toResolve](Sink sink) {
- sink(tr("Circular reference:\n"));
+ sink(tr("Circular reference:"));
+ sink(u"\n");
for (const Path &vPath : *visitedRefs) {
sink(u" ");
vPath.dump(sink);
@@ -755,7 +756,7 @@ bool DomItem::resolve(Path path,
current = PathCurrent::LookupDynamic;
}
if (current == PathCurrent::LookupStrict) {
- myResolveErrors().error(tr("@lookupStrinct unimplemented"))
+ myResolveErrors().error(tr("@lookupStrict unimplemented"))
.handle(errorHandler);
return false;
} else if (current == PathCurrent::LookupDynamic) {
diff --git a/src/qmldom/qqmldompath.cpp b/src/qmldom/qqmldompath.cpp
index 871fb20f5c..60086ced10 100644
--- a/src/qmldom/qqmldompath.cpp
+++ b/src/qmldom/qqmldompath.cpp
@@ -365,7 +365,7 @@ Path Path::fromString(QStringView s, ErrorHandler errorHandler)
components.append(Component(Current(s.mid(i0,i-i0))));
state = ParserState::End;
} else if (c.isLetter()) {
- myErrors().warning(tr("Field expressions should start with dot even a the start of the path %1.")
+ myErrors().warning(tr("Field expressions should start with a dot, even when at the start of the path %1.")
.arg(s)).handle(errorHandler);
return Path();
} else {
@@ -455,7 +455,7 @@ Path Path::fromString(QStringView s, ErrorHandler errorHandler)
myErrors().error(tr("Filter from string not yet implemented.")).handle(errorHandler);
return Path();
} else {
- myErrors().error(tr("Unexpected character '%1' after square braket at %2.")
+ myErrors().error(tr("Unexpected character '%1' after square bracket at %2.")
.arg(c).arg(i-1)).handle(errorHandler);
return Path();
}
@@ -495,7 +495,7 @@ Path Path::fromString(QStringView s, ErrorHandler errorHandler)
.arg(QString::number(i0))).handle(errorHandler);
return Path();
} else {
- myErrors().hint(tr("Index shound use square brackets and not a dot (at char %1).")
+ myErrors().hint(tr("Index should use square brackets and not a dot (at char %1).")
.arg(QString::number(i0))).handle(errorHandler);
}
state = ParserState::End;