home-assistant-intents 2024.12.4__tar.gz → 2024.12.9__tar.gz

{home_assistant_intents-2024.12.4/home_assistant_intents.egg-info → home_assistant_intents-2024.12.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: home-assistant-intents
-Version: 2024.12.4
+Version: 2024.12.9
 Summary: Intents for Home Assistant
 Author-email: The Home Assistant Authors <hello@home-assistant.io>
 License: Apache-2.0

{home_assistant_intents-2024.12.4 → home_assistant_intents-2024.12.9}/home_assistant_intents/data/ca.json

@@ -25,8 +25,8 @@
         },
         {
           "sentences": [
-            "(<apaga>|<tanca>) tots els llums [<everywhere>]",
-            "(<apaga>|<tanca>) totes les llums [<everywhere>]"
+            "[<can_you>] (<apaga>|<tanca>) tots els llums [<everywhere>]",
+            "[<can_you>] (<apaga>|<tanca>) totes les llums [<everywhere>]"
           ],
           "expansion_rules": {
             "everywhere": "(de|a) [la] casa"
@@ -37,8 +37,8 @@
         },
         {
           "sentences": [
-            "(<apaga>|<tanca>) <pronom_singular> llum",
-            "(<apaga>|<tanca>) <pronom_plural> llums"
+            "[<torna_a>|<can_you>] (<apaga>|<tanca>) <pronom_singular> llum",
+            "[<torna_a>|<can_you>] (<apaga>|<tanca>) <pronom_plural> llums"
           ],
           "slots": {
             "domain": "light"
@@ -51,8 +51,8 @@
         },
         {
           "sentences": [
-            "(<apaga>|<tanca>) <pronom_singular> llum <area>",
-            "(<apaga>|<tanca>) [tot[e]s] <pronom_plural> llums <area>"
+            "[<torna_a>|<can_you>] (<apaga>|<tanca>) <pronom_singular> llum <area>",
+            "[<can_you>] (<apaga>|<tanca>) [tot[e]s] <pronom_plural> llums <area>"
           ],
           "slots": {
             "domain": "light"
@@ -138,6 +138,24 @@
           "slots": {
             "domain": "fan"
           }
+        },
+        {
+          "sentences": [
+            "(desblo(queja|ca))[r|t] <name> [<area>]"
+          ],
+          "requires_context": {
+            "domain": "lock"
+          },
+          "response": "lock"
+        },
+        {
+          "sentences": [
+            "(desblo(queja|ca))[r|t] tot[e]s <pronom_plural> <objectes_amb_clau> [<area>]"
+          ],
+          "slots": {
+            "domain": "lock"
+          },
+          "response": "lock"
         }
       ]
     },
@@ -145,14 +163,16 @@
       "data": [
         {
           "sentences": [
-            "[saps] on (és|es) [troba] <now> <la_persona>",
-            "[saps] on (està|para) <la_persona> <now>",
-            "[saps] on puc trobar <la_persona> <now>",
+            "[saps] <on> (és|es) [troba] <now> <la_persona>",
+            "[saps] <on> (està|para) <la_persona> <now>",
+            "[saps] <on> puc trobar <la_persona> <now>",
             "pots localitza[r] <la_persona>"
           ],
           "response": "where",
           "expansion_rules": {
-            "la_persona": "((a|al|el|en|a en|la) |l'){name}"
+            "la_persona": "((a|al|el|en|a en|la) |l'){name}",
+            "on": "(on|<on_typo>)",
+            "on_typo": "(or)"
           },
           "requires_context": {
             "domain": "person"
@@ -197,7 +217,8 @@
         },
         {
           "sentences": [
-            "(quin és|com es troba) [l'estat|l'estat de] <name> [<area>]"
+            "quin és l'estat [de|del|de la] <name> [<area>]",
+            "com es troba [l'estat] <name> [<area>]"
           ],
           "response": "one",
           "excludes_context": {
@@ -209,8 +230,8 @@
         },
         {
           "sentences": [
-            "(el|la) [dispositiu] <name> es troba {on_off_states:state} [<area>]",
-            "m'he deixat [el|la] <name> {on_off_states:state}",
+            "(el|la) [dispositiu] {name} es troba {on_off_states:state} [<area>]",
+            "m'he deixat <name> {on_off_states:state}",
             "m'he deixat [el|la] {on_off_domains:domain} [<area>] {on_off_states:state}"
           ],
           "response": "one_yesno",
@@ -262,7 +283,7 @@
       "data": [
         {
           "sentences": [
-            "<quant_queda> (al|de|del|pel) [meu] <temporitzador> [<dades>]",
+            "<quant_queda> (el|al|de|del|pel) [meu] <temporitzador> [<dades>]",
             "<quant_queda> perquè [s']acabi el [meu] <temporitzador> [<dades>]",
             "<quant_queda> per acabar el [meu] <temporitzador> [<dades>]",
             "com (va|està) el [meu] <temporitzador> [<dades>]"
@@ -318,8 +339,8 @@
       "data": [
         {
           "sentences": [
-            "(<engega>|<obre>) tots els llums [<everywhere>]",
-            "(<engega>|<obre>) totes les llums [<everywhere>]"
+            "[<can_you>] (<engega>|<obre>) tots els llums [<everywhere>]",
+            "[<can_you>] (<engega>|<obre>) totes les llums [<everywhere>]"
           ],
           "expansion_rules": {
             "everywhere": "(de|a) [la] casa"
@@ -330,8 +351,8 @@
         },
         {
           "sentences": [
-            "(<engega>|<obre>) <pronom_singular> llum",
-            "(<engega>|<obre>) <pronom_plural> llums"
+            "[<torna_a>|<can_you>] (<engega>|<obre>) <pronom_singular> llum",
+            "[<torna_a>|<can_you>] (<engega>|<obre>) <pronom_plural> llums"
           ],
           "slots": {
             "domain": "light"
@@ -344,8 +365,8 @@
         },
         {
           "sentences": [
-            "(<engega>|<obre>) <pronom_singular> llum <area>",
-            "(<engega>|<obre>) [tot[e]s] <pronom_plural> llums <area>"
+            "[<torna_a>|<can_you>] (<engega>|<obre>) <pronom_singular> llum <area>",
+            "[<can_you>] (<engega>|<obre>) [tot[e]s] <pronom_plural> llums <area>"
           ],
           "slots": {
             "domain": "light"
@@ -435,6 +456,24 @@
           },
           "response": "scene"
         },
+        {
+          "sentences": [
+            "(tanca|bloqueja)[r|t] <name> [<area>]"
+          ],
+          "requires_context": {
+            "domain": "lock"
+          },
+          "response": "lock"
+        },
+        {
+          "sentences": [
+            "(tanca|bloqueja)[r|t] tot[e]s <pronom_plural> <objectes_amb_clau>"
+          ],
+          "slots": {
+            "domain": "lock"
+          },
+          "response": "lock"
+        },
         {
           "sentences": [
             "<engega> <name> [en marxa]"
@@ -736,11 +775,6 @@
           ],
           "expansion_rules": {
             "of": "en |de |d'"
-          },
-          "requires_context": {
-            "area": {
-              "slot": false
-            }
           }
         },
         {
@@ -922,7 +956,8 @@
         "fans_area": "Ventiladors apagats a {{ slots.area }}",
         "cover": "Tanco {{ slots.name }}",
         "cover_device_area": "Tanco {{ slots.device_class }} a {{ slots.area }}",
-        "cover_device_class": "Tanco {{ slots.device_class }}"
+        "cover_device_class": "Tanco {{ slots.device_class }}",
+        "lock": "Desbloquejo {{ slots.name }}"
       },
       "HassStartTimer": {
         "default": "Començo el temporitzador",
@@ -940,7 +975,7 @@
         "cover_device_class": "Obro {{ slots.device_class }}",
         "scene": "Activat",
         "script": "Iniciant",
-        "lock": "Tancant"
+        "lock": "Tanco {{ slots.name }}"
       },
       "HassMediaPause": {
         "default": "Reproducció en pausa"
@@ -1300,9 +1335,9 @@
     "lluentor": "{brightness}[<percent>]",
     "al_stt_typo": "(del|el|en|o)",
     "engega": "(encén|encendre|engega|posa|activa|<engega_stt_typo>)[r|t]",
-    "engega_stt_typo": "((en|em)[ ](geguen|gendra|llega|sembla))|(Àngela|posen)",
-    "apaga": "(apaga[guen]|atura|desconnecta|para)[r|t]|<apaga_stt_typo>",
-    "apaga_stt_typo": "(a paga[r])",
+    "engega_stt_typo": "((en|em)[ ](geguen|gendra|llega|sembla))|(Àngela|posen|posem|General)",
+    "apaga": "(apaga|atura|desconnecta|para)[r|t]|<apaga_stt_typo>",
+    "apaga_stt_typo": "((potser|a) paga[r]|aparga|apaguen|apa ara|a part [de])",
     "tanca": "tanca[r|t]",
     "obre": "(obr(e|i|ir)|obert|òbriga)",
     "llums": "([el|la|es|sa] llum|[els|les|es|ses] llums)",
@@ -1320,12 +1355,15 @@
     "reproduir": "reprodu(ir|eix|ix)|passa[r] [endavant]|(toca|posa|fica|salta|canvia|escolta|continua)[r]",
     "reproduir_again": "(reproduir|posar|ficar|escoltar)",
     "reactiva": "(reanuda[r]|reactiva[r]|repr(è|e)n[dre]|continua[r]|segu(ir|eix|ix))",
+    "objectes_amb_clau": "port(a|es)|pany[s]|portic(ó|ons)",
     "hora": "hor(a|es)",
     "now": "[ara|ara mateix]",
     "how_much": "(quan|(quant|quin)[s|a|es]|què)",
     "again": "([un|una] altr(e|a) (cop|vegada)|de nou)",
+    "torna_a": "(torna[r] a)",
+    "can_you": "[pots|podries]",
     "temporitzador": "(temporitzador|compte enrere|minuter)",
-    "timer_set": "(posa|crea|comença|inicia|activa|programa|fixa|estableix|engega)[r|t]",
+    "timer_set": "(posa|crea|comença|inicia|activa|programa|fixa|estableix|engega)[r|t|'m]",
     "timer_cancel": "(cancel[·l]a|atura|para|deixa|elimina)[r|t]",
     "timer_duration_seconds": "{timer_seconds:seconds} segon[s]",
     "timer_duration_minutes": "({timer_minutes:minutes} minut[s][ [i ]{timer_seconds:seconds} segon[s]])|({timer_minutes:minutes} minut[s] i {timer_half:seconds})|({timer_half:seconds} minut[s])",
@@ -1346,6 +1384,8 @@
     "Pots dir-me",
     "Podries dir-me",
     "Em pots dir",
-    "Em podries dir"
+    "Em podries dir",
+    "Que pots dir-me",
+    "Ara bé"
   ]
 }

{home_assistant_intents-2024.12.4 → home_assistant_intents-2024.12.9}/home_assistant_intents/data/de.json

@@ -89,8 +89,8 @@
           "sentences": [
             "<schliessen> <name>",
             "<name> <schliessen>",
-            "<machen> <name> <zu>",
-            "<name> <zu>[<machen>]"
+            "(<machen>|<fahren>) <name> <zu>",
+            "<name> <zu>[(<machen>|<fahren>)]"
           ],
           "requires_context": {
             "domain": "cover"
@@ -105,9 +105,9 @@
             "<schliessen> <area> (<abdeckung>|<tor>|<garage>)",
             "<schliessen> (<abdeckung>|<tor>|<garage>) <area>",
             "(<abdeckung>|<tor>|<garage>) <area> <schliessen>",
-            "<machen> <area> (<abdeckung>|<tor>|<garage>) <zu>",
-            "<machen> (<abdeckung>|<tor>|<garage>) <area> <zu>",
-            "(<abdeckung>|<tor>|<garage>) <area> <zu>[ <machen>]"
+            "(<machen>|<fahren>) <area> (<abdeckung>|<tor>|<garage>) <zu>",
+            "(<machen>|<fahren>) (<abdeckung>|<tor>|<garage>) <area> <zu>",
+            "(<abdeckung>|<tor>|<garage>) <area> <zu>[ (<machen>|<fahren>)]"
           ],
           "slots": {
             "domain": "cover"
@@ -118,8 +118,8 @@
           "sentences": [
             "<schliessen>[ <area>] (<alle_abdeckungen>|<alle_tore>|<alle_garagen>)",
             "<schliessen> (<alle_abdeckungen>|<alle_tore>|<alle_garagen>)[ <area>]",
-            "<machen>[ <area>] (<alle_abdeckungen>|<alle_tore>|<alle_garagen>) <zu>",
-            "<machen> (<alle_abdeckungen>|<alle_tore>|<alle_garagen>)[ <area>] <zu>"
+            "(<machen>|<fahren>)[ <area>] (<alle_abdeckungen>|<alle_tore>|<alle_garagen>) <zu>",
+            "(<machen>|<fahren>) (<alle_abdeckungen>|<alle_tore>|<alle_garagen>)[ <area>] <zu>"
           ],
           "slots": {
             "domain": "cover"
@@ -322,7 +322,7 @@
         },
         {
           "sentences": [
-            "(wie|was) ist[ [der ]Zustand <von_dem>] <name>[ <area>]"
+            "(wie|was) ist[ [der ]Zustand <von_dem>] <name>[ <area_floor>]"
           ],
           "response": "einzeln",
           "excludes_context": {
@@ -335,9 +335,9 @@
         },
         {
           "sentences": [
-            "ist <name> {on_off_states:state}[ <area>]",
-            "ist <name>[ <area>] {on_off_states:state}",
-            "ist[ <area>] <name> {on_off_states:state}"
+            "ist <name> {on_off_states:state}[ <area_floor>]",
+            "ist <name>[ <area_floor>] {on_off_states:state}",
+            "ist[ <area_floor>] <name> {on_off_states:state}"
           ],
           "response": "einzeln_janein",
           "excludes_context": {
@@ -348,33 +348,33 @@
         },
         {
           "sentences": [
-            "sind[ <irgend>] {on_off_domains:domain} {on_off_states:state}[ <area>]",
-            "sind[ <irgend>] {on_off_domains:domain}[ <area>] {on_off_states:state}",
-            "sind[ <area>][ <irgend>] {on_off_domains:domain} {on_off_states:state}"
+            "sind[ <irgend>] {on_off_domains:domain} {on_off_states:state}[ <area_floor>]",
+            "sind[ <irgend>] {on_off_domains:domain}[ <area_floor>] {on_off_states:state}",
+            "sind[ <area_floor>][ <irgend>] {on_off_domains:domain} {on_off_states:state}"
           ],
           "response": "irgendeins"
         },
         {
           "sentences": [
-            "(sind|ist) <alle> {on_off_domains:domain} {on_off_states:state}[ <area>]",
-            "(sind|ist) <alle> {on_off_domains:domain}[ <area>] {on_off_states:state}",
-            "(sind|ist)[ <area>] <alle> {on_off_domains:domain} {on_off_states:state}"
+            "(sind|ist) <alle> {on_off_domains:domain} {on_off_states:state}[ <area_floor>]",
+            "(sind|ist) <alle> {on_off_domains:domain}[ <area_floor>] {on_off_states:state}",
+            "(sind|ist)[ <area_floor>] <alle> {on_off_domains:domain} {on_off_states:state}"
           ],
           "response": "alle"
         },
         {
           "sentences": [
-            "<welche> {on_off_domains:domain} (ist|sind) {on_off_states:state}[ <area>]",
-            "<welche> {on_off_domains:domain} (ist|sind)[ <area>] {on_off_states:state}",
-            "<welche> {on_off_domains:domain}[ <area>] (ist|sind) {on_off_states:state}"
+            "<welche> {on_off_domains:domain} (ist|sind) {on_off_states:state}[ <area_floor>]",
+            "<welche> {on_off_domains:domain} (ist|sind)[ <area_floor>] {on_off_states:state}",
+            "<welche> {on_off_domains:domain}[ <area_floor>] (ist|sind) {on_off_states:state}"
           ],
           "response": "welches"
         },
         {
           "sentences": [
-            "<wieviel> {on_off_domains:domain} (ist|sind) {on_off_states:state}[ <area>]",
-            "<wieviel> {on_off_domains:domain} (ist|sind)[ <area>] {on_off_states:state}",
-            "<wieviel> {on_off_domains:domain}[ <area>] (ist|sind) {on_off_states:state}"
+            "<wieviel> {on_off_domains:domain} (ist|sind) {on_off_states:state}[ <area_floor>]",
+            "<wieviel> {on_off_domains:domain} (ist|sind)[ <area_floor>] {on_off_states:state}",
+            "<wieviel> {on_off_domains:domain}[ <area_floor>] (ist|sind) {on_off_states:state}"
           ],
           "response": "wie_viele"
         },
@@ -1309,8 +1309,8 @@
           "sentences": [
             "<öffnen> <name>",
             "<name> <öffnen>",
-            "<machen> <name> <auf>",
-            "<name> <auf>[<machen>]"
+            "(<machen>|<fahren>) <name> <auf>",
+            "<name> <auf>[(<machen>|<fahren>)]"
           ],
           "requires_context": {
             "domain": "cover"
@@ -1325,9 +1325,9 @@
             "<öffnen> <area> (<abdeckung>|<tor>|<garage>)",
             "<öffnen> (<abdeckung>|<tor>|<garage>) <area>",
             "(<abdeckung>|<tor>|<garage>) <area> <öffnen>",
-            "<machen> <area> (<abdeckung>|<tor>|<garage>) <auf>",
-            "<machen> (<abdeckung>|<tor>|<garage>) <area> <auf>",
-            "(<abdeckung>|<tor>|<garage>) <area> <auf>[ <machen>]"
+            "(<machen>|<fahren>) <area> (<abdeckung>|<tor>|<garage>) <auf>",
+            "(<machen>|<fahren>) (<abdeckung>|<tor>|<garage>) <area> <auf>",
+            "(<abdeckung>|<tor>|<garage>) <area> <auf>[ (<machen>|<fahren>)]"
           ],
           "slots": {
             "domain": "cover"
@@ -1338,12 +1338,12 @@
           "sentences": [
             "<öffnen> <area> (<alle_tore>|<alle_garagen>)",
             "<öffnen> (<alle_tore>|<alle_garagen>) <area>",
-            "<machen> <area> (<alle_tore>|<alle_garagen>) <auf>",
-            "<machen> (<alle_tore>|<alle_garagen>) <area> <auf>",
+            "(<machen>|<fahren>) <area> (<alle_tore>|<alle_garagen>) <auf>",
+            "(<machen>|<fahren>) (<alle_tore>|<alle_garagen>) <area> <auf>",
             "<öffnen>[ <area>] (<alle_abdeckungen>|<alle_tore>|<alle_garagen>)",
             "<öffnen> (<alle_abdeckungen>|<alle_tore>|<alle_garagen>)[ <area>]",
-            "<machen>[ <area>] (<alle_abdeckungen>|<alle_tore>|<alle_garagen>) <auf>",
-            "<machen> (<alle_abdeckungen>|<alle_tore>|<alle_garagen>)[ <area>] <auf>"
+            "(<machen>|<fahren>)[ <area>] (<alle_abdeckungen>|<alle_tore>|<alle_garagen>) <auf>",
+            "(<machen>|<fahren>) (<alle_abdeckungen>|<alle_tore>|<alle_garagen>)[ <area>] <auf>"
           ],
           "slots": {
             "domain": "cover"
@@ -1895,7 +1895,7 @@
     },
     "intents": {
       "HassGetState": {
-        "einzeln": "{{ slots.name | capitalize }} ist {{ state.state_with_unit }}\n",
+        "einzeln": "{{ slots.name | capitalize }} ist {{ state.state_with_unit | replace(\".\", \",\") if state.state|float(state.state) is number else state.state_with_unit }}\n",
         "einzeln_janein": "{% if query.matched %}\n  Ja\n{% else %}\n  Nein\n{% endif %}\n",
         "irgendeins": "{% if query.matched %}\n  {% set match = query.matched | map(attribute=\"name\") | sort | list %}\n  {% if match | length > 4 %}\n    Ja, {{ match[:3] | join(\", \") }} und {{ (match | length - 3) }} weitere\n  {%- else -%}\n    Ja,\n    {% for name in match -%}\n      {% if not loop.first and not loop.last %}, {% elif loop.last and not loop.first %} und {% endif -%}\n      {{ name }}\n    {%- endfor -%}\n  {% endif %}\n{% else %}\n  Nein\n{% endif %}\n",
         "alle": "{% if not query.unmatched: %}\n  Ja\n{% else %}\n  {% set no_match = query.unmatched | map(attribute=\"name\") | sort | list %}\n  {% if no_match | length > 4 %}\n    Nein, {{ no_match[:3] | join(\", \") }} und {{ (no_match | length - 3) }} weitere sind es nicht\n  {%- else -%}\n    Nein,\n    {% for name in no_match -%}\n      {% if not loop.first and not loop.last %}, {% elif loop.last and not loop.first %} und {% endif -%}\n      {{ name }}\n    {%- endfor %} {% if no_match | length == 1 %}ist{% else %}sind{% endif %} es nicht\n  {% endif %}\n{% endif %}\n",
@@ -2116,7 +2116,7 @@
           "out": "shade"
         },
         {
-          "in": "(Rollladen|Rollläden|Rollo[s]|Beschattung[en])",
+          "in": "(Roll[l](a|ä)den|Rollo[s]|Beschattung[en])",
           "out": "shutter"
         },
         {
@@ -2424,9 +2424,10 @@
     "name": "<artikel_bestimmt> {name}",
     "area": "[in|an|auf|bei][ (<artikel_bestimmt>|im|am|<von_dem>)] {area}[s]",
     "floor": "[in|auf][ (<artikel_bestimmt>|im|<von_dem>)] {floor}[ Geschoss]",
+    "area_floor": "(<area>|<floor>)",
     "an": "(an|ein|auf)",
     "aus": "(aus|ab|zu)",
-    "auf": "(auf|hoch|rauf|nach oben)",
+    "auf": "(auf|hoch|[he]rauf|nach oben)",
     "zu": "(zu|[he]runter|nach unten)",
     "von_dem": "(von[ dem]|vom)",
     "zu_dem": "(zu[ dem]|zum)",
@@ -2435,9 +2436,10 @@
     "öffnen": "(öffne[n]|aufmachen|auf machen)",
     "schalten": "(schalt[e|en|et])",
     "machen": "(mach[e|en|t])",
+    "fahren": "(fahr[e|en|t])",
     "setzen": "(setz[e|en]|stell[e|en]|einstellen|änder[e|n]|veränder[e|n])",
-    "abdeckung": "[(das|die|der|den) ](Rollo[s]|Abdeckung[en]|Rolll(a|ä)den|Jalousie[n]|Raffstore[s]|Markise[n]|Vorh(a|ä)ng[e]|Beschattung[en])",
-    "alle_abdeckungen": "<alle> (Rollos|Abdeckungen|Rolll(a|ä)den|Jalousien|Raffstores|Markisen|Vorhänge|Beschattungen)",
+    "abdeckung": "[(das|die|der|den) ](Rollo[s]|Abdeckung[en]|Roll[l](a|ä)den|Jalousie[n]|Raffstore[s]|Markise[n]|Vorh(a|ä)ng[e]|Beschattung[en])",
+    "alle_abdeckungen": "<alle> (Rollos|Abdeckungen|Roll[l](a|ä)den|Jalousien|Raffstores|Markisen|Vorhänge|Beschattungen)",
     "garage": "[(die|das) ](Garage[n]|Garagentor[e])",
     "alle_garagen": "<alle> (Garagen[tore])",
     "tor": "[(das|die) ]Tor[e]",

{home_assistant_intents-2024.12.4 → home_assistant_intents-2024.12.9}/home_assistant_intents/data/en.json

@@ -1164,7 +1164,7 @@
         },
         {
           "sentences": [
-            "(do you know|tell me|<what_is>) [the [current] (state|value) of] <name> [in <area>]"
+            "(do you know|tell me|<what_is>) [the [current] (state|value) of] <name> [<in_area_floor>]"
           ],
           "response": "one",
           "excludes_context": {
@@ -1176,7 +1176,7 @@
         },
         {
           "sentences": [
-            "is [the] [state of] <name> {on_off_states:state} [in <area>]"
+            "is [the] [state of] <name> {on_off_states:state} [<in_area_floor>]"
           ],
           "response": "one_yesno",
           "excludes_context": {
@@ -1188,27 +1188,27 @@
         },
         {
           "sentences": [
-            "(is|are) [there] any {on_off_domains:domain} {on_off_states:state} [in <area>]",
-            "(do you know|tell me) if there are any {on_off_domains:domain} {on_off_states:state} [in <area>]"
+            "(is|are) [there] any {on_off_domains:domain} {on_off_states:state} [<in_area_floor>]",
+            "(do you know|tell me) if there are any {on_off_domains:domain} {on_off_states:state} [<in_area_floor>]"
           ],
           "response": "any"
         },
         {
           "sentences": [
-            "are all [the] {on_off_domains:domain} [(switched|turned|set [to])] {on_off_states:state} [in <area>]",
-            "are all [the] {on_off_domains:domain} in <area> [(switched|turned|set [to])] {on_off_states:state}"
+            "are all [the] {on_off_domains:domain} [(switched|turned|set [to])] {on_off_states:state} [<in_area_floor>]",
+            "are all [the] {on_off_domains:domain} <in_area_floor> [(switched|turned|set [to])] {on_off_states:state}"
           ],
           "response": "all"
         },
         {
           "sentences": [
-            "[do you know] (which|what) {on_off_domains:domain} (is|are) {on_off_states:state} [in <area>]"
+            "[do you know] (which|what) {on_off_domains:domain} (is|are) {on_off_states:state} [<in_area_floor>]"
           ],
           "response": "which"
         },
         {
           "sentences": [
-            "[tell me] how many {on_off_domains:domain} (is|are) {on_off_states:state} [in <area>]"
+            "[tell me] how many {on_off_domains:domain} (is|are) {on_off_states:state} [<in_area_floor>]"
           ],
           "response": "how_many"
         },
@@ -3779,7 +3779,7 @@
     "lock_states": {
       "values": [
         {
-          "in": "[securely ]locked",
+          "in": "[securely] locked",
           "out": "locked"
         },
         {
@@ -3983,7 +3983,7 @@
     "bs_power_states": {
       "values": [
         {
-          "in": "(powered[ on]|power detected)",
+          "in": "(powered [on]|power detected)",
           "out": "on"
         },
         {
@@ -4170,37 +4170,37 @@
     }
   },
   "expansion_rules": {
-    "name": "[the ]{name}",
-    "area": "[the ]{area}",
-    "floor": "[the ]{floor}[ floor]",
+    "name": "[the] {name}",
+    "area": "[the] {area}",
+    "floor": "[the] {floor} [floor]",
     "area_floor": "(<area>|<floor>)",
-    "in_area_floor": "[<in> ]<area_floor>",
-    "what_is": "(what's|whats|what is|tell me)[ the]",
-    "lockable": "[(the|my) ](lock|door|window|gate|garage door|shutter)[s]",
+    "in_area_floor": "[<in>] <area_floor>",
+    "what_is": "(what's|whats|what is|tell me) [the]",
+    "lockable": "[(the|my)] (lock|door|window|gate|garage door|shutter)[s]",
     "where_is": "(where's|wheres|where is)",
-    "which": "(which|what)[ of the]",
-    "is": "(is|are)[ (there|the)]",
+    "which": "(which|what) [of the]",
+    "is": "(is|are) [(there|the)]",
     "are": "<is>",
-    "any": "(any|some)[ of the]",
-    "are_any": "[<are> ]<any>",
-    "how_many": "how many[ of the]",
-    "brightness": "{brightness}[[ ]%| percent]",
-    "light": "[the ](light|lights|lighting|lamp|lamps)",
+    "any": "(any|some) [of the]",
+    "are_any": "[<are>] <any>",
+    "how_many": "how many [of the]",
+    "brightness": "{brightness}[([ ]%)| percent]",
+    "light": "[the] (light|lights|lighting|lamp|lamps)",
     "turn": "(turn|switch|change|bring)",
     "temp": "(temp|temperature)",
-    "temperature": "{temperature}[([ ]°[ ][{temperature_unit}])|( degrees[ {temperature_unit}])]",
-    "open": "(open|raise|lift)[ up]",
-    "close": "(close|shut|lower)[ (up|down)]",
+    "temperature": "{temperature}[([ ]°[[ ]{temperature_unit}])|( degrees {temperature_unit})]",
+    "open": "(open|raise|lift) [up]",
+    "close": "(close|shut|lower) [(up|down)]",
     "set": "(set|make|change|turn)",
-    "numeric_value_set": "(set|change|turn[ (up|down)]|increase|decrease|make)",
+    "numeric_value_set": "(set|change|turn [(up|down)]|increase|decrease|make)",
     "in": "(in|on|at|of|across|around|throughout)",
-    "position": "{position}[[ ]%| percent]",
-    "volume": "{volume:volume_level}[[ ]%| percent]",
+    "position": "{position}[([ ]%)| percent]",
+    "volume": "{volume:volume_level}[([ ]%)| percent]",
     "currently": "(currently|presently|right now|at the moment)",
-    "state": "[(present|current) ](state|status)",
+    "state": "[(present|current)] (state|status)",
     "clean": "(vacuum|clean)",
-    "all": "(all[[ of] the]|every[ single]|each[ and every])",
-    "are_all": "[<are> ]<all>",
+    "all": "(all [[of] the]|every [single]|each [and every])",
+    "are_all": "[<are>] <all>",
     "home": "(home|house|appartment|flat)",
     "everywhere": "(everywhere|all over|[<in>] the [(entire|whole)] <home>|[<in>] <all> (room|area|floor)[s])",
     "here": "([in] here|[in] (this|the) (room|area|space))",
@@ -4208,12 +4208,12 @@
     "timer_set": "(start|set|create)",
     "timer_cancel": "(cancel|stop)",
     "timer_duration_seconds": "{timer_seconds:seconds} second[s]",
-    "timer_duration_minutes": "({timer_minutes:minutes} minute[s][ [and ]{timer_seconds:seconds} second[s]])|({timer_minutes:minutes} and[ a] {timer_half:seconds} minute[s])|({timer_half:seconds} a minute[s])",
-    "timer_duration_hours": "({timer_hours:hours} hour[s][ [and ]{timer_minutes:minutes} minute[s]][ [and ]{timer_seconds:seconds} second[s]])|({timer_hours:hours} and[ a] {timer_half:minutes} hour[s])|({timer_half:minutes} an hour[s])",
+    "timer_duration_minutes": "({timer_minutes:minutes} minute[s] [[and] {timer_seconds:seconds} second[s]])|({timer_minutes:minutes} and [a] {timer_half:seconds} minute[s])|({timer_half:seconds} a minute[s])",
+    "timer_duration_hours": "({timer_hours:hours} hour[s] [[and] {timer_minutes:minutes} minute[s]] [[and] {timer_seconds:seconds} second[s]])|({timer_hours:hours} and [a] {timer_half:minutes} hour[s])|({timer_half:minutes} an hour[s])",
     "timer_duration": "<timer_duration_seconds>|<timer_duration_minutes>|<timer_duration_hours>",
     "timer_start_seconds": "{timer_seconds:start_seconds} second[s]",
-    "timer_start_minutes": "{timer_minutes:start_minutes} minute[s][ [and ]{timer_seconds:start_seconds} second[s]]",
-    "timer_start_hours": "{timer_hours:start_hours} hour[s][ [and ]{timer_minutes:start_minutes} minute[s]][ [and ]{timer_seconds:start_seconds} second[s]]",
+    "timer_start_minutes": "{timer_minutes:start_minutes} minute[s] [[and] {timer_seconds:start_seconds} second[s]]",
+    "timer_start_hours": "{timer_hours:start_hours} hour[s] [[and] {timer_minutes:start_minutes} minute[s]] [[and] {timer_seconds:start_seconds} second[s]]",
     "timer_start": "<timer_start_seconds>|<timer_start_minutes>|<timer_start_hours>"
   },
   "skip_words": [