Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r465a935949a85d3d1bebd11979737ff38ef96122 -rc81638f15702e8a1f7c58c07e7f1642d158b5f15
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 465a935949a85d3d1bebd11979737ff38ef96122)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision c81638f15702e8a1f7c58c07e7f1642d158b5f15)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      11-Aug-2022                                                        
+ * \date    (last)      15-Aug-2022                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *                                                                                 
@@ -47,8 +47,8 @@
 /*0011*/case GuiAlarmID::ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP              : { result = QObject::tr("HD dialysate temperature below target temperature."                                                                                          ); break; } /*  11*/
 /*0012*/case GuiAlarmID::ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED                    : { result = QObject::tr("HD firmware image integrity POST test failed."                                                                                               ); break; } /*  12*/
 /*0013*/case GuiAlarmID::ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED                    : { result = QObject::tr("DG firmware image integrity POST test failed."                                                                                               ); break; } /*  13*/
-/*0014*/case GuiAlarmID::ALARM_ID___AVAILABLE_1                                    : { result = QObject::tr("Not used."                                                                                                                                   ); break; } /*  14*/
-/*0015*/case GuiAlarmID::ALARM_ID___AVAILABLE_2                                    : { result = QObject::tr("Not used."                                                                                                                                   ); break; } /*  15*/
+/*0014*/case GuiAlarmID::ALARM_ID_DG_INVALID_USAGE_RECORD                          : { result = QObject::tr("DG invalid usage record CRC."                                                                                                                ); break; } /*  14*/
+/*0015*/case GuiAlarmID::ALARM_ID_HD_INVALID_USAGE_RECORD                          : { result = QObject::tr("HD invalid usage record CRC."                                                                                                                ); break; } /*  15*/
 /*0016*/case GuiAlarmID::ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE                 : { result = QObject::tr("HD alarm audio failed POST."                                                                                                                 ); break; } /*  16*/
 /*0017*/case GuiAlarmID::ALARM_ID_HD_UI_POST_FAILED                                : { result = QObject::tr("HD UI POST failed."                                                                                                                          ); break; } /*  17*/
 /*0018*/case GuiAlarmID::ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD           : { result = QObject::tr("DG load cells invalid calibration record."                                                                                                   ); break; } /*  18*/
@@ -136,9 +136,9 @@
 /*0100*/case GuiAlarmID::ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT                     : { result = QObject::tr("HD no cartridge self-test timeout."                                                                                                          ); break; } /* 100*/
 /*0101*/case GuiAlarmID::ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT                         : { result = QObject::tr("HD dry self-test timeout."                                                                                                                   ); break; } /* 101*/
 /*0102*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANAGE        : { result = QObject::tr("DG heat disinfect temperature gradient out of range."                                                                                        ); break; } /* 102*/
-/*0103*/case GuiAlarmID::ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID       : { result = QObject::tr("HD non-volatile calibration group invalid record CRC."                                                                                       ); break; } /* 103*/
+/*0103*/case GuiAlarmID::ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID       : { result = QObject::tr("HD invalid calibration CRC."                                                                                                                 ); break; } /* 103*/
 /*0104*/case GuiAlarmID::ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS                          : { result = QObject::tr("Air trap level sensors reporting illegal combination of air/fluid."                                                                          ); break; } /* 104*/
-/*0105*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID       : { result = QObject::tr("DG non-volatile system group invalid record CRC."                                                                                            ); break; } /* 105*/
+/*0105*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID       : { result = QObject::tr("DG invalid calibration CRC."                                                                                                                 ); break; } /* 105*/
 /*0106*/case GuiAlarmID::ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD      : { result = QObject::tr("DG dialysate flow sensor invalid calibration record."                                                                                        ); break; } /* 106*/
 /*0107*/case GuiAlarmID::ALARM_ID_DG_RESTARTED_FAULT                               : { result = QObject::tr("HD reports DG restarted fault."                                                                                                              ); break; } /* 107*/
 /*0108*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR                        : { result = QObject::tr("HD syringe pump ADC error."                                                                                                                  ); break; } /* 108*/