From 4dfee9fcf66c061c32355955dc13b2bf15457569 Mon Sep 17 00:00:00 2001
From: apo-mak <apo-mak@users.noreply.github.com>
Date: Sun, 17 Dec 2023 11:49:11 +0200
Subject: [PATCH 1/7] Update turnOff and LightsTurnOff

---
 responses/el/HassTurnOff.yaml               |  3 ++-
 sentences/el/homeassistant_HassTurnOff.yaml | 14 ++++++++++++++
 sentences/el/light_HassTurnOff.yaml         | 21 +++++++++++++++++++++
 tests/el/light_HassTurnOff.yaml             |  9 ++-------
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/responses/el/HassTurnOff.yaml b/responses/el/HassTurnOff.yaml
index cc9097b584..c528177a11 100644
--- a/responses/el/HassTurnOff.yaml
+++ b/responses/el/HassTurnOff.yaml
@@ -3,7 +3,8 @@ responses:
   intents:
     HassTurnOff:
       default: "Έκλεισε"
-      lights_area: "Έκλεισαν τα φώτα"
+      light_all: "Έκλεισαν όλα τα φώτα"
+      lights_area: "Έκλεισαν όλα τα φώτα"
       fans_area: "Έκλεισαν οι ανεμιστήρες"
       cover: "{{ slots.name }} έκλεισε"
       cover_area: "{{ slots.area }} έκλεισε"
diff --git a/sentences/el/homeassistant_HassTurnOff.yaml b/sentences/el/homeassistant_HassTurnOff.yaml
index fea8343a9f..56f19b8474 100644
--- a/sentences/el/homeassistant_HassTurnOff.yaml
+++ b/sentences/el/homeassistant_HassTurnOff.yaml
@@ -7,3 +7,17 @@ intents:
           - <articles> <name> να <turn_off>
           - να <turn_off> <articles> <name>
           - να <turn_off> <articles> <name>
+      - sentences:
+          - <turn_on> [(πάνω | ψηλά)] [<all>] [<articles>] (<garage_doors> | <doors> |
+            <covers>) <articles> <area> [(πάνω | ψηλά)]
+          - <turn_on> [(πάνω | ψηλά)] <articles> <area> [<all>] [<articles>] (<garage_doors>
+            | <doors> | <covers>) [(πάνω | ψηλά)]
+        response: cover_area
+        excludes_context:
+          domain:
+            - binary_sensor
+            - cover
+            - lock
+            - scene
+            - script
+            - sensor
diff --git a/sentences/el/light_HassTurnOff.yaml b/sentences/el/light_HassTurnOff.yaml
index 54adb03748..31e6b22384 100644
--- a/sentences/el/light_HassTurnOff.yaml
+++ b/sentences/el/light_HassTurnOff.yaml
@@ -9,3 +9,24 @@ intents:
           domain: light
           name: all
         response: "lights_area"
+
+      - sentences:
+          - "[<turn_off>] (όλα τα <lights> | σβηστά <lights> παντού)"
+          - "Κλείσε (όλα τα <lights>|<lights> παντού)"
+        response: "light_all"
+        slots:
+          domain: "light"
+          name: "all"
+
+      # Turn off lights in the same area as a satellite device
+      - sentences:
+          - "<turn_off> ( σβήσε | κλείσε) [ the] ( τα <lights> | το φώς )<in_here>"
+          - "<turn_off>[ αυτό | αυτά|  εδώ ] ( τα <lights> | το <lights> )( off;<in_here>)"
+        response: "lights_area"
+        expansion_rules:
+          in_here: "[ στο δωμάτιο | στον χώρο | εδώ ]"
+        slots:
+          domain: "light"
+        requires_context:
+          area:
+            slot: true
diff --git a/tests/el/light_HassTurnOff.yaml b/tests/el/light_HassTurnOff.yaml
index 5abe68153b..a5f6bd3cbf 100644
--- a/tests/el/light_HassTurnOff.yaml
+++ b/tests/el/light_HassTurnOff.yaml
@@ -4,20 +4,15 @@ tests:
       - Κλείσε όλα τα φώτα στο σαλόνι
       - Σβήσε όλα τα φώτα στο σαλόνι
       - Απενεργοποίησε όλα τα φώτα στο σαλόνι
