Index: sources/view/valarmstatus.cpp
===================================================================
diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r5abbbc0d8019925283cc4b38c782afde9802aa35
--- sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision b798668f16ad0967ab97e96f5f9a2cdd821e899f)
+++ sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision 5abbbc0d8019925283cc4b38c782afde9802aa35)
@@ -81,27 +81,18 @@
     int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum));
     const char *key = mo->enumerator(enumIdx).valueToKey(vEnum);
     if (key)
-        return qPrintable(key);
-    else
+    {
+        Model::MAlarmStatus mData;
+        return mData.toText(vEnum);
+    } else
+    {
         return QString("ALARM_ID_UNDEFINED [%1]").arg(vEnum);
+    }
 }
 
 QString View::VAlarmStatus::text()
 {
-    QString text;
     if (alarm_AlarmID() != GuiAlarmID::ALARM_ID_NO_ALARM)
-        text = alarmIDText (static_cast<GuiAlarmID>(alarm_AlarmID())) + " , " +
-                 FSN(alarm_EscalateIn       ())                       + " , " +
-                 FSN(alarm_MuteTimeout      ())                + " ["+
-                (alarm_Flag_systemFault     ()   ? "1" : "0" ) + " " +
-                (alarm_Flag_stop            ()   ? "1" : "0" ) + " " +
-                (alarm_Flag_noClear         ()   ? "1" : "0" ) + " " +
-                (alarm_Flag_noResume        ()   ? "1" : "0" ) + " " +
-                (alarm_Flag_noRinseback     ()   ? "1" : "0" ) + " " +
-                (alarm_Flag_noEndTreatment  ()   ? "1" : "0" ) + " " +
-                (alarm_Flag_noNewTreatment  ()   ? "1" : "0" ) + " " +
-                (alarm_Flag_bypassDialyzer  ()   ? "1" : "0" ) + " " +
-                (alarm_Flag_alarmsToEscalate()   ? "1" : "0" ) + " " +
-                (alarm_Flag_alarmsSilenced  ()   ? "1" : "0" ) + "]" ;
-    return text;
+        return alarmIDText(static_cast<GuiAlarmID>(alarm_AlarmID()));
+    return "No Alarm";
 }