Index: Alarms/Alarms.conf
===================================================================
diff -u -ra0b3e71e3bb0ba51509b2370dbd9b20e4e526af5 -rf24ecf486ae12326e176bc88b3fe7f956111388f
--- Alarms/Alarms.conf	(.../Alarms.conf)	(revision a0b3e71e3bb0ba51509b2370dbd9b20e4e526af5)
+++ Alarms/Alarms.conf	(.../Alarms.conf)	(revision f24ecf486ae12326e176bc88b3fe7f956111388f)
@@ -59,12 +59,12 @@
 [10]
 Title   = 
 Message = 
- = ALARM_ID_HD_BLOOD_LEAK_FAULT
+ = ALARM_ID_HD___AVAILABLE_7
 
 [11]
 Title   = 
 Message = 
- = ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE
+ = ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP
 
 [12]
 Title   = Self Test Error
@@ -79,12 +79,12 @@
 [14]
 Title   = 
 Message = 
- = ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION
+ = ALARM_ID___AVAILABLE_1
 
 [15]
 Title   = 
 Message = 
- = ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION
+ = ALARM_ID___AVAILABLE_2
 
 [16]
 Title   = Self Test Error
@@ -104,7 +104,7 @@
 [19]
 Title   = Calibration Error
 Message = Call service to schedule a repair.
-DG flow sensors invalid calibration record = ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD
+DG flow sensors invalid calibration record = ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP
 
 [20]
 Title   = Calibration Error
@@ -152,12 +152,12 @@
 [27]
 Title   = 
 Message = 
- = ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD
+ = ALARM_ID_HD___AVAILABLE_3
 
 [28]
 Title   = 
 Message = 
- = ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD
+ = ALARM_ID_HD___AVAILABLE_4
 
 [29]
 Title   = Calibration Error
@@ -385,12 +385,12 @@
 [72]
 Title   = 
 Message = 
- = ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE
+ = ALARM_ID_HD___AVAILABLE_5
 
 [73]
 Title   = 
 Message = 
- = ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE
+ = ALARM_ID_HD___AVAILABLE_6
 
 [74]
 Title   = Self Test Error
@@ -800,12 +800,12 @@
 [155]
 Title   = 
 Message = 
- = ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE
+ = ALARM_ID_HD___AVAILABLE_9
 
 [156]
 Title   = 
 Message = 
- = ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT
+ = ALARM_ID_HD___AVAILABLE_10
 
 [157]
 Title   = 
@@ -905,7 +905,7 @@
 [176]
 Title   = 
 Message = 
-// TODO remove this alarm         HD active reservoir is full during treatment and DG not ready to switch reservoirs. = ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH
+// TODO remove this alarm         HD active reservoir is full during treatment and DG not ready to switch reservoirs. = ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE
 
 [177]
 Title   = Machine Error
@@ -990,7 +990,7 @@
 [193]
 Title   = 
 Message = 
- = ALARM_ID__AVAILABLE_13
+ = ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE
 
 [194]
 Title   = RO Pump Error
@@ -1190,7 +1190,7 @@
 [233]
 Title   = 
 Message = 
- = ALARM_ID__AVAILABLE_8
+ = ALARM_ID_DG_BAROMETRIC_SENSOR_COEFFS_BAD_CRC
 
 [234]
 Title   = Communication Failure
@@ -1344,7 +1344,7 @@
 
 [264]
 Title   = Machine Error
-Message = Call service to schedule a repair.
+Message = Power cycle the system.\nCall service to schedule a repair if problem persist.
 UI POST SD-Card failure = ALARM_ID_UI_POST_FAILURE_SDCARD
 
 [265]