Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Id67ceddd5ee9c7353cba2c3d24564b0168a32651

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