Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -rc1bf1899a0b9c8a079e8c341fc4134e6f419dce4 -r844261255eaf89e3b1e7b54e970a8d69730a8d4c
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision c1bf1899a0b9c8a079e8c341fc4134e6f419dce4)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 844261255eaf89e3b1e7b54e970a8d69730a8d4c)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      01-Sep-2022                                                        
+ * \date    (last)      06-Sep-2022                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *                                                                                 
@@ -47,7 +47,7 @@
 /*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_DG_INVALID_USAGE_RECORD                              : { result = QObject::tr("DG invalid usage record CRC."                                                                                                                ); break; } /*  14*/
+/*0014*/case GuiAlarmID::ALARM_ID_DG_INVALID_USAGE_RECORD_CRC                          : { 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*/
@@ -332,7 +332,9 @@
 /*0296*/case GuiAlarmID::ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT                            : { result = QObject::tr("DG TDi sensors FPGA fault."                                                                                                                  ); break; } /* 296*/
 /*0297*/case GuiAlarmID::ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT                            : { result = QObject::tr("DG TRo sensors FPGA fault."                                                                                                                  ); break; } /* 297*/
 /*0298*/case GuiAlarmID::ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT                            : { result = QObject::tr("DG baro sensor FPGA fault."                                                                                                                  ); break; } /* 298*/
-/*0299*/case GuiAlarmID::NUM_OF_ALARM_IDS                                              : { result = QObject::tr("Total number of alarms."                                                                                                                     ); break; } /* 299*/
+/*0299*/case GuiAlarmID::ALARM_ID_DG_DISINFECT_HAS_BEEN_EXPIRED                        : { result = QObject::tr("DG disinfect has been expired."                                                                                                              ); break; } /* 299*/
+/*0300*/case GuiAlarmID::ALARM_ID_DG_SERIVCE_TIME_INTERVAL_HAS_ELAPSED                 : { result = QObject::tr("DG service time interval has elapsed."                                                                                                       ); break; } /* 300*/
+/*0301*/case GuiAlarmID::NUM_OF_ALARM_IDS                                              : { result = QObject::tr("Total number of alarms."                                                                                                                     ); break; } /* 301*/
                                                                                    
     default:                                                                       
         result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));