-      - Σβήσε τα φώτα στο σαλόνι
-      - Σβήσε τις λάμπες στο σαλόνι
-      - Σβήσε τα φωτιστικά στο σαλόνι
-
       - Σβήσε στο σαλόνι όλες τις λάμπες
       - Απενεργοποίησε στο σαλόνι όλα τα φωτιστικά
-      - Κλείσε στο σαλόνι τα φώτα
     intent:
       name: HassTurnOff
       slots:
         area: Σαλόνι
         domain: light
         name: all
-    response: Έκλεισαν τα φώτα
+    response: Έκλεισαν όλα τα φώτα
   - sentences:
       - Κλείσε όλα τα φώτα στην κουζίνα
       - Σβήσε όλα τα φώτα στην κουζίνα
@@ -35,4 +30,4 @@ tests:
         area: Κουζίνα
         domain: light
         name: all
-    response: Έκλεισαν τα φώτα
+    response: Έκλεισαν όλα τα φώτα

From bcd3849441c02ea62cdba374e6d76b717773f31f Mon Sep 17 00:00:00 2001
From: apo-mak <apo-mak@users.noreply.github.com>
Date: Sun, 17 Dec 2023 11:56:49 +0200
Subject: [PATCH 2/7] Update homeassistant_HassTurnOff.yaml

---
 sentences/el/homeassistant_HassTurnOff.yaml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/sentences/el/homeassistant_HassTurnOff.yaml b/sentences/el/homeassistant_HassTurnOff.yaml
index 56f19b8474..fea8343a9f 100644
--- a/sentences/el/homeassistant_HassTurnOff.yaml
+++ b/sentences/el/homeassistant_HassTurnOff.yaml
@@ -7,17 +7,3 @@ intents:
           - <articles> <name> να <turn_off>
           - να <turn_off> <articles> <name>
           - να <turn_off> <articles> <name>
-      - sentences:
-          - <turn_on> [(πάνω | ψηλά)] [<all>] [<articles>] (<garage_doors> | <doors> |
-            <covers>) <articles> <area> [(πάνω | ψηλά)]
-          - <turn_on> [(πάνω | ψηλά)] <articles> <area> [<all>] [<articles>] (<garage_doors>
-            | <doors> | <covers>) [(πάνω | ψηλά)]
-        response: cover_area
-        excludes_context:
-          domain:
-            - binary_sensor
-            - cover
-            - lock
-            - scene
-            - script
-            - sensor

From 5cca47702714bc8d2b48dd82e823cfb8524e0c66 Mon Sep 17 00:00:00 2001
From: apo-mak <apo-mak@users.noreply.github.com>
Date: Sun, 17 Dec 2023 21:19:07 +0200
Subject: [PATCH 3/7] Update HassTurnOff.yaml

---
 responses/el/HassTurnOff.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/responses/el/HassTurnOff.yaml b/responses/el/HassTurnOff.yaml
index c528177a11..99a21e0a00 100644
--- a/responses/el/HassTurnOff.yaml
+++ b/responses/el/HassTurnOff.yaml
@@ -4,7 +4,7 @@ responses:
     HassTurnOff:
       default: "Έκλεισε"
       light_all: "Έκλεισαν όλα τα φώτα"
-      lights_area: "Έκλεισαν όλα τα φώτα"
+      lights_area: "Έκλεισαν τα φώτα"
       fans_area: "Έκλεισαν οι ανεμιστήρες"
       cover: "{{ slots.name }} έκλεισε"
       cover_area: "{{ slots.area }} έκλεισε"

From 0ee2da35a61f2c5816e6b9b6ba05e0d9c52c731b Mon Sep 17 00:00:00 2001
From: apo-mak <apo-mak@users.noreply.github.com>
Date: Sun, 17 Dec 2023 21:25:36 +0200
Subject: [PATCH 4/7] Update light_HassTurnOff.yaml

---
 tests/el/light_HassTurnOff.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/el/light_HassTurnOff.yaml b/tests/el/light_HassTurnOff.yaml
index a5f6bd3cbf..4763a8d753 100644
--- a/tests/el/light_HassTurnOff.yaml
+++ b/tests/el/light_HassTurnOff.yaml
@@ -12,7 +12,7 @@ tests:
         area: Σαλόνι
         domain: light
         name: all
