Index: shared/scripts/configuration/strings.py
===================================================================
diff -u -rdd182e384d5248240f343cc4855ff292ba5e4ee3 -r6052b7abfc1d50f6c952a4e12a9bc86c2c5f6e04
--- shared/scripts/configuration/strings.py	(.../strings.py)	(revision dd182e384d5248240f343cc4855ff292ba5e4ee3)
+++ shared/scripts/configuration/strings.py	(.../strings.py)	(revision 6052b7abfc1d50f6c952a4e12a9bc86c2c5f6e04)
@@ -17,15 +17,12 @@
 PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "Ultrafiltration" , "BP/HR" , "Connection" , "Start"]
 POST_TREATMENT_SCREENS = ["Disconnection", "Review", "Disposables", "Disinfection"]  
 
-<<<<<<< HEAD
 BLOOD_PRIMING_TEXT = "Blood Priming"
 SALINE_UNIT = "mL"
-BLOOD_PRIMING_UNIT = "mL" 
+BLOOD_PRIMING_UNIT = "mL"
 BLOOD_PRIMING_VALUE_0 = "0"
-BLOOD_PRIMING_DEFAULT_VALUE = BLOOD_PRIMING_VALUE_0 + BLOOD_PRIMING_UNIT
+BLOOD_PRIMING_DEFAULT_VALUE = BLOOD_PRIMING_VALUE_0 + " " + BLOOD_PRIMING_UNIT
 
-=======
->>>>>>> 993645b00fe6db65799c8d8c93bfd2b864cb2d37
 #UF treatment 
 ULTRAFILTRATION_PAUSED_TEXT = "Ultrafiltration Paused"
 RESUME_TEXT = "RESUME ULTRAFILTRATION"
@@ -40,9 +37,6 @@
 #Blood Priming
 BLOOD_PRIMING_TEXT = "Blood Priming"
 SALINE_UNIT = "mL"
-BLOOD_PRIMING_UNIT = "mL"
-BLOOD_PRIMING_VALUE_0 = "0"
-BLOOD_PRIMING_DEFAULT_VALUE = BLOOD_PRIMING_VALUE_0 + BLOOD_PRIMING_UNIT
 ACK_REQ_STATUS = 'Ack Req'
 ACK_BAK_STATUS = 'Ack Bak'
 
@@ -525,7 +519,9 @@
 FLOW_UNIT = "mL/min"
 BLOOD_FLOW_TEXT = "blood"
 DIALYSATE_FLOW_TEXT = "dialysate"
- 
+
+LIQUID_UNIT = "mL"
+
 #tst_treatment_monitoring
 FLOWS_TEXT = "FLOWS"
 BLOOD_UNIT = "mL/min"
@@ -975,6 +971,53 @@
 BLOOD_PRESSURE_UNIT = "mmHg"
 HEART_RATE_UNIT = "BPM"
 
-BLOOD_PRIMING_UNIT = "mL"
-BLOOD_PRIMING_VALUE_0 = "0"
-BLOOD_PRIMING_DEFAULT_VALUE = BLOOD_PRIMING_VALUE_0 + BLOOD_PRIMING_UNIT
+HEPARIN_TEXT = "HEPARIN"
+VOLUME_DELIVERED = "Volume Delivered"
+
+
+#main-treatment heparin 
+HEPARIN_UNIT = "mL"
+HEPARIN_DELIVERY_TEXT = "HEPARIN DELIVERY"
+HEPARIN_DELIVERY_OFF_TEXT = "OFF"
+HEPARIN_STOP_TEXT = "Delivery Stopped"
+HEPARIN_RESUME_DELIVERY_TEXT = "RESUME DELIVERY"
+HEPARIN_BOLUS_ACTIVE_TEXT = "Bolus Active" 
+HEPARIN_PAUSE_DELIVERY_TEXT = "PAUSE DELIVERY"
+HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT = "Maximum Cumulative Heparin Volume Delivered"
+HEPARIN_SYRINGE_EMPTY_TEXT = "Syringe Empty"
+
+#Time_Duration
+CREATE_TREATMENT_PARAMETERS = ["Blood Flow Rate", "Dialysate Flow Rate", "Duration","Heparin Dispensing Rate",
+                              "Heparin Bolus Volume","Heparin Stop Time", "Saline Bolus","Dialysate Temperature","Blood Pressure Measurement Interval",
+                              "Rinseback Flow Rate"]
+TREATMENT_PAUSED_TEXT = "Treatment Paused"
+
+PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "Ultrafiltration" , "BP/HR" , "Connection" , "Start"]  
+
+
+CONSUMABLE_SELF_TEST_TEXT = "Consumables Self Test"
+BICARB_PUMP_CHECK_TEXT = "BiCarb Pump Check"
+ACID_PUMP_CHECK_TEXT = "Acid Pump Check"
+SELF_TEST_COMPLETE_TEXT = "Self Test Complete!"
+BUSY = "Busy"
+CHECK = "Check"
+BEGIN_PRIME_TITLE = "Begin Prime"
+PRIMING_TITLE = "Priming"
+SYSTEM_SELF_TEST_TITLE = "System Self Test"
+FILTER_FLUSH_TITLE = "Filter Flush"
+
+#Pre-Treatment Disposables
+NEXT_BUTTON_TEXT = "NEXT"
+BACK_BUTTON_TEXT = "BACK"
+CONFIRM_BUTTON_TEXT = "CONFIRM"
+
+
+#Pre_treatment_water_sample
+SAMPLE_TEXT = "Sample"
+CREATE_TEXT = "Create"
+NEXT_BUTTON_TEXT = "NEXT"
+WATER_SAMPLE_BUTTON_TEXT = "WATER  SAMPLE"
+BACK_BUTTON_TEXT = "BACK"
+PASS_TEXT = "PASS"
+FAIL_TEXT = "FAIL"
+OK_TEXT = "OK"