diff --git a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
index ce1b634c9085..2cf6bf863f88 100644
--- a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
+++ b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
@@ -306,7 +306,7 @@ public class MyPersistObject implements XPersistObject, XTypeProvider,
    * Gives a factory for creating the service.
    * This method is called by the <code>JavaLoader</code>
    * <p>
-   * @return  returns a <code>XSingleServiceFactory</code> for creating the component
+   * @return  returns an <code>XSingleServiceFactory</code> for creating the component
    * @param   implName     the name of the implementation for which a service is desired
    * @param   multiFactory the service manager to be used if needed
    * @param   regKey       the registryKey
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
index d83e952fc2bf..894e3f0c7bcc 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
@@ -59,7 +59,7 @@ public class _XAccessibleContext extends MultiMethodTest {
 
     /**
      * Calls the method and stores the number of children. <p>
-     * Has <b> OK </b> status if non-negative number returned.
+     * Has <b> OK </b> status if a non-negative number is returned.
      */
     public void _getAccessibleChildCount() {
         childCount = oObj.getAccessibleChildCount();
@@ -70,8 +70,8 @@ public class _XAccessibleContext extends MultiMethodTest {
     /**
      * Tries to get every child and checks its parent. <p>
      *
-     * Has <b> OK </b> status if parent of every child
-     * and the tested component are the same objects.
+     * Has <b> OK </b> status if the parent of every child
+     * and the tested component are the same object.
      *
      * The following method tests are to be completed successfully before :
      * <ul>
@@ -190,7 +190,7 @@ public class _XAccessibleContext extends MultiMethodTest {
      * it with tested component.<p>
      *
      * Has <b> OK </b> status if the parent's child and the tested
-     * component are the same objects.
+     * component are the same object.
      *
      * The following method tests are to be completed successfully before :
      * <ul>
@@ -238,7 +238,7 @@ public class _XAccessibleContext extends MultiMethodTest {
     /**
      * Get the accessible role of component. <p>
      *
-     * Has <b> OK </b> status if non-negative number returned.
+     * Has <b> OK </b> status if a non-negative number is returned.
      */
     public void _getAccessibleRole() {
         short role = oObj.getAccessibleRole();
@@ -249,7 +249,7 @@ public class _XAccessibleContext extends MultiMethodTest {
     /**
      * Get the accessible name of the component. <p>
      *
-     * Has <b> OK </b> status if the name has non-zero length.
+     * Has <b> OK </b> status if the name is not null.
      */
     public void _getAccessibleName() {
         String name = oObj.getAccessibleName();
@@ -260,7 +260,7 @@ public class _XAccessibleContext extends MultiMethodTest {
     /**
      * Get the accessible description of the component. <p>
      *
-     * Has <b> OK </b> status if the description has non-zero length.
+     * Has <b> OK </b> status if the description is not null.
      */
     public void _getAccessibleDescription() {
         String descr = oObj.getAccessibleDescription();
diff --git a/qadevOOo/tests/java/ifc/awt/_XComboBox.java b/qadevOOo/tests/java/ifc/awt/_XComboBox.java
index b830c6776234..85bed8b60802 100644
--- a/qadevOOo/tests/java/ifc/awt/_XComboBox.java
+++ b/qadevOOo/tests/java/ifc/awt/_XComboBox.java
@@ -135,7 +135,7 @@ public class _XComboBox extends MultiMethodTest {
     }
 
     /**
-    * Adds one two items to the last position and check the number of
+    * Adds two items to the last position and check the number of
     * items after addition. <p>
     * Has <b>OK</b> status if the number of items increased by 2.<p>
     * The following method tests are to be executed before :
@@ -157,7 +157,7 @@ public class _XComboBox extends MultiMethodTest {
     /**
     * Gets the current number of items and tries to remove them all
     * then checks number of items. <p>
-    * Has <b>OK</b> status if no items remains. <p>
+    * Has <b>OK</b> status if no items remain. <p>
     * The following method tests are to be executed before :
     * <ul>
     *  <li> <code> getItems </code> </li>
diff --git a/qadevOOo/tests/java/ifc/awt/_XListBox.java b/qadevOOo/tests/java/ifc/awt/_XListBox.java
index a9acba185313..4b60d769e41d 100644
--- a/qadevOOo/tests/java/ifc/awt/_XListBox.java
+++ b/qadevOOo/tests/java/ifc/awt/_XListBox.java
@@ -156,7 +156,7 @@ public class _XListBox extends MultiMethodTest {
     }
 
     /**
-    * Adds one two items to the last position and check the number of
+    * Adds two items to the last position and check the number of
     * items after addition. <p>
     * Has <b>OK</b> status if the number of items increased by 2.<p>
     * The following method tests are to be executed before :
@@ -178,7 +178,7 @@ public class _XListBox extends MultiMethodTest {
     /**
     * Gets the current number of items and tries to remove them all
     * then checks number of items. <p>
-    * Has <b>OK</b> status if no items remains. <p>
+    * Has <b>OK</b> status if no items remain. <p>
     * The following method tests are to be executed before :
     * <ul>
     *  <li> <code> getItems </code> </li>
diff --git a/qadevOOo/tests/java/ifc/container/_XIndexContainer.java b/qadevOOo/tests/java/ifc/container/_XIndexContainer.java
index b32127e770d9..b0e63f6b4a44 100644
--- a/qadevOOo/tests/java/ifc/container/_XIndexContainer.java
+++ b/qadevOOo/tests/java/ifc/container/_XIndexContainer.java
@@ -34,7 +34,7 @@ import com.sun.star.lang.IndexOutOfBoundsException;
 * This test needs the following object relations :
 * <ul>
 *  <li> <code>'INSTANCE1', ..., 'INSTANCEN'</code> : N relations
-*   which represents objects to be inserted. See below
+*   which represent objects to be inserted. See below
 *   for more information.</li>
 *  <li> <code>'XIndexContainerINDEX'</code> : For internal test
 *   usage. Contains current thread number. </li>
@@ -43,21 +43,21 @@ import com.sun.star.lang.IndexOutOfBoundsException;
 * <ul> <p>
 * XIndexContainer needs n ObjectRelations "INSTANCEn" , where n=1, ...,
 * THRCNT.<p>
-* When this interface tested by different threads, it must use different
+* When this interface is tested by different threads, it must use different
 * instances to insert/remove - one for each thread.
 * <p>
 * That's why we use objRelation "XIndexContainerINDEX" to store the number of
-* last taken instance. If there is no such relation, it initialize with 1.
+* last taken instance. If there is no such relation, it initializes with 1.
 * <p>
-* This ObjectRelations should be necessary to create an Object,
-* which is insertable by insterByIndex()
+* These ObjectRelations should be necessary to create an Object,
+* which is insertable by insertByIndex()
 * INSTANCEn are n Objectrelations so that every thread can insert its own
-* object. n depends on the variable THRCNT which and comes from API.INI
+* object. n depends on the variable THRCNT and comes from API.INI
 * <p>
 * Why that:
 * If you insert the same Object by insertByIndex() several times you
 * don't insert the Object several times. The first insertByIndex() inserts
-* the Object to the Container but all other insertByIndex() changes
+* the Object into the Container but all other insertByIndex() calls change
 * the Index in the Container because it's the same Object. <p>
 * Test is multithread compliant. <p>
 * @see com.sun.star.container.XIndexContainer
@@ -72,7 +72,7 @@ public class _XIndexContainer extends MultiMethodTest {
     * First tries to insert proper object. Second tries to insert
     * null value. For each test thread different objects are inserted
     * on different indexes. For example for the first started test index
-    * is 0 and object is get from relation 'INSTANCE1', and so on. <p>
+    * is 0 and object is retrieved from relation 'INSTANCE1', and so on. <p>
     * Has <b>OK</b> status if in the first case <code>getByIndex</code>
     * method returns non null value and in the second <code>
     * IndexOutOfBoundsException</code> was thrown.
diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
index 502a102a4463..b96b02415cc1 100644
--- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
@@ -42,11 +42,11 @@ import com.sun.star.util.XURLTransformer;
  * This test needs the following object relations :
  * <ul>
  *  <li> <code>'FrameLoader.URL'</code> (of type <code>String</code>):
- *   a url of component to be loaded </li>
+ *   a url of the component to be loaded </li>
  *  <li> <code>'FrameLoader.Frame'</code> <b>(optional)</b>
  *  (of type <code>com.sun.star.frame.XFrame</code>):
- *   a target frame where component to be loaded. If this
- *   relation is omitted then a text document created and its
+ *   a target frame where component is to be loaded. If this
+ *   relation is omitted then a text document is created and its
  *   frame is used. </li>
  * <ul> <p>
  *
@@ -61,7 +61,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
 
     /**
      * Retrieves all relations. If optional relation
-     * <code>FrameLoader.Frame</code> not found
+     * <code>FrameLoader.Frame</code> is not found,
      * creates a new document and obtains its frame for loading. <p>
      *
      * Also <code>MediaDescriptor</code> is created using
@@ -101,7 +101,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
                     (XURLTransformer.class, o) ;
 
             } catch ( com.sun.star.uno.Exception e ) {
-                // Some exception occurs.FAILED
+                // Some exception occurred. FAILED
                 e.printStackTrace( log );
                 throw new StatusException( "Couldn't create a document.", e );
             }
@@ -122,7 +122,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
 
 
     /**
-     * Tries to load component to a frame. <p>
+     * Tries to load a component into a frame. <p>
      * Has <b> OK </b> status if <code>true</code> is returned.
      */
     public void _load() {
@@ -132,7 +132,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
     }
 
     /**
-     * Tries to load component to a frame in separate thread to
+     * Tries to load component to a frame in a separate thread to
      * avoid blocking of the current thread and immediately
      * cancels loading. <p>
      *
diff --git a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java
index 0fe58a683209..022c49cbb7bd 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java
@@ -71,7 +71,7 @@ public class _XTransliteration extends MultiMethodTest {
     }
 
     /**
-    * Calls the method for load IGNORE_CASE module and checks the name returned
+    * Calls the method to load IGNORE_CASE module and checks the name returned
     * by the method <code>getName</code>. <p>
     * Has <b>OK</b> status if the method <code>getName</code> returns the
     * string "case ignore (generic)".
@@ -91,7 +91,7 @@ public class _XTransliteration extends MultiMethodTest {
      * Loads <code>LOWERCASE_UPPERCASE</code> module and checks the current
      * name of object. <p>
      *
-     * Has <b>OK</b> status if the name of the object is equals to
+     * Has <b>OK</b> status if the name of the object is equal to
      * 'lower_to_upper(generic)'
      */
     public void _loadModuleNew() {
@@ -109,7 +109,7 @@ public class _XTransliteration extends MultiMethodTest {
     }
 
     /**
-    * Calls the method for load LOWERCASE_UPPERCASE module and
+    * Calls the method to load LOWERCASE_UPPERCASE module and
     * checks the name returned by the method <code>getName</code>. <p>
     * Has <b>OK</b> status if the method <code>getName</code> returns the
     * string "lower_to_upper(generic)".
@@ -126,7 +126,7 @@ public class _XTransliteration extends MultiMethodTest {
     }
 
     /**
-    * Calls the method for load UPPERCASE_LOWERCASE module and
+    * Calls the method to load UPPERCASE_LOWERCASE module and
     * checks the name returned by the method <code>getName</code>. <p>
     * Has <b>OK</b> status if the method <code>getName</code> returns the
     * string "upper_to_lower(generic)".
@@ -276,10 +276,10 @@ public class _XTransliteration extends MultiMethodTest {
      * substrings, and without of bounds offset and length
      * parameters.<p>
      *
-     * Has <b>OK</b> status if comparings of equal substrings
-     * always return 0, if comparisons of none equal returns
+     * Has <b>OK</b> status if comparisons of equal substrings
+     * always return 0, if comparisons of non-equal returns
      * proper value according to lexicographical order and if
-     * comparisons with invalid parameters return none 0 value.
+     * comparisons with invalid parameters return non-zero value.
      */
     public void _compareSubstring() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
@@ -352,9 +352,9 @@ public class _XTransliteration extends MultiMethodTest {
      * Test performed for sets of equal strings and not equal
      * strings.<p>
      *
-     * Has <b>OK</b> status if comparings of equal strings
-     * always return 0 and if comparisons of none equal returns
-     * proper value according to lexicographical order .
+     * Has <b>OK</b> status if comparisons of equal strings
+     * always return 0 and if comparisons of non-equal returns
+     * proper value according to lexicographical order.
      */
     public void _compareString() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
diff --git a/qadevOOo/tests/java/mod/_stm/Pump.java b/qadevOOo/tests/java/mod/_stm/Pump.java
index 9f5bb1603e0c..5a4201992663 100644
--- a/qadevOOo/tests/java/mod/_stm/Pump.java
+++ b/qadevOOo/tests/java/mod/_stm/Pump.java
@@ -55,11 +55,11 @@ public class Pump extends TestCase {
     /**
     * Creating a TestEnvironment for the interfaces to be tested.
     * Creates an instance of the service <code>com.sun.star.io.Pump</code>.
-    * Settings up input and output streams for the created pump.
+    * Setting up input and output streams for the created pump.
     * Object relations created :
     * <ul>
     *  <li> <code>'InputStream'</code> for
-    *      {@link ifc.io._XActiveDataSource}(an input stream to set) </li>
+    *      {@link ifc.io._XActiveDataSink}(an input stream to set) </li>
     *  <li> <code>'OutputStream'</code> for
     *      {@link ifc.io._XActiveDataSource}(an output stream to set) </li>
     * </ul>
diff --git a/qadevOOo/tests/java/mod/_streams/uno/Pump.java b/qadevOOo/tests/java/mod/_streams/uno/Pump.java
index 7d22722bfc06..1a48285c26f4 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/Pump.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/Pump.java
@@ -55,11 +55,11 @@ public class Pump extends TestCase {
     /**
     * Creating a TestEnvironment for the interfaces to be tested.
     * Creates an instance of the service <code>com.sun.star.io.Pump</code>.
-    * Settings up input and output streams for the created pump.
+    * Setting up input and output streams for the created pump.
     * Object relations created :
     * <ul>
     *  <li> <code>'InputStream'</code> for
-    *      {@link ifc.io._XActiveDataSource}(an input stream to set) </li>
+    *      {@link ifc.io._XActiveDataSink}(an input stream to set) </li>
     *  <li> <code>'OutputStream'</code> for
     *      {@link ifc.io._XActiveDataSource}(an output stream to set) </li>
     * </ul>
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 2f6394fb5774..d74953512ffa 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -746,7 +746,7 @@ namespace
 {
     /**
      No separate error code if unicode to text conversion or getcwd fails because for the
-     caller there is no difference why a file could not be found in CDW
+     caller there is no difference why a file could not be found in CWD
     */
     bool find_in_CWD(const OUString& file_path, OUString& result)
     {
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 8679d6266876..e7d3ec62e8a5 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -54,9 +54,9 @@ extern "C"
 {
 #endif
 
-// common used string resource
-// these common used string will be used as assist resource in test
-// they are mostly OS independent, some of the resource can be reused
+// commonly used string resources
+// these commonly used strings will be used as assistant resources in test
+// they are mostly OS independent, some of the resources can be reused
 // so, a common test data repository will be better since it can be
 // shared among all test code
 
@@ -124,7 +124,7 @@ OUString aTempDirectoryURL(getTempDirectoryURL_());
 OUString aUserDirectorySys( aTempDirectorySys + "" );
 OUString aUserDirectoryURL( aTempDirectoryURL + "" );
 
-// common used URL:temp, canonical, root, relative, link,etc
+// commonly used URLs: temp, canonical, root, relative, link, etc.
 
 OUString aCanURL1( aTempDirectoryURL +  "/canonical.name" );
 OUString aCanURL2(
@@ -150,7 +150,7 @@ OUString aRelURL5( aTempDirectoryURL + "/./../"     );
 OUString aLnkURL1( aTempDirectoryURL + "/link.file" );
 OUString aHidURL1( u".hiddenfile"_ustr );
 
-// common used System Path:temp, root,etc
+// commonly used System Paths: temp, root, etc.
 
 OUString aRootSys( u"" TEST_PLATFORM_ROOT ""_ustr);
 OUString aSysPath1( aTempDirectorySys + "/system.path" );
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index a86ac5a10107..9bff514394ea 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -46,7 +46,7 @@ public:
     void create_002()
         {
             rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmInvalid, rtl_Cipher_ModeECB);
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provide wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provides wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
         }
     void create_003()
         {
@@ -61,7 +61,7 @@ public:
     void create_004()
         {
             rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmInvalid, rtl_Cipher_ModeCBC);
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provide wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provides wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
         }
     void create_005()
         {
@@ -72,17 +72,17 @@ public:
     void create_006()
         {
             rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmInvalid, rtl_Cipher_ModeStream);
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provide wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provides wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
         }
     void create_007()
         {
             rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeInvalid);
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provide wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provides wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
         }
     void create_008()
         {
             rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmInvalid, rtl_Cipher_ModeInvalid);
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provide wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provides wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
         }
 
     // Change the following lines only, if you add, remove or rename
@@ -134,7 +134,7 @@ public:
     void createBF_004()
         {
             rtlCipher aCipher = rtl_cipher_createBF(rtl_Cipher_ModeInvalid);
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provide wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("create provides wrong object.", static_cast<rtlCipher>(nullptr), aCipher);
             // rtl_cipher_destroy(aCipher);
         }
     // Change the following lines only, if you add, remove or rename
diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
index a6ae1fa38a50..7114c141766b 100644
--- a/sal/qa/rtl/crc32/rtl_crc32.cxx
+++ b/sal/qa/rtl/crc32/rtl_crc32.cxx
@@ -55,7 +55,7 @@ public:
 
         nCRC = rtl_crc32(nCRC, buf, num);
 
-        CPPUNIT_ASSERT_MESSAGE("buffer contain 2 empty bytes, crc is zero", nCRC != 0);
+        CPPUNIT_ASSERT_MESSAGE("buffer contains 2 empty bytes, crc is zero", nCRC != 0);
     }
 
     void rtl_crc32_002_1()
@@ -67,7 +67,7 @@ public:
 
         nCRC = rtl_crc32(nCRC, buf, num);
 
-        CPPUNIT_ASSERT_MESSAGE("buffer contain 3 empty bytes, crc is zero", nCRC != 0);
+        CPPUNIT_ASSERT_MESSAGE("buffer contains 3 empty bytes, crc is zero", nCRC != 0);
     }
 
     /**
@@ -93,7 +93,7 @@ public:
         CPPUNIT_ASSERT_MESSAGE("checksum should differ for buf1 and buf2", nCRC1 != nCRC2);
     }
 
-    /** check if the crc32 only use as much values, as given
+    /** check if the crc32 only uses as many values as given
      *
      */
     void rtl_crc32_003_1()
@@ -110,10 +110,10 @@ public:
 
         nCRC2 = rtl_crc32(nCRC2, buf2, num2);
 
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("checksum leave it's bounds", nCRC2, nCRC1);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("checksum leaves its bounds", nCRC2, nCRC1);
     }
 
-    /** check if the crc32 differ at same content in reverse order
+    /** check if the crc32 differs with same content in reverse order
      *
      */
     void rtl_crc32_003_2()
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 2244d98e3cc7..3c610d4bc6eb 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -238,7 +238,7 @@ public:
 
         if (!bClearSalt)
         {
-            // wilful contamination
+            // willful contamination
             pSaltData[0] = 1;
         }
 
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 569465c5701a..c0b74bf3de43 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -45,7 +45,7 @@ public:
     void getDefault_001()
     {
         rtl_Locale* pData = rtl_locale_getDefault();
-        CPPUNIT_ASSERT_MESSAGE("locale must not null", pData != nullptr);
+        CPPUNIT_ASSERT_MESSAGE("locale must not be null", pData != nullptr);
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -77,7 +77,7 @@ public:
     {
         rtl_locale_setDefault(u"en", u"US", u"");
         rtl_Locale* pData = rtl_locale_getDefault();
-        CPPUNIT_ASSERT_MESSAGE("locale must not null", pData != nullptr);
+        CPPUNIT_ASSERT_MESSAGE("locale must not be null", pData != nullptr);
 
         // be sure to not GPF
     }
diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx
index 862927f665d4..cb25d4920d33 100644
--- a/sal/qa/rtl/ostring/rtl_OString2.cxx
+++ b/sal/qa/rtl/ostring/rtl_OString2.cxx
@@ -237,7 +237,7 @@ public:
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.00000000001) == false);
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.000000000001) == false);
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.0000000000001) == false);
-            // we check til 14 values after comma
+            // we check till 14 values after comma
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.00000000000001) == true);
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.000000000000001) == true);
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.0000000000000001) == true);
@@ -475,7 +475,7 @@ public:
 
             sal_Bool bRes = check_replaceAt(new OString("Java desktop system"),
             new OString("Sun "), new OString("Java desktop system"), -4, 8 );
