Index: sources/view/settings/VBluetooth.cpp
===================================================================
diff -u -re8262d170bb94046ddb767074a31530bdf4a2319 -r1d6adeff8df4dc9395d6a2aee3c7f33d903c4711
--- sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision e8262d170bb94046ddb767074a31530bdf4a2319)
+++ sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision 1d6adeff8df4dc9395d6a2aee3c7f33d903c4711)
@@ -114,12 +114,12 @@
     }
 
     // TODO: re-evaluate the states for the scan button enable/disable.
-    // scanEnabled(state == MBluetooth::eIS_Idle               ||
-    //             state == MBluetooth::eIS_Scan_Done          ||
-    //             state == MBluetooth::eIS_Scan_NotFound      ||
-    //             state == MBluetooth::eIS_Device_Error       ||
-    //             state == MBluetooth::eIS_Device_Waiting
-    //             );
+    // scanEnabled(state == MBluetooth::eIS_Idle
+    //          || state == MBluetooth::eIS_Scan_Done
+    //          || state == MBluetooth::eIS_Scan_NotFound
+    //          || state == MBluetooth::eIS_Device_Error
+    //          || state == MBluetooth::eIS_Device_Waiting
+    //          );
 
     switch (state) {
     // The device name is not always available and the interface may be in investigation.
@@ -257,7 +257,7 @@
     case MBluetooth::eIS_Device_Init            : message = tr("Device Initializing ..."                ); break;
     case MBluetooth::eIS_Device_Error_Init      : message = tr("Device Initialization Error"            ); break;
     case MBluetooth::eIS_Device_Start           : message = tr("Device Connecting ..."                  ); break;
-    case MBluetooth::eIS_Device_Waiting         : message = tr("Device Ready For Measurement ..."       ); break; // received feedback and changed the "Waiting" to this to avoid user confusion.
+    case MBluetooth::eIS_Device_Waiting         : message = tr("Device Waiting To Connect ..."          ); break; // received feedback and changed the "Waiting" to this to avoid user confusion.
     case MBluetooth::eIS_Device_Error           : message = tr("Device Connection Error"                ); break;
     case MBluetooth::eIS_Device_Connect         : message = tr("Device Connected"                       ); break;
     case MBluetooth::eIS_Device_Done            : message = tr("Device Clean Up"                        ); break;