From 55a7cf2384333dd1eb504b66dfdbe73705e222be Mon Sep 17 00:00:00 2001 From: Yannick Schaus Date: Mon, 15 Oct 2018 00:09:31 +0200 Subject: [PATCH] semantics: add synonyms, fix "blinds" in French (#6362) Signed-off-by: Yannick Schaus --- .../model/SemanticTags.csv | 22 +++++++++---------- .../semantics/model/equipment/Blinds.java | 2 +- .../model/equipment/CleaningRobot.java | 2 +- .../semantics/model/equipment/FrontDoor.java | 2 +- .../core/semantics/model/equipment/HVAC.java | 2 +- .../semantics/model/equipment/Lightbulb.java | 2 +- .../model/equipment/MotionDetector.java | 2 +- .../model/equipment/PowerOutlet.java | 2 +- .../semantics/model/equipment/Projector.java | 2 +- .../model/equipment/RadiatorControl.java | 2 +- .../semantics/model/equipment/Receiver.java | 2 +- .../semantics/model/equipment/Screen.java | 2 +- .../src/main/resources/tags.properties | 22 +++++++++---------- .../src/main/resources/tags_fr.properties | 2 +- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/model/SemanticTags.csv b/bundles/core/org.eclipse.smarthome.core.semantics/model/SemanticTags.csv index 986048aeb80..9eccafa5512 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/model/SemanticTags.csv +++ b/bundles/core/org.eclipse.smarthome.core.semantics/model/SemanticTags.csv @@ -50,26 +50,26 @@ Point,Tampered,Status,Tampered,, Point,OpenLevel,Status,OpenLevel,, Point,Tilt,Status,Tilt,, Equipment,Battery,,Battery,Batteries, -Equipment,Blinds,,Blinds,, +Equipment,Blinds,,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters", Equipment,Camera,,Camera,Cameras, Equipment,Car,,Car,Cars, -Equipment,CleaningRobot,,Cleaning Robot,Cleaning Robots, +Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots", Equipment,Door,,Door,Doors, -Equipment,FrontDoor,Door,Front Door,Front Doors, +Equipment,FrontDoor,Door,Front Door,"Front Doors, Frontdoor, Frontdoors", Equipment,GarageDoor,Door,Garage Door,Garage Doors, -Equipment,HVAC,,HVAC,"Air Conditioning, A/C, A/Cs", +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, Lamps, Lights", +Equipment,Lightbulb,,Lightbulb,"Lightbulbs, Bulb, Bulbs, Lamp, Lamps, Lights, Lighting", Equipment,Lock,,Lock,Locks, -Equipment,MotionDetector,,Motion Detector,Motion Detectors, +Equipment,MotionDetector,,Motion Detector,"Motion Detectors, Motion sensor, Motion sensors", Equipment,NetworkAppliance,,Network Appliance,Network Appliances, -Equipment,PowerOutlet,,Power Outlet,Power Outlets, -Equipment,Projector,,Projector,Projectors, -Equipment,RadiatorControl,,Radiator Control,Radiator Controls, -Equipment,Receiver,,Receiver,Receivers, +Equipment,PowerOutlet,,Power Outlet,"Power Outlets, Outlet, Outlets", +Equipment,Projector,,Projector,"Projectors, Beamer, Beamers", +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, +Equipment,Screen,,Screen,"Screens, Television, Televisions, TV, TVs", Equipment,Siren,,Siren,Sirens, Equipment,SmokeDetector,,Smoke Detector,Smoke Detectors, Equipment,Speaker,,Speaker,Speakers, diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Blinds.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Blinds.java index 168a638e441..5757f9e18d8 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Blinds.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Blinds.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_Blinds", label = "Blinds", synonyms = "", description = "") +@TagInfo(id = "Equipment_Blinds", label = "Blinds", synonyms = "Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters", description = "") public interface Blinds extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/CleaningRobot.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/CleaningRobot.java index 4781847ecde..92b74a1ed9e 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/CleaningRobot.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/CleaningRobot.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_CleaningRobot", label = "Cleaning Robot", synonyms = "Cleaning Robots", description = "") +@TagInfo(id = "Equipment_CleaningRobot", label = "Cleaning Robot", synonyms = "Cleaning Robots, Vacuum robot, Vacuum robots", description = "") public interface CleaningRobot extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/FrontDoor.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/FrontDoor.java index 9808f526e44..dd38fdcd52b 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/FrontDoor.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/FrontDoor.java @@ -20,6 +20,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_Door_FrontDoor", label = "Front Door", synonyms = "Front Doors", description = "") +@TagInfo(id = "Equipment_Door_FrontDoor", label = "Front Door", synonyms = "Front Doors, Frontdoor, Frontdoors", description = "") public interface FrontDoor extends Door { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/HVAC.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/HVAC.java index 37867fc0cda..0558faa5185 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/HVAC.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/HVAC.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_HVAC", label = "HVAC", synonyms = "Air Conditioning, A/C, A/Cs", description = "") +@TagInfo(id = "Equipment_HVAC", label = "HVAC", synonyms = "Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC", description = "") public interface HVAC extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Lightbulb.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Lightbulb.java index 8a0bde8e13a..1201e10af51 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Lightbulb.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Lightbulb.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_Lightbulb", label = "Lightbulb", synonyms = "Lightbulbs, Lamps, Lights", description = "") +@TagInfo(id = "Equipment_Lightbulb", label = "Lightbulb", synonyms = "Lightbulbs, Bulb, Bulbs, Lamp, Lamps, Lights, Lighting", description = "") public interface Lightbulb extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/MotionDetector.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/MotionDetector.java index abf28fefe3e..e5b6fc84f96 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/MotionDetector.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/MotionDetector.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_MotionDetector", label = "Motion Detector", synonyms = "Motion Detectors", description = "") +@TagInfo(id = "Equipment_MotionDetector", label = "Motion Detector", synonyms = "Motion Detectors, Motion sensor, Motion sensors", description = "") public interface MotionDetector extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/PowerOutlet.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/PowerOutlet.java index b53dd0b874a..8002f8cfb9c 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/PowerOutlet.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/PowerOutlet.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_PowerOutlet", label = "Power Outlet", synonyms = "Power Outlets", description = "") +@TagInfo(id = "Equipment_PowerOutlet", label = "Power Outlet", synonyms = "Power Outlets, Outlet, Outlets", description = "") public interface PowerOutlet extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Projector.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Projector.java index 7ae2af2bad6..e9dbec641b3 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Projector.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Projector.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_Projector", label = "Projector", synonyms = "Projectors", description = "") +@TagInfo(id = "Equipment_Projector", label = "Projector", synonyms = "Projectors, Beamer, Beamers", description = "") public interface Projector extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/RadiatorControl.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/RadiatorControl.java index 28d99ebab8d..d07a19f3d28 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/RadiatorControl.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/RadiatorControl.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_RadiatorControl", label = "Radiator Control", synonyms = "Radiator Controls", description = "") +@TagInfo(id = "Equipment_RadiatorControl", label = "Radiator Control", synonyms = "Radiator Controls, Radiator, Radiators", description = "") public interface RadiatorControl extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Receiver.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Receiver.java index e09e8914df3..2fea17253fb 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Receiver.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Receiver.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_Receiver", label = "Receiver", synonyms = "Receivers", description = "") +@TagInfo(id = "Equipment_Receiver", label = "Receiver", synonyms = "Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers", description = "") public interface Receiver extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Screen.java b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Screen.java index 7dfb58c8706..14b26a7c1ce 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Screen.java +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Screen.java @@ -21,6 +21,6 @@ * @author Generated from generateTagClasses.groovy - Initial contribution * */ -@TagInfo(id = "Equipment_Screen", label = "Screen", synonyms = "Screens", description = "") +@TagInfo(id = "Equipment_Screen", label = "Screen", synonyms = "Screens, Television, Televisions, TV, TVs", description = "") public interface Screen extends Equipment { } diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/resources/tags.properties b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/resources/tags.properties index 82f9b130766..249d493e752 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/resources/tags.properties +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/resources/tags.properties @@ -50,26 +50,26 @@ Point_Status_Tampered=Tampered Point_Status_OpenLevel=OpenLevel Point_Status_Tilt=Tilt Equipment_Battery=Battery,Batteries -Equipment_Blinds=Blinds +Equipment_Blinds=Blinds,Rollershutter,Rollershutters,Roller shutter,Roller shutters,Shutter,Shutters Equipment_Camera=Camera,Cameras Equipment_Car=Car,Cars -Equipment_CleaningRobot=Cleaning Robot,Cleaning Robots +Equipment_CleaningRobot=Cleaning Robot,Cleaning Robots,Vacuum robot,Vacuum robots Equipment_Door=Door,Doors -Equipment_Door_FrontDoor=Front Door,Front Doors +Equipment_Door_FrontDoor=Front Door,Front Doors,Frontdoor,Frontdoors Equipment_Door_GarageDoor=Garage Door,Garage Doors -Equipment_HVAC=HVAC,Air Conditioning,A/C,A/Cs +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,Lamps,Lights +Equipment_Lightbulb=Lightbulb,Lightbulbs,Bulb,Bulbs,Lamp,Lamps,Lights,Lighting Equipment_Lock=Lock,Locks -Equipment_MotionDetector=Motion Detector,Motion Detectors +Equipment_MotionDetector=Motion Detector,Motion Detectors,Motion sensor,Motion sensors Equipment_NetworkAppliance=Network Appliance,Network Appliances -Equipment_PowerOutlet=Power Outlet,Power Outlets -Equipment_Projector=Projector,Projectors -Equipment_RadiatorControl=Radiator Control,Radiator Controls -Equipment_Receiver=Receiver,Receivers +Equipment_PowerOutlet=Power Outlet,Power Outlets,Outlet,Outlets +Equipment_Projector=Projector,Projectors,Beamer,Beamers +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 +Equipment_Screen=Screen,Screens,Television,Televisions,TV,TVs Equipment_Siren=Siren,Sirens Equipment_SmokeDetector=Smoke Detector,Smoke Detectors Equipment_Speaker=Speaker,Speakers diff --git a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/resources/tags_fr.properties b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/resources/tags_fr.properties index 1b93382abed..771edf313c3 100644 --- a/bundles/core/org.eclipse.smarthome.core.semantics/src/main/resources/tags_fr.properties +++ b/bundles/core/org.eclipse.smarthome.core.semantics/src/main/resources/tags_fr.properties @@ -49,7 +49,7 @@ Point_Status_Tampered=vandalis Point_Status_OpenLevel=niveau d'ouverture,niveaux d'ouverture Point_Status_Tilt=inclinaison,inclinaisons Equipment_Battery=batterie,batteries -Equipment_Blinds=batterie,batteries +Equipment_Blinds=store,stores,volet,volets Equipment_Camera=caméra,caméras Equipment_Car=voiture,voitures Equipment_CleaningRobot=robot ménager,robots ménagers,robot aspirateur,robots aspirateurs