-            CPPUNIT_ASSERT_MESSAGE("navigate index", bRes == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("negative index", bRes == sal_True);
         }
     void replaceAt_005()
         {
@@ -501,8 +501,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::replaceAt);
 
 } // namespace rtl_OString
 
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
+// this macro creates an empty function, which will be called by RegisterAllFunctions()
+// to give the user the possibility to also register some functions by hand.
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index ce88bf866cda..00775c9f86cb 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -195,7 +195,7 @@ namespace rtl_str
     CPPUNIT_TEST(compare_003);
     CPPUNIT_TEST(compare_004);
     CPPUNIT_TEST_SUITE_END();
-    }; // class compare
+    }; // class shortenedCompareIgnoreAsciiCase_WithLength
 
     class hashCode : public CppUnit::TestFixture
     {
@@ -238,7 +238,7 @@ namespace rtl_str
         CPPUNIT_TEST(hashCode_002);
         CPPUNIT_TEST(hashCode_003);
         CPPUNIT_TEST_SUITE_END();
-    }; // class compare
+    }; // class hashCode
 
     class indexOfChar : public CppUnit::TestFixture
     {
@@ -283,7 +283,7 @@ namespace rtl_str
         CPPUNIT_TEST(indexOfChar_001);
         CPPUNIT_TEST(indexOfChar_002);
         CPPUNIT_TEST_SUITE_END();
-    }; // class compare
+    }; // class indexOfChar
 
     class lastIndexOfChar : public CppUnit::TestFixture
     {
@@ -374,7 +374,7 @@ namespace rtl_str
         CPPUNIT_TEST(indexOfStr_001);
         CPPUNIT_TEST(indexOfStr_002);
         CPPUNIT_TEST_SUITE_END();
-    }; // class compare
+    }; // class indexOfStr
 
     class lastIndexOfStr : public CppUnit::TestFixture
     {
@@ -489,7 +489,7 @@ namespace rtl_str
         CPPUNIT_TEST(replaceChar_WithLength_000);
         CPPUNIT_TEST(replaceChar_WithLength_001);
         CPPUNIT_TEST_SUITE_END();
-    }; // class replaceChar
+    }; // class replaceChar_WithLength
 
     class toAsciiLowerCase : public CppUnit::TestFixture
     {
@@ -515,7 +515,7 @@ namespace rtl_str
         CPPUNIT_TEST_SUITE(toAsciiLowerCase);
         CPPUNIT_TEST(toAsciiLowerCase_001);
         CPPUNIT_TEST_SUITE_END();
-    }; // class replaceChar
+    }; // class toAsciiLowerCase
 
     class toAsciiLowerCase_WithLength : public CppUnit::TestFixture
     {
@@ -548,7 +548,7 @@ namespace rtl_str
         CPPUNIT_TEST(toAsciiLowerCase_WithLength_000);
         CPPUNIT_TEST(toAsciiLowerCase_WithLength_001);
         CPPUNIT_TEST_SUITE_END();
-    }; // class replaceChar
+    }; // class toAsciiLowerCase_WithLength
 
     class toAsciiUpperCase : public CppUnit::TestFixture
     {
@@ -574,7 +574,7 @@ namespace rtl_str
         CPPUNIT_TEST_SUITE(toAsciiUpperCase);
         CPPUNIT_TEST(toAsciiUpperCase_001);
         CPPUNIT_TEST_SUITE_END();
-    }; // class replaceChar
+    }; // class toAsciiUpperCase
 
     class toAsciiUpperCase_WithLength : public CppUnit::TestFixture
     {
@@ -607,7 +607,7 @@ namespace rtl_str
         CPPUNIT_TEST(toAsciiUpperCase_WithLength_000);
         CPPUNIT_TEST(toAsciiUpperCase_WithLength_001);
         CPPUNIT_TEST_SUITE_END();
-    }; // class replaceChar
+    }; // class toAsciiUpperCase_WithLength
 
     class trim_WithLength : public CppUnit::TestFixture
     {
diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx
index 15a13d9ea814..b1d2f3c8f813 100644
--- a/sal/qa/rtl/ostring/rtl_string.cxx
+++ b/sal/qa/rtl/ostring/rtl_string.cxx
@@ -162,8 +162,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::getLength);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::newFromString);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::convertUStringToString);
 
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
+// this macro creates an empty function, which will be called by RegisterAllFunctions()
+// to give the user the possibility to also register some functions by hand.
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index ef4c4ae74f09..49dfbb8ce21e 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -276,7 +276,7 @@ public:
                 CPPUNIT_ASSERT (!is_double_equal(1.0, 1.00000000001));
                 CPPUNIT_ASSERT (!is_double_equal(1.0, 1.000000000001));
                 CPPUNIT_ASSERT (!is_double_equal(1.0, 1.0000000000001));