-    response: Έκλεισαν όλα τα φώτα
+    response: Έκλεισαν τα φώτα
   - sentences:
       - Κλείσε όλα τα φώτα στην κουζίνα
       - Σβήσε όλα τα φώτα στην κουζίνα

From a2641d7447d3808cbfb3868be16739232f32274e Mon Sep 17 00:00:00 2001
From: apo-mak <apo-mak@users.noreply.github.com>
Date: Sun, 17 Dec 2023 21:53:17 +0200
Subject: [PATCH 5/7] Update light_HassTurnOff.yaml

---
 tests/el/light_HassTurnOff.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/el/light_HassTurnOff.yaml b/tests/el/light_HassTurnOff.yaml
index 4763a8d753..00750bdabe 100644
--- a/tests/el/light_HassTurnOff.yaml
+++ b/tests/el/light_HassTurnOff.yaml
@@ -30,4 +30,4 @@ tests:
         area: Κουζίνα
         domain: light
         name: all
-    response: Έκλεισαν όλα τα φώτα
+    response: Έκλεισαν τα φώτα

From 49f1980675c4548a0788a992f9303ddd32e3f0fc Mon Sep 17 00:00:00 2001
From: apo-mak <apo-mak@users.noreply.github.com>
Date: Mon, 18 Dec 2023 11:05:54 +0200
Subject: [PATCH 6/7] Update light_HassTurnOff.yaml

---
 sentences/el/light_HassTurnOff.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sentences/el/light_HassTurnOff.yaml b/sentences/el/light_HassTurnOff.yaml
index 31e6b22384..2dfe331f6b 100644
--- a/sentences/el/light_HassTurnOff.yaml
+++ b/sentences/el/light_HassTurnOff.yaml
@@ -20,8 +20,8 @@ intents:
 
       # Turn off lights in the same area as a satellite device
       - sentences:
-          - "<turn_off> ( σβήσε | κλείσε) [ the] ( τα <lights> | το φώς )<in_here>"
-          - "<turn_off>[ αυτό | αυτά|  εδώ ] ( τα <lights> | το <lights> )( off;<in_here>)"
+          - "<turn_off> ( σβήσε | κλείσε) [ <articles> ] ( <lights> | φώς )<in_here>"
+          - "<turn_off>[ αυτό | αυτά|  εδώ ] ( <lights> | <lights> )( <in_here> )"
         response: "lights_area"
         expansion_rules:
           in_here: "[ στο δωμάτιο | στον χώρο | εδώ ]"

From c97a30bcddbad9554c89a342c506f6c89ae547b8 Mon Sep 17 00:00:00 2001
From: apo-mak <apo-mak@users.noreply.github.com>
Date: Mon, 18 Dec 2023 11:11:33 +0200
Subject: [PATCH 7/7] Update light_HassTurnOff.yaml

---
 sentences/el/light_HassTurnOff.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sentences/el/light_HassTurnOff.yaml b/sentences/el/light_HassTurnOff.yaml
index 2dfe331f6b..e28ae9f262 100644
--- a/sentences/el/light_HassTurnOff.yaml
+++ b/sentences/el/light_HassTurnOff.yaml
@@ -11,7 +11,7 @@ intents:
         response: "lights_area"
 
       - sentences:
-          - "[<turn_off>] (όλα τα <lights> | σβηστά <lights> παντού)"
+          - "[<turn_off>] (όλα τα <lights> | <lights> παντού)"
           - "Κλείσε (όλα τα <lights>|<lights> παντού)"
         response: "light_all"
         slots:
@@ -20,8 +20,8 @@ intents:
 
       # Turn off lights in the same area as a satellite device
       - sentences:
-          - "<turn_off> ( σβήσε | κλείσε) [ <articles> ] ( <lights> | φώς )<in_here>"
-          - "<turn_off>[ αυτό | αυτά|  εδώ ] ( <lights> | <lights> )( <in_here> )"
+          - "<turn_off> [ <articles> ] ( <lights> )<in_here>"
+          - "<turn_off>[ αυτό | αυτά|  εδώ ] ( <lights> )( <in_here> )"
         response: "lights_area"
         expansion_rules:
           in_here: "[ στο δωμάτιο | στον χώρο | εδώ ]"