3 files changed, 81 insertions, 3 deletions
diff --git a/templates/short/alarm.vm b/templates/short/alarm.vm
index 15970dab8..effcb8f15 100644
--- a/templates/short/alarm.vm
+++ b/templates/short/alarm.vm
@@ -1,2 +1,80 @@
 #set($subject = "$device.name: alarm!")
-$device.name alarm: $position.getString("alarm") at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
+#set($alarmName = $position.getString("alarm"))
+#if(    $alarmName == "general")
+	#set($alarmName = "General")
+#elseif($alarmName == "sos")
+	#set($alarmName = "SOS")
+#elseif($alarmName == "vibration")
+	#set($alarmName = "Vibration")
+#elseif($alarmName == "movement")
+	#set($alarmName = "Movement")
+#elseif($alarmName == "lowspeed")
+	#set($alarmName = "Low Speed")
+#elseif($alarmName == "overspeed")
+	#set($alarmName = "Overspeed")
+#elseif($alarmName == "fallDown")
+	#set($alarmName = "Fall Down")
+#elseif($alarmName == "lowPower")
+	#set($alarmName = "Low Power")
+#elseif($alarmName == "lowBattery")
+	#set($alarmName = "Low Battery")
+#elseif($alarmName == "fault")
+	#set($alarmName = "Fault")
+#elseif($alarmName == "powerOff")
+	#set($alarmName = "Power Off")
+#elseif($alarmName == "powerOn")
+	#set($alarmName = "Power On")
+#elseif($alarmName == "door")
+	#set($alarmName = "Door")
+#elseif($alarmName == "lock")
+	#set($alarmName = "Lock")
+#elseif($alarmName == "unlock")
+	#set($alarmName = "Unlock")
+#elseif($alarmName == "geofence")
+	#set($alarmName = "Geofence")
+#elseif($alarmName == "geofenceEnter")
+	#set($alarmName = "Geofence Enter")
+#elseif($alarmName == "geofenceExit")
+	#set($alarmName = "Geofence Exit")
+#elseif($alarmName == "gpsAntennaCut")
+	#set($alarmName = "GPS Antenna Cut")
+#elseif($alarmName == "accident")
+	#set($alarmName = "Accident")
+#elseif($alarmName == "tow")
+	#set($alarmName = "Tow")
+#elseif($alarmName == "idle")
+	#set($alarmName = "Idle")
+#elseif($alarmName == "highRpm")
+	#set($alarmName = "High RPM")
+#elseif($alarmName == "hardAcceleration")
+	#set($alarmName = "Hard Acceleration")
+#elseif($alarmName == "hardBraking")
+	#set($alarmName = "Hard Braking")
+#elseif($alarmName == "hardCornering")
+	#set($alarmName = "Hard Cornering")
+#elseif($alarmName == "laneChange")
+	#set($alarmName = "Lane Change")
+#elseif($alarmName == "fatigueDriving")
+	#set($alarmName = "Fatigue Driving")
+#elseif($alarmName == "powerCut")
+	#set($alarmName = "Power Cut")
+#elseif($alarmName == "powerRestored")
+	#set($alarmName = "Power Restored")
+#elseif($alarmName == "jamming")
+	#set($alarmName = "Jamming")
+#elseif($alarmName == "temperature")
+	#set($alarmName = "Temperature")
+#elseif($alarmName == "parking")
+	#set($alarmName = "Parking")
+#elseif($alarmName == "bonnet")
+	#set($alarmName = "Bonnet")
+#elseif($alarmName == "footBrake")
+	#set($alarmName = "Foot Brake")
+#elseif($alarmName == "fuelLeak")
+	#set($alarmName = "Fuel Leak")
+#elseif($alarmName == "tampering")
+	#set($alarmName = "Tampering")
+#elseif($alarmName == "removing")
+	#set($alarmName = "Removing")
+#end
+$device.name alarm: $alarmName at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/queuedCommandSent.vm b/templates/short/queuedCommandSent.vm
new file mode 100644
index 000000000..67f031280
--- /dev/null
+++ b/templates/short/queuedCommandSent.vm
@@ -0,0 +1,2 @@
+#set($subject = "$device.name: queued command sent")
+Queued command sent to $device.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/unknown.vm b/templates/short/unknown.vm
deleted file mode 100644
index 2f9d5e3af..000000000
--- a/templates/short/unknown.vm
+++ /dev/null
@@ -1,2 +0,0 @@
-#set($subject = "Unknown type")
-Unknown type