-                // we check til 15 values after comma
+                // we check till 15 values after comma
                 CPPUNIT_ASSERT (is_double_equal(1.0, 1.00000000000001));
                 CPPUNIT_ASSERT (is_double_equal(1.0, 1.000000000000001));
                 CPPUNIT_ASSERT (is_double_equal(1.0, 1.0000000000000001));
@@ -622,7 +622,7 @@ public:
         }
     void lastIndexOf_test_salunicode_offset_002()
         {
-            // search for 's', start pos is last occur from search behind, found (17)
+            // search for 's', start pos is last occurrence from search behind, found (17)
             sal_Unicode cuChar = L's';
             lastIndexOf_salunicode_offset(u"the sun sun java system"_ustr, cuChar, 17, 19);
         }
@@ -828,7 +828,7 @@ public:
 
     void intern()
     {
-        // The empty string is 'static' a special case ...
+        // The empty string is 'static', a special case ...
         OUString().intern();
         OUString::intern( "",strlen(""),RTL_TEXTENCODING_ASCII_US );
 
@@ -837,7 +837,7 @@ public:
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "string contents", u"foo"_ustr, aFooIntern);
         CPPUNIT_ASSERT_EQUAL_MESSAGE("string length", static_cast<sal_Int32>(3), aFooIntern.getLength());
         // We have to dup due to no atomic 'intern' bit-set operation
-        CPPUNIT_ASSERT_MESSAGE("intern dups", aFoo.pData != aFooIntern.pData);
+        CPPUNIT_ASSERT_MESSAGE("intern duplicates", aFoo.pData != aFooIntern.pData);
 
         // Test interning lots of things
         int i;