summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-18 03:02:13 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-18 03:02:13 +0200
commitbc7ed4f112c85ac9db5a4126eb446591e0283bc3 (patch)
tree56acefb955d2caa56c084c0ca9b4dfa42fca1a8e /src
parent6e60c31d3513da3a9ec5e9a38326961bc6a32928 (diff)
parent6edf63144df8662bb3ff787553b183584a533f56 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src')
-rw-r--r--src/linguist/linguist/doc/src/linguist-manual.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linguist/linguist/doc/src/linguist-manual.qdoc b/src/linguist/linguist/doc/src/linguist-manual.qdoc
index 09726dbd4..c93515e9d 100644
--- a/src/linguist/linguist/doc/src/linguist-manual.qdoc
+++ b/src/linguist/linguist/doc/src/linguist-manual.qdoc
@@ -1065,8 +1065,8 @@
are optional in the plain-text system. However, with the text-ID-based
system, this extra information becomes essential because without it you only
have the text ID and the translator might not be able to make a sensible
- translation from without any other context. You can use long descriptive
- text ID and no comments but comments are often easier to understand.
+ translation from that without further context. You can use long descriptive
+ text IDs and no comments, but comments are often easier to understand.
\endlist