Index: sources/storage/FileHandler.cpp
===================================================================
diff -u -r0c983aea7de7480e86739469f5a64ad18b244634 -r79e076cece4ba503be6c3834eb68d1e5cb1b882f
--- sources/storage/FileHandler.cpp	(.../FileHandler.cpp)	(revision 0c983aea7de7480e86739469f5a64ad18b244634)
+++ sources/storage/FileHandler.cpp	(.../FileHandler.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
@@ -42,7 +42,7 @@
 {
     static uint count;
     static QString mCritical;
-    // coco begin validated : This has been manually test. Needs file system access to produce errors for hundred times.
+    // disabled coco begin validated : This has been manually test. Needs file system access to produce errors for hundred times.
     if (mCritical != vMessage || !(count % 1000)) {
         // coco end
         count = 0;
@@ -72,7 +72,7 @@
     QFile::OpenMode openMode = vAppend            ?
                     QFile::Text | QFile::Append   :
                     QFile::Text | QFile::WriteOnly;
-    // coco begin validated : This has been manually test. Needs file system access to make file the way it cannot be opened for writing.
+    // disabled coco begin validated : This has been manually test. Needs file system access to make file the way it cannot be opened for writing.
     if (! file.open(openMode)) {
         QString   msg = QString("Cannot open file for write (%1). Possible corrupted file system.").arg(vFileName);
         // here cannot use LOG_XXXX because if the folder cannot be created then the log cannot be written.
@@ -144,7 +144,7 @@
  */
 int FileHandler::copyFolder(const QString &vSource, const QString &vDestination)
 {
-    // coco begin validated: This needs user interaction to export to USB device
+    // disabled coco begin validated: This needs user interaction to export to USB device
     // has been tested manually since currently it is the only place it has been used.
     QString cmd = "cp";
     QStringList arguments;
@@ -164,7 +164,7 @@
  */
 int FileHandler::moveFolder(const QString &vSource, const QString &vDestination)
 {
-    // coco begin validated: This needs user interaction to check the file system
+    // disabled coco begin validated: This needs user interaction to check the file system
     // has been tested manually since currently it is the only place it has been used.
     QString cmd = "mv";
     QStringList arguments;
@@ -185,7 +185,7 @@
  */
 int FileHandler::removeFolder(const QString &vFolder)
 {
-    // coco begin validated: This needs user interaction to check the file system
+    // disabled coco begin validated: This needs user interaction to check the file system
     // has been tested manually since currently it is the only place it has been used.
     QString cmd = "rm";
     QStringList arguments;
@@ -214,7 +214,7 @@
         for (const auto &info : infoList) {
             QDateTime fileTime = info.lastModified();
             QString   fileName = info.absoluteFilePath();
-            // coco begin validated : This has been manually tested since requires to change in file system to reproduce the error.
+            // disabled coco begin validated : This has been manually tested since requires to change in file system to reproduce the error.
             if (fileTime.isValid()) {
                 if (fileTime.date() <= vDateOlderThan) {
                     if (QFile::remove(fileName)) {
@@ -263,7 +263,7 @@
  */
 bool FileHandler::isMounted(const QString &vPath, bool *vIsReadOnly)
 {
-    // coco begin validated: Needed User Interaction to make the device not ready so tested manually
+    // disabled coco begin validated: Needed User Interaction to make the device not ready so tested manually
     bool mounted = false;
     // removing the extra '/' from the vPath if there is to be able to compare to the root path of the storage
     QString path = vPath.trimmed();
@@ -302,7 +302,7 @@
  *          if vRetainPercent is used then it contains list of the file(s) to be removed.
  */
 QFileInfoList FileHandler::find(const QString &vPath, QStringList vNameFilters, quint8 vRetainPercent) {
-    // coco begin validated: Manually tested. Needs to fill up the storage to test some functionalities like vRetainPercent
+    // disabled coco begin validated: Manually tested. Needs to fill up the storage to test some functionalities like vRetainPercent
 
     QFileInfoList fileInfoList;
     // if all the files need to retain then no file shall be listed in the remove list.
@@ -377,7 +377,7 @@
  *          if vRetainPercent is used then it contains list of the file(s) to be removed.
  */
 QFileInfoList FileHandler::find(const QString &vPath, QStringList vNameFilters) {
-    // coco begin validated: Needs to manually create specific folder with specific files to check the functionality
+    // disabled coco begin validated: Needs to manually create specific folder with specific files to check the functionality
     // manually tested
     QFileInfoList fileInfoList;
     QDir dir(vPath);
@@ -396,7 +396,7 @@
 // coco end
 
 quint64 FileHandler::totalSize(const QFileInfoList &vFileInfoList) {
-    // coco begin validated: Manually tested. requires list of files on file system to test and requires manual specific files for test.
+    // disabled coco begin validated: Manually tested. requires list of files on file system to test and requires manual specific files for test.
     quint64 total = 0;
     for (auto it = vFileInfoList.crbegin(); it != vFileInfoList.crend(); ++it) {
         total += it->size();