[semantics] Ontology enhanced (#1814)

Related to #1791

Also-by: Christoph Weitkamp <github@christophweitkamp.de>
Also-by: Mark <m.stroeve@appsoftware.nl>
Signed-off-by: Laurent Garnier <lg.hc@free.fr>

bundles/org.openhab.core.semantics/model/SemanticTags.csv

@@ -1,22 +1,40 @@
 Type,Tag,Parent,Label,Synonyms,Description
 Location,Indoor,,Indoor,,Anything that is inside a closed building
+Location,Apartment,Indoor,Apartment,Apartments,
 Location,Building,Indoor,Building,Buildings,
 Location,Garage,Building,Garage,Garages,
+Location,House,Building,House,Houses,
+Location,Shed,Building,Shed,Sheds,
+Location,SummerHouse,Building,Summer House,"Summer Houses, Second Home, Second Homes",
 Location,Floor,Indoor,Floor,Floors,
 Location,GroundFloor,Floor,Ground Floor,"Ground Floors, Downstairs",
 Location,FirstFloor,Floor,First Floor,"First Floors, Upstairs",
+Location,SecondFloor,Floor,Second Floor,"Second Floors",
+Location,ThirdFloor,Floor,Third Floor,"Third Floors",
 Location,Attic,Floor,Attic,Attics,
-Location,Basement,Floor,Basement,"Basements, Cellar, Cellars",
-Location,Corridor,Indoor,Corridor,Corridors,
+Location,Basement,Floor,Basement,Basements,
+Location,Corridor,Indoor,Corridor,"Corridors, Hallway, Hallways",
 Location,Room,Indoor,Room,Rooms,
+Location,Bathroom,Room,Bathroom,"Bathrooms, Bath, Baths, Powder Room, Powder Rooms",
 Location,Bedroom,Room,Bedroom,Bedrooms,
+Location,BoilerRoom,Room,Boiler Room,Boiler Rooms,
+Location,Cellar,Room,Cellar,Cellars,
+Location,DiningRoom,Room,Dining Room,Dining Rooms,
+Location,Entry,Room,Entry,"Entries, Foyer, Foyers",
+Location,FamilyRoom,Room,Family Room,Family Rooms,
+Location,GuestRoom,Room,Guest Room,Guest Rooms,
 Location,Kitchen,Room,Kitchen,Kitchens,
-Location,Bathroom,Room,Bathroom,"Bathrooms, Bath, Baths",
+Location,LaundryRoom,Room,Laundry Room,Laundry Rooms,
 Location,LivingRoom,Room,Living Room,Living Rooms,
+Location,Office,Room,Office,Offices,
+Location,Veranda,Room,Veranda,Verandas,
 Location,Outdoor,,Outdoor,,
-Location,Garden,Outdoor,Garden,Gardens,
-Location,Terrace,Outdoor,Terrace,"Terraces, Deck, Decks",
 Location,Carport,Outdoor,Carport,Carports,
+Location,Driveway,Outdoor,Driveway,Driveways,
+Location,Garden,Outdoor,Garden,Gardens,
+Location,Patio,Outdoor,Patio,Patios,
+Location,Porch,Outdoor,Porch,Proches,
+Location,Terrace,Outdoor,Terrace,"Terraces, Deck, Decks",
 Property,Temperature,,Temperature,Temperatures,
 Property,Light,,Light,"Lights, Lighting",
 Property,ColorTemperature,,Color Temperature,,
@@ -38,6 +56,13 @@ Property,Frequency,,Frequency,,
 Property,Gas,,Gas,,
 Property,SoundVolume,,Sound Volume,,
 Property,Oil,,Oil,,
+Property,Duration,,Duration,,
+Property,Illuminance,,Illuminance,,
+Property,Level,,Level,,
+Property,Opening,,Opening,,
+Property,Timestamp,,Timestamp,,
+Property,Ultraviolet,,Ultraviolet,UV,
+Property,Vibration,,Vibration,,
 Point,Alarm,,Alarm,,
 Point,Control,,Control,,
 Point,Switch,Control,Switch,,
@@ -45,36 +70,60 @@ Point,Measurement,,Measurement,,
 Point,Setpoint,,Setpoint,,
 Point,Status,,Status,,
 Point,LowBattery,Status,LowBattery,,
+Point,OpenLevel,Status,OpenLevel,,
 Point,OpenState,Status,OpenState,,
 Point,Tampered,Status,Tampered,,
-Point,OpenLevel,Status,OpenLevel,,
 Point,Tilt,Status,Tilt,,
+Equipment,AlarmSystem,,Alarm System,Alarm Systems,
 Equipment,Battery,,Battery,Batteries,
 Equipment,Blinds,,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters",
+Equipment,Boiler,,Boiler,Boilers,
 Equipment,Camera,,Camera,Cameras,
 Equipment,Car,,Car,Cars,
 Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",
 Equipment,Door,,Door,Doors,
+Equipment,BackDoor,Door,Back Door,Back Doors,
+Equipment,CellarDoor,Door,Cellar Door,Cellar Doors,
 Equipment,FrontDoor,Door,Front Door,"Front Doors, Frontdoor, Frontdoors",
 Equipment,GarageDoor,Door,Garage Door,Garage Doors,
+Equipment,Gate,Door,Gate,Gates,
+Equipment,InnerDoor,Door,Inner Door,Inner Doors,
+Equipment,SideDoor,Door,Side Door,Side Doors,
+Equipment,Doorbell,,Doorbell,Doorbells,
+Equipment,Fan,,Fan,Fans,
+Equipment,CeilingFan,Fan,Ceiling Fan,Ceiling Fans,
+Equipment,KitchenHood,Fan,Kitchen Hood,Kitchen Hoods,
 Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC",
 Equipment,Inverter,,Inverter,Inverters,
 Equipment,LawnMower,,Lawn Mower,Lawn Mowers,
 Equipment,Lightbulb,,Lightbulb,"Lightbulbs, Bulb, Bulbs, Lamp, Lamps, Lights, Lighting",
+Equipment,LightStripe,Lightbulb,Light Stripe,Light Stripes,
 Equipment,Lock,,Lock,Locks,
-Equipment,MotionDetector,,Motion Detector,"Motion Detectors, Motion sensor, Motion sensors",
 Equipment,NetworkAppliance,,Network Appliance,Network Appliances,
 Equipment,PowerOutlet,,Power Outlet,"Power Outlets, Outlet, Outlets",
 Equipment,Projector,,Projector,"Projectors, Beamer, Beamers",
+Equipment,Pump,,Pump,Pumps,
 Equipment,RadiatorControl,,Radiator Control,"Radiator Controls, Radiator, Radiators",
 Equipment,Receiver,,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers",
 Equipment,RemoteControl,,Remote Control,Remote Controls,
-Equipment,Screen,,Screen,"Screens, Television, Televisions, TV, TVs",
+Equipment,Screen,,Screen,Screens,
+Equipment,Television,Screen,Television,"Televisions, TV, TVs",
+Equipment,Sensor,,Sensor,Sensors,
+Equipment,MotionDetector,Sensor,Motion Detector,"Motion Detectors, Motion sensor, Motion sensors",
+Equipment,SmokeDetector,Sensor,Smoke Detector,Smoke Detectors,
 Equipment,Siren,,Siren,Sirens,
-Equipment,SmokeDetector,,Smoke Detector,Smoke Detectors,
+Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones",
 Equipment,Speaker,,Speaker,Speakers,
 Equipment,Valve,,Valve,Valves,
+Equipment,VoiceAssistant,,Voice Assistant,Voice Assistants,
 Equipment,WallSwitch,,Wall Switch,Wall Switches,
 Equipment,WebService,,Web Service,Web Services,
-Equipment,Window,,Window,Windows,
+Equipment,WeatherService,WebService,Weather Service,Weather Services,
 Equipment,WhiteGood,,White Good,White Goods,
+Equipment,Dishwasher,WhiteGood,Dishwasher,Dishwashers,
+Equipment,Dryer,WhiteGood,Dryer,Dryers,
+Equipment,Freezer,WhiteGood,Freezer,Freezers,
+Equipment,Oven,WhiteGood,Oven,Ovens,
+Equipment,Refrigerator,WhiteGood,Refrigerator,Refrigerators,
+Equipment,WashingMachine,WhiteGood,Washing Machine,Washing Machines,
+Equipment,Window,,Window,Windows,

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/AlarmSystem.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Alarm System.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_AlarmSystem", label = "Alarm System", synonyms = "Alarm Systems", description = "")
+public interface AlarmSystem extends Equipment {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/BackDoor.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Back Door.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Door_BackDoor", label = "Back Door", synonyms = "Back Doors", description = "")
+public interface BackDoor extends Door {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Boiler.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Boiler.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Boiler", label = "Boiler", synonyms = "Boilers", description = "")
+public interface Boiler extends Equipment {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CeilingFan.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Ceiling Fan.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Fan_CeilingFan", label = "Ceiling Fan", synonyms = "Ceiling Fans", description = "")
+public interface CeilingFan extends Fan {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CellarDoor.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Cellar Door.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Door_CellarDoor", label = "Cellar Door", synonyms = "Cellar Doors", description = "")
+public interface CellarDoor extends Door {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dishwasher.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Dishwasher.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_WhiteGood_Dishwasher", label = "Dishwasher", synonyms = "Dishwashers", description = "")
+public interface Dishwasher extends WhiteGood {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Doorbell.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Doorbell.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Doorbell", label = "Doorbell", synonyms = "Doorbells", description = "")
+public interface Doorbell extends Equipment {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dryer.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Dryer.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_WhiteGood_Dryer", label = "Dryer", synonyms = "Dryers", description = "")
+public interface Dryer extends WhiteGood {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java

@@ -31,32 +31,56 @@ public class Equipments {
 
     static {
         EQUIPMENTS.add(Equipment.class);
+        EQUIPMENTS.add(AlarmSystem.class);
+        EQUIPMENTS.add(BackDoor.class);
         EQUIPMENTS.add(Battery.class);
         EQUIPMENTS.add(Blinds.class);
+        EQUIPMENTS.add(Boiler.class);
         EQUIPMENTS.add(Camera.class);
         EQUIPMENTS.add(Car.class);
+        EQUIPMENTS.add(CeilingFan.class);
+        EQUIPMENTS.add(CellarDoor.class);
         EQUIPMENTS.add(CleaningRobot.class);
+        EQUIPMENTS.add(Dishwasher.class);
         EQUIPMENTS.add(Door.class);
+        EQUIPMENTS.add(Doorbell.class);
+        EQUIPMENTS.add(Dryer.class);
+        EQUIPMENTS.add(Fan.class);
+        EQUIPMENTS.add(Freezer.class);
         EQUIPMENTS.add(FrontDoor.class);
         EQUIPMENTS.add(GarageDoor.class);
+        EQUIPMENTS.add(Gate.class);
         EQUIPMENTS.add(HVAC.class);
+        EQUIPMENTS.add(InnerDoor.class);
         EQUIPMENTS.add(Inverter.class);
+        EQUIPMENTS.add(KitchenHood.class);
         EQUIPMENTS.add(LawnMower.class);
+        EQUIPMENTS.add(LightStripe.class);
         EQUIPMENTS.add(Lightbulb.class);
         EQUIPMENTS.add(Lock.class);
         EQUIPMENTS.add(MotionDetector.class);
         EQUIPMENTS.add(NetworkAppliance.class);
+        EQUIPMENTS.add(Oven.class);
         EQUIPMENTS.add(PowerOutlet.class);
         EQUIPMENTS.add(Projector.class);
+        EQUIPMENTS.add(Pump.class);
         EQUIPMENTS.add(RadiatorControl.class);
         EQUIPMENTS.add(Receiver.class);
+        EQUIPMENTS.add(Refrigerator.class);
         EQUIPMENTS.add(RemoteControl.class);
         EQUIPMENTS.add(Screen.class);
+        EQUIPMENTS.add(Sensor.class);
+        EQUIPMENTS.add(SideDoor.class);
         EQUIPMENTS.add(Siren.class);
+        EQUIPMENTS.add(Smartphone.class);
         EQUIPMENTS.add(SmokeDetector.class);
         EQUIPMENTS.add(Speaker.class);
+        EQUIPMENTS.add(Television.class);
         EQUIPMENTS.add(Valve.class);
+        EQUIPMENTS.add(VoiceAssistant.class);
         EQUIPMENTS.add(WallSwitch.class);
+        EQUIPMENTS.add(WashingMachine.class);
+        EQUIPMENTS.add(WeatherService.class);
         EQUIPMENTS.add(WebService.class);
         EQUIPMENTS.add(WhiteGood.class);
         EQUIPMENTS.add(Window.class);

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Fan.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Fan.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Fan", label = "Fan", synonyms = "Fans", description = "")
+public interface Fan extends Equipment {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Freezer.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Freezer.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_WhiteGood_Freezer", label = "Freezer", synonyms = "Freezers", description = "")
+public interface Freezer extends WhiteGood {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Gate.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Gate.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Door_Gate", label = "Gate", synonyms = "Gates", description = "")
+public interface Gate extends Door {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/InnerDoor.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Inner Door.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Door_InnerDoor", label = "Inner Door", synonyms = "Inner Doors", description = "")
+public interface InnerDoor extends Door {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/KitchenHood.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Kitchen Hood.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Fan_KitchenHood", label = "Kitchen Hood", synonyms = "Kitchen Hoods", description = "")
+public interface KitchenHood extends Fan {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LightStripe.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Light Stripe.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Lightbulb_LightStripe", label = "Light Stripe", synonyms = "Light Stripes", description = "")
+public interface LightStripe extends Lightbulb {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java

@@ -13,7 +13,6 @@
 package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.core.semantics.model.Equipment;
 import org.openhab.core.semantics.model.TagInfo;
 
 /**
@@ -22,6 +21,6 @@ import org.openhab.core.semantics.model.TagInfo;
  * @author Generated from generateTagClasses.groovy - Initial contribution
  */
 @NonNullByDefault
-@TagInfo(id = "Equipment_MotionDetector", label = "Motion Detector", synonyms = "Motion Detectors, Motion sensor, Motion sensors", description = "")
-public interface MotionDetector extends Equipment {
+@TagInfo(id = "Equipment_Sensor_MotionDetector", label = "Motion Detector", synonyms = "Motion Detectors, Motion sensor, Motion sensors", description = "")
+public interface MotionDetector extends Sensor {
 }

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Oven.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Oven.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_WhiteGood_Oven", label = "Oven", synonyms = "Ovens", description = "")
+public interface Oven extends WhiteGood {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Pump.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Pump.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Pump", label = "Pump", synonyms = "Pumps", description = "")
+public interface Pump extends Equipment {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Refrigerator.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Refrigerator.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_WhiteGood_Refrigerator", label = "Refrigerator", synonyms = "Refrigerators", description = "")
+public interface Refrigerator extends WhiteGood {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java

@@ -22,6 +22,6 @@ import org.openhab.core.semantics.model.TagInfo;
  * @author Generated from generateTagClasses.groovy - Initial contribution
  */
 @NonNullByDefault
-@TagInfo(id = "Equipment_Screen", label = "Screen", synonyms = "Screens, Television, Televisions, TV, TVs", description = "")
+@TagInfo(id = "Equipment_Screen", label = "Screen", synonyms = "Screens", description = "")
 public interface Screen extends Equipment {
 }

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Sensor.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Sensor.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Sensor", label = "Sensor", synonyms = "Sensors", description = "")
+public interface Sensor extends Equipment {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SideDoor.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Side Door.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Door_SideDoor", label = "Side Door", synonyms = "Side Doors", description = "")
+public interface SideDoor extends Door {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Smartphone.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Smartphone.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Smartphone", label = "Smartphone", synonyms = "Smartphones, Phone, Phones", description = "")
+public interface Smartphone extends Equipment {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java

@@ -13,7 +13,6 @@
 package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.core.semantics.model.Equipment;
 import org.openhab.core.semantics.model.TagInfo;
 
 /**
@@ -22,6 +21,6 @@ import org.openhab.core.semantics.model.TagInfo;
  * @author Generated from generateTagClasses.groovy - Initial contribution
  */
 @NonNullByDefault
-@TagInfo(id = "Equipment_SmokeDetector", label = "Smoke Detector", synonyms = "Smoke Detectors", description = "")
-public interface SmokeDetector extends Equipment {
+@TagInfo(id = "Equipment_Sensor_SmokeDetector", label = "Smoke Detector", synonyms = "Smoke Detectors", description = "")
+public interface SmokeDetector extends Sensor {
 }

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Television.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Television.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_Screen_Television", label = "Television", synonyms = "Televisions, TV, TVs", description = "")
+public interface Television extends Screen {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/VoiceAssistant.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Voice Assistant.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_VoiceAssistant", label = "Voice Assistant", synonyms = "Voice Assistants", description = "")
+public interface VoiceAssistant extends Equipment {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WashingMachine.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Washing Machine.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_WhiteGood_WashingMachine", label = "Washing Machine", synonyms = "Washing Machines", description = "")
+public interface WashingMachine extends WhiteGood {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WeatherService.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.equipment;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Weather Service.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Equipment_WebService_WeatherService", label = "Weather Service", synonyms = "Weather Services", description = "")
+public interface WeatherService extends WebService {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Apartment.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Apartment.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Apartment", label = "Apartment", synonyms = "Apartments", description = "")
+public interface Apartment extends Indoor {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java

@@ -21,6 +21,6 @@ import org.openhab.core.semantics.model.TagInfo;
  * @author Generated from generateTagClasses.groovy - Initial contribution
  */
 @NonNullByDefault
-@TagInfo(id = "Location_Indoor_Floor_Basement", label = "Basement", synonyms = "Basements, Cellar, Cellars", description = "")
+@TagInfo(id = "Location_Indoor_Floor_Basement", label = "Basement", synonyms = "Basements", description = "")
 public interface Basement extends Floor {
 }

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java

@@ -21,6 +21,6 @@ import org.openhab.core.semantics.model.TagInfo;
  * @author Generated from generateTagClasses.groovy - Initial contribution
  */
 @NonNullByDefault
-@TagInfo(id = "Location_Indoor_Room_Bathroom", label = "Bathroom", synonyms = "Bathrooms, Bath, Baths", description = "")
+@TagInfo(id = "Location_Indoor_Room_Bathroom", label = "Bathroom", synonyms = "Bathrooms, Bath, Baths, Powder Room, Powder Rooms", description = "")
 public interface Bathroom extends Room {
 }

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/BoilerRoom.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Boiler Room.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Room_BoilerRoom", label = "Boiler Room", synonyms = "Boiler Rooms", description = "")
+public interface BoilerRoom extends Room {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Cellar.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Cellar.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Room_Cellar", label = "Cellar", synonyms = "Cellars", description = "")
+public interface Cellar extends Room {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java

@@ -21,6 +21,6 @@ import org.openhab.core.semantics.model.TagInfo;
  * @author Generated from generateTagClasses.groovy - Initial contribution
  */
 @NonNullByDefault
-@TagInfo(id = "Location_Indoor_Corridor", label = "Corridor", synonyms = "Corridors", description = "")
+@TagInfo(id = "Location_Indoor_Corridor", label = "Corridor", synonyms = "Corridors, Hallway, Hallways", description = "")
 public interface Corridor extends Indoor {
 }

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/DiningRoom.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Dining Room.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Room_DiningRoom", label = "Dining Room", synonyms = "Dining Rooms", description = "")
+public interface DiningRoom extends Room {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Driveway.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Driveway.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Outdoor_Driveway", label = "Driveway", synonyms = "Driveways", description = "")
+public interface Driveway extends Outdoor {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Entry.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Entry.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Room_Entry", label = "Entry", synonyms = "Entries, Foyer, Foyers", description = "")
+public interface Entry extends Room {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FamilyRoom.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Family Room.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Room_FamilyRoom", label = "Family Room", synonyms = "Family Rooms", description = "")
+public interface FamilyRoom extends Room {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GuestRoom.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Guest Room.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Room_GuestRoom", label = "Guest Room", synonyms = "Guest Rooms", description = "")
+public interface GuestRoom extends Room {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/House.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a House.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Building_House", label = "House", synonyms = "Houses", description = "")
+public interface House extends Building {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LaundryRoom.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Laundry Room.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Room_LaundryRoom", label = "Laundry Room", synonyms = "Laundry Rooms", description = "")
+public interface LaundryRoom extends Room {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java

@@ -31,24 +31,42 @@ public class Locations {
 
     static {
         LOCATIONS.add(Location.class);
+        LOCATIONS.add(Apartment.class);
         LOCATIONS.add(Attic.class);
         LOCATIONS.add(Basement.class);
         LOCATIONS.add(Bathroom.class);
         LOCATIONS.add(Bedroom.class);
+        LOCATIONS.add(BoilerRoom.class);
         LOCATIONS.add(Building.class);
         LOCATIONS.add(Carport.class);
+        LOCATIONS.add(Cellar.class);
         LOCATIONS.add(Corridor.class);
+        LOCATIONS.add(DiningRoom.class);
+        LOCATIONS.add(Driveway.class);
+        LOCATIONS.add(Entry.class);
+        LOCATIONS.add(FamilyRoom.class);
         LOCATIONS.add(FirstFloor.class);
         LOCATIONS.add(Floor.class);
         LOCATIONS.add(Garage.class);
         LOCATIONS.add(Garden.class);
         LOCATIONS.add(GroundFloor.class);
+        LOCATIONS.add(GuestRoom.class);
+        LOCATIONS.add(House.class);
         LOCATIONS.add(Indoor.class);
         LOCATIONS.add(Kitchen.class);
+        LOCATIONS.add(LaundryRoom.class);
         LOCATIONS.add(LivingRoom.class);
+        LOCATIONS.add(Office.class);
         LOCATIONS.add(Outdoor.class);
+        LOCATIONS.add(Patio.class);
+        LOCATIONS.add(Porch.class);
         LOCATIONS.add(Room.class);
+        LOCATIONS.add(SecondFloor.class);
+        LOCATIONS.add(Shed.class);
+        LOCATIONS.add(SummerHouse.class);
         LOCATIONS.add(Terrace.class);
+        LOCATIONS.add(ThirdFloor.class);
+        LOCATIONS.add(Veranda.class);
     }
 
     public static Stream<Class<? extends Location>> stream() {

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Office.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Office.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Room_Office", label = "Office", synonyms = "Offices", description = "")
+public interface Office extends Room {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Patio.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Patio.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Outdoor_Patio", label = "Patio", synonyms = "Patios", description = "")
+public interface Patio extends Outdoor {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Porch.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Porch.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Outdoor_Porch", label = "Porch", synonyms = "Proches", description = "")
+public interface Porch extends Outdoor {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SecondFloor.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Second Floor.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Floor_SecondFloor", label = "Second Floor", synonyms = "Second Floors", description = "")
+public interface SecondFloor extends Floor {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Shed.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Shed.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Building_Shed", label = "Shed", synonyms = "Sheds", description = "")
+public interface Shed extends Building {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SummerHouse.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Summer House.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Building_SummerHouse", label = "Summer House", synonyms = "Summer Houses, Second Home, Second Homes", description = "")
+public interface SummerHouse extends Building {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/ThirdFloor.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Third Floor.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Floor_ThirdFloor", label = "Third Floor", synonyms = "Third Floors", description = "")
+public interface ThirdFloor extends Floor {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Veranda.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.location;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Veranda.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Location_Indoor_Room_Veranda", label = "Veranda", synonyms = "Verandas", description = "")
+public interface Veranda extends Room {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Duration.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.property;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Duration.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Property_Duration", label = "Duration", synonyms = "", description = "")
+public interface Duration extends Property {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Illuminance.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.property;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Illuminance.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Property_Illuminance", label = "Illuminance", synonyms = "", description = "")
+public interface Illuminance extends Property {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Level.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.property;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Level.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Property_Level", label = "Level", synonyms = "", description = "")
+public interface Level extends Property {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Opening.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.property;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Opening.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Property_Opening", label = "Opening", synonyms = "", description = "")
+public interface Opening extends Property {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java

@@ -35,13 +35,17 @@ public class Properties {
         PROPERTIES.add(CO2.class);
         PROPERTIES.add(ColorTemperature.class);
         PROPERTIES.add(Current.class);
+        PROPERTIES.add(Duration.class);
         PROPERTIES.add(Energy.class);
         PROPERTIES.add(Frequency.class);
         PROPERTIES.add(Gas.class);
         PROPERTIES.add(Humidity.class);
+        PROPERTIES.add(Illuminance.class);
+        PROPERTIES.add(Level.class);
         PROPERTIES.add(Light.class);
         PROPERTIES.add(Noise.class);
         PROPERTIES.add(Oil.class);
+        PROPERTIES.add(Opening.class);
         PROPERTIES.add(Power.class);
         PROPERTIES.add(Presence.class);
         PROPERTIES.add(Pressure.class);
@@ -49,6 +53,9 @@ public class Properties {
         PROPERTIES.add(Smoke.class);
         PROPERTIES.add(SoundVolume.class);
         PROPERTIES.add(Temperature.class);
+        PROPERTIES.add(Timestamp.class);
+        PROPERTIES.add(Ultraviolet.class);
+        PROPERTIES.add(Vibration.class);
         PROPERTIES.add(Voltage.class);
         PROPERTIES.add(Water.class);
         PROPERTIES.add(Wind.class);

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Timestamp.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.property;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Timestamp.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Property_Timestamp", label = "Timestamp", synonyms = "", description = "")
+public interface Timestamp extends Property {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Ultraviolet.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.property;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Ultraviolet.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Property_Ultraviolet", label = "Ultraviolet", synonyms = "UV", description = "")
+public interface Ultraviolet extends Property {
+}

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Vibration.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.semantics.model.property;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
+
+/**
+ * This class defines a Vibration.
+ *
+ * @author Generated from generateTagClasses.groovy - Initial contribution
+ */
+@NonNullByDefault
+@TagInfo(id = "Property_Vibration", label = "Vibration", synonyms = "", description = "")
+public interface Vibration extends Property {
+}

bundles/org.openhab.core.semantics/src/main/resources/tags.properties

@@ -1,22 +1,40 @@
 # Generated content - do not edit!
 Location_Indoor=Indoor
+Location_Indoor_Apartment=Apartment,Apartments
 Location_Indoor_Building=Building,Buildings
 Location_Indoor_Building_Garage=Garage,Garages
+Location_Indoor_Building_House=House,Houses
+Location_Indoor_Building_Shed=Shed,Sheds
+Location_Indoor_Building_SummerHouse=Summer House,Summer Houses,Second Home,Second Homes
 Location_Indoor_Floor=Floor,Floors
 Location_Indoor_Floor_GroundFloor=Ground Floor,Ground Floors,Downstairs
 Location_Indoor_Floor_FirstFloor=First Floor,First Floors,Upstairs
+Location_Indoor_Floor_SecondFloor=Second Floor,Second Floors
+Location_Indoor_Floor_ThirdFloor=Third Floor,Third Floors
 Location_Indoor_Floor_Attic=Attic,Attics
-Location_Indoor_Floor_Basement=Basement,Basements,Cellar,Cellars
-Location_Indoor_Corridor=Corridor,Corridors
+Location_Indoor_Floor_Basement=Basement,Basements
+Location_Indoor_Corridor=Corridor,Corridors,Hallway,Hallways
 Location_Indoor_Room=Room,Rooms
+Location_Indoor_Room_Bathroom=Bathroom,Bathrooms,Bath,Baths,Powder Room,Powder Rooms
 Location_Indoor_Room_Bedroom=Bedroom,Bedrooms
+Location_Indoor_Room_BoilerRoom=Boiler Room,Boiler Rooms
+Location_Indoor_Room_Cellar=Cellar,Cellars
+Location_Indoor_Room_DiningRoom=Dining Room,Dining Rooms
+Location_Indoor_Room_Entry=Entry,Entries,Foyer,Foyers
+Location_Indoor_Room_FamilyRoom=Family Room,Family Rooms
+Location_Indoor_Room_GuestRoom=Guest Room,Guest Rooms
 Location_Indoor_Room_Kitchen=Kitchen,Kitchens
-Location_Indoor_Room_Bathroom=Bathroom,Bathrooms,Bath,Baths
+Location_Indoor_Room_LaundryRoom=Laundry Room,Laundry Rooms
 Location_Indoor_Room_LivingRoom=Living Room,Living Rooms
+Location_Indoor_Room_Office=Office,Offices
+Location_Indoor_Room_Veranda=Veranda,Verandas
 Location_Outdoor=Outdoor
-Location_Outdoor_Garden=Garden,Gardens
-Location_Outdoor_Terrace=Terrace,Terraces,Deck,Decks
 Location_Outdoor_Carport=Carport,Carports
+Location_Outdoor_Driveway=Driveway,Driveways
+Location_Outdoor_Garden=Garden,Gardens
+Location_Outdoor_Patio=Patio,Patios
+Location_Outdoor_Porch=Porch,Proches
+Location_Outdoor_Terrace=Terrace,Terraces,Deck,Decks
 Property_Temperature=Temperature,Temperatures
 Property_Light=Light,Lights,Lighting
 Property_ColorTemperature=Color Temperature
@@ -38,6 +56,13 @@ Property_Frequency=Frequency
 Property_Gas=Gas
 Property_SoundVolume=Sound Volume
 Property_Oil=Oil
+Property_Duration=Duration
+Property_Illuminance=Illuminance
+Property_Level=Level
+Property_Opening=Opening
+Property_Timestamp=Timestamp
+Property_Ultraviolet=Ultraviolet,UV
+Property_Vibration=Vibration
 Point_Alarm=Alarm
 Point_Control=Control
 Point_Control_Switch=Switch
@@ -45,36 +70,60 @@ Point_Measurement=Measurement
 Point_Setpoint=Setpoint
 Point_Status=Status
 Point_Status_LowBattery=LowBattery
+Point_Status_OpenLevel=OpenLevel
 Point_Status_OpenState=OpenState
 Point_Status_Tampered=Tampered
-Point_Status_OpenLevel=OpenLevel
 Point_Status_Tilt=Tilt
+Equipment_AlarmSystem=Alarm System,Alarm Systems
 Equipment_Battery=Battery,Batteries
 Equipment_Blinds=Blinds,Rollershutter,Rollershutters,Roller shutter,Roller shutters,Shutter,Shutters
+Equipment_Boiler=Boiler,Boilers
 Equipment_Camera=Camera,Cameras
 Equipment_Car=Car,Cars
 Equipment_CleaningRobot=Cleaning Robot,Cleaning Robots,Vacuum robot,Vacuum robots
 Equipment_Door=Door,Doors
+Equipment_Door_BackDoor=Back Door,Back Doors
+Equipment_Door_CellarDoor=Cellar Door,Cellar Doors
 Equipment_Door_FrontDoor=Front Door,Front Doors,Frontdoor,Frontdoors
 Equipment_Door_GarageDoor=Garage Door,Garage Doors
+Equipment_Door_Gate=Gate,Gates
+Equipment_Door_InnerDoor=Inner Door,Inner Doors
+Equipment_Door_SideDoor=Side Door,Side Doors
+Equipment_Doorbell=Doorbell,Doorbells
+Equipment_Fan=Fan,Fans
+Equipment_Fan_CeilingFan=Ceiling Fan,Ceiling Fans
+Equipment_Fan_KitchenHood=Kitchen Hood,Kitchen Hoods
 Equipment_HVAC=HVAC,Heating,Ventilation,Air Conditioning,A/C,A/Cs,AC
 Equipment_Inverter=Inverter,Inverters
 Equipment_LawnMower=Lawn Mower,Lawn Mowers
 Equipment_Lightbulb=Lightbulb,Lightbulbs,Bulb,Bulbs,Lamp,Lamps,Lights,Lighting
+Equipment_Lightbulb_LightStripe=Light Stripe,Light Stripes
 Equipment_Lock=Lock,Locks
-Equipment_MotionDetector=Motion Detector,Motion Detectors,Motion sensor,Motion sensors
 Equipment_NetworkAppliance=Network Appliance,Network Appliances
 Equipment_PowerOutlet=Power Outlet,Power Outlets,Outlet,Outlets
 Equipment_Projector=Projector,Projectors,Beamer,Beamers
+Equipment_Pump=Pump,Pumps
 Equipment_RadiatorControl=Radiator Control,Radiator Controls,Radiator,Radiators
 Equipment_Receiver=Receiver,Receivers,Audio Receiver,Audio Receivers,AV Receiver,AV Receivers
 Equipment_RemoteControl=Remote Control,Remote Controls
-Equipment_Screen=Screen,Screens,Television,Televisions,TV,TVs
+Equipment_Screen=Screen,Screens
+Equipment_Screen_Television=Television,Televisions,TV,TVs
+Equipment_Sensor=Sensor,Sensors
+Equipment_Sensor_MotionDetector=Motion Detector,Motion Detectors,Motion sensor,Motion sensors
+Equipment_Sensor_SmokeDetector=Smoke Detector,Smoke Detectors
 Equipment_Siren=Siren,Sirens
-Equipment_SmokeDetector=Smoke Detector,Smoke Detectors
+Equipment_Smartphone=Smartphone,Smartphones,Phone,Phones
 Equipment_Speaker=Speaker,Speakers
 Equipment_Valve=Valve,Valves
+Equipment_VoiceAssistant=Voice Assistant,Voice Assistants
 Equipment_WallSwitch=Wall Switch,Wall Switches
 Equipment_WebService=Web Service,Web Services
-Equipment_Window=Window,Windows
+Equipment_WebService_WeatherService=Weather Service,Weather Services
 Equipment_WhiteGood=White Good,White Goods
+Equipment_WhiteGood_Dishwasher=Dishwasher,Dishwashers
+Equipment_WhiteGood_Dryer=Dryer,Dryers
+Equipment_WhiteGood_Freezer=Freezer,Freezers
+Equipment_WhiteGood_Oven=Oven,Ovens
+Equipment_WhiteGood_Refrigerator=Refrigerator,Refrigerators
+Equipment_WhiteGood_WashingMachine=Washing Machine,Washing Machines
+Equipment_Window=Window,Windows

bundles/org.openhab.core.semantics/src/main/resources/tags_de.properties

@@ -1,21 +1,39 @@
 Location_Indoor=Innen,Drinnen
-Location_Indoor_Building=Gebäude,Haus
+Location_Indoor_Apartment=Wohnung,Wohnungen
+Location_Indoor_Building=Gebäude
 Location_Indoor_Building_Garage=Garage,Garagen
+Location_Indoor_Building_House=Haus,Häuser
+Location_Indoor_Building_Shed=Schuppen,Stall,Ställe
+Location_Indoor_Building_SummerHouse=Sommerhaus,Sommerhäuser
 Location_Indoor_Floor=Stock,Stockwerk,Etage
 Location_Indoor_Floor_GroundFloor=Erdgeschoss,EG
-Location_Indoor_Floor_FirstFloor=Obergeschoss,OG
-Location_Indoor_Floor_Attic=Dachboden
+Location_Indoor_Floor_FirstFloor=Obergeschoss,OG,Erster Stock
+Location_Indoor_Floor_SecondFloor=Zweiter Stock
+Location_Indoor_Floor_ThirdFloor=Dritter Stock
+Location_Indoor_Floor_Attic=Dachboden,Dackgeschoss
 Location_Indoor_Floor_Basement=Keller,Untergeschoss
 Location_Indoor_Corridor=Korridor,Korridore,Hausgang,Flur,Flure
 Location_Indoor_Room=Raum,Räume,Zimmer
-Location_Indoor_Room_Bedroom=Schlafzimmer
-Location_Indoor_Room_Kitchen=Küche
 Location_Indoor_Room_Bathroom=Bad,Bäder,Badezimmer
+Location_Indoor_Room_Bedroom=Schlafzimmer
+Location_Indoor_Room_BoilerRoom=Heizungsraum
+Location_Indoor_Room_Cellar=Keller
+Location_Indoor_Room_DiningRoom=Esszimmer
+Location_Indoor_Room_Entry=Eingang,Eingänge
+Location_Indoor_Room_FamilyRoom=Familienzimmer
+Location_Indoor_Room_GuestRoom=Gästezimmer
+Location_Indoor_Room_Kitchen=Küche,Küchen
+Location_Indoor_Room_LaundryRoom=Hauswirtschftsraum,Hauswirtschftsräeum,Waschküche,Waschküchen
 Location_Indoor_Room_LivingRoom=Wohnzimmer
+Location_Indoor_Room_Office=Büro,Büros
+Location_Indoor_Room_Veranda=Veranda
 Location_Outdoor=Außen,Draußen
-Location_Outdoor_Garden=Garten,Gärten
-Location_Outdoor_Terrace=Terrasse,Freisitz
 Location_Outdoor_Carport=Carport,Carports,Autounterstand
+Location_Outdoor_Driveway=Auffahrt
+Location_Outdoor_Garden=Garten,Gärten
+Location_Outdoor_Patio=Patio,Innenhof
+Location_Outdoor_Porch=Vorhalle,Lobby
+Location_Outdoor_Terrace=Terrasse,Freisitz
 Property_Temperature=Temperatur,Temperaturen
 Property_Light=Licht,Lichter,Beleuchtung
 Property_ColorTemperature=Farbtemperatur
@@ -37,6 +55,13 @@ Property_Frequency=Frequenz
 Property_Gas=Gas
 Property_SoundVolume=Lautstärke
 Property_Oil=Öl
+Property_Duration=Dauer
+Property_Illuminance=Beleuchtungsstärke
+Property_Level=Ebene,Ebenen,Level
+Property_Opening=Eröffnung
+Property_Timestamp=Zeitpunkt,Zeitpunkte
+Property_Ultraviolet=Ultraviolett
+Property_Vibration=Vibration,Vibrationen
 Point_Alarm=Alarm,Alarme
 Point_Control=Regler,Bedienung,Steuerung
 Point_Control_Switch=Schalter
@@ -44,36 +69,60 @@ Point_Measurement=Messung,Messungen
 Point_Setpoint=Sollwert,Sollwerte
 Point_Status=Status
 Point_Status_LowBattery=Niedriger Batteriestatus
+Point_Status_OpenLevel=Öffnungsniveau
 Point_Status_OpenState=Offen,Offener Zustand
 Point_Status_Tampered=Manipuliert
-Point_Status_OpenLevel=Öffnungsniveau
 Point_Status_Tilt=Neigung
+Equipment_AlarmSystem=Alarmanlage,Alarmanlagen
 Equipment_Battery=Batterie,Batterien
 Equipment_Blinds=Jalousie,Jalousien,Rollladen,Rollläden
+Equipment_Boiler=Kessel,Heizkessel,Boiler
 Equipment_Camera=Kamera,Kameras
 Equipment_Car=Auto,Autos,Wagen,KFZ
 Equipment_CleaningRobot=Roboterstaubsauger,Reinigungsroboter,Staubsaugerroboter
+Equipment_Doorbell=Türklingel
 Equipment_Door=Tür,Türen
-Equipment_Door_FrontDoor=Haustür,Haustüren,Eingangstür,Vordertür,Fronttür,Fronttüren
+Equipment_Door_BackDoor=Hintertür,Hintertüren
+Equipment_Door_CellarDoor=Kellertür,Kellertüren
+Equipment_Door_FrontDoor=Haustür,Haustüren,Eingangstür,Eingangstüren,Vordertür,Vordertüren,Fronttür,Fronttüren
 Equipment_Door_GarageDoor=Garagentor,Garagentore
+Equipment_Door_Gate=Tor,Tore,Pforte,Pforten
+Equipment_Door_InnerDoor=Innentür,Innentüren
+Equipment_Door_SideDoor=Seitentür,Seitentüren,Seiteneingang,Seiteneingänge
+Equipment_Fan=Ventilator,Ventilatoren
+Equipment_Fan_CeilingFan=Deckenventilator,Deckenventilatoren
+Equipment_Fan_KitchenHood=Dunstabzugshaube,Dunstabzugshauben
 Equipment_HVAC=Heizung,Lüftung,Klima,Klimaanlage
 Equipment_Inverter=Wechselrichter
 Equipment_LawnMower=Rasenmäher,Mähroboter,Mäher
 Equipment_Lightbulb=Glühbirne,Glühbirnen,Licht,Lichter,Beleuchtung,Lampe,Lampen
+Equipment_Lightbulb_LightStripe=Lichtstreifen
 Equipment_Lock=Schloss,Schlösser,Türschloss,Türschlösser
-Equipment_MotionDetector=Bewegung,Bewegungssensor,Bewegungssensoren,Bewegungsdetektor,Bewegungsmelder
 Equipment_NetworkAppliance=Netzwerk,Server,Servers,Gateway,Gateways,Bridge,Bridges,Router
 Equipment_PowerOutlet=Steckdose,Steckdosen
 Equipment_Projector=Projektor,Projektoren,Beamer
+Equipment_Pump=Pump,Pumpen
 Equipment_RadiatorControl=Heizkörper,Heizkörperregelung,Thermostat,Thermostate,Heizkörperthermostat,Heizkörperthermostate
 Equipment_Receiver=Receiver,AV-Receiver,Audio-Spieler,Empfänger,Audioempfänger
 Equipment_RemoteControl=Fernbedienung,Fernbedienungen
-Equipment_Screen=Bildschirm,Bildschirme,Fernseher,Monitor,Monitore,TV
+Equipment_Screen=Bildschirm,Bildschirme,Monitor,Monitore
+Equipment_Screen_Television=Fernseher,TV,TVs
+Equipment_Sensor=Sensor,Sensoren
+Equipment_Sensor_MotionDetector=Bewegung,Bewegungssensor,Bewegungssensoren,Bewegungsdetektor,Bewegungsmelder
+Equipment_Sensor_SmokeDetector=Rauchmelder
 Equipment_Siren=Sirene,Sirenen
-Equipment_SmokeDetector=Rauchmelder
+Equipment_Smartphone=Smartphone,Smartphones,Handy,Handys
 Equipment_Speaker=Lautsprecher
 Equipment_Valve=Ventil,Ventile
+Equipment_VoiceAssistant=Sprachassistent,Sprachassistenten
 Equipment_WallSwitch=Wandschalter,Wanddimmer,Lichtschalter,Schalter
 Equipment_WebService=Web Service,Web Services
+Equipment_WebService_WeatherService=Wetterdienst,Wetterdienste
+Equipment_WhiteGood=Haushaltsgerät,Haushaltsgeräte,Hausgerät,Hausgeräte
+Equipment_WhiteGood_Dishwasher=Spülmaschine,Spülmaschinen,Geschirrspüler
+Equipment_WhiteGood_Dryer=Trockner,Wäschetrockner
+Equipment_WhiteGood_Freezer=Gefriertruhe,Gefriertruhen,Gefrierschrank,Gefrierschränke
+Equipment_WhiteGood_Oven=Ofen,Öfen,Backofen,Backöfen,Herd
+Equipment_WhiteGood_Refrigerator=Kühlschrank,Kühlschränke
+Equipment_WhiteGood_WashingMachine=Waschmaschine,Waschmaschinen
 Equipment_Window=Fenster
-Equipment_WhiteGood=Haushaltsgerät,Haushaltsgeräte,Hausgerät,Hausgeräte,Waschmaschine,Waschmaschinen,Geschirrspüler,Trockner,Wäschetrockner,Kühlschrank,Kühlschränke,Ofen,Backofen,Herd,Gefrierschrank

bundles/org.openhab.core.semantics/src/main/resources/tags_fr.properties

@@ -1,21 +1,39 @@
 Location_Indoor=intérieur,dedans
-Location_Indoor_Building=bâtiment,bâtiments,maison,maisons
+Location_Indoor_Apartment=appartement,appartements
+Location_Indoor_Building=bâtiment,bâtiments
 Location_Indoor_Building_Garage=garage,garages
+Location_Indoor_Building_House=maison,maisons
+Location_Indoor_Building_Shed=cabanon,cabanons
+Location_Indoor_Building_SummerHouse=maison d'été,maisons d'été,maison secondaire,maisons secondaires
 Location_Indoor_Floor=étage,étages
 Location_Indoor_Floor_GroundFloor=rez de chaussée,rez-de-chaussée
 Location_Indoor_Floor_FirstFloor=premier étage
+Location_Indoor_Floor_SecondFloor=second étage,deuxième étage
+Location_Indoor_Floor_ThirdFloor=troisième étage
 Location_Indoor_Floor_Attic=grenier,greniers
-Location_Indoor_Floor_Basement=cave,caves
+Location_Indoor_Floor_Basement=sous-sol,sous-sols
 Location_Indoor_Corridor=couloir,couloirs
 Location_Indoor_Room=pièce,pièces
+Location_Indoor_Room_Bathroom=salle de bain,salles de bain,salle d'eau,salles d'eau
 Location_Indoor_Room_Bedroom=chambre,chambre à coucher,chambres,chambres à coucher
+Location_Indoor_Room_BoilerRoom=chaufferie,chaufferies
+Location_Indoor_Room_Cellar=cave,caves
+Location_Indoor_Room_DiningRoom=salle à manger,salles à manger
+Location_Indoor_Room_Entry=entrée,entrées
+Location_Indoor_Room_FamilyRoom=salle familiale,salles familiales
+Location_Indoor_Room_GuestRoom=chambre d'amis,chambres d'amis
 Location_Indoor_Room_Kitchen=cuisine,cuisines
-Location_Indoor_Room_Bathroom=salle de bain,salles de bain
-Location_Indoor_Room_LivingRoom=salon,séjour
+Location_Indoor_Room_LaundryRoom=buanderie,buanderies
+Location_Indoor_Room_LivingRoom=salon,salons,séjour,séjours
+Location_Indoor_Room_Office=bureau,bureaux
+Location_Indoor_Room_Veranda=véranda,vérandas
 Location_Outdoor=extérieur,dehors
-Location_Outdoor_Garden=jardin,jardins
-Location_Outdoor_Terrace=terrasse,terrasses
 Location_Outdoor_Carport=abri,abris,abri voiture,abris voitures
+Location_Outdoor_Driveway=allée,allées
+Location_Outdoor_Garden=jardin,jardins
+Location_Outdoor_Patio=patio,patios
+Location_Outdoor_Porch=porche,porches
+Location_Outdoor_Terrace=terrasse,terrasses
 Property_Temperature=température,températures
 Property_Light=lumière,lumières,lampes,éclairage
 Property_ColorTemperature=température de couleur,température couleur
@@ -37,6 +55,13 @@ Property_Frequency=fr
 Property_Gas=gaz
 Property_SoundVolume=volume,volumes,volume sonore,volumes sonores
 Property_Oil=fioul,fuel,pétrole
+Property_Duration=durée
+Property_Illuminance=luminance,éclairement
+Property_Level=niveau
+Property_Opening=ouverture
+Property_Timestamp=horodatage,heure
+Property_Ultraviolet=Ultraviolet,UV
+Property_Vibration=Vibration
 Point_Alarm=alarme,alarmes
 Point_Control=contrôle,contrôles
 Point_Control_Switch=interrupteurs
@@ -44,36 +69,60 @@ Point_Measurement=mesure,mesures
 Point_Setpoint=réglage,réglages,consigne,consignes
 Point_Status=statut,statuts
 Point_Status_LowBattery=batterie faible,batteries faibles
+Point_Status_OpenLevel=niveau d'ouverture,niveaux d'ouverture
 Point_Status_OpenState=ouverture,ouvertures
 Point_Status_Tampered=vandalisé,manipulé,trafiqué
-Point_Status_OpenLevel=niveau d'ouverture,niveaux d'ouverture
 Point_Status_Tilt=inclinaison,inclinaisons
+Equipment_AlarmSystem=système d'alarme,systèmes d'alarme
 Equipment_Battery=batterie,batteries
 Equipment_Blinds=store,stores,volet,volets
+Equipment_Boiler=chaudière,chaudières
 Equipment_Camera=caméra,caméras
 Equipment_Car=voiture,voitures
 Equipment_CleaningRobot=robot ménager,robots ménagers,robot aspirateur,robots aspirateurs
 Equipment_Door=porte,portes
+Equipment_Door_BackDoor=porte arrière,portes arrière,porte de derrière,portes de derrière
+Equipment_Door_CellarDoor=porte de cave,portes de cave
 Equipment_Door_FrontDoor=porte d'entrée,portes d'entrée
 Equipment_Door_GarageDoor=porte de garage,porte du garage,portes de garage,portes des garages
+Equipment_Door_Gate=portail,portails
+Equipment_Door_InnerDoor=porte intérieure,portes intérioeures
+Equipment_Door_SideDoor=porte de côté,portes de côté
+Equipment_Doorbell=sonnette,sonnettes
+Equipment_Fan=ventilateur,ventilateurs
+Equipment_Fan_CeilingFan=ventilateur de plafond,ventilateurs de plafond
+Equipment_Fan_KitchenHood=hotte de cuisine,hottes de cuisine,hotte,hottes
 Equipment_HVAC=chauffage,ventilation,air conditionné
 Equipment_Inverter=convertisseur,onduleur,convertisseur solaire,onduleur solaire,panneau solaire,panneaux solaires
 Equipment_LawnMower=tondeuse,tondeuses,tondeuse à gazon,tondeuses à gazon
 Equipment_Lightbulb=ampoule,ampoules,lumière,lumières,lampe,lampes
+Equipment_Lightbulb_LightStripe=bandeau lumineux,bandeaux lumineux
 Equipment_Lock=serrure,serrures,verrou,verrous
-Equipment_MotionDetector=mouvement,détecteur de mouvement,détecteurs de mouvement,détection de mouvement
 Equipment_NetworkAppliance=réseau,serveur,serveurs,routeur,routeurs
 Equipment_PowerOutlet=prise,prises,prise de courant,prises de courant
 Equipment_Projector=projecteur,projecteurs
+Equipment_Pump=pompe,pompes
 Equipment_RadiatorControl=radiateur,radiateurs,themostat,thermostats
 Equipment_Receiver=amplificateur,amplificateurs,ampli,amplis,récepteur,récepteurs
 Equipment_RemoteControl=télécommande,télécommandes
-Equipment_Screen=écran,écrans,télé,télés,télévision,télévisions,tv,tvs
+Equipment_Screen=écran,écrans
+Equipment_Screen_Television=télé,télés,télévision,télévisions,tv,tvs
+Equipment_Sensor=sonde,sondes
+Equipment_Sensor_MotionDetector=détecteur de mouvement,détecteurs de mouvement,détection de mouvement
+Equipment_Sensor_SmokeDetector=détecteur de fumée,détecteurs de fumée,détection de fumée
 Equipment_Siren=sirène,sirènes
-Equipment_SmokeDetector=fumée,détecteur de fumée,détecteurs de fumée,détection de fumée
+Equipment_Smartphone=téléphone,téléphones
 Equipment_Speaker=enceinte,enceintes,haut parleur,haut parleurs,haut-parleur,haut-parleurs
 Equipment_Valve=valve,valves
+Equipment_VoiceAssistant=assistant vocal,assistants vocaux
 Equipment_WallSwitch=interrupteur,interrupteur,interrupteur mural,interrupteurs muraux
 Equipment_WebService=web service,web services
+Equipment_WebService_WeatherService=service météo,services météo
+Equipment_WhiteGood=électroménager,appareil électroménager,appareils électroménagers
+Equipment_WhiteGood_Dishwasher=lave-vaiselle,lave-vaiselles,lave vaiselle,lave vaiselles
+Equipment_WhiteGood_Dryer=sèche-linge,sèche-linges,sèche linge,sèche linges
+Equipment_WhiteGood_Freezer=congélateur,congélateurs
+Equipment_WhiteGood_Oven=four,fours
+Equipment_WhiteGood_Refrigerator=réfrigérateur,réfrigérateurs,frigo,frigos
+Equipment_WhiteGood_WashingMachine=machine à laver,machines à laver
 Equipment_Window=fenêtre,fenêtres
-Equipment_WhiteGood=électroménager,appareil électroménager,appareils électroménagers,machine à laver,machines à laver,lave vaiselle,lave vaisselles,sèche linge,sèche linges,réfrigérateur,réfrigérateurs,frigo,frigos,four,fours

bundles/org.openhab.core.semantics/src/main/resources/tags_nl.properties

@@ -1,21 +1,39 @@
 Location_Indoor=Binnen
-Location_Indoor_Building=Gebouw,Gebouwen,Huis,Huizen,Woning,Woningen
+Location_Indoor_Apartment=Appartement,Appartementen
+Location_Indoor_Building=Gebouw,Gebouwen
 Location_Indoor_Building_Garage=Garage,Garages
+Location_Indoor_Building_House= Huis,Huizen,Woning,Woningen
+Location_Indoor_Building_Shed= Schuur,Schuren
+Location_Indoor_Building_SummerHouse= Vakantiewoning,Vakantiewoningen,Tweede Woning,Recreatiewoning
 Location_Indoor_Floor=Verdieping,Verdiepingen,Etage,Etages,Vloer,Vloeren
 Location_Indoor_Floor_GroundFloor=Begane Grond,Beneden,Beneden Etage,Gelijkvloers
 Location_Indoor_Floor_FirstFloor=Eerste Verdieping,Eerste Etage,Boven,Bovenverdieping
+Location_Indoor_Floor_SecondFloor=Tweede Verdieping,Derde Etage
+Location_Indoor_Floor_ThirdFloor=Derde Verdieping,Derde Etage
 Location_Indoor_Floor_Attic=Zolder,Zolders
 Location_Indoor_Floor_Basement=Kelder,Kelders
 Location_Indoor_Corridor=Hal,Gang
 Location_Indoor_Room=Kamer,Kamers,Vertrek,Vertrekken,Ruimte,Ruimtes,Verblijf,Verblijven
-Location_Indoor_Room_Bedroom=Slaapkamer,Slaapkamers
-Location_Indoor_Room_Kitchen=Keuken,Keukens
 Location_Indoor_Room_Bathroom=Badkamer,Badkamers
+Location_Indoor_Room_Bedroom=Slaapkamer,Slaapkamers
+Location_Indoor_Room_BoilerRoom=CV ruimte, CV Ruimes, Ketelruimte, Ketelruimtes 
+Location_Indoor_Room_Cellar=Kelder,Kelders
+Location_Indoor_Room_DiningRoom=Eetkamer,Eetkamers
+Location_Indoor_Room_Entry=Ingang,Ingangen
+Location_Indoor_Room_FamilyRoom=Familiekamer,Familiekamers
+Location_Indoor_Room_GuestRoom=Logeerkamer,Logeerkamers,Gastenkamer,Gastenkamers
+Location_Indoor_Room_Kitchen=Keuken,Keukens
+Location_Indoor_Room_LaundryRoom=Wasruimte,Wasruimtes
 Location_Indoor_Room_LivingRoom=Woonkamer,Woonkamers
+Location_Indoor_Room_Office=Kantoor,Kantoren
+Location_Indoor_Room_Veranda=Veranda,Veranda''s
 Location_Outdoor=Buiten
+Location_Outdoor_Carport=Carport,Carports
+Location_Outdoor_Driveway=Oprit,Opritten
 Location_Outdoor_Garden=Tuin,Tuinen
+Location_Outdoor_Patio=Terras,Terassen,Patio,Patio''s
+Location_Outdoor_Porch=Veranda,Veranda''s
 Location_Outdoor_Terrace=Terras,Patio
-Location_Outdoor_Carport=Carport
 Property_Temperature=Temperatuur,Temperaturen
 Property_Light=Licht,Lichten
 Property_ColorTemperature=Kleur Temperatuur
@@ -37,6 +55,13 @@ Property_Frequency=Frequentie
 Property_Gas=Gas
 Property_SoundVolume=Geluidsvolume
 Property_Oil=Olie
+Property_Duration=Looptijd,Tijdsduur
+Property_Illuminance=Helderheid,Luminantie
+Property_Level=Niveau
+Property_Opening=Openen
+Property_Timestamp=Tijdstempel,Tijdsaanduiding
+Property_Ultraviolet=Ultraviolet,UV
+Property_Vibration=Vibratie
 Point_Alarm=Alarm
 Point_Control=Regelaar
 Point_Control_Switch=Schakelaar
@@ -44,36 +69,60 @@ Point_Measurement=Meting
 Point_Setpoint=Instelpunt
 Point_Status=Status
 Point_Status_LowBattery=Bijna Lege Batterij
+Point_Status_OpenLevel=Open niveau
 Point_Status_OpenState=Open,Open Toestand
 Point_Status_Tampered=Geknoeid
-Point_Status_OpenLevel=Open niveau
 Point_Status_Tilt=Gekanteld
+Equipment_AlarmSystem=Alarmsysteem,Alarmsystemen
 Equipment_Battery=Batterij,Batterijen
 Equipment_Blinds=Zonnewering,Zonneweringen,Jaloezien,Luxaflex,Lamellen,Rolgordijn,Rolgordijnen
+Equipment_Boiler=Boiler,Boilers
 Equipment_Camera=Camera,Camera''s
 Equipment_Car=Auto,Auto''s
 Equipment_CleaningRobot=Schoonmaak Robot,Schoonmaak Robots,Robotstofzuiger,Robotstofzuigers
 Equipment_Door=Deur,Deuren
+Equipment_Door_BackDoor=Achterdeur,Achterdeuren
+Equipment_Door_CellarDoor=Kelderdeur,Kelderdeuren
 Equipment_Door_FrontDoor=Voordeur
 Equipment_Door_GarageDoor=Garagedeur,Garagedeuren,Garagepoort
+Equipment_Door_Gate=Poortdeur,Poortdeuren
+Equipment_Door_InnerDoor=Binnendeur,Binnendeuren
+Equipment_Doorbell=Deurbel,Deurbellen
+Equipment_Fan=Ventilator,Ventilatoren
+Equipment_Door_SideDoor=Zijdeur,Zijdeuren
+Equipment_Fan_CeilingFan=Plafondventilator,Plafondventilatoren
+Equipment_Fan_KitchenHood=Afzuigkap,Afzuigkappen
 Equipment_HVAC=Verwarming,Centrale verwarming,CV,Ventilatie,Air Conditioning,A/C,A/Cs,AC
 Equipment_Inverter=Omvormer
 Equipment_LawnMower=Grasmaaier,Grasmaaiers,Grasmachine,Grasmachines
 Equipment_Lightbulb=Lamp,Lampen,Verlichting,Peertje,Peertjes,Gloeilamp,Gloeilampen
+Equipment_Lightbulb_LightStripe=LED strip, LED strips
 Equipment_Lock=Slot,Sloten
-Equipment_MotionDetector=Bewegingsdetector,Bewegingsdetectoren,Bewegingsmelder,Bewegingsmelders,Bewegingssensor,Bewegingssensors,Bewegingssensoren
-Equipment_NetworkAppliance=Netwerkapparatuur,Netwerkapparaat,Netwerkapparaten,Bridge,Bridges,Server,Servers,Router,Routers
+Equipment_NetworkAppliance=Netwerkapparatuur,Netwerkapparaat,Netwerkapparaten
 Equipment_PowerOutlet=Stopcontact,Stopcontacten,Wandcontactdoos,Wandcontactdozen,WCD,WCD''s,Stekkerdoos,Stekkerdozen
 Equipment_Projector=Projector,Projectors,Projectoren,Beamer,Beamers
+Equipment_Pump=Pomp,Pompen
 Equipment_RadiatorControl=Radiator,Thermostaat,Thermostaatknop,Verwarming
 Equipment_Receiver=Receiver,Versterker
 Equipment_RemoteControl=Afstandsbediening,Afstandsbedieningen
 Equipment_Screen=Scherm,Schermen,Televisie,Televisie,TV,TV''s,Beeldscherm,Beeldschermen
+Equipment_Screen_Television=Televisie,Televisie''s,TV,TV''s
+Equipment_Sensor=Sensor,Sensoren
+Equipment_Sensor_MotionDetector=Bewegingsdetector,Bewegingsdetectoren,Bewegingsmelder,Bewegingsmelders,Bewegingssensor,Bewegingssensors,Bewegingssensoren
+Equipment_Sensor_SmokeDetector=Rookmelder,Rookmelders
 Equipment_Siren=Sirene,Sirenes
-Equipment_SmokeDetector=Rookmelder,Rookmelders
+Equipment_Smartphone=Smartphone,Smartphones,Mobiele telefoon,Mobiele telefoons
 Equipment_Speaker=Box,Boxen,Luidspreker,Luidsprekers
 Equipment_Valve=Klep,Kleppen,Ventiel,Ventielen
+Equipment_VoiceAssistant=Stemassistent,Stemassistenten
 Equipment_WallSwitch=Wandschakelaar,Wandschakelaars,Muurschakelaar,Muurschakelaars
 Equipment_WebService=Web Service,Web Services
+Equipment_WebService_WeatherService=Weerbericht,Weerdienst
+Equipment_WhiteGood=Witgoed
+Equipment_WhiteGood_Dishwasher=Vaatwasser,Vaatwassers
+Equipment_WhiteGood_Dryer=Droger,Drogers
+Equipment_WhiteGood_Freezer=Vriezer,Vriezers
+Equipment_WhiteGood_Oven=Oven,Ovens
+Equipment_WhiteGood_Refrigerator=Koelkast,Koelkasten
+Equipment_WhiteGood_WashingMachine=Wasmachine,Wasmachines
 Equipment_Window=Raam,Ramen,Venster,Vensters
-Equipment_WhiteGood=Witgoed,Oven,Vaatwasser,Afwasmachine,Koelkast,Vriezer,Vrieskast,Diepvriezer,Droger,Droogkast,Wasmachine,Magnetron,Microgolfoven,Koelvriescombinatie,Combimagnetron,Fornuis,Kookplaat,Kookvuur,Stoomoven

bundles/org.openhab.core.semantics/src/main/resources/tags_no.properties

@@ -1,21 +1,39 @@
 Location_Indoor=Innendørs
+Location_Indoor_Apartment=xxx
 Location_Indoor_Building=Bygning,Bygninger
 Location_Indoor_Building_Garage=Garasje,Garasjer
+Location_Indoor_Building_House=xxx
+Location_Indoor_Building_Shed=xxx
+Location_Indoor_Building_SummerHouse=xxx
 Location_Indoor_Floor=Etasje,Etasjer
 Location_Indoor_Floor_GroundFloor=Første Etasje,Første Etasjer,Underetasjen
 Location_Indoor_Floor_FirstFloor=Andre Etasje,Andre Etasjer,Overetasjen
+Location_Indoor_Floor_SecondFloor=xxx
+Location_Indoor_Floor_ThirdFloor=xxx
 Location_Indoor_Floor_Attic=Loft
 Location_Indoor_Floor_Basement=Kjeller,Kjellere,Sokkel
 Location_Indoor_Corridor=Korridor,Korridorer
 Location_Indoor_Room=Rom
-Location_Indoor_Room_Bedroom=Soverom
-Location_Indoor_Room_Kitchen=Kjøkken
 Location_Indoor_Room_Bathroom=Baderom,Bad
+Location_Indoor_Room_Bedroom=Soverom
+Location_Indoor_Room_BoilerRoom=xxx
+Location_Indoor_Room_Cellar=xxx
+Location_Indoor_Room_DiningRoom=xxx
+Location_Indoor_Room_Entry=xxx
+Location_Indoor_Room_FamilyRoom=xxx
+Location_Indoor_Room_GuestRoom=xxx
+Location_Indoor_Room_Kitchen=Kjøkken
+Location_Indoor_Room_LaundryRoom=xxx
 Location_Indoor_Room_LivingRoom=Stue,Stuer
+Location_Indoor_Room_Office=xxx
+Location_Indoor_Room_Veranda=xxx
 Location_Outdoor=Utendørs
-Location_Outdoor_Garden=Hage,Hager
-Location_Outdoor_Terrace=Terrasse,Terrasser,Veranda,Verandaer
 Location_Outdoor_Carport=Carport,Carporter
+Location_Outdoor_Driveway=xxx
+Location_Outdoor_Garden=Hage,Hager
+Location_Outdoor_Patio=xxx
+Location_Outdoor_Porch=xxx
+Location_Outdoor_Terrace=Terrasse,Terrasser,Veranda,Verandaer
 Property_Temperature=Temperatur,Temperaturer
 Property_Light=Lys,Belysning
 Property_ColorTemperature=Fargetemperatur
@@ -37,6 +55,13 @@ Property_Frequency=Frekvens
 Property_Gas=Gass
 Property_SoundVolume=Lydvolum
 Property_Oil=Olje
+Property_Duration=xxx
+Property_Illuminance=xxx
+Property_Level=xxx
+Property_Opening=xxx
+Property_Timestamp=xxx
+Property_Ultraviolet=xxx
+Property_Vibration=xxx
 Point_Alarm=Alarm
 Point_Control=Kontroll
 Point_Control_Switch=Bryter
@@ -44,36 +69,60 @@ Point_Measurement=M
 Point_Setpoint=Settpunkt
 Point_Status=Status
 Point_Status_LowBattery=Lavt Batteri
+Point_Status_OpenLevel=Åpent Nivå
 Point_Status_OpenState=Åpen Tilstand
 Point_Status_Tampered=Tuklet
-Point_Status_OpenLevel=Åpent Nivå
 Point_Status_Tilt=Tilt
+Equipment_AlarmSystem=xxx
 Equipment_Battery=Batteri,Batterier
 Equipment_Blinds=Persienner,Rullegardin,Rullegardiner
+Equipment_Boiler=xxx
 Equipment_Camera=Kamera,Kameraer
 Equipment_Car=Bil,Biler
 Equipment_CleaningRobot=Rengjørings Robot,Rengjørings Roboter,Robot Støvsuger,Robot Støvsugere
 Equipment_Door=Dør,Dører
+Equipment_Door_BackDoor=xxx
+Equipment_Door_CellarDoor=xxx
 Equipment_Door_FrontDoor=Inngangsdør,Inngangsdører
 Equipment_Door_GarageDoor=Garasjedør,Garasjedører
+Equipment_Door_Gate=xxx
+Equipment_Door_InnerDoor=xxx
+Equipment_Door_SideDoor=xxx
+Equipment_Doorbell=xxx
+Equipment_Fan=xxx
+Equipment_Fan_CeilingFan=xxx
+Equipment_Fan_KitchenHood=xxx
 Equipment_HVAC=HVAC,Ventilasjon,Klimaanlegg,A/C,A/Cs,AC
 Equipment_Inverter=Varmepumpe,Varmepumper
 Equipment_LawnMower=Gressklipper,Gressklippere
 Equipment_Lightbulb=Lyspære,Lyspærer,Pære,Pærer,Lampe,Lamper,Lys
+Equipment_Lightbulb_LightStripe=xxx
 Equipment_Lock=Lås,Låser
-Equipment_MotionDetector=Bevegelsesdetektor,Bevegelsesdetektorer,Bevegelses Sensor,Bevegelses Sensorer
 Equipment_NetworkAppliance=Nettverksapparat,Nettverksapparater
 Equipment_PowerOutlet=Strømuttak,Uttak
 Equipment_Projector=Prosjektor,Prosjektorer,Fremviser,Fremvisere
+Equipment_Pump=xxx
 Equipment_RadiatorControl=Radiatorstyring,Radiatorstyringer,Radiator,Radiatorer
 Equipment_Receiver=Mottaker,Mottakere,Lydmottaker,Lydmottakere,AV-mottaker,AV-mottakere
 Equipment_RemoteControl=Fjernkontroll,Fjernkontroller
 Equipment_Screen=Skjerm,Skjermer,Fjernsynsapparat,Fjernsynsapparater,TV,TVs
+Equipment_Screen_Television=xxx
+Equipment_Sensor=xxx
+Equipment_Sensor_MotionDetector=Bevegelsesdetektor,Bevegelsesdetektorer,Bevegelses Sensor,Bevegelses Sensorer
+Equipment_Sensor_SmokeDetector=Røykdetektor,Røykdetektorer
 Equipment_Siren=Sirene,Sirener
-Equipment_SmokeDetector=Røykdetektor,Røykdetektorer
+Equipment_Smartphone=xxx
 Equipment_Speaker=Høyttaler,Høyttalere
 Equipment_Valve=Ventil,Ventiler
+Equipment_VoiceAssistant=xxx
 Equipment_WallSwitch=Veggbryter,Veggbrytere
 Equipment_WebService=Nettjeneste,Nettjenester
-Equipment_Window=Vindu,Vinduer
+Equipment_WebService_WeatherService=xxx
 Equipment_WhiteGood=Hvitevare,Hvitevarer
+Equipment_WhiteGood_Dishwasher=xxx
+Equipment_WhiteGood_Dryer=xxx
+Equipment_WhiteGood_Freezer=xxx
+Equipment_WhiteGood_Oven=xxx
+Equipment_WhiteGood_Refrigerator=xxx
+Equipment_WhiteGood_WashingMachine=xxx
+Equipment_Window=Vindu,Vinduer

bundles/org.openhab.core.semantics/src/main/resources/tags_pl.properties

@@ -1,21 +1,39 @@
 Location_Indoor=Wnętrze,Wnętrz,Wewnętrzne,Wewnętrzny,Wewnętrzna
+Location_Indoor_Apartment=xxx
 Location_Indoor_Building=Budynek,Budynki,Dom,Domowe,Budynkowe,Budynkowa,Budynkowy
 Location_Indoor_Building_Garage=Garaż,Garaże,Garażom,Garażowe
+Location_Indoor_Building_House=xxx
+Location_Indoor_Building_Shed=xxx
+Location_Indoor_Building_SummerHouse=xxx
 Location_Indoor_Floor=Podłoga,Podłogi,Podłodze
 Location_Indoor_Floor_GroundFloor=Parter,Parterze,Parteru,Parterowe
 Location_Indoor_Floor_FirstFloor=Pierwsze piętro,Pierwszym piętrze,Pierwsze piętra,Piętro wyżej
+Location_Indoor_Floor_SecondFloor=xxx
+Location_Indoor_Floor_ThirdFloor=xxx
 Location_Indoor_Floor_Attic=Poddasze,Poddaszu,Poddasza
 Location_Indoor_Floor_Basement=Piwnica,Piwnice,Piwnicy
 Location_Indoor_Corridor=Korytarz,Korytarze,Korytarzu,Korytarzem
 Location_Indoor_Room=Pokój,Pokoje,Pokoju
-Location_Indoor_Room_Bedroom=Sypialnia,Sypialnie,Sypialni,Sypialniane
-Location_Indoor_Room_Kitchen=Kuchnia,Kuchnie,Kuchni,Kuchenne
 Location_Indoor_Room_Bathroom=Łazienka,Łazience,Łazienki,Łazienkowe
+Location_Indoor_Room_Bedroom=Sypialnia,Sypialnie,Sypialni,Sypialniane
+Location_Indoor_Room_BoilerRoom=xxx
+Location_Indoor_Room_Cellar=xxx
+Location_Indoor_Room_DiningRoom=xxx
+Location_Indoor_Room_Entry=xxx
+Location_Indoor_Room_FamilyRoom=xxx
+Location_Indoor_Room_GuestRoom=xxx
+Location_Indoor_Room_Kitchen=Kuchnia,Kuchnie,Kuchni,Kuchenne
+Location_Indoor_Room_LaundryRoom=xxx
 Location_Indoor_Room_LivingRoom=Pokój dzienny,Pokoje dzienne,Pokoju dziennym,Salon,Salonie,Salonowe
+Location_Indoor_Room_Office=xxx
+Location_Indoor_Room_Veranda=xxx
 Location_Outdoor=Na zewnątrz,Zewnętrzne,Zewnętrzny,Zewnętrzna
-Location_Outdoor_Garden=Ogród,Ogrody,ogrodowe,Ogródek,ogródkowe
-Location_Outdoor_Terrace=Taras,Tarasy,Tarasowe
 Location_Outdoor_Carport=Wiata,Wiata garażowa,Wiaty garażowej
+Location_Outdoor_Driveway=xxx
+Location_Outdoor_Garden=Ogród,Ogrody,ogrodowe,Ogródek,ogródkowe
+Location_Outdoor_Patio=xxx
+Location_Outdoor_Porch=xxx
+Location_Outdoor_Terrace=Taras,Tarasy,Tarasowe
 Property_Temperature=Temperatura,Temperatury
 Property_Light=Światło,Światła,Oświetlenie,Oświetleniu,Światłu
 Property_ColorTemperature=Temperatura barwy,Temperatura koloru
@@ -37,6 +55,13 @@ Property_Frequency=Częstotliwość,Częstotliwości
 Property_Gas=Gaz,Gazu
 Property_SoundVolume=Głośność dźwięku,Głośność
 Property_Oil=Olej,Oleju
+Property_Duration=xxx
+Property_Illuminance=xxx
+Property_Level=xxx
+Property_Opening=xxx
+Property_Timestamp=xxx
+Property_Ultraviolet=xxx
+Property_Vibration=xxx
 Point_Alarm=Alarm,Alarmu,alarmowy
 Point_Control=Kontrola,Zarządzanie
 Point_Control_Switch=Przełącznik,Włącznik,Łącznik,Przycisk
@@ -44,36 +69,60 @@ Point_Measurement=Pomiar,Pomiary,Metryka,Metryki
 Point_Setpoint=Wartość zadana
 Point_Status=Status,Stan
 Point_Status_LowBattery=Niski poziom baterii,Słaba bateria
+Point_Status_OpenLevel=Poziom otwarcia
 Point_Status_OpenState=Otwarte,Otwarty,Otwarta
 Point_Status_Tampered=Naruszone,Naruszony,Naruszona,Manipulowane,Manipulowany,Manipulowana
-Point_Status_OpenLevel=Poziom otwarcia
 Point_Status_Tilt=Przechylenie,Nachylenie
+Equipment_AlarmSystem=xxx
 Equipment_Battery=Bateria,Baterie
 Equipment_Blinds=Żaluzje,Żaluzja,Żaluzji,Żaluzjom
+Equipment_Boiler=xxx
 Equipment_Camera=Kamera,Kamery,Aparat,Aparaty
 Equipment_Car=Samochód,Samochody,Samochodu,Samochodowe
 Equipment_CleaningRobot=Robot czyszczący,Roboty czyszczące,Odkurzacz automatyczny,Odkurzacz
 Equipment_Door=Drzwi,Drzwiom
+Equipment_Door_BackDoor=xxx
+Equipment_Door_CellarDoor=xxx
 Equipment_Door_FrontDoor=Drzwi wejściowe,Drzwi wejściowych,Drzwiom wejściowym
 Equipment_Door_GarageDoor=Bramy garażowe,Drzwi garażowe,Brama garażowa,Bramom garażowym
+Equipment_Door_Gate=xxx
+Equipment_Door_InnerDoor=xxx
+Equipment_Door_SideDoor=xxx
+Equipment_Doorbell=xxx
+Equipment_Fan=xxx
+Equipment_Fan_CeilingFan=xxx
+Equipment_Fan_KitchenHood=xxx
 Equipment_HVAC=Klimatyzacja,Klimatyzacje,Klimatyzację,Klimatyzacji,Klima,Klimie,Klimom,Klimę
 Equipment_Inverter=Inwerter,Falownik
 Equipment_LawnMower=Kosiarka,Kosiarki,Kosiarce,Kosiarkę
 Equipment_Lightbulb=Żarówka,Żarówek,Żarówki,Żarówkę,Lampa,Lampka,Lampę,Lampkę,Lampki,Lampie
+Equipment_Lightbulb_LightStripe=xxx
 Equipment_Lock=Zamek,Zamki,Zamków,Zamka
-Equipment_MotionDetector=Detektor ruchu,Detektory ruchu,Czujka ruchu,Czujkę ruchu,Czujnik ruchu,Czujniki ruchu,Czujników ruchu
 Equipment_NetworkAppliance=Urządzenie sieciowe,Urządzenia sieciowe
 Equipment_PowerOutlet=Gniazdko,Gniazdo,Kontakt,Gniazdko zasilania,Gniazda zasilania,Wtyczka,Wtyczkę
 Equipment_Projector=Projektor,Projektory,Projektorów,Projektorom,Projektorem
+Equipment_Pump=xxx
 Equipment_RadiatorControl=Sterowanie radiatorem
 Equipment_Receiver=Odbiornik,Odbiorniki
 Equipment_RemoteControl=Zdalne sterowanie,Pilot,Kontroler,Piloty,Pilota,Pilotów
 Equipment_Screen=Ekran,Ekrany
+Equipment_Screen_Television=xxx
+Equipment_Sensor=xxx
+Equipment_Sensor_MotionDetector=Detektor ruchu,Detektory ruchu,Czujka ruchu,Czujkę ruchu,Czujnik ruchu,Czujniki ruchu,Czujników ruchu
+Equipment_Sensor_SmokeDetector=Wykrywacz dymu,Czujniki dymu
 Equipment_Siren=Syrena,Syreny,Syrena alarmowa,Syrenę,Syrenę alarmową,Syreny alarmowej
-Equipment_SmokeDetector=Wykrywacz dymu,Czujniki dymu
+Equipment_Smartphone=xxx
 Equipment_Speaker=Głośnik,Głośniki
 Equipment_Valve=Valve,Zawory
+Equipment_VoiceAssistant=xxx
 Equipment_WallSwitch=Przełącznik ścienny,Przełączniki ścienne
 Equipment_WebService=Usługa internetowa,Usługi internetowe
-Equipment_Window=Okno,Okna
+Equipment_WebService_WeatherService=xxx
 Equipment_WhiteGood=AGD
+Equipment_WhiteGood_Dishwasher=xxx
+Equipment_WhiteGood_Dryer=xxx
+Equipment_WhiteGood_Freezer=xxx
+Equipment_WhiteGood_Oven=xxx
+Equipment_WhiteGood_Refrigerator=xxx
+Equipment_WhiteGood_WashingMachine=xxx
+Equipment_Window=Okno,Okna