Index: en_US.udic
===================================================================
diff -u -r7b34653589ba6e4f4705fb4026fcd9319c41c352 -r1d6adeff8df4dc9395d6a2aee3c7f33d903c4711
--- en_US.udic	(.../en_US.udic)	(revision 7b34653589ba6e4f4705fb4026fcd9319c41c352)
+++ en_US.udic	(.../en_US.udic)	(revision 1d6adeff8df4dc9395d6a2aee3c7f33d903c4711)
@@ -200,3 +200,4 @@
 vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 dialyzer
 deviceID
+reconnection
Index: sources/bluetooth/BluetoothInterface.cpp
===================================================================
diff -u -rbefa8e7e7667c4aa5193022bd80e9f52c2374ad0 -r1d6adeff8df4dc9395d6a2aee3c7f33d903c4711
--- sources/bluetooth/BluetoothInterface.cpp	(.../BluetoothInterface.cpp)	(revision befa8e7e7667c4aa5193022bd80e9f52c2374ad0)
+++ sources/bluetooth/BluetoothInterface.cpp	(.../BluetoothInterface.cpp)	(revision 1d6adeff8df4dc9395d6a2aee3c7f33d903c4711)
@@ -528,6 +528,7 @@
         return;
     }
 
+    _tryingrepairActive = true;
     // Notify the View that it is a new scan so clean up the list, and update screen status.
     NOTIFY_SCAN_START
 
@@ -545,9 +546,6 @@
     data.addr = vData.mAddr;
     data.name = vData.mName;
     onDeviceSelect(data);
-
-    // set the flag for the re-connection timer.
-    _reconnectionActive = true;
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -574,6 +572,9 @@
  */
 void BluetoothInterface::onDeviceError(QLowEnergyController::Error vError)
 {
+    // if the device is trying to connect to the previously paired device and the device was not on at this moment it should go to the reconnection state.
+    if ( _tryingrepairActive ) _reconnectionActive = true;
+
     // if reconnect is active it should display "Device Connecting ..." and shouldn't display the "Connection Error",
     // because we know we will always get the error since we are trying to connected to a device which is probably off.
     if ( ! _reconnectionActive )
Index: sources/bluetooth/BluetoothInterface.h
===================================================================
diff -u -r47c8f13876317ba36500400f894d96c9bce9eb17 -r1d6adeff8df4dc9395d6a2aee3c7f33d903c4711
--- sources/bluetooth/BluetoothInterface.h	(.../BluetoothInterface.h)	(revision 47c8f13876317ba36500400f894d96c9bce9eb17)
+++ sources/bluetooth/BluetoothInterface.h	(.../BluetoothInterface.h)	(revision 1d6adeff8df4dc9395d6a2aee3c7f33d903c4711)
@@ -73,6 +73,7 @@
     QBluetoothDeviceInfo            _temp                                   ;
     quint8                          _tempBatt                   = 0         ;
 
+    bool                            _tryingrepairActive         = false     ;
     bool                            _reconnectionActive         = false     ;
     const quint16                   _interval                   = 1000      ; // the interface timer base interval in mSec
 
Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml
===================================================================
diff -u -rbefa8e7e7667c4aa5193022bd80e9f52c2374ad0 -r1d6adeff8df4dc9395d6a2aee3c7f33d903c4711
--- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision befa8e7e7667c4aa5193022bd80e9f52c2374ad0)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 1d6adeff8df4dc9395d6a2aee3c7f33d903c4711)
@@ -42,14 +42,14 @@
         readonly property string textOff            : qsTr("OFF")
         readonly property string textPause          : qsTr("PAUSE DELIVERY")
         readonly property string textResume         : qsTr("RESUME DELIVERY")
-        readonly property string textComplete       : qsTr("COMPLETE")
+        readonly property string textComplete       : qsTr("OFF")
         readonly property string textVolumeTarget   : "(" + valueTarget + unit + ")"
         readonly property string mesgCompleted      : qsTr("Maximum Cumulative Heparin Volume Delivered")
         readonly property string mesgBolus          : qsTr("Bolus Active")
         readonly property string mesgEmpty          : qsTr("Syringe Empty")
         readonly property string mesgOff            : qsTr("") // it is redundant since the button text is now display OFF
         readonly property string mesgStopped        : qsTr("Delivery Stopped")
-        readonly property string mesgDispensing     : qsTr("Delivery Active")
+        readonly property string mesgDispensing     : qsTr("Dispensing Active")
         readonly property string mesgRejectReason   : vTreatmentAdjustmentHeparin.adjustment_ReasonText
     }
 
Index: sources/view/settings/VBluetooth.cpp
===================================================================
diff -u -rbefa8e7e7667c4aa5193022bd80e9f52c2374ad0 -r1d6adeff8df4dc9395d6a2aee3c7f33d903c4711
--- sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision befa8e7e7667c4aa5193022bd80e9f52c2374ad0)
+++ sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision 1d6adeff8df4dc9395d6a2aee3c7f33d903c4711)
@@ -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;