Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r6ea9e90a8da8e207dada0d9a22b2d9523a95fe10 -rfe28eeae194ab09dfe2a9604206fd0b784f2c460
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 6ea9e90a8da8e207dada0d9a22b2d9523a95fe10)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision fe28eeae194ab09dfe2a9604206fd0b784f2c460)
@@ -183,14 +183,14 @@
 /*0147*/case GuiAlarmID::ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT                   : { result = QObject::tr("DG dialysate generation conductivity fault alarm."                                                                                           ); break; } /* 147*/
 /*0148*/case GuiAlarmID::ALARM_ID_INLET_WATER_HIGH_TEMPERATURE                   : { result = QObject::tr("Inlet water temperature too high."                                                                                                           ); break; } /* 148*/
 /*0149*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_TEMPERATURE                    : { result = QObject::tr("Inlet water temperature too low."                                                                                                            ); break; } /* 149*/
-/*0150*/case GuiAlarmID::ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY                  : { result = QObject::tr("Inlet water conductivity too high."                                                                                                          ); break; } /* 150*/
+/*0150*/case GuiAlarmID::ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE      : { result = QObject::tr("Inlet water conductivity is in warning range."                                                                                               ); break; } /* 150*/
 /*0151*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY                   : { result = QObject::tr("Inlet water conductivity too low."                                                                                                           ); break; } /* 151*/
 /*0152*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_PRESSURE                       : { result = QObject::tr("Inlet water pressure too low."                                                                                                               ); break; } /* 152*/
 /*0153*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_HIGH                           : { result = QObject::tr("HD prime completed high priority alarm."                                                                                                     ); break; } /* 153*/
 /*0154*/case GuiAlarmID::ALARM_ID_NVDATA_EEPROM_OPS_FAILURE                      : { result = QObject::tr("EEPROM operations (read, write, erase) failure."                                                                                             ); break; } /* 154*/
 /*0155*/case GuiAlarmID::ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC                : { result = QObject::tr("DG software configuration record invalid CRC."                                                                                               ); break; } /* 155*/
 /*0156*/case GuiAlarmID::ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR                 : { result = QObject::tr("HW usage data (treatment time in HD and total consumed water in DG) failure."                                                                ); break; } /* 156*/
-/*0157*/case GuiAlarmID::ALARM_ID____AVAILABLE_23                                : { result = QObject::tr("This alarm ID is available for use."                                                                                                         ); break; } /* 157*/
+/*0157*/case GuiAlarmID::ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE           : { result = QObject::tr("Inlet water temperature is not within specified range."                                                                                      ); break; } /* 157*/
 /*0158*/case GuiAlarmID::ALARM_ID____AVAILABLE_24                                : { result = QObject::tr("This alarm ID is available for use."                                                                                                         ); break; } /* 158*/
 /*0159*/case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK         : { result = QObject::tr("Dialysate inlet pump failed flow vs motor speed check."                                                                                      ); break; } /* 159*/
 /*0160*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH                : { result = QObject::tr("Blood pump rotor speed too high."                                                                                                            ); break; } /* 160*/