Semantic tags: Apply description texts for Point/Property/Equipment (#4750)

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch> Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com>
2026-07-29 12:34:22 +02:00 · 2025-05-18 18:03:30 +02:00
parent d346509a2a
commit c4c2c4c431
3 changed files with 227 additions and 153 deletions
@@ -35,18 +35,18 @@ Location,Garden,Outdoor,Garden,Gardens,
 Location,Patio,Outdoor,Patio,Patios,
 Location,Porch,Outdoor,Porch,Porches,
 Location,Terrace,Outdoor,Terrace,"Terraces, Deck, Decks",
-Point,Alarm,,Alarm,,
-Point,Calculation,,Calculation,,
-Point,Control,,Control,,
-Point,Switch,Control,Switch,,
-Point,Forecast,,Forecast,,
-Point,Measurement,,Measurement,,
-Point,Setpoint,,Setpoint,,
-Point,Status,,Status,,
+Point,Alarm,,Alarm,,Read only data point indicating an alarm condition
+Point,Calculation,,Calculation,,Read only analog calculated data point
+Point,Control,,Control,,Read-Write analog data point
+Point,Switch,Control,Switch,,Read-Write digital data point
+Point,Forecast,,Forecast,,Read only analog predicted data point
+Point,Measurement,,Measurement,,Read only analog data point from a sensor
+Point,Setpoint,,Setpoint,,Read-Write analog data point for a controller
+Point,Status,,Status,,Read only data point indicating a status condition
 Property,AirQuality,,Air Quality,,
-Property,AQI,AirQuality,AQI,Air Quality Index,
-Property,CO,AirQuality,CO,Carbon Monoxide,
-Property,CO2,AirQuality,CO2,Carbon Dioxide,
+Property,AQI,AirQuality,AQI,Air Quality Index,Air Quality Index
+Property,CO,AirQuality,CO,Carbon Monoxide,Carbon monoxide
+Property,CO2,AirQuality,CO2,Carbon Dioxide,Carbon dioxide
 Property,Ozone,AirQuality,Ozone,,
 Property,ParticulateMatter,AirQuality,Particulate Matter,PM25,
 Property,Pollen,AirQuality,Pollen,,
@@ -55,76 +55,76 @@ Property,VOC,AirQuality,VOC,Volatile Organic Compounds,
 Property,Airconditioning,,Airconditioning,,
 Property,Airflow,,Airflow,,
 Property,App,,App,Application,Software program
-Property,Brightness,,Brightness,,
-Property,Channel,,Channel,,
+Property,Brightness,,Brightness,,Brightness of a light source
+Property,Channel,,Channel,,Media channel selection
 Property,Color,,Color,,
-Property,ColorTemperature,,Color Temperature,,
-Property,Current,,Current,,
-Property,Duration,,Duration,,
-Property,Enabled,,Enabled,,
+Property,ColorTemperature,,Color Temperature,,Color temperature of a light source
+Property,Current,,Current,,Electric current
+Property,Duration,,Duration,,Time duration
+Property,Enabled,,Enabled,,Enabled state
 Property,Energy,,Energy,,
 Property,Frequency,,Frequency,,
 Property,Gas,,Gas,,
 Property,Heating,,Heating,,
-Property,Humidity,,Humidity,Moisture,
+Property,Humidity,,Humidity,,
 Property,Illuminance,,Illuminance,,
-Property,Info,,Information,,
+Property,Info,,Information,,General information
 Property,Level,,Level,,
-Property,Light,,Light,"Lights, Lighting",
-Property,LowBattery,,Low Battery,,
-Property,MediaControl,,Media Control,,
-Property,Mode,,Mode,,
+Property,Light,,Light,"Lights, Lighting",Control or status of a light
+Property,LowBattery,,Low Battery,,Low battery indication
+Property,MediaControl,,Media Control,,Audio- or visual- media control
+Property,Mode,,Mode,,Operating mode
 Property,Moisture,,Moisture,,
-Property,Motion,,Motion,,
+Property,Motion,,Motion,,Motion detected
 Property,Noise,,Noise,,
 Property,Oil,,Oil,,
-Property,Opening,,Opening,,
-Property,OpenLevel,Opening,Open Level,,
-Property,OpenState,Opening,Open State,Open Closed,
-Property,Position,,Position,,
-Property,GeoLocation,Position,Geo Location,,
+Property,Opening,,Opening,,Opening of a door or window etc.
+Property,OpenLevel,Opening,Open Level,,Open position (analog) of a door or window etc.
+Property,OpenState,Opening,Open State,Open Closed,Open state (digital) of a door or window etc.
+Property,Position,,Position,,Position measurement or control
+Property,GeoLocation,Position,Geo Location,,Geo location coordinate
 Property,Power,,Power,,
-Property,Presence,,Presence,,
+Property,Presence,,Presence,,Presence detection
 Property,Pressure,,Pressure,,
 Property,Progress,,Progress,,
 Property,QualityOfService,,Quality of Service,,
 Property,Rain,,Rain,,
 Property,SignalStrength,,Signal Strength,,
 Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication,
-Property,Smoke,,Smoke,,
-Property,SoundVolume,,Sound Volume,,
+Property,Smoke,,Smoke,,Smoke detection
+Property,SoundVolume,,Sound Volume,,Sound volume level
 Property,Speed,,Speed,,
-Property,Tampered,,Tampered,,
+Property,Tampered,,Tampered,,Tampering detected
 Property,Temperature,,Temperature,Temperatures,
-Property,Tilt,,Tilt,,
-Property,Timestamp,,Timestamp,,
+Property,Tilt,,Tilt,,"Tilt of a blind, shade or shutter"
+Property,Timestamp,,Timestamp,,Timestamp of an event
 Property,Ultraviolet,,Ultraviolet,UV,
 Property,Ventilation,,Ventilation,,
 Property,Vibration,,Vibration,,
 Property,Voltage,,Voltage,,
 Property,Water,,Water,,
-Property,Wind,,Wind,,
+Property,Wind,,Wind,,Wind speed or direction
 Equipment,AlarmDevice,,Alarm Device,,
 Equipment,AlarmSystem,,Alarm System,Alarm Systems,
-Equipment,Application,,Application,Software program,
-Equipment,AudioVisual,,Audio Visual,,
-Equipment,Display,AudioVisual,Display,,
-Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",
-Equipment,Television,Display,Television,"Televisions, TV, TVs",
-Equipment,MediaPlayer,AudioVisual,Media Player,,
-Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers",
-Equipment,Screen,AudioVisual,Screen,Screens,
-Equipment,Speaker,AudioVisual,Speaker,Speakers,
+Equipment,Application,,Application,"App, Software program",Software program
+Equipment,AudioVisual,,Audio Visual,,Audio visual device
+Equipment,Display,AudioVisual,Display,,Visual display
+Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",Projector
+Equipment,Television,Display,Television,"Televisions, TV, TVs",Television
+Equipment,MediaPlayer,AudioVisual,Media Player,,Media player
+Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers","Audio-(visual) receiver, amplifier, tuner, sound processor"
+Equipment,Screen,AudioVisual,Screen,Screens,Visual display screen
+Equipment,Speaker,AudioVisual,Speaker,Speakers,Loud-speaker
 Equipment,Bed,,Bed,,
 Equipment,Camera,,Camera,Cameras,
 Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",
 Equipment,Computer,,Computer,,
 Equipment,ControlDevice,,Control Device,,
-Equipment,Button,ControlDevice,Button,,
-Equipment,Dial,ControlDevice,Dial,Rotary Dial,
+Equipment,Button,ControlDevice,Button,,Push or touch button
+Equipment,Dial,ControlDevice,Dial,Rotary Dial,Rotary dial
 Equipment,Keypad,ControlDevice,Keypad,,
-Equipment,Slider,ControlDevice,Slider,,
-Equipment,WallSwitch,ControlDevice,Wall Switch,Wall Switches,
+Equipment,Slider,ControlDevice,Slider,,Slider control
+Equipment,WallSwitch,ControlDevice,Wall Switch,Wall Switches,Wall switch
 Equipment,Door,,Door,Doors,
 Equipment,BackDoor,Door,Back Door,Back Doors,
 Equipment,CellarDoor,Door,Cellar Door,Cellar Doors,
@@ -135,10 +135,10 @@ Equipment,InnerDoor,Door,Inner Door,Inner Doors,
 Equipment,SideDoor,Door,Side Door,Side Doors,
 Equipment,Doorbell,,Doorbell,Doorbells,
 Equipment,DrinkingWater,,Drinking Water,Potable Water,
-Equipment,HotWaterFaucet,DrinkingWater,Hot Water Faucet,"Hot Water Tap, Boiling Water Tap, Boiling Water Faucet",
+Equipment,HotWaterFaucet,DrinkingWater,Hot Water Faucet,"Hot Water Tap, Boiling Water Tap, Boiling Water Faucet",Hot water faucet or tap
 Equipment,WaterFilter,DrinkingWater,Water Filter,,
 Equipment,WaterSoftener,DrinkingWater,Water Softener,,
-Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC",
+Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC","Heating, Ventilation or AirConditioning"
 Equipment,AirConditioner,HVAC,Air Conditioner,,
 Equipment,AirFilter,HVAC,Air Filter,,
 Equipment,Boiler,HVAC,Boiler,Boilers,
@@ -153,7 +153,7 @@ Equipment,HeatPump,HVAC,Heat Pump,,
 Equipment,HeatRecovery,HVAC,Heat Recovery,Energy Recovery,
 Equipment,Humidifier,HVAC,Humidifier,,
 Equipment,RadiatorControl,HVAC,Radiator Control,"Radiator Controls, Radiator, Radiators",
-Equipment,SmartVent,HVAC,Smart Vent,,
+Equipment,SmartVent,HVAC,Smart Vent,,Smart ventilation device
 Equipment,Thermostat,HVAC,Thermostat,,
 Equipment,WaterHeater,HVAC,Water Heater,Water Boiler,
 Equipment,Horticulture,,Horticulture,,
@@ -169,8 +169,8 @@ Equipment,Lamp,LightSource,Lamp,,
 Equipment,LightStrip,LightSource,Light Strip,LED Strip,
 Equipment,LightStripe,LightSource,Light Stripe,Light Stripes,
 Equipment,Lightbulb,LightSource,Light Bulb,"Lightbulbs, Bulb, Bulbs, Lamp, Lamps",
-Equipment,Pendant,LightSource,Pendant,,
-Equipment,Sconce,LightSource,Sconce,,
+Equipment,Pendant,LightSource,Pendant,,Pendant light
+Equipment,Sconce,LightSource,Sconce,,Sconce light
 Equipment,SpotLight,LightSource,Spot Light,,
 Equipment,TrackLight,LightSource,Track Light,,
 Equipment,WallLight,LightSource,Wall Light,,
@@ -188,17 +188,17 @@ Equipment,PowerOutlet,,Power Outlet,"Power Outlets, Outlet, Outlets, Smart Plug,
 Equipment,PowerSupply,,Power Supply,,
 Equipment,Battery,PowerSupply,Battery,Batteries,
 Equipment,EVSE,PowerSupply,Electric Vehicle Supply Equipment,"EV Charger, Car Charger",
-Equipment,Generator,PowerSupply,Generator,Emergency Generator,
-Equipment,Inverter,PowerSupply,Inverter,Inverters,
+Equipment,Generator,PowerSupply,Generator,Emergency Generator,Electricity generator
+Equipment,Inverter,PowerSupply,Inverter,Inverters,Electrical power inverter
 Equipment,SolarPanel,PowerSupply,Solar Panel,,
-Equipment,TransferSwitch,PowerSupply,Transfer Switch,,
+Equipment,TransferSwitch,PowerSupply,Transfer Switch,,Electricity transfer switch
 Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply,
 Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine,
 Equipment,Printer,,Printer,,
 Equipment,Printer3D,Printer,3D Printer,,
 Equipment,Pump,,Pump,Pumps,
 Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump",
-Equipment,RemoteControl,,Remote Control,Remote Controls,
+Equipment,RemoteControl,,Remote Control,Remote Controls,Remote control device
 Equipment,Sensor,,Sensor,Sensors,
 Equipment,AirQualitySensor,Sensor,Air Quality Sensor,,
 Equipment,CO2Sensor,Sensor,CO2 Sensor,,
@@ -221,10 +221,10 @@ Equipment,VibrationSensor,Sensor,Vibration Sensor,,
 Equipment,WaterMeter,Sensor,Water Meter,,
 Equipment,WaterQualitySensor,Sensor,Water Quality Sensor,,
 Equipment,WeatherStation,Sensor,Weather Station,,
-Equipment,Siren,,Siren,Sirens,
+Equipment,Siren,,Siren,Sirens,Alarm siren
 Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones",
-Equipment,Tool,,Tool,,
-Equipment,Tracker,,Tracker,,
+Equipment,Tool,,Tool,,Hand- or machine- tool
+Equipment,Tracker,,Tracker,,Location tracker
 Equipment,Valve,,Valve,Valves,
 Equipment,Vehicle,,Vehicle,,
 Equipment,Car,Vehicle,Car,,
@@ -232,33 +232,33 @@ Equipment,VoiceAssistant,,Voice Assistant,Voice Assistants,
 Equipment,WebService,,Web Service,Web Services,
 Equipment,WeatherService,WebService,Weather Service,Weather Services,
 Equipment,Wellness,,Wellness,,
-Equipment,Chlorinator,Wellness,Chlorinator,,
+Equipment,Chlorinator,Wellness,Chlorinator,,Water chlorinator
 Equipment,Jacuzzi,Wellness,Jacuzzi,"Spa, Hot Tub, Whirlpool",
-Equipment,PoolCover,Wellness,Pool Cover,,
-Equipment,PoolHeater,Wellness,Pool Heater,,
+Equipment,PoolCover,Wellness,Pool Cover,,Swimming or wellness pool cover
+Equipment,PoolHeater,Wellness,Pool Heater,,Swimming or wellness pool heater
 Equipment,Sauna,Wellness,Sauna,Steam Room,
 Equipment,Shower,Wellness,Shower,,
 Equipment,SwimmingPool,Wellness,Swimming Pool,"Swimming Pool, Pool",
-Equipment,WhiteGood,,White Good,White Goods,
+Equipment,WhiteGood,,White Good,White Goods,White goods appliance
 Equipment,AirFryer,WhiteGood,Air Fryer,,
 Equipment,CoffeeMaker,WhiteGood,Coffee Maker,"Coffee Makers, Coffee Machine, Coffee Machines",
-Equipment,Cooktop,WhiteGood,Cooktop,Hob,
+Equipment,Cooktop,WhiteGood,Cooktop,Hob,Cooktop appliance
 Equipment,Dishwasher,WhiteGood,Dishwasher,Dishwashers,
-Equipment,Dryer,WhiteGood,Dryer,"Dryers, Tumble Dryer, Tumble Dryers",
+Equipment,Dryer,WhiteGood,Dryer,"Dryers, Tumble Dryer, Tumble Dryers",Laundry (tumble) dryer
 Equipment,FoodProcessor,WhiteGood,Food Processor,,
 Equipment,Freezer,WhiteGood,Freezer,Freezers,
-Equipment,Fryer,WhiteGood,Fryer,,
+Equipment,Fryer,WhiteGood,Fryer,,Deep fryer
 Equipment,IceMaker,WhiteGood,Ice Maker,,
-Equipment,Microwave,WhiteGood,Microwave,,
-Equipment,Mixer,WhiteGood,Mixer,,
+Equipment,Microwave,WhiteGood,Microwave,,Microwave cooker
+Equipment,Mixer,WhiteGood,Mixer,,Food mixer
 Equipment,Oven,WhiteGood,Oven,Ovens,
-Equipment,Range,WhiteGood,Range,,
+Equipment,Range,WhiteGood,Range,,Kitchen range
 Equipment,Refrigerator,WhiteGood,Refrigerator,Refrigerators,
 Equipment,Toaster,WhiteGood,Toaster,Toaster Oven,
 Equipment,WashingMachine,WhiteGood,Washing Machine,Washing Machines,
 Equipment,Window,,Window,Windows,
 Equipment,WindowCovering,,Window Covering,,
-Equipment,Blinds,WindowCovering,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters",
-Equipment,Drapes,WindowCovering,Drapes,Curtains,
-Equipment,Zone,,Zone,,
-Equipment,AlarmZone,Zone,Alarm Zone,,
+Equipment,Blinds,WindowCovering,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters","Window blinds, shades or shutters"
+Equipment,Drapes,WindowCovering,Drapes,Curtains,Curtains or drapes
+Equipment,Zone,,Zone,,Equipment zone
+Equipment,AlarmZone,Zone,Alarm Zone,,Security alarm zone
@@ -216,42 +216,42 @@ public class DefaultSemanticTags {
        public static final SemanticTag ALARM = new SemanticTagImpl( //
                "Point_Alarm", //
                "Alarm", //
-                "", //
+                "Read only data point indicating an alarm condition", //
                "");
        public static final SemanticTag CALCULATION = new SemanticTagImpl( //
                "Point_Calculation", //
                "Calculation", //
-                "", //
+                "Read only analog calculated data point", //
                "");
        public static final SemanticTag CONTROL = new SemanticTagImpl( //
                "Point_Control", //
                "Control", //
-                "", //
+                "Read-Write analog data point", //
                "");
        public static final SemanticTag SWITCH = new SemanticTagImpl( //
                "Point_Control_Switch", //
                "Switch", //
-                "", //
+                "Read-Write digital data point", //
                "");
        public static final SemanticTag FORECAST = new SemanticTagImpl( //
                "Point_Forecast", //
                "Forecast", //
-                "", //
+                "Read only analog predicted data point", //
                "");
        public static final SemanticTag MEASUREMENT = new SemanticTagImpl( //
                "Point_Measurement", //
                "Measurement", //
-                "", //
+                "Read only analog data point from a sensor", //
                "");
        public static final SemanticTag SETPOINT = new SemanticTagImpl( //
                "Point_Setpoint", //
                "Setpoint", //
-                "", //
+                "Read-Write analog data point for a controller", //
                "");
        public static final SemanticTag STATUS = new SemanticTagImpl( //
                "Point_Status", //
                "Status", //
-                "", //
+                "Read only data point indicating a status condition", //
                "");
    }

@@ -264,17 +264,17 @@ public class DefaultSemanticTags {
        public static final SemanticTag AQI = new SemanticTagImpl( //
                "Property_AirQuality_AQI", //
                "AQI", //
-                "", //
+                "Air Quality Index", //
                "Air Quality Index");
        public static final SemanticTag CO = new SemanticTagImpl( //
                "Property_AirQuality_CO", //
                "CO", //
-                "", //
+                "Carbon monoxide", //
                "Carbon Monoxide");
        public static final SemanticTag CO2 = new SemanticTagImpl( //
                "Property_AirQuality_CO2", //
                "CO2", //
-                "", //
+                "Carbon dioxide", //
                "Carbon Dioxide");
        public static final SemanticTag OZONE = new SemanticTagImpl( //
                "Property_AirQuality_Ozone", //
@@ -319,12 +319,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag BRIGHTNESS = new SemanticTagImpl( //
                "Property_Brightness", //
                "Brightness", //
-                "", //
+                "Brightness of a light source", //
                "");
        public static final SemanticTag CHANNEL = new SemanticTagImpl( //
                "Property_Channel", //
                "Channel", //
-                "", //
+                "Media channel selection", //
                "");
        public static final SemanticTag COLOR = new SemanticTagImpl( //
                "Property_Color", //
@@ -334,22 +334,22 @@ public class DefaultSemanticTags {
        public static final SemanticTag COLOR_TEMPERATURE = new SemanticTagImpl( //
                "Property_ColorTemperature", //
                "Color Temperature", //
-                "", //
+                "Color temperature of a light source", //
                "");
        public static final SemanticTag CURRENT = new SemanticTagImpl( //
                "Property_Current", //
                "Current", //
-                "", //
+                "Electric current", //
                "");
        public static final SemanticTag DURATION = new SemanticTagImpl( //
                "Property_Duration", //
                "Duration", //
-                "", //
+                "Time duration", //
                "");
        public static final SemanticTag ENABLED = new SemanticTagImpl( //
                "Property_Enabled", //
                "Enabled", //
-                "", //
+                "Enabled state", //
                "");
        public static final SemanticTag ENERGY = new SemanticTagImpl( //
                "Property_Energy", //
@@ -375,7 +375,7 @@ public class DefaultSemanticTags {
                "Property_Humidity", //
                "Humidity", //
                "", //
-                "Moisture");
+                "");
        public static final SemanticTag ILLUMINANCE = new SemanticTagImpl( //
                "Property_Illuminance", //
                "Illuminance", //
@@ -384,7 +384,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag INFO = new SemanticTagImpl( //
                "Property_Info", //
                "Information", //
-                "", //
+                "General information", //
                "");
        public static final SemanticTag LEVEL = new SemanticTagImpl( //
                "Property_Level", //
@@ -394,22 +394,22 @@ public class DefaultSemanticTags {
        public static final SemanticTag LIGHT = new SemanticTagImpl( //
                "Property_Light", //
                "Light", //
-                "", //
+                "Control or status of a light", //
                "Lights, Lighting");
        public static final SemanticTag LOW_BATTERY = new SemanticTagImpl( //
                "Property_LowBattery", //
                "Low Battery", //
-                "", //
+                "Low battery indication", //
                "");
        public static final SemanticTag MEDIA_CONTROL = new SemanticTagImpl( //
                "Property_MediaControl", //
                "Media Control", //
-                "", //
+                "Audio- or visual- media control", //
                "");
        public static final SemanticTag MODE = new SemanticTagImpl( //
                "Property_Mode", //
                "Mode", //
-                "", //
+                "Operating mode", //
                "");
        public static final SemanticTag MOISTURE = new SemanticTagImpl( //
                "Property_Moisture", //
@@ -419,7 +419,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag MOTION = new SemanticTagImpl( //
                "Property_Motion", //
                "Motion", //
-                "", //
+                "Motion detected", //
                "");
        public static final SemanticTag NOISE = new SemanticTagImpl( //
                "Property_Noise", //
@@ -434,27 +434,27 @@ public class DefaultSemanticTags {
        public static final SemanticTag OPENING = new SemanticTagImpl( //
                "Property_Opening", //
                "Opening", //
-                "", //
+                "Opening of a door or window etc.", //
                "");
        public static final SemanticTag OPEN_LEVEL = new SemanticTagImpl( //
                "Property_Opening_OpenLevel", //
                "Open Level", //
-                "", //
+                "Open position (analog) of a door or window etc.", //
                "");
        public static final SemanticTag OPEN_STATE = new SemanticTagImpl( //
                "Property_Opening_OpenState", //
                "Open State", //
-                "", //
+                "Open state (digital) of a door or window etc.", //
                "Open Closed");
        public static final SemanticTag POSITION = new SemanticTagImpl( //
                "Property_Position", //
                "Position", //
-                "", //
+                "Position measurement or control", //
                "");
        public static final SemanticTag GEO_LOCATION = new SemanticTagImpl( //
                "Property_Position_GeoLocation", //
                "Geo Location", //
-                "", //
+                "Geo location coordinate", //
                "");
        public static final SemanticTag POWER = new SemanticTagImpl( //
                "Property_Power", //
@@ -464,7 +464,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag PRESENCE = new SemanticTagImpl( //
                "Property_Presence", //
                "Presence", //
-                "", //
+                "Presence detection", //
                "");
        public static final SemanticTag PRESSURE = new SemanticTagImpl( //
                "Property_Pressure", //
@@ -499,12 +499,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag SMOKE = new SemanticTagImpl( //
                "Property_Smoke", //
                "Smoke", //
-                "", //
+                "Smoke detection", //
                "");
        public static final SemanticTag SOUND_VOLUME = new SemanticTagImpl( //
                "Property_SoundVolume", //
                "Sound Volume", //
-                "", //
+                "Sound volume level", //
                "");
        public static final SemanticTag SPEED = new SemanticTagImpl( //
                "Property_Speed", //
@@ -514,7 +514,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag TAMPERED = new SemanticTagImpl( //
                "Property_Tampered", //
                "Tampered", //
-                "", //
+                "Tampering detected", //
                "");
        public static final SemanticTag TEMPERATURE = new SemanticTagImpl( //
                "Property_Temperature", //
@@ -524,12 +524,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag TILT = new SemanticTagImpl( //
                "Property_Tilt", //
                "Tilt", //
-                "", //
+                "Tilt of a blind, shade or shutter", //
                "");
        public static final SemanticTag TIMESTAMP = new SemanticTagImpl( //
                "Property_Timestamp", //
                "Timestamp", //
-                "", //
+                "Timestamp of an event", //
                "");
        public static final SemanticTag ULTRAVIOLET = new SemanticTagImpl( //
                "Property_Ultraviolet", //
@@ -559,7 +559,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag WIND = new SemanticTagImpl( //
                "Property_Wind", //
                "Wind", //
-                "", //
+                "Wind speed or direction", //
                "");
    }

@@ -577,47 +577,47 @@ public class DefaultSemanticTags {
        public static final SemanticTag APPLICATION = new SemanticTagImpl( //
                "Equipment_Application", //
                "Application", //
-                "", //
-                "Software program");
+                "Software program", //
+                "App, Software program");
        public static final SemanticTag AUDIO_VISUAL = new SemanticTagImpl( //
                "Equipment_AudioVisual", //
                "Audio Visual", //
-                "", //
+                "Audio visual device", //
                "");
        public static final SemanticTag DISPLAY = new SemanticTagImpl( //
                "Equipment_AudioVisual_Display", //
                "Display", //
-                "", //
+                "Visual display", //
                "");
        public static final SemanticTag PROJECTOR = new SemanticTagImpl( //
                "Equipment_AudioVisual_Display_Projector", //
                "Projector", //
-                "", //
+                "Projector", //
                "Projectors, Beamer, Beamers");
        public static final SemanticTag TELEVISION = new SemanticTagImpl( //
                "Equipment_AudioVisual_Display_Television", //
                "Television", //
-                "", //
+                "Television", //
                "Televisions, TV, TVs");
        public static final SemanticTag MEDIA_PLAYER = new SemanticTagImpl( //
                "Equipment_AudioVisual_MediaPlayer", //
                "Media Player", //
-                "", //
+                "Media player", //
                "");
        public static final SemanticTag RECEIVER = new SemanticTagImpl( //
                "Equipment_AudioVisual_Receiver", //
                "Receiver", //
-                "", //
+                "Audio-(visual) receiver, amplifier, tuner, sound processor", //
                "Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers");
        public static final SemanticTag SCREEN = new SemanticTagImpl( //
                "Equipment_AudioVisual_Screen", //
                "Screen", //
-                "", //
+                "Visual display screen", //
                "Screens");
        public static final SemanticTag SPEAKER = new SemanticTagImpl( //
                "Equipment_AudioVisual_Speaker", //
                "Speaker", //
-                "", //
+                "Loud-speaker", //
                "Speakers");
        public static final SemanticTag BED = new SemanticTagImpl( //
                "Equipment_Bed", //
@@ -647,12 +647,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag BUTTON = new SemanticTagImpl( //
                "Equipment_ControlDevice_Button", //
                "Button", //
-                "", //
+                "Push or touch button", //
                "");
        public static final SemanticTag DIAL = new SemanticTagImpl( //
                "Equipment_ControlDevice_Dial", //
                "Dial", //
-                "", //
+                "Rotary dial", //
                "Rotary Dial");
        public static final SemanticTag KEYPAD = new SemanticTagImpl( //
                "Equipment_ControlDevice_Keypad", //
@@ -662,12 +662,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag SLIDER = new SemanticTagImpl( //
                "Equipment_ControlDevice_Slider", //
                "Slider", //
-                "", //
+                "Slider control", //
                "");
        public static final SemanticTag WALL_SWITCH = new SemanticTagImpl( //
                "Equipment_ControlDevice_WallSwitch", //
                "Wall Switch", //
-                "", //
+                "Wall switch", //
                "Wall Switches");
        public static final SemanticTag DOOR = new SemanticTagImpl( //
                "Equipment_Door", //
@@ -722,7 +722,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag HOT_WATER_FAUCET = new SemanticTagImpl( //
                "Equipment_DrinkingWater_HotWaterFaucet", //
                "Hot Water Faucet", //
-                "", //
+                "Hot water faucet or tap", //
                "Hot Water Tap, Boiling Water Tap, Boiling Water Faucet");
        public static final SemanticTag WATER_FILTER = new SemanticTagImpl( //
                "Equipment_DrinkingWater_WaterFilter", //
@@ -737,7 +737,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag HVAC = new SemanticTagImpl( //
                "Equipment_HVAC", //
                "HVAC", //
-                "", //
+                "Heating, Ventilation or AirConditioning", //
                "Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC");
        public static final SemanticTag AIR_CONDITIONER = new SemanticTagImpl( //
                "Equipment_HVAC_AirConditioner", //
@@ -812,7 +812,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag SMART_VENT = new SemanticTagImpl( //
                "Equipment_HVAC_SmartVent", //
                "Smart Vent", //
-                "", //
+                "Smart ventilation device", //
                "");
        public static final SemanticTag THERMOSTAT = new SemanticTagImpl( //
                "Equipment_HVAC_Thermostat", //
@@ -892,12 +892,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag PENDANT = new SemanticTagImpl( //
                "Equipment_LightSource_Pendant", //
                "Pendant", //
-                "", //
+                "Pendant light", //
                "");
        public static final SemanticTag SCONCE = new SemanticTagImpl( //
                "Equipment_LightSource_Sconce", //
                "Sconce", //
-                "", //
+                "Sconce light", //
                "");
        public static final SemanticTag SPOT_LIGHT = new SemanticTagImpl( //
                "Equipment_LightSource_SpotLight", //
@@ -987,12 +987,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag GENERATOR = new SemanticTagImpl( //
                "Equipment_PowerSupply_Generator", //
                "Generator", //
-                "", //
+                "Electricity generator", //
                "Emergency Generator");
        public static final SemanticTag INVERTER = new SemanticTagImpl( //
                "Equipment_PowerSupply_Inverter", //
                "Inverter", //
-                "", //
+                "Electrical power inverter", //
                "Inverters");
        public static final SemanticTag SOLAR_PANEL = new SemanticTagImpl( //
                "Equipment_PowerSupply_SolarPanel", //
@@ -1002,7 +1002,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag TRANSFER_SWITCH = new SemanticTagImpl( //
                "Equipment_PowerSupply_TransferSwitch", //
                "Transfer Switch", //
-                "", //
+                "Electricity transfer switch", //
                "");
        public static final SemanticTag UPS = new SemanticTagImpl( //
                "Equipment_PowerSupply_UPS", //
@@ -1037,7 +1037,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag REMOTE_CONTROL = new SemanticTagImpl( //
                "Equipment_RemoteControl", //
                "Remote Control", //
-                "", //
+                "Remote control device", //
                "Remote Controls");
        public static final SemanticTag SENSOR = new SemanticTagImpl( //
                "Equipment_Sensor", //
@@ -1152,7 +1152,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag SIREN = new SemanticTagImpl( //
                "Equipment_Siren", //
                "Siren", //
-                "", //
+                "Alarm siren", //
                "Sirens");
        public static final SemanticTag SMARTPHONE = new SemanticTagImpl( //
                "Equipment_Smartphone", //
@@ -1162,12 +1162,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag TOOL = new SemanticTagImpl( //
                "Equipment_Tool", //
                "Tool", //
-                "", //
+                "Hand- or machine- tool", //
                "");
        public static final SemanticTag TRACKER = new SemanticTagImpl( //
                "Equipment_Tracker", //
                "Tracker", //
-                "", //
+                "Location tracker", //
                "");
        public static final SemanticTag VALVE = new SemanticTagImpl( //
                "Equipment_Valve", //
@@ -1207,7 +1207,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag CHLORINATOR = new SemanticTagImpl( //
                "Equipment_Wellness_Chlorinator", //
                "Chlorinator", //
-                "", //
+                "Water chlorinator", //
                "");
        public static final SemanticTag JACUZZI = new SemanticTagImpl( //
                "Equipment_Wellness_Jacuzzi", //
@@ -1217,12 +1217,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag POOL_COVER = new SemanticTagImpl( //
                "Equipment_Wellness_PoolCover", //
                "Pool Cover", //
-                "", //
+                "Swimming or wellness pool cover", //
                "");
        public static final SemanticTag POOL_HEATER = new SemanticTagImpl( //
                "Equipment_Wellness_PoolHeater", //
                "Pool Heater", //
-                "", //
+                "Swimming or wellness pool heater", //
                "");
        public static final SemanticTag SAUNA = new SemanticTagImpl( //
                "Equipment_Wellness_Sauna", //
@@ -1242,7 +1242,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag WHITE_GOOD = new SemanticTagImpl( //
                "Equipment_WhiteGood", //
                "White Good", //
-                "", //
+                "White goods appliance", //
                "White Goods");
        public static final SemanticTag AIR_FRYER = new SemanticTagImpl( //
                "Equipment_WhiteGood_AirFryer", //
@@ -1257,7 +1257,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag COOKTOP = new SemanticTagImpl( //
                "Equipment_WhiteGood_Cooktop", //
                "Cooktop", //
-                "", //
+                "Cooktop appliance", //
                "Hob");
        public static final SemanticTag DISHWASHER = new SemanticTagImpl( //
                "Equipment_WhiteGood_Dishwasher", //
@@ -1267,7 +1267,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag DRYER = new SemanticTagImpl( //
                "Equipment_WhiteGood_Dryer", //
                "Dryer", //
-                "", //
+                "Laundry (tumble) dryer", //
                "Dryers, Tumble Dryer, Tumble Dryers");
        public static final SemanticTag FOOD_PROCESSOR = new SemanticTagImpl( //
                "Equipment_WhiteGood_FoodProcessor", //
@@ -1282,7 +1282,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag FRYER = new SemanticTagImpl( //
                "Equipment_WhiteGood_Fryer", //
                "Fryer", //
-                "", //
+                "Deep fryer", //
                "");
        public static final SemanticTag ICE_MAKER = new SemanticTagImpl( //
                "Equipment_WhiteGood_IceMaker", //
@@ -1292,12 +1292,12 @@ public class DefaultSemanticTags {
        public static final SemanticTag MICROWAVE = new SemanticTagImpl( //
                "Equipment_WhiteGood_Microwave", //
                "Microwave", //
-                "", //
+                "Microwave cooker", //
                "");
        public static final SemanticTag MIXER = new SemanticTagImpl( //
                "Equipment_WhiteGood_Mixer", //
                "Mixer", //
-                "", //
+                "Food mixer", //
                "");
        public static final SemanticTag OVEN = new SemanticTagImpl( //
                "Equipment_WhiteGood_Oven", //
@@ -1307,7 +1307,7 @@ public class DefaultSemanticTags {
        public static final SemanticTag RANGE = new SemanticTagImpl( //
                "Equipment_WhiteGood_Range", //
                "Range", //
-                "", //
+                "Kitchen range", //
                "");
        public static final SemanticTag REFRIGERATOR = new SemanticTagImpl( //
                "Equipment_WhiteGood_Refrigerator", //
@@ -1337,22 +1337,22 @@ public class DefaultSemanticTags {
        public static final SemanticTag BLINDS = new SemanticTagImpl( //
                "Equipment_WindowCovering_Blinds", //
                "Blinds", //
-                "", //
+                "Window blinds, shades or shutters", //
                "Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters");
        public static final SemanticTag DRAPES = new SemanticTagImpl( //
                "Equipment_WindowCovering_Drapes", //
                "Drapes", //
-                "", //
+                "Curtains or drapes", //
                "Curtains");
        public static final SemanticTag ZONE = new SemanticTagImpl( //
                "Equipment_Zone", //
                "Zone", //
-                "", //
+                "Equipment zone", //
                "");
        public static final SemanticTag ALARM_ZONE = new SemanticTagImpl( //
                "Equipment_Zone_AlarmZone", //
                "Alarm Zone", //
-                "", //
+                "Security alarm zone", //
                "");
    }
 }
@@ -37,17 +37,28 @@ Location_Outdoor_Patio=Patio,Patios
 Location_Outdoor_Porch=Porch,Porches
 Location_Outdoor_Terrace=Terrace,Terraces,Deck,Decks
 Point_Alarm=Alarm
+Point_Alarm__description=Read only data point indicating an alarm condition
 Point_Calculation=Calculation
+Point_Calculation__description=Read only analog calculated data point
 Point_Control=Control
+Point_Control__description=Read-Write analog data point
 Point_Control_Switch=Switch
+Point_Control_Switch__description=Read-Write digital data point
 Point_Forecast=Forecast
+Point_Forecast__description=Read only analog predicted data point
 Point_Measurement=Measurement
+Point_Measurement__description=Read only analog data point from a sensor
 Point_Setpoint=Setpoint
+Point_Setpoint__description=Read-Write analog data point for a controller
 Point_Status=Status
+Point_Status__description=Read only data point indicating a status condition
 Property_AirQuality=Air Quality
 Property_AirQuality_AQI=AQI,Air Quality Index
+Property_AirQuality_AQI__description=Air Quality Index
 Property_AirQuality_CO=CO,Carbon Monoxide
+Property_AirQuality_CO__description=Carbon monoxide
 Property_AirQuality_CO2=CO2,Carbon Dioxide
+Property_AirQuality_CO2__description=Carbon dioxide
 Property_AirQuality_Ozone=Ozone
 Property_AirQuality_ParticulateMatter=Particulate Matter,PM25
 Property_AirQuality_Pollen=Pollen
@@ -58,35 +69,53 @@ Property_Airflow=Airflow
 Property_App=App,Application
 Property_App__description=Software program
 Property_Brightness=Brightness
+Property_Brightness__description=Brightness of a light source
 Property_Channel=Channel
+Property_Channel__description=Media channel selection
 Property_Color=Color
 Property_ColorTemperature=Color Temperature
+Property_ColorTemperature__description=Color temperature of a light source
 Property_Current=Current
+Property_Current__description=Electric current
 Property_Duration=Duration
+Property_Duration__description=Time duration
 Property_Enabled=Enabled
+Property_Enabled__description=Enabled state
 Property_Energy=Energy
 Property_Frequency=Frequency
 Property_Gas=Gas
 Property_Heating=Heating
-Property_Humidity=Humidity,Moisture
+Property_Humidity=Humidity
 Property_Illuminance=Illuminance
 Property_Info=Information
+Property_Info__description=General information
 Property_Level=Level
 Property_Light=Light,Lights,Lighting
+Property_Light__description=Control or status of a light
 Property_LowBattery=Low Battery
+Property_LowBattery__description=Low battery indication
 Property_MediaControl=Media Control
+Property_MediaControl__description=Audio- or visual- media control
 Property_Mode=Mode
+Property_Mode__description=Operating mode
 Property_Moisture=Moisture
 Property_Motion=Motion
+Property_Motion__description=Motion detected
 Property_Noise=Noise
 Property_Oil=Oil
 Property_Opening=Opening
+Property_Opening__description=Opening of a door or window etc.
 Property_Opening_OpenLevel=Open Level
+Property_Opening_OpenLevel__description=Open position (analog) of a door or window etc.
 Property_Opening_OpenState=Open State,Open Closed
+Property_Opening_OpenState__description=Open state (digital) of a door or window etc.
 Property_Position=Position
+Property_Position__description=Position measurement or control
 Property_Position_GeoLocation=Geo Location
+Property_Position_GeoLocation__description=Geo location coordinate
 Property_Power=Power
 Property_Presence=Presence
+Property_Presence__description=Presence detection
 Property_Pressure=Pressure
 Property_Progress=Progress
 Property_QualityOfService=Quality of Service
@@ -94,39 +123,58 @@ Property_Rain=Rain
 Property_SignalStrength=Signal Strength
 Property_SignalStrength_RSSI=RSSI,Received Signal Strength Indication
 Property_Smoke=Smoke
+Property_Smoke__description=Smoke detection
 Property_SoundVolume=Sound Volume
+Property_SoundVolume__description=Sound volume level
 Property_Speed=Speed
 Property_Tampered=Tampered
+Property_Tampered__description=Tampering detected
 Property_Temperature=Temperature,Temperatures
 Property_Tilt=Tilt
+Property_Tilt__description=Tilt of a blind, shade or shutter
 Property_Timestamp=Timestamp
+Property_Timestamp__description=Timestamp of an event
 Property_Ultraviolet=Ultraviolet,UV
 Property_Ventilation=Ventilation
 Property_Vibration=Vibration
 Property_Voltage=Voltage
 Property_Water=Water
 Property_Wind=Wind
+Property_Wind__description=Wind speed or direction
 Equipment_AlarmDevice=Alarm Device
 Equipment_AlarmSystem=Alarm System,Alarm Systems
-Equipment_Application=Application,Software program
+Equipment_Application=Application,App,Software program
+Equipment_Application__description=Software program
 Equipment_AudioVisual=Audio Visual
+Equipment_AudioVisual__description=Audio visual device
 Equipment_AudioVisual_Display=Display
+Equipment_AudioVisual_Display__description=Visual display
 Equipment_AudioVisual_Display_Projector=Projector,Projectors,Beamer,Beamers
+Equipment_AudioVisual_Display_Projector__description=Projector
 Equipment_AudioVisual_Display_Television=Television,Televisions,TV,TVs
+Equipment_AudioVisual_Display_Television__description=Television
 Equipment_AudioVisual_MediaPlayer=Media Player
+Equipment_AudioVisual_MediaPlayer__description=Media player
 Equipment_AudioVisual_Receiver=Receiver,Receivers,Audio Receiver,Audio Receivers,AV Receiver,AV Receivers
+Equipment_AudioVisual_Receiver__description=Audio-(visual) receiver, amplifier, tuner, sound processor
 Equipment_AudioVisual_Screen=Screen,Screens
+Equipment_AudioVisual_Screen__description=Visual display screen
 Equipment_AudioVisual_Speaker=Speaker,Speakers
+Equipment_AudioVisual_Speaker__description=Loud-speaker
 Equipment_Bed=Bed
 Equipment_Camera=Camera,Cameras
 Equipment_CleaningRobot=Cleaning Robot,Cleaning Robots,Vacuum robot,Vacuum robots
 Equipment_Computer=Computer
 Equipment_ControlDevice=Control Device
 Equipment_ControlDevice_Button=Button
+Equipment_ControlDevice_Button__description=Push or touch button
 Equipment_ControlDevice_Dial=Dial,Rotary Dial
+Equipment_ControlDevice_Dial__description=Rotary dial
 Equipment_ControlDevice_Keypad=Keypad
 Equipment_ControlDevice_Slider=Slider
+Equipment_ControlDevice_Slider__description=Slider control
 Equipment_ControlDevice_WallSwitch=Wall Switch,Wall Switches
+Equipment_ControlDevice_WallSwitch__description=Wall switch
 Equipment_Door=Door,Doors
 Equipment_Door_BackDoor=Back Door,Back Doors
 Equipment_Door_CellarDoor=Cellar Door,Cellar Doors
@@ -138,9 +186,11 @@ Equipment_Door_SideDoor=Side Door,Side Doors
 Equipment_Doorbell=Doorbell,Doorbells
 Equipment_DrinkingWater=Drinking Water,Potable Water
 Equipment_DrinkingWater_HotWaterFaucet=Hot Water Faucet,Hot Water Tap,Boiling Water Tap,Boiling Water Faucet
+Equipment_DrinkingWater_HotWaterFaucet__description=Hot water faucet or tap
 Equipment_DrinkingWater_WaterFilter=Water Filter
 Equipment_DrinkingWater_WaterSoftener=Water Softener
 Equipment_HVAC=HVAC,Heating,Ventilation,Air Conditioning,A/C,A/Cs,AC
+Equipment_HVAC__description=Heating, Ventilation or AirConditioning
 Equipment_HVAC_AirConditioner=Air Conditioner
 Equipment_HVAC_AirFilter=Air Filter
 Equipment_HVAC_Boiler=Boiler,Boilers
@@ -156,6 +206,7 @@ Equipment_HVAC_HeatRecovery=Heat Recovery,Energy Recovery
 Equipment_HVAC_Humidifier=Humidifier
 Equipment_HVAC_RadiatorControl=Radiator Control,Radiator Controls,Radiator,Radiators
 Equipment_HVAC_SmartVent=Smart Vent
+Equipment_HVAC_SmartVent__description=Smart ventilation device
 Equipment_HVAC_Thermostat=Thermostat
 Equipment_HVAC_WaterHeater=Water Heater,Water Boiler
 Equipment_Horticulture=Horticulture
@@ -172,7 +223,9 @@ Equipment_LightSource_LightStrip=Light Strip,LED Strip
 Equipment_LightSource_LightStripe=Light Stripe,Light Stripes
 Equipment_LightSource_Lightbulb=Light Bulb,Lightbulbs,Bulb,Bulbs,Lamp,Lamps
 Equipment_LightSource_Pendant=Pendant
+Equipment_LightSource_Pendant__description=Pendant light
 Equipment_LightSource_Sconce=Sconce
+Equipment_LightSource_Sconce__description=Sconce light
 Equipment_LightSource_SpotLight=Spot Light
 Equipment_LightSource_TrackLight=Track Light
 Equipment_LightSource_WallLight=Wall Light
@@ -191,9 +244,12 @@ Equipment_PowerSupply=Power Supply
 Equipment_PowerSupply_Battery=Battery,Batteries
 Equipment_PowerSupply_EVSE=Electric Vehicle Supply Equipment,EV Charger,Car Charger
 Equipment_PowerSupply_Generator=Generator,Emergency Generator
+Equipment_PowerSupply_Generator__description=Electricity generator
 Equipment_PowerSupply_Inverter=Inverter,Inverters
+Equipment_PowerSupply_Inverter__description=Electrical power inverter
 Equipment_PowerSupply_SolarPanel=Solar Panel
 Equipment_PowerSupply_TransferSwitch=Transfer Switch
+Equipment_PowerSupply_TransferSwitch__description=Electricity transfer switch
 Equipment_PowerSupply_UPS=UPS,Uninterruptible Power Supply
 Equipment_PowerSupply_WindGenerator=Wind Generator,Wind Turbine
 Equipment_Printer=Printer
@@ -201,6 +257,7 @@ Equipment_Printer_Printer3D=3D Printer
 Equipment_Pump=Pump,Pumps
 Equipment_Pump_WaterFeature=Water Feature,Waterfall,Pond Pump
 Equipment_RemoteControl=Remote Control,Remote Controls
+Equipment_RemoteControl__description=Remote control device
 Equipment_Sensor=Sensor,Sensors
 Equipment_Sensor_AirQualitySensor=Air Quality Sensor
 Equipment_Sensor_CO2Sensor=CO2 Sensor
@@ -224,9 +281,12 @@ Equipment_Sensor_WaterMeter=Water Meter
 Equipment_Sensor_WaterQualitySensor=Water Quality Sensor
 Equipment_Sensor_WeatherStation=Weather Station
 Equipment_Siren=Siren,Sirens
+Equipment_Siren__description=Alarm siren
 Equipment_Smartphone=Smartphone,Smartphones,Phone,Phones
 Equipment_Tool=Tool
+Equipment_Tool__description=Hand- or machine- tool
 Equipment_Tracker=Tracker
+Equipment_Tracker__description=Location tracker
 Equipment_Valve=Valve,Valves
 Equipment_Vehicle=Vehicle
 Equipment_Vehicle_Car=Car
@@ -235,32 +295,46 @@ Equipment_WebService=Web Service,Web Services
 Equipment_WebService_WeatherService=Weather Service,Weather Services
 Equipment_Wellness=Wellness
 Equipment_Wellness_Chlorinator=Chlorinator
+Equipment_Wellness_Chlorinator__description=Water chlorinator
 Equipment_Wellness_Jacuzzi=Jacuzzi,Spa,Hot Tub,Whirlpool
 Equipment_Wellness_PoolCover=Pool Cover
+Equipment_Wellness_PoolCover__description=Swimming or wellness pool cover
 Equipment_Wellness_PoolHeater=Pool Heater
+Equipment_Wellness_PoolHeater__description=Swimming or wellness pool heater
 Equipment_Wellness_Sauna=Sauna,Steam Room
 Equipment_Wellness_Shower=Shower
 Equipment_Wellness_SwimmingPool=Swimming Pool,Swimming Pool,Pool
 Equipment_WhiteGood=White Good,White Goods
+Equipment_WhiteGood__description=White goods appliance
 Equipment_WhiteGood_AirFryer=Air Fryer
 Equipment_WhiteGood_CoffeeMaker=Coffee Maker,Coffee Makers,Coffee Machine,Coffee Machines
 Equipment_WhiteGood_Cooktop=Cooktop,Hob
+Equipment_WhiteGood_Cooktop__description=Cooktop appliance
 Equipment_WhiteGood_Dishwasher=Dishwasher,Dishwashers
 Equipment_WhiteGood_Dryer=Dryer,Dryers,Tumble Dryer,Tumble Dryers
+Equipment_WhiteGood_Dryer__description=Laundry (tumble) dryer
 Equipment_WhiteGood_FoodProcessor=Food Processor
 Equipment_WhiteGood_Freezer=Freezer,Freezers
 Equipment_WhiteGood_Fryer=Fryer
+Equipment_WhiteGood_Fryer__description=Deep fryer
 Equipment_WhiteGood_IceMaker=Ice Maker
 Equipment_WhiteGood_Microwave=Microwave
+Equipment_WhiteGood_Microwave__description=Microwave cooker
 Equipment_WhiteGood_Mixer=Mixer
+Equipment_WhiteGood_Mixer__description=Food mixer
 Equipment_WhiteGood_Oven=Oven,Ovens
 Equipment_WhiteGood_Range=Range
+Equipment_WhiteGood_Range__description=Kitchen range
 Equipment_WhiteGood_Refrigerator=Refrigerator,Refrigerators
 Equipment_WhiteGood_Toaster=Toaster,Toaster Oven
 Equipment_WhiteGood_WashingMachine=Washing Machine,Washing Machines
 Equipment_Window=Window,Windows
 Equipment_WindowCovering=Window Covering
 Equipment_WindowCovering_Blinds=Blinds,Rollershutter,Rollershutters,Roller shutter,Roller shutters,Shutter,Shutters
+Equipment_WindowCovering_Blinds__description=Window blinds, shades or shutters
 Equipment_WindowCovering_Drapes=Drapes,Curtains
+Equipment_WindowCovering_Drapes__description=Curtains or drapes
 Equipment_Zone=Zone
+Equipment_Zone__description=Equipment zone
 Equipment_Zone_AlarmZone=Alarm Zone
+Equipment_Zone_AlarmZone__description=Security alarm zone